From ef532ecc941513a9debadbfc0737eb7461cd3886 Mon Sep 17 00:00:00 2001 From: CWX Date: Fri, 19 Aug 2022 17:27:56 +0100 Subject: [PATCH] bump for aki 3.2.0 --- .../bepInEx/plugins/CWX-BushWhacker.dll | Bin 5632 -> 0 bytes .../types/generators/BotLootGenerator.d.ts | 27 - .../types/generators/BotWeaponGenerator.d.ts | 97 --- .../types/helpers/InRaidHelper.d.ts | 45 -- .../models/eft/common/tables/IBotBase.d.ts | 101 --- .../models/spt/config/IHideoutConfig.d.ts | 27 - .../types/utils/TimeUtil.d.ts | 8 - .../bepInEx/plugins/CWX-BushWhacker.dll | Bin 0 -> 6144 bytes .../mods/CWX-BushWhacker 1.2.1}/LICENSE.txt | 0 .../mods/CWX-BushWhacker 1.2.1}/package.json | 4 +- .../mods/CWX-BushWhacker 1.2.1/src/mod.ts | 14 + .../CWX-BushWhacker 1.2.1}/types/Program.d.ts | 0 .../CWX-BushWhacker 1.2.1}/types/TYPES.d.ts | 0 .../CWX-BushWhacker 1.2.1}/types/Utils.d.ts | 0 .../types/callbacks/BotCallbacks.d.ts | 0 .../types/callbacks/BundleCallbacks.d.ts | 0 .../callbacks/CustomizationCallbacks.d.ts | 0 .../types/callbacks/DataCallbacks.d.ts | 0 .../types/callbacks/DialogueCallbacks.d.ts | 0 .../types/callbacks/GameCallbacks.d.ts | 0 .../types/callbacks/HandbookCallbacks.d.ts | 0 .../types/callbacks/HealthCallbacks.d.ts | 0 .../types/callbacks/HideoutCallbacks.d.ts | 0 .../types/callbacks/HttpCallbacks.d.ts | 0 .../types/callbacks/InraidCallbacks.d.ts | 0 .../types/callbacks/InsuranceCallbacks.d.ts | 0 .../types/callbacks/InventoryCallbacks.d.ts | 0 .../types/callbacks/ItemEventCallbacks.d.ts | 0 .../types/callbacks/LauncherCallbacks.d.ts | 0 .../types/callbacks/LocationCallbacks.d.ts | 0 .../types/callbacks/MatchCallbacks.d.ts | 0 .../types/callbacks/ModCallbacks.d.ts | 0 .../types/callbacks/NoteCallbacks.d.ts | 0 .../types/callbacks/NotifierCallbacks.d.ts | 2 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 0 .../types/callbacks/PresetCallbacks.d.ts | 0 .../types/callbacks/ProfileCallbacks.d.ts | 0 .../types/callbacks/QuestCallbacks.d.ts | 0 .../types/callbacks/RagfairCallbacks.d.ts | 0 .../types/callbacks/RepairCallbacks.d.ts | 0 .../types/callbacks/SaveCallbacks.d.ts | 0 .../types/callbacks/TradeCallbacks.d.ts | 0 .../types/callbacks/TraderCallbacks.d.ts | 0 .../types/callbacks/WeatherCallbacks.d.ts | 0 .../types/callbacks/WishlistCallbacks.d.ts | 0 .../types/context/ApplicationContext.d.ts | 9 + .../types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 2 +- .../controllers/CustomizationController.d.ts | 0 .../types/controllers/DialogueController.d.ts | 0 .../types/controllers/GameController.d.ts | 0 .../types/controllers/HandbookController.d.ts | 0 .../types/controllers/HealthController.d.ts | 0 .../types/controllers/HideoutController.d.ts | 56 +- .../types/controllers/InraidController.d.ts | 19 +- .../controllers/InsuranceController.d.ts | 1 - .../controllers/InventoryController.d.ts | 0 .../types/controllers/LauncherController.d.ts | 0 .../types/controllers/LocationController.d.ts | 0 .../types/controllers/MatchController.d.ts | 4 +- .../types/controllers/NoteController.d.ts | 3 +- .../types/controllers/NotifierController.d.ts | 0 .../controllers/PresetBuildController.d.ts | 0 .../types/controllers/PresetController.d.ts | 0 .../types/controllers/ProfileController.d.ts | 8 +- .../types/controllers/QuestController.d.ts | 0 .../types/controllers/RagfairController.d.ts | 0 .../types/controllers/RepairController.d.ts | 1 - .../RepeatableQuestController.d.ts | 3 +- .../types/controllers/TradeController.d.ts | 0 .../types/controllers/TraderController.d.ts | 0 .../types/controllers/WeatherController.d.ts | 0 .../types/controllers/WishlistController.d.ts | 0 .../types/di/Container.d.ts | 0 .../types/di/OnLoad.d.ts | 0 .../types/di/OnLoadOnUpdate.d.ts | 0 .../types/di/OnUpdate.d.ts | 0 .../types/di/Router.d.ts | 0 .../types/di/Serializer.d.ts | 0 .../types/generators/BotGenerator.d.ts | 30 +- .../generators/BotInventoryGenerator.d.ts | 2 +- .../types/generators/BotLootGenerator.d.ts | 124 ++++ .../types/generators/BotWeaponGenerator.d.ts | 173 +++++ .../types/generators/LocationGenerator.d.ts | 0 .../types/generators/PMCLootGenerator.d.ts | 0 .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 0 .../generators/RagfairOfferGenerator.d.ts | 0 .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 0 .../types/helpers/AssortHelper.d.ts | 0 .../types/helpers/BotGeneratorHelper.d.ts | 12 +- .../types/helpers/BotHelper.d.ts | 3 +- .../types/helpers/ContainerHelper.d.ts | 0 .../types/helpers/DialogueHelper.d.ts | 21 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 0 .../types/helpers/ExtendedProfileHelper.d.ts | 0 .../types/helpers/GameEventHelper.d.ts | 2 +- .../types/helpers/HandbookHelper.d.ts | 0 .../types/helpers/HealthHelper.d.ts | 0 .../types/helpers/HideoutHelper.d.ts | 17 +- .../types/helpers/HttpServerHelper.d.ts | 0 .../types/helpers/InRaidHelper.d.ts | 97 +++ .../types/helpers/InventoryHelper.d.ts | 0 .../types/helpers/ItemHelper.d.ts | 5 +- .../types/helpers/NotificationSendHelper.d.ts | 0 .../types/helpers/NotifierHelper.d.ts | 0 .../types/helpers/PaymentHelper.d.ts | 0 .../types/helpers/PresetHelper.d.ts | 0 .../types/helpers/ProbabilityHelper.d.ts | 0 .../types/helpers/ProfileHelper.d.ts | 9 +- .../types/helpers/QuestConditionHelper.d.ts | 0 .../types/helpers/QuestHelper.d.ts | 27 +- .../types/helpers/RagfairHelper.d.ts | 0 .../types/helpers/RagfairOfferHelper.d.ts | 2 +- .../types/helpers/RagfairSellHelper.d.ts | 0 .../types/helpers/RagfairServerHelper.d.ts | 2 +- .../types/helpers/RagfairSortHelper.d.ts | 0 .../types/helpers/RagfairTaxHelper.d.ts | 0 .../types/helpers/RepairHelper.d.ts | 2 +- .../types/helpers/SecureContainerHelper.d.ts | 0 .../types/helpers/TradeHelper.d.ts | 0 .../types/helpers/TraderAssortHelper.d.ts | 0 .../types/helpers/TraderHelper.d.ts | 0 .../types/helpers/UtilityHelper.d.ts | 0 .../types/helpers/WeightedRandomHelper.d.ts | 0 .../types/ide/BleedingEdgeEntry.d.ts | 0 .../types/ide/Compiler.d.ts | 0 .../types/ide/DebugEntry.d.ts | 0 .../types/ide/ReleaseEntry.d.ts | 0 .../types/ide/TestEntry.d.ts | 0 .../types/loaders/BundleLoader.d.ts | 0 .../types/loaders/DelayedModLoader.d.ts | 0 .../types/loaders/InitialModLoader.d.ts | 0 .../types/loaders/PostAkiModLoader.d.ts | 0 .../types/loaders/PostDBModLoader.d.ts | 0 .../types/loaders/PreAkiModLoader.d.ts | 0 .../types/models/common/MinMax.d.ts | 4 + .../eft/bot/IGenerateBotsRequestData.d.ts | 0 .../models/eft/common/IEmptyRequestData.d.ts | 0 .../types/models/eft/common/IGlobals.d.ts | 0 .../types/models/eft/common/ILocation.d.ts | 0 .../models/eft/common/ILocationBase.d.ts | 0 .../ILocationsSourceDestinationBase.d.ts | 0 .../types/models/eft/common/ILooseLoot.d.ts | 0 .../models/eft/common/IMetricsTableData.d.ts | 0 .../types/models/eft/common/IPmcData.d.ts | 3 + .../models/eft/common/MemberCategory.d.ts | 0 .../request/IBaseInteractionRequestData.d.ts | 0 .../models/eft/common/tables/IBotBase.d.ts} | 126 ++-- .../models/eft/common/tables/IBotCore.d.ts | 0 .../models/eft/common/tables/IBotType.d.ts | 27 +- .../eft/common/tables/ICustomizationItem.d.ts | 0 .../eft/common/tables/IHandbookBase.d.ts | 0 .../types/models/eft/common/tables/IItem.d.ts | 0 .../eft/common/tables/ILocationsBase.d.ts | 0 .../models/eft/common/tables/ILootBase.d.ts | 0 .../models/eft/common/tables/IMatch.d.ts | 0 .../eft/common/tables/IProfileTemplate.d.ts | 0 .../models/eft/common/tables/IQuest.d.ts | 0 .../eft/common/tables/IRepeatableQuests.d.ts | 0 .../eft/common/tables/ITemplateItem.d.ts | 0 .../models/eft/common/tables/ITrader.d.ts | 0 .../IBuyClothingRequestData.d.ts | 0 .../IWearClothingRequestData.d.ts | 0 .../models/eft/dialog/IFriendRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsResponse.d.ts | 0 .../dialog/IGetChatServerListRequestData.d.ts | 0 .../dialog/IGetFriendListDataResponse.d.ts | 0 .../dialog/IGetMailDialogInfoRequestData.d.ts | 0 .../dialog/IGetMailDialogListRequestData.d.ts | 0 .../dialog/IGetMailDialogViewRequestData.d.ts | 0 .../IGetMailDialogViewResponseData.d.ts | 0 .../eft/dialog/IPinDialogRequestData.d.ts | 0 .../eft/dialog/IRemoveDialogRequestData.d.ts | 0 .../eft/dialog/ISendMessageRequest.d.ts | 0 .../eft/dialog/ISetDialogReadRequestData.d.ts | 0 .../models/eft/game/IGameConfigResponse.d.ts | 0 .../eft/game/IGameEmptyCrcRequestData.d.ts | 0 .../eft/game/IReportNicknameRequestData.d.ts | 0 .../eft/game/IVersionValidateRequestData.d.ts | 0 .../types/models/eft/health/Effect.d.ts | 0 .../health/IHealthTreatmentRequestData.d.ts | 0 .../eft/health/IOffraidEatRequestData.d.ts | 0 .../eft/health/IOffraidHealRequestData.d.ts | 0 .../eft/health/ISyncHealthRequestData.d.ts | 0 .../models/eft/hideout/HideoutAreasEnum.d.ts | 0 .../HideoutUpgradeCompleteRequestData.d.ts | 0 .../models/eft/hideout/IHideoutArea.d.ts | 0 ...utContinousProductionStartRequestData.d.ts | 0 .../eft/hideout/IHideoutProduction.d.ts | 0 .../hideout/IHideoutPutItemInRequestData.d.ts | 0 .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IHideoutScavCaseStartRequestData.d.ts | 0 .../eft/hideout/IHideoutSettingsBase.d.ts | 0 ...deoutSingleProductionStartRequestData.d.ts | 0 .../IHideoutTakeItemOutRequestData.d.ts | 0 .../IHideoutTakeProductionRequestData.d.ts | 0 .../IHideoutToggleAreaRequestData.d.ts | 0 .../IHideoutUpgradeCompleteRequestData.d.ts | 0 .../hideout/IHideoutUpgradeRequestData.d.ts | 0 .../httpResponse/IGetBodyResponseData.d.ts | 0 .../eft/httpResponse/INullResponseData.d.ts | 0 .../inRaid/IRegisterPlayerRequestData.d.ts | 0 .../eft/inRaid/ISaveProgressRequestData.d.ts | 0 .../IGetInsuranceCostRequestData.d.ts | 0 .../IGetInsuranceCostResponseData.d.ts | 0 .../eft/insurance/IInsureRequestData.d.ts | 0 .../eft/inventory/IAddItemRequestData.d.ts | 0 .../inventory/IInventoryAddRequestData.d.ts | 0 .../IInventoryBaseActionRequestData.d.ts | 0 .../inventory/IInventoryBindRequestData.d.ts | 0 .../IInventoryCreateMarkerRequestData.d.ts | 0 .../IInventoryDeleteMarkerRequestData.d.ts | 0 .../IInventoryEditMarkerRequestData.d.ts | 0 .../IInventoryExamineRequestData.d.ts | 0 .../inventory/IInventoryFoldRequestData.d.ts | 0 .../inventory/IInventoryMergeRequestData.d.ts | 0 .../inventory/IInventoryMoveRequestData.d.ts | 0 ...IInventoryReadEncyclopediaRequestData.d.ts | 0 .../IInventoryRemoveRequestData.d.ts | 0 .../inventory/IInventorySortRequestData.d.ts | 0 .../inventory/IInventorySplitRequestData.d.ts | 0 .../inventory/IInventorySwapRequestData.d.ts | 0 .../inventory/IInventoryTagRequestData.d.ts | 0 .../IInventoryToggleRequestData.d.ts | 0 .../IInventoryTransferRequestData.d.ts | 0 .../IEmptyItemEventRouterResponse.d.ts | 0 .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../itemEvent/IItemEventRouterRequest.d.ts | 0 .../itemEvent/IItemEventRouterResponse.d.ts | 0 .../eft/launcher/IChangeRequestData.d.ts | 0 .../launcher/IGetMiniProfileRequestData.d.ts | 0 .../eft/launcher/ILoginRequestData.d.ts | 0 .../models/eft/launcher/IMiniProfile.d.ts | 0 .../models/eft/launcher/IRegisterData.d.ts | 0 .../eft/launcher/IRemoveProfileData.d.ts | 0 .../eft/location/IGetLocationRequestData.d.ts | 0 .../eft/match/ICreateGroupRequestData.d.ts | 0 .../eft/match/IEndOfflineRaidRequestData.d.ts | 0 .../eft/match/IGetGroupStatusRequestData.d.ts | 0 .../eft/match/IGetProfileRequestData.d.ts | 0 .../eft/match/IJoinMatchRequestData.d.ts | 0 .../models/eft/match/IJoinMatchResult.d.ts | 0 .../eft/match/IPutMetricsRequestData.d.ts | 0 .../match/IStartOffineRaidRequestData.d.ts | 0 .../eft/match/IUpdatePingRequestData.d.ts | 0 .../models/eft/notes/INoteActionData.d.ts | 0 .../types/models/eft/notifier/INotifier.d.ts | 0 .../notifier/ISelectProfileRequestData.d.ts | 0 ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../IPresetBuildActionRequestData.d.ts | 0 .../profile/GetProfileStatusResponseData.d.ts | 0 .../types/models/eft/profile/IAkiProfile.d.ts | 14 +- .../IProfileChangeNicknameRequestData.d.ts | 0 .../IProfileChangeVoiceRequestData.d.ts | 0 .../profile/IProfileCreateRequestData.d.ts | 0 .../eft/profile/ISearchFriendRequestData.d.ts | 0 .../eft/profile/ISearchFriendResponse.d.ts | 0 .../profile/IValidateNicknameRequestData.d.ts | 0 .../eft/quests/IAcceptQuestRequestData.d.ts | 0 .../eft/quests/ICompleteQuestRequestData.d.ts | 0 .../eft/quests/IHandoverQuestRequestData.d.ts | 0 .../eft/quests/IListQuestsRequestData.d.ts | 0 .../quests/IRepeatableQuestChangeRequest.d.ts | 0 .../eft/ragfair/IAddOfferRequestData.d.ts | 0 .../eft/ragfair/IExtendOfferRequestData.d.ts | 0 .../eft/ragfair/IGetItemPriceResult.d.ts | 0 .../ragfair/IGetMarketPriceRequestData.d.ts | 0 .../models/eft/ragfair/IGetOffersResult.d.ts | 0 .../models/eft/ragfair/IRagfairOffer.d.ts | 0 .../eft/ragfair/IRemoveOfferRequestData.d.ts | 0 .../eft/ragfair/ISearchRequestData.d.ts | 0 .../ISendRagfairReportRequestData.d.ts | 0 .../repair/IBaseRepairActionDataRequest.d.ts | 0 .../eft/repair/IRepairActionDataRequest.d.ts | 0 .../ITraderRepairActionDataRequest.d.ts | 0 .../trade/IProcessBaseTradeRequestData.d.ts | 0 .../trade/IProcessBuyTradeRequestData.d.ts | 0 .../IProcessRagfairTradeRequestData.d.ts | 0 .../trade/IProcessSellTradeRequestData.d.ts | 0 .../models/eft/weather/IWeatherData.d.ts | 0 .../eft/wishlist/IWishlistActionData.d.ts | 0 .../types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../types/models/enums/BaseClasses.d.ts | 0 .../types/models/enums/BotAmount.d.ts | 0 .../types/models/enums/BotDifficulty.d.ts | 0 .../types/models/enums/ConfigTypes.d.ts | 2 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/ELocationName.d.ts | 0 .../types/models/enums/EquipmentSlots.d.ts | 0 .../types/models/enums/HideoutAreas.d.ts | 0 .../types/models/enums/MemberCategory.d.ts | 0 .../types/models/enums/MessageType.d.ts | 0 .../types/models/enums/Money.d.ts | 0 .../types/models/enums/QuestRewardType.d.ts | 0 .../types/models/enums/QuestStatus.d.ts | 3 +- .../types/models/enums/RaidMode.d.ts | 0 .../types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/Traders.d.ts | 0 .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 0 .../types/models/external/IPostDBLoadMod.d.ts | 0 .../types/models/external/IPreAkiLoadMod.d.ts | 0 .../types/models/external/mod.d.ts | 0 .../types/models/external/tsyringe.d.ts | 0 .../types/models/spt/bindings/Route.d.ts | 0 .../types/models/spt/bots/BotLootCache.d.ts | 0 .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../models/spt/callbacks/IBotCallbacks.d.ts | 0 .../spt/callbacks/IBundleCallbacks.d.ts | 0 .../callbacks/ICustomizationCallbacks.d.ts | 0 .../models/spt/callbacks/IDataCallbacks.d.ts | 0 .../spt/callbacks/IDialogueCallbacks.d.ts | 0 .../models/spt/callbacks/IGameCallbacks.d.ts | 0 .../spt/callbacks/IHandbookCallbacks.d.ts | 0 .../spt/callbacks/IHealthCallbacks.d.ts | 0 .../spt/callbacks/IHideoutCallbacks.d.ts | 0 .../models/spt/callbacks/IHttpCallbacks.d.ts | 0 .../spt/callbacks/IInraidCallbacks.d.ts | 0 .../spt/callbacks/IInsuranceCallbacks.d.ts | 0 .../spt/callbacks/IInventoryCallbacks.d.ts | 0 .../spt/callbacks/IItemEventCallbacks.d.ts | 0 .../spt/callbacks/ILauncherCallbacks.d.ts | 0 .../spt/callbacks/ILocationCallbacks.d.ts | 0 .../models/spt/callbacks/IMatchCallbacks.d.ts | 0 .../models/spt/callbacks/IModCallbacks.d.ts | 0 .../models/spt/callbacks/INoteCallbacks.d.ts | 0 .../spt/callbacks/INotifierCallbacks.d.ts | 0 .../spt/callbacks/IPresetBuildCallbacks.d.ts | 0 .../spt/callbacks/IPresetCallbacks.d.ts | 0 .../spt/callbacks/IProfileCallbacks.d.ts | 0 .../models/spt/callbacks/IQuestCallbacks.d.ts | 0 .../spt/callbacks/IRagfairCallbacks.d.ts | 0 .../spt/callbacks/IRepairCallbacks.d.ts | 0 .../models/spt/callbacks/ISaveCallbacks.d.ts | 0 .../models/spt/callbacks/ITradeCallbacks.d.ts | 0 .../spt/callbacks/ITraderCallbacks.d.ts | 0 .../spt/callbacks/IWeatherCallbacks.d.ts | 0 .../spt/callbacks/IWishlistCallbacks.d.ts | 0 .../models/spt/config/IAirdropConfig.d.ts | 0 .../types/models/spt/config/IBaseConfig.d.ts | 0 .../types/models/spt/config/IBotConfig.d.ts | 27 +- .../types/models/spt/config/ICoreConfig.d.ts | 0 .../models/spt/config/IHealthConfig.d.ts | 0 .../models/spt/config/IHideoutConfig.d.ts | 7 + .../types/models/spt/config/IHttpConfig.d.ts | 0 .../models/spt/config/IInRaidConfig.d.ts | 0 .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IInventoryConfig.d.ts | 0 .../models/spt/config/ILocaleConfig.d.ts | 0 .../models/spt/config/ILocationConfig.d.ts | 0 .../types/models/spt/config/IMatchConfig.d.ts | 0 .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../types/models/spt/config/IQuestConfig.d.ts | 0 .../models/spt/config/IRagfairConfig.d.ts | 5 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 0 .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../spt/controllers/IBotController.d.ts | 0 .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../spt/generators/ILocationGenerator.d.ts | 0 .../spt/generators/IPMCLootGenerator.d.ts | 0 .../generators/IRagfairAssortGenerator.d.ts | 0 .../generators/IRagfairOfferGenerator.d.ts | 0 .../types/models/spt/helpers/Traders.d.ts | 0 .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 0 .../models/spt/logging/LogTextColor.d.ts | 0 .../types/models/spt/logging/SptLogger.d.ts | 0 .../types/models/spt/mod/IMod.d.ts | 0 .../types/models/spt/mod/IModLoader.d.ts | 0 .../models/spt/mod/IPackageJsonData.d.ts | 0 .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../spt/ragfair/IRagfairServerPrices.d.ts | 0 .../models/spt/server/IDatabaseTables.d.ts | 0 .../types/models/spt/server/IHttpServer.d.ts | 0 .../types/models/spt/server/ILocaleBase.d.ts | 0 .../types/models/spt/server/ILocations.d.ts | 0 .../types/models/spt/server/IServerBase.d.ts | 0 .../models/spt/server/ISettingsBase.d.ts | 0 .../models/spt/services/CustomPreset.d.ts | 0 .../spt/services/CustomTraderAssortData.d.ts | 0 .../types/models/spt/utils/IAsyncQueue.d.ts | 0 .../types/models/spt/utils/ICommand.d.ts | 0 .../types/models/spt/utils/ILogger.d.ts | 0 .../models/spt/utils/IUuidGenerator.d.ts | 0 .../types/routers/HttpRouter.d.ts | 0 .../types/routers/ImageRouter.d.ts | 0 .../types/routers/ItemEventRouter.d.ts | 0 .../routers/dynamic/BotDynamicRouter.d.ts | 0 .../routers/dynamic/BundleDynamicRouter.d.ts | 0 .../dynamic/CustomizationDynamicRouter.d.ts | 0 .../routers/dynamic/DataDynamicRouter.d.ts | 0 .../routers/dynamic/HttpDynamicRouter.d.ts | 0 .../routers/dynamic/InraidDynamicRouter.d.ts | 0 .../dynamic/LocationDynamicRouter.d.ts | 0 .../dynamic/NotifierDynamicRouter.d.ts | 0 .../routers/dynamic/TraderDynamicRouter.d.ts | 0 .../CustomizationItemEventRouter.d.ts | 0 .../item_events/HealthItemEventRouter.d.ts | 0 .../item_events/HideoutItemEventRouter.d.ts | 0 .../item_events/InsuranceItemEventRouter.d.ts | 0 .../item_events/InventoryItemEventRouter.d.ts | 0 .../item_events/NoteItemEventRouter.d.ts | 0 .../PresetBuildItemEventRouter.d.ts | 0 .../item_events/QuestItemEventRouter.d.ts | 0 .../item_events/RagfairItemEventRouter.d.ts | 0 .../item_events/RepairItemEventRouter.d.ts | 0 .../item_events/TradeItemEventRouter.d.ts | 0 .../item_events/WishlistItemEventRouter.d.ts | 0 .../save_load/HealthSaveLoadRouter.d.ts | 0 .../save_load/InraidSaveLoadRouter.d.ts | 0 .../save_load/InsuranceSaveLoadRouter.d.ts | 0 .../save_load/ProfileSaveLoadRouter.d.ts | 0 .../routers/serializers/BundleSerializer.d.ts | 0 .../routers/serializers/ImageSerializer.d.ts | 0 .../routers/serializers/NotifySerializer.d.ts | 0 .../types/routers/static/BotStaticRouter.d.ts | 0 .../routers/static/BundleStaticRouter.d.ts | 0 .../static/CustomizationStaticRouter.d.ts | 0 .../routers/static/DataStaticRouter.d.ts | 0 .../routers/static/DialogStaticRouter.d.ts | 0 .../routers/static/GameStaticRouter.d.ts | 0 .../routers/static/HealthStaticRouter.d.ts | 0 .../routers/static/InraidStaticRouter.d.ts | 0 .../routers/static/InsuranceStaticRouter.d.ts | 0 .../routers/static/ItemEventStaticRouter.d.ts | 0 .../routers/static/LauncherStaticRouter.d.ts | 0 .../routers/static/LocationStaticRouter.d.ts | 0 .../routers/static/MatchStaticRouter.d.ts | 0 .../routers/static/NotifierStaticRouter.d.ts | 0 .../routers/static/PresetStaticRouter.d.ts | 0 .../routers/static/ProfileStaticRouter.d.ts | 0 .../routers/static/QuestStaticRouter.d.ts | 0 .../routers/static/RagfairStaticRouter.d.ts | 0 .../routers/static/TraderStaticRouter.d.ts | 0 .../routers/static/WeatherStaticRouter.d.ts | 0 .../types/servers/ConfigServer.d.ts | 0 .../types/servers/DatabaseServer.d.ts | 0 .../types/servers/HttpServer.d.ts | 4 +- .../types/servers/RagfairServer.d.ts | 0 .../types/servers/SaveServer.d.ts | 0 .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 35 +- .../types/services/FenceService.d.ts | 0 .../types/services/HashCacheService.d.ts | 0 .../types/services/InsuranceService.d.ts | 17 +- .../types/services/LocaleService.d.ts | 0 .../types/services/MatchLocationService.d.ts | 0 .../types/services/ModCompilerService.d.ts | 0 .../types/services/NotificationService.d.ts | 8 +- .../types/services/PaymentService.d.ts | 0 .../types/services/PlayerService.d.ts | 0 .../types/services/ProfileFixerService.d.ts | 21 + .../services/RagfairCategoriesService.d.ts | 0 .../services/RagfairLinkedItemService.d.ts | 0 .../types/services/RagfairOfferService.d.ts | 0 .../types/services/RagfairPriceService.d.ts | 1 + .../services/RagfairRequiredItemsService.d.ts | 0 .../types/services/TraderAssortService.d.ts | 0 .../types/services/mod/CustomItemService.d.ts | 80 ++ .../mod/dynamicRouter/DynamicRouterMod.d.ts | 0 .../DynamicRouterModService.d.ts | 0 .../services/mod/image/imageRouteService.d.ts | 0 .../types/services/mod/onLoad/OnLoadMod.d.ts | 0 .../services/mod/onLoad/OnLoadModService.d.ts | 0 .../services/mod/onUpdate/OnUpdateMod.d.ts | 0 .../mod/onUpdate/OnUpdateModService.d.ts | 0 .../mod/staticRouter/StaticRouterMod.d.ts | 0 .../staticRouter/StaticRouterModService.d.ts | 0 .../types/utils/App.d.ts | 1 + .../types/utils/AyncQueue.d.ts | 0 .../types/utils/DatabaseImporter.d.ts | 0 .../types/utils/HashUtil.d.ts | 0 .../types/utils/HttpResponseUtil.d.ts | 0 .../types/utils/JsonUtil.d.ts | 0 .../types/utils/Logger.d.ts | 0 .../types/utils/MathUtil.d.ts | 0 .../types/utils/ObjectId.d.ts | 0 .../types/utils/RandomUtil.d.ts | 0 .../types/utils/TimeUtil.d.ts | 18 + .../types/utils/UUidGenerator.d.ts | 0 .../types/utils/VFS.d.ts | 0 .../types/utils/Watermark.d.ts | 0 .../utils/collections/lists/LinkedList.d.ts | 30 + .../types/utils/decorators/Singleton.d.ts | 0 .../types/utils/decorators/constructor.d.ts | 0 Live/CWX_BushWhacker/CWX_BushWhacker.csproj | 3 + Live/CWX_BushWhacker/Plugin.cs | 14 +- Live/CWX_BushWhacker/server/dist/package.json | 4 +- Live/CWX_BushWhacker/server/dist/src/mod.ts | 8 +- .../types/callbacks/NotifierCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../dist/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../dist/types/controllers/BotController.d.ts | 2 +- .../types/controllers/HideoutController.d.ts | 56 +- .../types/controllers/InraidController.d.ts | 19 +- .../controllers/InsuranceController.d.ts | 1 - .../types/controllers/MatchController.d.ts | 4 +- .../types/controllers/NoteController.d.ts | 3 +- .../types/controllers/ProfileController.d.ts | 8 +- .../types/controllers/RepairController.d.ts | 1 - .../RepeatableQuestController.d.ts | 3 +- .../dist/types/generators/BotGenerator.d.ts | 30 +- .../generators/BotInventoryGenerator.d.ts | 2 +- .../types/generators/BotLootGenerator.d.ts | 109 ++- .../types/generators/BotWeaponGenerator.d.ts | 108 ++- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/helpers/BotGeneratorHelper.d.ts | 12 +- .../server/dist/types/helpers/BotHelper.d.ts | 3 +- .../dist/types/helpers/DialogueHelper.d.ts | 21 +- .../dist/types/helpers/GameEventHelper.d.ts | 2 +- .../dist/types/helpers/HideoutHelper.d.ts | 17 +- .../dist/types/helpers/InRaidHelper.d.ts | 70 +- .../server/dist/types/helpers/ItemHelper.d.ts | 5 +- .../dist/types/helpers/ProfileHelper.d.ts | 9 +- .../dist/types/helpers/QuestHelper.d.ts | 27 +- .../types/helpers/RagfairOfferHelper.d.ts | 2 +- .../types/helpers/RagfairServerHelper.d.ts | 2 +- .../dist/types/helpers/RepairHelper.d.ts | 2 +- .../dist/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IPmcData.d.ts | 348 +-------- .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../types/models/eft/profile/IAkiProfile.d.ts | 14 +- .../dist/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../dist/types/models/enums/ConfigTypes.d.ts | 2 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../dist/types/models/enums/QuestStatus.d.ts | 3 +- .../dist/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 27 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 5 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../server/dist/types/servers/HttpServer.d.ts | 4 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 35 +- .../dist/types/services/InsuranceService.d.ts | 17 +- .../types/services/NotificationService.d.ts | 8 +- .../types/services/ProfileFixerService.d.ts | 21 + .../types/services/RagfairPriceService.d.ts | 1 + .../types/services/mod/CustomItemService.d.ts | 80 ++ .../server/dist/types/utils/App.d.ts | 1 + .../server/dist/types/utils/TimeUtil.d.ts | 10 + .../utils/collections/lists/LinkedList.d.ts | 30 + Live/CWX_BushWhacker/server/package.json | 4 +- Live/CWX_BushWhacker/server/src/mod.ts | 8 +- .../types/callbacks/NotifierCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../server/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 2 +- .../types/controllers/HideoutController.d.ts | 56 +- .../types/controllers/InraidController.d.ts | 19 +- .../controllers/InsuranceController.d.ts | 1 - .../types/controllers/MatchController.d.ts | 4 +- .../types/controllers/NoteController.d.ts | 3 +- .../types/controllers/ProfileController.d.ts | 8 +- .../types/controllers/RepairController.d.ts | 1 - .../RepeatableQuestController.d.ts | 3 +- .../server/types/generators/BotGenerator.d.ts | 30 +- .../generators/BotInventoryGenerator.d.ts | 2 +- .../types/generators/BotLootGenerator.d.ts | 109 ++- .../types/generators/BotWeaponGenerator.d.ts | 108 ++- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/helpers/BotGeneratorHelper.d.ts | 12 +- .../server/types/helpers/BotHelper.d.ts | 3 +- .../server/types/helpers/DialogueHelper.d.ts | 21 +- .../server/types/helpers/GameEventHelper.d.ts | 2 +- .../server/types/helpers/HideoutHelper.d.ts | 17 +- .../server/types/helpers/InRaidHelper.d.ts | 70 +- .../server/types/helpers/ItemHelper.d.ts | 5 +- .../server/types/helpers/ProfileHelper.d.ts | 9 +- .../server/types/helpers/QuestHelper.d.ts | 27 +- .../types/helpers/RagfairOfferHelper.d.ts | 2 +- .../types/helpers/RagfairServerHelper.d.ts | 2 +- .../server/types/helpers/RepairHelper.d.ts | 2 +- .../server/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IPmcData.d.ts | 348 +-------- .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../types/models/eft/profile/IAkiProfile.d.ts | 14 +- .../server/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../types/models/enums/ConfigTypes.d.ts | 2 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/QuestStatus.d.ts | 3 +- .../server/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 27 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 5 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../server/types/servers/HttpServer.d.ts | 4 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 35 +- .../types/services/InsuranceService.d.ts | 17 +- .../types/services/NotificationService.d.ts | 8 +- .../types/services/ProfileFixerService.d.ts | 21 + .../types/services/RagfairPriceService.d.ts | 1 + .../types/services/mod/CustomItemService.d.ts | 80 ++ .../server/types/utils/App.d.ts | 1 + .../server/types/utils/TimeUtil.d.ts | 10 + .../utils/collections/lists/LinkedList.d.ts | 30 + .../types/generators/BotLootGenerator.d.ts | 27 - .../types/generators/BotWeaponGenerator.d.ts | 97 --- .../types/helpers/InRaidHelper.d.ts | 45 -- .../models/eft/common/tables/IBotBase.d.ts | 101 --- .../models/spt/config/IHideoutConfig.d.ts | 27 - .../types/utils/TimeUtil.d.ts | 8 - .../bepInEx/plugins/CWX-DeSharpener.dll | Bin .../mods/CWX-DeSharpener 1.4.1}/LICENSE.txt | 0 .../mods/CWX-DeSharpener 1.4.1}/package.json | 4 +- .../mods/CWX-DeSharpener 1.4.1}/src/mod.ts | 4 - .../CWX-DeSharpener 1.4.1}/types/Program.d.ts | 0 .../CWX-DeSharpener 1.4.1}/types/TYPES.d.ts | 0 .../CWX-DeSharpener 1.4.1}/types/Utils.d.ts | 0 .../types/callbacks/BotCallbacks.d.ts | 0 .../types/callbacks/BundleCallbacks.d.ts | 0 .../callbacks/CustomizationCallbacks.d.ts | 0 .../types/callbacks/DataCallbacks.d.ts | 0 .../types/callbacks/DialogueCallbacks.d.ts | 0 .../types/callbacks/GameCallbacks.d.ts | 0 .../types/callbacks/HandbookCallbacks.d.ts | 0 .../types/callbacks/HealthCallbacks.d.ts | 0 .../types/callbacks/HideoutCallbacks.d.ts | 0 .../types/callbacks/HttpCallbacks.d.ts | 0 .../types/callbacks/InraidCallbacks.d.ts | 0 .../types/callbacks/InsuranceCallbacks.d.ts | 0 .../types/callbacks/InventoryCallbacks.d.ts | 0 .../types/callbacks/ItemEventCallbacks.d.ts | 0 .../types/callbacks/LauncherCallbacks.d.ts | 0 .../types/callbacks/LocationCallbacks.d.ts | 0 .../types/callbacks/MatchCallbacks.d.ts | 0 .../types/callbacks/ModCallbacks.d.ts | 0 .../types/callbacks/NoteCallbacks.d.ts | 0 .../types/callbacks/NotifierCallbacks.d.ts | 2 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 0 .../types/callbacks/PresetCallbacks.d.ts | 0 .../types/callbacks/ProfileCallbacks.d.ts | 0 .../types/callbacks/QuestCallbacks.d.ts | 0 .../types/callbacks/RagfairCallbacks.d.ts | 0 .../types/callbacks/RepairCallbacks.d.ts | 0 .../types/callbacks/SaveCallbacks.d.ts | 0 .../types/callbacks/TradeCallbacks.d.ts | 0 .../types/callbacks/TraderCallbacks.d.ts | 0 .../types/callbacks/WeatherCallbacks.d.ts | 0 .../types/callbacks/WishlistCallbacks.d.ts | 0 .../types/context/ApplicationContext.d.ts | 9 + .../types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 2 +- .../controllers/CustomizationController.d.ts | 0 .../types/controllers/DialogueController.d.ts | 0 .../types/controllers/GameController.d.ts | 0 .../types/controllers/HandbookController.d.ts | 0 .../types/controllers/HealthController.d.ts | 0 .../types/controllers/HideoutController.d.ts | 56 +- .../types/controllers/InraidController.d.ts | 19 +- .../controllers/InsuranceController.d.ts | 1 - .../controllers/InventoryController.d.ts | 0 .../types/controllers/LauncherController.d.ts | 0 .../types/controllers/LocationController.d.ts | 0 .../types/controllers/MatchController.d.ts | 4 +- .../types/controllers/NoteController.d.ts | 3 +- .../types/controllers/NotifierController.d.ts | 0 .../controllers/PresetBuildController.d.ts | 0 .../types/controllers/PresetController.d.ts | 0 .../types/controllers/ProfileController.d.ts | 8 +- .../types/controllers/QuestController.d.ts | 0 .../types/controllers/RagfairController.d.ts | 0 .../types/controllers/RepairController.d.ts | 1 - .../RepeatableQuestController.d.ts | 3 +- .../types/controllers/TradeController.d.ts | 0 .../types/controllers/TraderController.d.ts | 0 .../types/controllers/WeatherController.d.ts | 0 .../types/controllers/WishlistController.d.ts | 0 .../types/di/Container.d.ts | 0 .../types/di/OnLoad.d.ts | 0 .../types/di/OnLoadOnUpdate.d.ts | 0 .../types/di/OnUpdate.d.ts | 0 .../types/di/Router.d.ts | 0 .../types/di/Serializer.d.ts | 0 .../types/generators/BotGenerator.d.ts | 30 +- .../generators/BotInventoryGenerator.d.ts | 2 +- .../types/generators/BotLootGenerator.d.ts | 124 ++++ .../types/generators/BotWeaponGenerator.d.ts | 173 +++++ .../types/generators/LocationGenerator.d.ts | 0 .../types/generators/PMCLootGenerator.d.ts | 0 .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 0 .../generators/RagfairOfferGenerator.d.ts | 0 .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 0 .../types/helpers/AssortHelper.d.ts | 0 .../types/helpers/BotGeneratorHelper.d.ts | 12 +- .../types/helpers/BotHelper.d.ts | 3 +- .../types/helpers/ContainerHelper.d.ts | 0 .../types/helpers/DialogueHelper.d.ts | 21 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 0 .../types/helpers/ExtendedProfileHelper.d.ts | 0 .../types/helpers/GameEventHelper.d.ts | 2 +- .../types/helpers/HandbookHelper.d.ts | 0 .../types/helpers/HealthHelper.d.ts | 0 .../types/helpers/HideoutHelper.d.ts | 17 +- .../types/helpers/HttpServerHelper.d.ts | 0 .../types/helpers/InRaidHelper.d.ts | 97 +++ .../types/helpers/InventoryHelper.d.ts | 0 .../types/helpers/ItemHelper.d.ts | 5 +- .../types/helpers/NotificationSendHelper.d.ts | 0 .../types/helpers/NotifierHelper.d.ts | 0 .../types/helpers/PaymentHelper.d.ts | 0 .../types/helpers/PresetHelper.d.ts | 0 .../types/helpers/ProbabilityHelper.d.ts | 0 .../types/helpers/ProfileHelper.d.ts | 9 +- .../types/helpers/QuestConditionHelper.d.ts | 0 .../types/helpers/QuestHelper.d.ts | 27 +- .../types/helpers/RagfairHelper.d.ts | 0 .../types/helpers/RagfairOfferHelper.d.ts | 2 +- .../types/helpers/RagfairSellHelper.d.ts | 0 .../types/helpers/RagfairServerHelper.d.ts | 2 +- .../types/helpers/RagfairSortHelper.d.ts | 0 .../types/helpers/RagfairTaxHelper.d.ts | 0 .../types/helpers/RepairHelper.d.ts | 2 +- .../types/helpers/SecureContainerHelper.d.ts | 0 .../types/helpers/TradeHelper.d.ts | 0 .../types/helpers/TraderAssortHelper.d.ts | 0 .../types/helpers/TraderHelper.d.ts | 0 .../types/helpers/UtilityHelper.d.ts | 0 .../types/helpers/WeightedRandomHelper.d.ts | 0 .../types/ide/BleedingEdgeEntry.d.ts | 0 .../types/ide/Compiler.d.ts | 0 .../types/ide/DebugEntry.d.ts | 0 .../types/ide/ReleaseEntry.d.ts | 0 .../types/ide/TestEntry.d.ts | 0 .../types/loaders/BundleLoader.d.ts | 0 .../types/loaders/DelayedModLoader.d.ts | 0 .../types/loaders/InitialModLoader.d.ts | 0 .../types/loaders/PostAkiModLoader.d.ts | 0 .../types/loaders/PostDBModLoader.d.ts | 0 .../types/loaders/PreAkiModLoader.d.ts | 0 .../types/models/common/MinMax.d.ts | 4 + .../eft/bot/IGenerateBotsRequestData.d.ts | 0 .../models/eft/common/IEmptyRequestData.d.ts | 0 .../types/models/eft/common/IGlobals.d.ts | 0 .../types/models/eft/common/ILocation.d.ts | 0 .../models/eft/common/ILocationBase.d.ts | 0 .../ILocationsSourceDestinationBase.d.ts | 0 .../types/models/eft/common/ILooseLoot.d.ts | 0 .../models/eft/common/IMetricsTableData.d.ts | 0 .../types/models/eft/common/IPmcData.d.ts | 3 + .../models/eft/common/MemberCategory.d.ts | 0 .../request/IBaseInteractionRequestData.d.ts | 0 .../models/eft/common/tables/IBotBase.d.ts} | 126 ++-- .../models/eft/common/tables/IBotCore.d.ts | 0 .../models/eft/common/tables/IBotType.d.ts | 27 +- .../eft/common/tables/ICustomizationItem.d.ts | 0 .../eft/common/tables/IHandbookBase.d.ts | 0 .../types/models/eft/common/tables/IItem.d.ts | 0 .../eft/common/tables/ILocationsBase.d.ts | 0 .../models/eft/common/tables/ILootBase.d.ts | 0 .../models/eft/common/tables/IMatch.d.ts | 0 .../eft/common/tables/IProfileTemplate.d.ts | 0 .../models/eft/common/tables/IQuest.d.ts | 0 .../eft/common/tables/IRepeatableQuests.d.ts | 0 .../eft/common/tables/ITemplateItem.d.ts | 0 .../models/eft/common/tables/ITrader.d.ts | 0 .../IBuyClothingRequestData.d.ts | 0 .../IWearClothingRequestData.d.ts | 0 .../models/eft/dialog/IFriendRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsResponse.d.ts | 0 .../dialog/IGetChatServerListRequestData.d.ts | 0 .../dialog/IGetFriendListDataResponse.d.ts | 0 .../dialog/IGetMailDialogInfoRequestData.d.ts | 0 .../dialog/IGetMailDialogListRequestData.d.ts | 0 .../dialog/IGetMailDialogViewRequestData.d.ts | 0 .../IGetMailDialogViewResponseData.d.ts | 0 .../eft/dialog/IPinDialogRequestData.d.ts | 0 .../eft/dialog/IRemoveDialogRequestData.d.ts | 0 .../eft/dialog/ISendMessageRequest.d.ts | 0 .../eft/dialog/ISetDialogReadRequestData.d.ts | 0 .../models/eft/game/IGameConfigResponse.d.ts | 0 .../eft/game/IGameEmptyCrcRequestData.d.ts | 0 .../eft/game/IReportNicknameRequestData.d.ts | 0 .../eft/game/IVersionValidateRequestData.d.ts | 0 .../types/models/eft/health/Effect.d.ts | 0 .../health/IHealthTreatmentRequestData.d.ts | 0 .../eft/health/IOffraidEatRequestData.d.ts | 0 .../eft/health/IOffraidHealRequestData.d.ts | 0 .../eft/health/ISyncHealthRequestData.d.ts | 0 .../models/eft/hideout/HideoutAreasEnum.d.ts | 0 .../HideoutUpgradeCompleteRequestData.d.ts | 0 .../models/eft/hideout/IHideoutArea.d.ts | 0 ...utContinousProductionStartRequestData.d.ts | 0 .../eft/hideout/IHideoutProduction.d.ts | 0 .../hideout/IHideoutPutItemInRequestData.d.ts | 0 .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IHideoutScavCaseStartRequestData.d.ts | 0 .../eft/hideout/IHideoutSettingsBase.d.ts | 0 ...deoutSingleProductionStartRequestData.d.ts | 0 .../IHideoutTakeItemOutRequestData.d.ts | 0 .../IHideoutTakeProductionRequestData.d.ts | 0 .../IHideoutToggleAreaRequestData.d.ts | 0 .../IHideoutUpgradeCompleteRequestData.d.ts | 0 .../hideout/IHideoutUpgradeRequestData.d.ts | 0 .../httpResponse/IGetBodyResponseData.d.ts | 0 .../eft/httpResponse/INullResponseData.d.ts | 0 .../inRaid/IRegisterPlayerRequestData.d.ts | 0 .../eft/inRaid/ISaveProgressRequestData.d.ts | 0 .../IGetInsuranceCostRequestData.d.ts | 0 .../IGetInsuranceCostResponseData.d.ts | 0 .../eft/insurance/IInsureRequestData.d.ts | 0 .../eft/inventory/IAddItemRequestData.d.ts | 0 .../inventory/IInventoryAddRequestData.d.ts | 0 .../IInventoryBaseActionRequestData.d.ts | 0 .../inventory/IInventoryBindRequestData.d.ts | 0 .../IInventoryCreateMarkerRequestData.d.ts | 0 .../IInventoryDeleteMarkerRequestData.d.ts | 0 .../IInventoryEditMarkerRequestData.d.ts | 0 .../IInventoryExamineRequestData.d.ts | 0 .../inventory/IInventoryFoldRequestData.d.ts | 0 .../inventory/IInventoryMergeRequestData.d.ts | 0 .../inventory/IInventoryMoveRequestData.d.ts | 0 ...IInventoryReadEncyclopediaRequestData.d.ts | 0 .../IInventoryRemoveRequestData.d.ts | 0 .../inventory/IInventorySortRequestData.d.ts | 0 .../inventory/IInventorySplitRequestData.d.ts | 0 .../inventory/IInventorySwapRequestData.d.ts | 0 .../inventory/IInventoryTagRequestData.d.ts | 0 .../IInventoryToggleRequestData.d.ts | 0 .../IInventoryTransferRequestData.d.ts | 0 .../IEmptyItemEventRouterResponse.d.ts | 0 .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../itemEvent/IItemEventRouterRequest.d.ts | 0 .../itemEvent/IItemEventRouterResponse.d.ts | 0 .../eft/launcher/IChangeRequestData.d.ts | 0 .../launcher/IGetMiniProfileRequestData.d.ts | 0 .../eft/launcher/ILoginRequestData.d.ts | 0 .../models/eft/launcher/IMiniProfile.d.ts | 0 .../models/eft/launcher/IRegisterData.d.ts | 0 .../eft/launcher/IRemoveProfileData.d.ts | 0 .../eft/location/IGetLocationRequestData.d.ts | 0 .../eft/match/ICreateGroupRequestData.d.ts | 0 .../eft/match/IEndOfflineRaidRequestData.d.ts | 0 .../eft/match/IGetGroupStatusRequestData.d.ts | 0 .../eft/match/IGetProfileRequestData.d.ts | 0 .../eft/match/IJoinMatchRequestData.d.ts | 0 .../models/eft/match/IJoinMatchResult.d.ts | 0 .../eft/match/IPutMetricsRequestData.d.ts | 0 .../match/IStartOffineRaidRequestData.d.ts | 0 .../eft/match/IUpdatePingRequestData.d.ts | 0 .../models/eft/notes/INoteActionData.d.ts | 0 .../types/models/eft/notifier/INotifier.d.ts | 0 .../notifier/ISelectProfileRequestData.d.ts | 0 ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../IPresetBuildActionRequestData.d.ts | 0 .../profile/GetProfileStatusResponseData.d.ts | 0 .../types/models/eft/profile/IAkiProfile.d.ts | 14 +- .../IProfileChangeNicknameRequestData.d.ts | 0 .../IProfileChangeVoiceRequestData.d.ts | 0 .../profile/IProfileCreateRequestData.d.ts | 0 .../eft/profile/ISearchFriendRequestData.d.ts | 0 .../eft/profile/ISearchFriendResponse.d.ts | 0 .../profile/IValidateNicknameRequestData.d.ts | 0 .../eft/quests/IAcceptQuestRequestData.d.ts | 0 .../eft/quests/ICompleteQuestRequestData.d.ts | 0 .../eft/quests/IHandoverQuestRequestData.d.ts | 0 .../eft/quests/IListQuestsRequestData.d.ts | 0 .../quests/IRepeatableQuestChangeRequest.d.ts | 0 .../eft/ragfair/IAddOfferRequestData.d.ts | 0 .../eft/ragfair/IExtendOfferRequestData.d.ts | 0 .../eft/ragfair/IGetItemPriceResult.d.ts | 0 .../ragfair/IGetMarketPriceRequestData.d.ts | 0 .../models/eft/ragfair/IGetOffersResult.d.ts | 0 .../models/eft/ragfair/IRagfairOffer.d.ts | 0 .../eft/ragfair/IRemoveOfferRequestData.d.ts | 0 .../eft/ragfair/ISearchRequestData.d.ts | 0 .../ISendRagfairReportRequestData.d.ts | 0 .../repair/IBaseRepairActionDataRequest.d.ts | 0 .../eft/repair/IRepairActionDataRequest.d.ts | 0 .../ITraderRepairActionDataRequest.d.ts | 0 .../trade/IProcessBaseTradeRequestData.d.ts | 0 .../trade/IProcessBuyTradeRequestData.d.ts | 0 .../IProcessRagfairTradeRequestData.d.ts | 0 .../trade/IProcessSellTradeRequestData.d.ts | 0 .../models/eft/weather/IWeatherData.d.ts | 0 .../eft/wishlist/IWishlistActionData.d.ts | 0 .../types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../types/models/enums/BaseClasses.d.ts | 0 .../types/models/enums/BotAmount.d.ts | 0 .../types/models/enums/BotDifficulty.d.ts | 0 .../types/models/enums/ConfigTypes.d.ts | 2 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/ELocationName.d.ts | 0 .../types/models/enums/EquipmentSlots.d.ts | 0 .../types/models/enums/HideoutAreas.d.ts | 0 .../types/models/enums}/MemberCategory.d.ts | 0 .../types/models/enums/MessageType.d.ts | 0 .../types/models/enums/Money.d.ts | 0 .../types/models/enums/QuestRewardType.d.ts | 0 .../types/models/enums/QuestStatus.d.ts | 3 +- .../types/models/enums/RaidMode.d.ts | 0 .../types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/Traders.d.ts | 0 .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 0 .../types/models/external/IPostDBLoadMod.d.ts | 0 .../types/models/external/IPreAkiLoadMod.d.ts | 0 .../types/models/external/mod.d.ts | 0 .../types/models/external/tsyringe.d.ts | 0 .../types/models/spt/bindings/Route.d.ts | 0 .../types/models/spt/bots/BotLootCache.d.ts | 0 .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../models/spt/callbacks/IBotCallbacks.d.ts | 0 .../spt/callbacks/IBundleCallbacks.d.ts | 0 .../callbacks/ICustomizationCallbacks.d.ts | 0 .../models/spt/callbacks/IDataCallbacks.d.ts | 0 .../spt/callbacks/IDialogueCallbacks.d.ts | 0 .../models/spt/callbacks/IGameCallbacks.d.ts | 0 .../spt/callbacks/IHandbookCallbacks.d.ts | 0 .../spt/callbacks/IHealthCallbacks.d.ts | 0 .../spt/callbacks/IHideoutCallbacks.d.ts | 0 .../models/spt/callbacks/IHttpCallbacks.d.ts | 0 .../spt/callbacks/IInraidCallbacks.d.ts | 0 .../spt/callbacks/IInsuranceCallbacks.d.ts | 0 .../spt/callbacks/IInventoryCallbacks.d.ts | 0 .../spt/callbacks/IItemEventCallbacks.d.ts | 0 .../spt/callbacks/ILauncherCallbacks.d.ts | 0 .../spt/callbacks/ILocationCallbacks.d.ts | 0 .../models/spt/callbacks/IMatchCallbacks.d.ts | 0 .../models/spt/callbacks/IModCallbacks.d.ts | 0 .../models/spt/callbacks/INoteCallbacks.d.ts | 0 .../spt/callbacks/INotifierCallbacks.d.ts | 0 .../spt/callbacks/IPresetBuildCallbacks.d.ts | 0 .../spt/callbacks/IPresetCallbacks.d.ts | 0 .../spt/callbacks/IProfileCallbacks.d.ts | 0 .../models/spt/callbacks/IQuestCallbacks.d.ts | 0 .../spt/callbacks/IRagfairCallbacks.d.ts | 0 .../spt/callbacks/IRepairCallbacks.d.ts | 0 .../models/spt/callbacks/ISaveCallbacks.d.ts | 0 .../models/spt/callbacks/ITradeCallbacks.d.ts | 0 .../spt/callbacks/ITraderCallbacks.d.ts | 0 .../spt/callbacks/IWeatherCallbacks.d.ts | 0 .../spt/callbacks/IWishlistCallbacks.d.ts | 0 .../models/spt/config/IAirdropConfig.d.ts | 0 .../types/models/spt/config/IBaseConfig.d.ts | 0 .../types/models/spt/config/IBotConfig.d.ts | 27 +- .../types/models/spt/config/ICoreConfig.d.ts | 0 .../models/spt/config/IHealthConfig.d.ts | 0 .../models/spt/config/IHideoutConfig.d.ts | 7 + .../types/models/spt/config/IHttpConfig.d.ts | 0 .../models/spt/config/IInRaidConfig.d.ts | 0 .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IInventoryConfig.d.ts | 0 .../models/spt/config/ILocaleConfig.d.ts | 0 .../models/spt/config/ILocationConfig.d.ts | 0 .../types/models/spt/config/IMatchConfig.d.ts | 0 .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../types/models/spt/config/IQuestConfig.d.ts | 0 .../models/spt/config/IRagfairConfig.d.ts | 5 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 0 .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../spt/controllers/IBotController.d.ts | 0 .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../spt/generators/ILocationGenerator.d.ts | 0 .../spt/generators/IPMCLootGenerator.d.ts | 0 .../generators/IRagfairAssortGenerator.d.ts | 0 .../generators/IRagfairOfferGenerator.d.ts | 0 .../types/models/spt/helpers/Traders.d.ts | 0 .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 0 .../models/spt/logging/LogTextColor.d.ts | 0 .../types/models/spt/logging/SptLogger.d.ts | 0 .../types/models/spt/mod/IMod.d.ts | 0 .../types/models/spt/mod/IModLoader.d.ts | 0 .../models/spt/mod/IPackageJsonData.d.ts | 0 .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../spt/ragfair/IRagfairServerPrices.d.ts | 0 .../models/spt/server/IDatabaseTables.d.ts | 0 .../types/models/spt/server/IHttpServer.d.ts | 0 .../types/models/spt/server/ILocaleBase.d.ts | 0 .../types/models/spt/server/ILocations.d.ts | 0 .../types/models/spt/server/IServerBase.d.ts | 0 .../models/spt/server/ISettingsBase.d.ts | 0 .../models/spt/services/CustomPreset.d.ts | 0 .../spt/services/CustomTraderAssortData.d.ts | 0 .../types/models/spt/utils/IAsyncQueue.d.ts | 0 .../types/models/spt/utils/ICommand.d.ts | 0 .../types/models/spt/utils/ILogger.d.ts | 0 .../models/spt/utils/IUuidGenerator.d.ts | 0 .../types/routers/HttpRouter.d.ts | 0 .../types/routers/ImageRouter.d.ts | 0 .../types/routers/ItemEventRouter.d.ts | 0 .../routers/dynamic/BotDynamicRouter.d.ts | 0 .../routers/dynamic/BundleDynamicRouter.d.ts | 0 .../dynamic/CustomizationDynamicRouter.d.ts | 0 .../routers/dynamic/DataDynamicRouter.d.ts | 0 .../routers/dynamic/HttpDynamicRouter.d.ts | 0 .../routers/dynamic/InraidDynamicRouter.d.ts | 0 .../dynamic/LocationDynamicRouter.d.ts | 0 .../dynamic/NotifierDynamicRouter.d.ts | 0 .../routers/dynamic/TraderDynamicRouter.d.ts | 0 .../CustomizationItemEventRouter.d.ts | 0 .../item_events/HealthItemEventRouter.d.ts | 0 .../item_events/HideoutItemEventRouter.d.ts | 0 .../item_events/InsuranceItemEventRouter.d.ts | 0 .../item_events/InventoryItemEventRouter.d.ts | 0 .../item_events/NoteItemEventRouter.d.ts | 0 .../PresetBuildItemEventRouter.d.ts | 0 .../item_events/QuestItemEventRouter.d.ts | 0 .../item_events/RagfairItemEventRouter.d.ts | 0 .../item_events/RepairItemEventRouter.d.ts | 0 .../item_events/TradeItemEventRouter.d.ts | 0 .../item_events/WishlistItemEventRouter.d.ts | 0 .../save_load/HealthSaveLoadRouter.d.ts | 0 .../save_load/InraidSaveLoadRouter.d.ts | 0 .../save_load/InsuranceSaveLoadRouter.d.ts | 0 .../save_load/ProfileSaveLoadRouter.d.ts | 0 .../routers/serializers/BundleSerializer.d.ts | 0 .../routers/serializers/ImageSerializer.d.ts | 0 .../routers/serializers/NotifySerializer.d.ts | 0 .../types/routers/static/BotStaticRouter.d.ts | 0 .../routers/static/BundleStaticRouter.d.ts | 0 .../static/CustomizationStaticRouter.d.ts | 0 .../routers/static/DataStaticRouter.d.ts | 0 .../routers/static/DialogStaticRouter.d.ts | 0 .../routers/static/GameStaticRouter.d.ts | 0 .../routers/static/HealthStaticRouter.d.ts | 0 .../routers/static/InraidStaticRouter.d.ts | 0 .../routers/static/InsuranceStaticRouter.d.ts | 0 .../routers/static/ItemEventStaticRouter.d.ts | 0 .../routers/static/LauncherStaticRouter.d.ts | 0 .../routers/static/LocationStaticRouter.d.ts | 0 .../routers/static/MatchStaticRouter.d.ts | 0 .../routers/static/NotifierStaticRouter.d.ts | 0 .../routers/static/PresetStaticRouter.d.ts | 0 .../routers/static/ProfileStaticRouter.d.ts | 0 .../routers/static/QuestStaticRouter.d.ts | 0 .../routers/static/RagfairStaticRouter.d.ts | 0 .../routers/static/TraderStaticRouter.d.ts | 0 .../routers/static/WeatherStaticRouter.d.ts | 0 .../types/servers/ConfigServer.d.ts | 0 .../types/servers/DatabaseServer.d.ts | 0 .../types/servers/HttpServer.d.ts | 4 +- .../types/servers/RagfairServer.d.ts | 0 .../types/servers/SaveServer.d.ts | 0 .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 35 +- .../types/services/FenceService.d.ts | 0 .../types/services/HashCacheService.d.ts | 0 .../types/services/InsuranceService.d.ts | 17 +- .../types/services/LocaleService.d.ts | 0 .../types/services/MatchLocationService.d.ts | 0 .../types/services/ModCompilerService.d.ts | 0 .../types/services/NotificationService.d.ts | 8 +- .../types/services/PaymentService.d.ts | 0 .../types/services/PlayerService.d.ts | 0 .../types/services/ProfileFixerService.d.ts | 21 + .../services/RagfairCategoriesService.d.ts | 0 .../services/RagfairLinkedItemService.d.ts | 0 .../types/services/RagfairOfferService.d.ts | 0 .../types/services/RagfairPriceService.d.ts | 1 + .../services/RagfairRequiredItemsService.d.ts | 0 .../types/services/TraderAssortService.d.ts | 0 .../types/services/mod/CustomItemService.d.ts | 80 ++ .../mod/dynamicRouter/DynamicRouterMod.d.ts | 0 .../DynamicRouterModService.d.ts | 0 .../services/mod/image/imageRouteService.d.ts | 0 .../types/services/mod/onLoad/OnLoadMod.d.ts | 0 .../services/mod/onLoad/OnLoadModService.d.ts | 0 .../services/mod/onUpdate/OnUpdateMod.d.ts | 0 .../mod/onUpdate/OnUpdateModService.d.ts | 0 .../mod/staticRouter/StaticRouterMod.d.ts | 0 .../staticRouter/StaticRouterModService.d.ts | 0 .../types/utils/App.d.ts | 1 + .../types/utils/AyncQueue.d.ts | 0 .../types/utils/DatabaseImporter.d.ts | 0 .../types/utils/HashUtil.d.ts | 0 .../types/utils/HttpResponseUtil.d.ts | 0 .../types/utils/JsonUtil.d.ts | 0 .../types/utils/Logger.d.ts | 0 .../types/utils/MathUtil.d.ts | 0 .../types/utils/ObjectId.d.ts | 0 .../types/utils/RandomUtil.d.ts | 0 .../types/utils/TimeUtil.d.ts | 18 + .../types/utils/UUidGenerator.d.ts | 0 .../types/utils/VFS.d.ts | 0 .../types/utils/Watermark.d.ts | 0 .../utils/collections/lists/LinkedList.d.ts | 30 + .../types/utils/decorators/Singleton.d.ts | 0 .../types/utils/decorators/constructor.d.ts | 0 Live/CWX_DeSharpener/server/dist/package.json | 4 +- Live/CWX_DeSharpener/server/dist/src/mod.ts | 4 - .../types/callbacks/NotifierCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../dist/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../dist/types/controllers/BotController.d.ts | 2 +- .../types/controllers/HideoutController.d.ts | 56 +- .../types/controllers/InraidController.d.ts | 19 +- .../controllers/InsuranceController.d.ts | 1 - .../types/controllers/MatchController.d.ts | 4 +- .../types/controllers/NoteController.d.ts | 3 +- .../types/controllers/ProfileController.d.ts | 8 +- .../types/controllers/RepairController.d.ts | 1 - .../RepeatableQuestController.d.ts | 3 +- .../dist/types/generators/BotGenerator.d.ts | 30 +- .../generators/BotInventoryGenerator.d.ts | 2 +- .../types/generators/BotLootGenerator.d.ts | 109 ++- .../types/generators/BotWeaponGenerator.d.ts | 108 ++- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/helpers/BotGeneratorHelper.d.ts | 12 +- .../server/dist/types/helpers/BotHelper.d.ts | 3 +- .../dist/types/helpers/DialogueHelper.d.ts | 21 +- .../dist/types/helpers/GameEventHelper.d.ts | 2 +- .../dist/types/helpers/HideoutHelper.d.ts | 17 +- .../dist/types/helpers/InRaidHelper.d.ts | 70 +- .../server/dist/types/helpers/ItemHelper.d.ts | 5 +- .../dist/types/helpers/ProfileHelper.d.ts | 9 +- .../dist/types/helpers/QuestHelper.d.ts | 27 +- .../types/helpers/RagfairOfferHelper.d.ts | 2 +- .../types/helpers/RagfairServerHelper.d.ts | 2 +- .../dist/types/helpers/RepairHelper.d.ts | 2 +- .../dist/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IPmcData.d.ts | 348 +-------- .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../types/models/eft/profile/IAkiProfile.d.ts | 14 +- .../dist/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../dist/types/models/enums/ConfigTypes.d.ts | 2 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../dist/types/models/enums/QuestStatus.d.ts | 3 +- .../dist/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 27 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 5 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../server/dist/types/servers/HttpServer.d.ts | 4 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 35 +- .../dist/types/services/InsuranceService.d.ts | 17 +- .../types/services/NotificationService.d.ts | 8 +- .../types/services/ProfileFixerService.d.ts | 21 + .../types/services/RagfairPriceService.d.ts | 1 + .../types/services/mod/CustomItemService.d.ts | 80 ++ .../server/dist/types/utils/App.d.ts | 1 + .../server/dist/types/utils/TimeUtil.d.ts | 10 + .../utils/collections/lists/LinkedList.d.ts | 30 + Live/CWX_DeSharpener/server/package.json | 4 +- Live/CWX_DeSharpener/server/src/mod.ts | 4 - .../types/callbacks/NotifierCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../server/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 2 +- .../types/controllers/HideoutController.d.ts | 56 +- .../types/controllers/InraidController.d.ts | 19 +- .../controllers/InsuranceController.d.ts | 1 - .../types/controllers/MatchController.d.ts | 4 +- .../types/controllers/NoteController.d.ts | 3 +- .../types/controllers/ProfileController.d.ts | 8 +- .../types/controllers/RepairController.d.ts | 1 - .../RepeatableQuestController.d.ts | 3 +- .../server/types/generators/BotGenerator.d.ts | 30 +- .../generators/BotInventoryGenerator.d.ts | 2 +- .../types/generators/BotLootGenerator.d.ts | 109 ++- .../types/generators/BotWeaponGenerator.d.ts | 108 ++- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/helpers/BotGeneratorHelper.d.ts | 12 +- .../server/types/helpers/BotHelper.d.ts | 3 +- .../server/types/helpers/DialogueHelper.d.ts | 21 +- .../server/types/helpers/GameEventHelper.d.ts | 2 +- .../server/types/helpers/HideoutHelper.d.ts | 17 +- .../server/types/helpers/InRaidHelper.d.ts | 70 +- .../server/types/helpers/ItemHelper.d.ts | 5 +- .../server/types/helpers/ProfileHelper.d.ts | 9 +- .../server/types/helpers/QuestHelper.d.ts | 27 +- .../types/helpers/RagfairOfferHelper.d.ts | 2 +- .../types/helpers/RagfairServerHelper.d.ts | 2 +- .../server/types/helpers/RepairHelper.d.ts | 2 +- .../server/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IPmcData.d.ts | 348 +-------- .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../types/models/eft/profile/IAkiProfile.d.ts | 14 +- .../server/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../types/models/enums/ConfigTypes.d.ts | 2 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/QuestStatus.d.ts | 3 +- .../server/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 27 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 5 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../server/types/servers/HttpServer.d.ts | 4 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 35 +- .../types/services/InsuranceService.d.ts | 17 +- .../types/services/NotificationService.d.ts | 8 +- .../types/services/ProfileFixerService.d.ts | 21 + .../types/services/RagfairPriceService.d.ts | 1 + .../types/services/mod/CustomItemService.d.ts | 80 ++ .../server/types/utils/App.d.ts | 1 + .../server/types/utils/TimeUtil.d.ts | 10 + .../utils/collections/lists/LinkedList.d.ts | 30 + .../user/mods/CWX-MasterKeys 1.2.0/src/mod.ts | 21 - .../CWX-MasterKeys 1.2.0/types/Utils.d.ts | 0 .../types/callbacks/MatchCallbacks.d.ts | 35 - .../types/controllers/BotController.d.ts | 20 - .../types/controllers/GameController.d.ts | 28 - .../types/controllers/InraidController.d.ts | 30 - .../types/controllers/MatchController.d.ts | 28 - .../types/controllers/QuestController.d.ts | 37 - .../types/generators/BotGenerator.d.ts | 36 - .../types/generators/BotLootGenerator.d.ts | 27 - .../types/generators/BotWeaponGenerator.d.ts | 44 -- .../types/generators/WeatherGenerator.d.ts | 19 - .../types/helpers/AssortHelper.d.ts | 16 - .../types/helpers/BotGeneratorHelper.d.ts | 60 -- .../types/helpers/BotHelper.d.ts | 22 - .../types/helpers/DurabilityLimitsHelper.d.ts | 25 - .../types/helpers/ExtendedProfileHelper.d.ts | 22 - .../types/helpers/HealthHelper.d.ts | 23 - .../types/helpers/HttpServerHelper.d.ts | 12 - .../types/helpers/InRaidHelper.d.ts | 33 - .../types/helpers/QuestHelper.d.ts | 68 -- .../types/helpers/RagfairSortHelper.d.ts | 12 - .../types/helpers/RepairHelper.d.ts | 20 - .../types/helpers/TraderAssortHelper.d.ts | 23 - .../types/helpers/TraderHelper.d.ts | 35 - .../models/eft/common/tables/IBotBase.d.ts | 101 --- .../eft/common/tables/ITemplateItem.d.ts | 401 ---------- .../models/eft/hideout/HideoutAreasEnum.d.ts | 25 - .../types/models/external/mod.d.ts | 5 - .../models/spt/config/IHideoutConfig.d.ts | 27 - .../types/models/spt/helpers/Traders.d.ts | 10 - .../types/routers/HttpRouter.d.ts | 11 - .../types/services/MatchLocationService.d.ts | 8 - .../types/services/ModCompilerService.d.ts | 15 - .../services/RagfairCategoriesService.d.ts | 10 - .../services/RagfairLinkedItemService.d.ts | 9 - .../types/services/RagfairPriceService.d.ts | 30 - .../types/utils/Logger.d.ts | 25 - .../types/utils/TimeUtil.d.ts | 8 - .../types/utils/Watermark.d.ts | 29 - .../bepInEx/plugins/CWX-MasterKey.dll | Bin 6144 -> 6144 bytes .../mods/CWX-MasterKeys 1.3.2}/LICENSE.txt | 0 .../mods/CWX-MasterKeys 1.3.2}/package.json | 4 +- .../mods/CWX-MasterKeys 1.3.2}/src/mod.ts | 4 - .../CWX-MasterKeys 1.3.2}/types/Program.d.ts | 0 .../CWX-MasterKeys 1.3.2}/types/TYPES.d.ts | 0 .../CWX-MasterKeys 1.3.2}/types/Utils.d.ts | 0 .../types/callbacks/BotCallbacks.d.ts | 4 +- .../types/callbacks/BundleCallbacks.d.ts | 13 +- .../callbacks/CustomizationCallbacks.d.ts | 6 +- .../types/callbacks/DataCallbacks.d.ts | 4 +- .../types/callbacks/DialogueCallbacks.d.ts | 8 +- .../types/callbacks/GameCallbacks.d.ts | 8 +- .../types/callbacks/HandbookCallbacks.d.ts | 2 +- .../types/callbacks/HealthCallbacks.d.ts | 13 +- .../types/callbacks/HideoutCallbacks.d.ts | 7 +- .../types/callbacks/HttpCallbacks.d.ts | 2 +- .../types/callbacks/InraidCallbacks.d.ts | 12 +- .../types/callbacks/InsuranceCallbacks.d.ts | 14 +- .../types/callbacks/InventoryCallbacks.d.ts | 2 +- .../types/callbacks/ItemEventCallbacks.d.ts | 4 +- .../types/callbacks/LauncherCallbacks.d.ts | 8 +- .../types/callbacks/LocationCallbacks.d.ts | 4 +- .../types/callbacks/MatchCallbacks.d.ts | 42 ++ .../types/callbacks/ModCallbacks.d.ts | 17 +- .../types/callbacks/NoteCallbacks.d.ts | 2 +- .../types/callbacks/NotifierCallbacks.d.ts | 6 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 7 +- .../types/callbacks/PresetCallbacks.d.ts | 2 +- .../types/callbacks/ProfileCallbacks.d.ts | 16 +- .../types/callbacks/QuestCallbacks.d.ts | 6 +- .../types/callbacks/RagfairCallbacks.d.ts | 21 +- .../types/callbacks/RepairCallbacks.d.ts | 2 +- .../types/callbacks/SaveCallbacks.d.ts | 2 +- .../types/callbacks/TradeCallbacks.d.ts | 2 +- .../types/callbacks/TraderCallbacks.d.ts | 4 +- .../types/callbacks/WeatherCallbacks.d.ts | 4 +- .../types/callbacks/WishlistCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 35 + .../controllers/CustomizationController.d.ts | 12 +- .../types/controllers/DialogueController.d.ts | 12 +- .../types/controllers/GameController.d.ts | 28 + .../types/controllers/HandbookController.d.ts | 4 +- .../types/controllers/HealthController.d.ts | 35 +- .../types/controllers/HideoutController.d.ts | 82 ++- .../types/controllers/InraidController.d.ts | 44 ++ .../controllers/InsuranceController.d.ts | 37 +- .../controllers/InventoryController.d.ts | 36 +- .../types/controllers/LauncherController.d.ts | 15 +- .../types/controllers/LocationController.d.ts | 10 +- .../types/controllers/MatchController.d.ts | 38 + .../types/controllers/NoteController.d.ts | 5 +- .../types/controllers/NotifierController.d.ts | 10 +- .../controllers/PresetBuildController.d.ts | 8 +- .../types/controllers/PresetController.d.ts | 4 +- .../types/controllers/ProfileController.d.ts | 28 +- .../types/controllers/QuestController.d.ts | 76 ++ .../types/controllers/RagfairController.d.ts | 51 +- .../types/controllers/RepairController.d.ts | 21 +- .../RepeatableQuestController.d.ts | 39 +- .../types/controllers/TradeController.d.ts | 10 +- .../types/controllers/TraderController.d.ts | 16 +- .../types/controllers/WeatherController.d.ts | 7 +- .../types/controllers/WishlistController.d.ts | 2 +- .../types/di/Container.d.ts | 0 .../types/di/OnLoad.d.ts | 0 .../types/di/OnLoadOnUpdate.d.ts | 0 .../types/di/OnUpdate.d.ts | 0 .../types/di/Router.d.ts | 0 .../types/di/Serializer.d.ts | 0 .../types/generators/BotGenerator.d.ts | 96 +++ .../generators/BotInventoryGenerator.d.ts | 24 +- .../types/generators/BotLootGenerator.d.ts | 124 ++++ .../types/generators/BotWeaponGenerator.d.ts | 173 +++++ .../types/generators/LocationGenerator.d.ts | 42 +- .../types/generators/PMCLootGenerator.d.ts | 13 +- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 16 +- .../generators/RagfairOfferGenerator.d.ts | 55 +- .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 33 + .../types/helpers/AssortHelper.d.ts | 36 + .../types/helpers/BotGeneratorHelper.d.ts | 131 ++++ .../types/helpers/BotHelper.d.ts | 45 ++ .../types/helpers/ContainerHelper.d.ts | 2 +- .../types/helpers/DialogueHelper.d.ts | 33 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 26 + .../types/helpers/ExtendedProfileHelper.d.ts | 0 .../types/helpers/GameEventHelper.d.ts | 4 +- .../types/helpers/HandbookHelper.d.ts | 2 +- .../types/helpers/HealthHelper.d.ts | 51 ++ .../types/helpers/HideoutHelper.d.ts | 69 +- .../types/helpers/HttpServerHelper.d.ts | 23 + .../types/helpers/InRaidHelper.d.ts | 97 +++ .../types/helpers/InventoryHelper.d.ts | 48 +- .../types/helpers/ItemHelper.d.ts | 101 ++- .../types/helpers/NotificationSendHelper.d.ts | 4 +- .../types/helpers/NotifierHelper.d.ts | 4 +- .../types/helpers/PaymentHelper.d.ts | 0 .../types/helpers/PresetHelper.d.ts | 8 +- .../types/helpers/ProbabilityHelper.d.ts | 14 + .../types/helpers/ProfileHelper.d.ts | 19 +- .../types/helpers/QuestConditionHelper.d.ts | 2 +- .../types/helpers/QuestHelper.d.ts | 115 +++ .../types/helpers/RagfairHelper.d.ts | 24 +- .../types/helpers/RagfairOfferHelper.d.ts | 51 +- .../types/helpers/RagfairSellHelper.d.ts | 11 +- .../types/helpers/RagfairServerHelper.d.ts | 34 +- .../types/helpers/RagfairSortHelper.d.ts | 14 + .../types/helpers/RagfairTaxHelper.d.ts | 11 +- .../types/helpers/RepairHelper.d.ts | 21 + .../types/helpers/SecureContainerHelper.d.ts | 2 +- .../types/helpers/TradeHelper.d.ts | 22 +- .../types/helpers/TraderAssortHelper.d.ts | 55 ++ .../types/helpers/TraderHelper.d.ts | 109 +++ .../types/helpers/UtilityHelper.d.ts | 0 .../types/helpers/WeightedRandomHelper.d.ts | 0 .../types/ide/BleedingEdgeEntry.d.ts | 0 .../types/ide/Compiler.d.ts | 0 .../types/ide/DebugEntry.d.ts | 0 .../types/ide/ReleaseEntry.d.ts | 0 .../types/ide/TestEntry.d.ts | 0 .../types/loaders/BundleLoader.d.ts | 8 +- .../types/loaders/DelayedModLoader.d.ts | 0 .../types/loaders/InitialModLoader.d.ts | 0 .../types/loaders/PostAkiModLoader.d.ts} | 8 +- .../types/loaders/PostDBModLoader.d.ts | 11 + .../types/loaders/PreAkiModLoader.d.ts} | 6 +- .../types/models/common/MinMax.d.ts | 4 + .../eft/bot/IGenerateBotsRequestData.d.ts | 0 .../models/eft/common/IEmptyRequestData.d.ts | 0 .../types/models/eft/common/IGlobals.d.ts | 5 +- .../types/models/eft/common/ILocation.d.ts | 0 .../models/eft/common/ILocationBase.d.ts | 9 +- .../ILocationsSourceDestinationBase.d.ts | 0 .../types/models/eft/common/ILooseLoot.d.ts | 0 .../models/eft/common/IMetricsTableData.d.ts | 0 .../types/models/eft/common/IPmcData.d.ts | 3 + .../models/eft/common}/MemberCategory.d.ts | 0 .../request/IBaseInteractionRequestData.d.ts | 0 .../models/eft/common/tables/IBotBase.d.ts} | 126 ++-- .../models/eft/common/tables/IBotCore.d.ts | 0 .../models/eft/common/tables/IBotType.d.ts | 27 +- .../eft/common/tables/ICustomizationItem.d.ts | 0 .../eft/common/tables/IHandbookBase.d.ts | 0 .../types/models/eft/common/tables/IItem.d.ts | 0 .../eft/common/tables/ILocationsBase.d.ts | 0 .../models/eft/common/tables/ILootBase.d.ts | 0 .../models/eft/common/tables/IMatch.d.ts | 10 + .../eft/common/tables/IProfileTemplate.d.ts | 25 + .../models/eft/common/tables/IQuest.d.ts | 7 +- .../eft/common/tables/IRepeatableQuests.d.ts | 0 .../eft/common/tables/ITemplateItem.d.ts | 455 ++++++++++++ .../models/eft/common/tables/ITrader.d.ts | 0 .../IBuyClothingRequestData.d.ts | 0 .../IWearClothingRequestData.d.ts | 0 .../models/eft/dialog/IFriendRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsResponse.d.ts | 0 .../dialog/IGetChatServerListRequestData.d.ts | 0 .../dialog/IGetFriendListDataResponse.d.ts | 0 .../dialog/IGetMailDialogInfoRequestData.d.ts | 0 .../dialog/IGetMailDialogListRequestData.d.ts | 0 .../dialog/IGetMailDialogViewRequestData.d.ts | 0 .../IGetMailDialogViewResponseData.d.ts | 0 .../eft/dialog/IPinDialogRequestData.d.ts | 0 .../eft/dialog/IRemoveDialogRequestData.d.ts | 0 .../eft/dialog/ISendMessageRequest.d.ts | 0 .../eft/dialog/ISetDialogReadRequestData.d.ts | 0 .../models/eft/game/IGameConfigResponse.d.ts | 0 .../eft/game/IGameEmptyCrcRequestData.d.ts | 0 .../eft/game/IReportNicknameRequestData.d.ts | 3 + .../eft/game/IVersionValidateRequestData.d.ts | 0 .../types/models/eft/health/Effect.d.ts | 5 + .../health/IHealthTreatmentRequestData.d.ts | 0 .../eft/health/IOffraidEatRequestData.d.ts | 0 .../eft/health/IOffraidHealRequestData.d.ts | 0 .../eft/health/ISyncHealthRequestData.d.ts | 0 .../models/eft/hideout/HideoutAreasEnum.d.ts | 0 .../HideoutUpgradeCompleteRequestData.d.ts | 0 .../models/eft/hideout/IHideoutArea.d.ts | 0 ...utContinousProductionStartRequestData.d.ts | 0 .../eft/hideout/IHideoutProduction.d.ts | 0 .../hideout/IHideoutPutItemInRequestData.d.ts | 0 .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IHideoutScavCaseStartRequestData.d.ts | 0 .../eft/hideout/IHideoutSettingsBase.d.ts | 0 ...deoutSingleProductionStartRequestData.d.ts | 0 .../IHideoutTakeItemOutRequestData.d.ts | 0 .../IHideoutTakeProductionRequestData.d.ts | 0 .../IHideoutToggleAreaRequestData.d.ts | 0 .../IHideoutUpgradeCompleteRequestData.d.ts | 0 .../hideout/IHideoutUpgradeRequestData.d.ts | 0 .../httpResponse/IGetBodyResponseData.d.ts | 0 .../eft/httpResponse/INullResponseData.d.ts | 0 .../inRaid/IRegisterPlayerRequestData.d.ts | 0 .../eft/inRaid/ISaveProgressRequestData.d.ts | 0 .../IGetInsuranceCostRequestData.d.ts | 0 .../IGetInsuranceCostResponseData.d.ts | 1 + .../eft/insurance/IInsureRequestData.d.ts | 0 .../eft/inventory/IAddItemRequestData.d.ts | 0 .../inventory/IInventoryAddRequestData.d.ts | 0 .../IInventoryBaseActionRequestData.d.ts | 0 .../inventory/IInventoryBindRequestData.d.ts | 0 .../IInventoryCreateMarkerRequestData.d.ts | 0 .../IInventoryDeleteMarkerRequestData.d.ts | 0 .../IInventoryEditMarkerRequestData.d.ts | 0 .../IInventoryExamineRequestData.d.ts | 0 .../inventory/IInventoryFoldRequestData.d.ts | 0 .../inventory/IInventoryMergeRequestData.d.ts | 0 .../inventory/IInventoryMoveRequestData.d.ts | 0 ...IInventoryReadEncyclopediaRequestData.d.ts | 0 .../IInventoryRemoveRequestData.d.ts | 0 .../inventory/IInventorySortRequestData.d.ts | 0 .../inventory/IInventorySplitRequestData.d.ts | 0 .../inventory/IInventorySwapRequestData.d.ts | 0 .../inventory/IInventoryTagRequestData.d.ts | 0 .../IInventoryToggleRequestData.d.ts | 0 .../IInventoryTransferRequestData.d.ts | 0 .../IEmptyItemEventRouterResponse.d.ts | 0 .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../itemEvent/IItemEventRouterRequest.d.ts | 0 .../itemEvent/IItemEventRouterResponse.d.ts | 0 .../eft/launcher/IChangeRequestData.d.ts | 0 .../launcher/IGetMiniProfileRequestData.d.ts | 0 .../eft/launcher/ILoginRequestData.d.ts | 0 .../models/eft/launcher/IMiniProfile.d.ts | 0 .../models/eft/launcher/IRegisterData.d.ts | 0 .../eft/launcher/IRemoveProfileData.d.ts | 0 .../eft/location/IGetLocationRequestData.d.ts | 0 .../eft/match/ICreateGroupRequestData.d.ts | 6 + .../eft/match/IEndOfflineRaidRequestData.d.ts | 0 .../eft/match/IGetGroupStatusRequestData.d.ts | 9 + .../eft/match/IGetProfileRequestData.d.ts | 0 .../eft/match/IJoinMatchRequestData.d.ts | 12 + .../models/eft/match/IJoinMatchResult.d.ts | 11 + .../eft/match/IPutMetricsRequestData.d.ts | 10 + .../match/IStartOffineRaidRequestData.d.ts | 9 +- .../eft/match/IUpdatePingRequestData.d.ts | 3 + .../models/eft/notes/INoteActionData.d.ts | 0 .../types/models/eft/notifier/INotifier.d.ts | 0 .../notifier/ISelectProfileRequestData.d.ts | 0 ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../IPresetBuildActionRequestData.d.ts | 0 .../profile/GetProfileStatusResponseData.d.ts | 11 + .../types/models/eft/profile/IAkiProfile.d.ts | 18 +- .../IProfileChangeNicknameRequestData.d.ts | 0 .../IProfileChangeVoiceRequestData.d.ts | 0 .../profile/IProfileCreateRequestData.d.ts | 0 .../eft/profile/ISearchFriendRequestData.d.ts | 0 .../eft/profile/ISearchFriendResponse.d.ts | 0 .../profile/IValidateNicknameRequestData.d.ts | 0 .../eft/quests/IAcceptQuestRequestData.d.ts | 0 .../eft/quests/ICompleteQuestRequestData.d.ts | 1 + .../eft/quests/IHandoverQuestRequestData.d.ts | 0 .../eft/quests/IListQuestsRequestData.d.ts | 0 .../quests/IRepeatableQuestChangeRequest.d.ts | 0 .../eft/ragfair/IAddOfferRequestData.d.ts | 0 .../eft/ragfair/IExtendOfferRequestData.d.ts | 0 .../eft/ragfair/IGetItemPriceResult.d.ts | 0 .../ragfair/IGetMarketPriceRequestData.d.ts | 0 .../models/eft/ragfair/IGetOffersResult.d.ts | 2 +- .../models/eft/ragfair/IRagfairOffer.d.ts | 0 .../eft/ragfair/IRemoveOfferRequestData.d.ts | 0 .../eft/ragfair/ISearchRequestData.d.ts | 0 .../ISendRagfairReportRequestData.d.ts | 3 + .../repair/IBaseRepairActionDataRequest.d.ts | 0 .../eft/repair/IRepairActionDataRequest.d.ts | 0 .../ITraderRepairActionDataRequest.d.ts | 0 .../trade/IProcessBaseTradeRequestData.d.ts | 0 .../trade/IProcessBuyTradeRequestData.d.ts | 0 .../IProcessRagfairTradeRequestData.d.ts | 0 .../trade/IProcessSellTradeRequestData.d.ts | 0 .../models/eft/weather/IWeatherData.d.ts | 0 .../eft/wishlist/IWishlistActionData.d.ts | 0 .../types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../types/models/enums/BaseClasses.d.ts | 0 .../types/models/enums/BotAmount.d.ts | 7 + .../types/models/enums/BotDifficulty.d.ts | 8 + .../types/models/enums/ConfigTypes.d.ts | 3 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/ELocationName.d.ts | 0 .../types/models/enums/EquipmentSlots.d.ts | 0 .../types/models/enums/HideoutAreas.d.ts | 0 .../types/models/enums}/MemberCategory.d.ts | 0 .../types/models/enums/MessageType.d.ts | 0 .../types/models/enums/Money.d.ts | 0 .../types/models/enums/QuestRewardType.d.ts | 8 + .../types/models/enums/QuestStatus.d.ts | 11 + .../types/models/enums/RaidMode.d.ts | 5 + .../types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/Traders.d.ts | 0 .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 4 + .../types/models/external/IPostDBLoadMod.d.ts | 4 + .../types/models/external/IPreAkiLoadMod.d.ts | 4 + .../types/models/external/mod.d.ts | 0 .../types/models/external/tsyringe.d.ts | 0 .../types/models/spt/bindings/Route.d.ts | 0 .../types/models/spt/bots/BotLootCache.d.ts | 23 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../models/spt/callbacks/IBotCallbacks.d.ts | 0 .../spt/callbacks/IBundleCallbacks.d.ts | 0 .../callbacks/ICustomizationCallbacks.d.ts | 0 .../models/spt/callbacks/IDataCallbacks.d.ts | 0 .../spt/callbacks/IDialogueCallbacks.d.ts | 0 .../models/spt/callbacks/IGameCallbacks.d.ts | 0 .../spt/callbacks/IHandbookCallbacks.d.ts | 0 .../spt/callbacks/IHealthCallbacks.d.ts | 0 .../spt/callbacks/IHideoutCallbacks.d.ts | 0 .../models/spt/callbacks/IHttpCallbacks.d.ts | 0 .../spt/callbacks/IInraidCallbacks.d.ts | 0 .../spt/callbacks/IInsuranceCallbacks.d.ts | 0 .../spt/callbacks/IInventoryCallbacks.d.ts | 0 .../spt/callbacks/IItemEventCallbacks.d.ts | 0 .../spt/callbacks/ILauncherCallbacks.d.ts | 0 .../spt/callbacks/ILocationCallbacks.d.ts | 0 .../models/spt/callbacks/IMatchCallbacks.d.ts | 0 .../models/spt/callbacks/IModCallbacks.d.ts | 0 .../models/spt/callbacks/INoteCallbacks.d.ts | 0 .../spt/callbacks/INotifierCallbacks.d.ts | 0 .../spt/callbacks/IPresetBuildCallbacks.d.ts | 0 .../spt/callbacks/IPresetCallbacks.d.ts | 0 .../spt/callbacks/IProfileCallbacks.d.ts | 0 .../models/spt/callbacks/IQuestCallbacks.d.ts | 0 .../spt/callbacks/IRagfairCallbacks.d.ts | 0 .../spt/callbacks/IRepairCallbacks.d.ts | 0 .../models/spt/callbacks/ISaveCallbacks.d.ts | 0 .../models/spt/callbacks/ITradeCallbacks.d.ts | 0 .../spt/callbacks/ITraderCallbacks.d.ts | 0 .../spt/callbacks/IWeatherCallbacks.d.ts | 0 .../spt/callbacks/IWishlistCallbacks.d.ts | 0 .../models/spt/config/IAirdropConfig.d.ts | 0 .../types/models/spt/config/IBaseConfig.d.ts | 0 .../types/models/spt/config/IBotConfig.d.ts | 32 +- .../types/models/spt/config/ICoreConfig.d.ts | 0 .../models/spt/config/IHealthConfig.d.ts | 0 .../models/spt/config/IHideoutConfig.d.ts | 7 + .../types/models/spt/config/IHttpConfig.d.ts | 0 .../models/spt/config/IInRaidConfig.d.ts | 1 + .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IInventoryConfig.d.ts | 0 .../models/spt/config/ILocaleConfig.d.ts | 5 + .../models/spt/config/ILocationConfig.d.ts | 0 .../types/models/spt/config/IMatchConfig.d.ts | 0 .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../types/models/spt/config/IQuestConfig.d.ts | 0 .../models/spt/config/IRagfairConfig.d.ts | 6 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 12 +- .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../spt/controllers/IBotController.d.ts | 0 .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../spt/generators/ILocationGenerator.d.ts | 0 .../spt/generators/IPMCLootGenerator.d.ts | 0 .../generators/IRagfairAssortGenerator.d.ts | 0 .../generators/IRagfairOfferGenerator.d.ts | 0 .../types/models/spt/helpers/Traders.d.ts | 0 .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 11 + .../models/spt/logging/LogTextColor.d.ts | 11 + .../types/models/spt/logging/SptLogger.d.ts | 7 + .../types/models/spt/mod/IMod.d.ts | 0 .../types/models/spt/mod/IModLoader.d.ts | 1 - .../models/spt/mod/IPackageJsonData.d.ts | 1 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../spt/ragfair/IRagfairServerPrices.d.ts | 0 .../models/spt/server/IDatabaseTables.d.ts | 29 +- .../types/models/spt/server/IHttpServer.d.ts | 1 + .../types/models/spt/server/ILocaleBase.d.ts | 2 +- .../types/models/spt/server/ILocations.d.ts | 0 .../types/models/spt/server/IServerBase.d.ts | 0 .../models/spt/server/ISettingsBase.d.ts | 0 .../models/spt/services/CustomPreset.d.ts | 5 + .../spt/services/CustomTraderAssortData.d.ts | 6 + .../types/models/spt/utils/IAsyncQueue.d.ts | 0 .../types/models/spt/utils/ICommand.d.ts | 0 .../types/models/spt/utils/ILogger.d.ts | 5 +- .../models/spt/utils/IUuidGenerator.d.ts | 0 .../types/routers/HttpRouter.d.ts | 16 + .../types/routers/ImageRouter.d.ts | 4 +- .../types/routers/ItemEventRouter.d.ts | 12 +- .../routers/dynamic/BotDynamicRouter.d.ts | 2 +- .../routers/dynamic/BundleDynamicRouter.d.ts | 2 +- .../dynamic/CustomizationDynamicRouter.d.ts | 2 +- .../routers/dynamic/DataDynamicRouter.d.ts | 2 +- .../routers/dynamic/HttpDynamicRouter.d.ts | 2 +- .../routers/dynamic/InraidDynamicRouter.d.ts | 2 +- .../dynamic/LocationDynamicRouter.d.ts | 2 +- .../dynamic/NotifierDynamicRouter.d.ts | 2 +- .../routers/dynamic/TraderDynamicRouter.d.ts | 2 +- .../CustomizationItemEventRouter.d.ts | 2 +- .../item_events/HealthItemEventRouter.d.ts | 2 +- .../item_events/HideoutItemEventRouter.d.ts | 2 +- .../item_events/InsuranceItemEventRouter.d.ts | 2 +- .../item_events/InventoryItemEventRouter.d.ts | 2 +- .../item_events/NoteItemEventRouter.d.ts | 2 +- .../PresetBuildItemEventRouter.d.ts | 2 +- .../item_events/QuestItemEventRouter.d.ts | 12 +- .../item_events/RagfairItemEventRouter.d.ts | 2 +- .../item_events/RepairItemEventRouter.d.ts | 2 +- .../item_events/TradeItemEventRouter.d.ts | 2 +- .../item_events/WishlistItemEventRouter.d.ts | 2 +- .../save_load/HealthSaveLoadRouter.d.ts | 0 .../save_load/InraidSaveLoadRouter.d.ts | 0 .../save_load/InsuranceSaveLoadRouter.d.ts | 0 .../save_load/ProfileSaveLoadRouter.d.ts | 0 .../routers/serializers/BundleSerializer.d.ts | 4 +- .../routers/serializers/ImageSerializer.d.ts | 2 +- .../routers/serializers/NotifySerializer.d.ts | 6 +- .../types/routers/static/BotStaticRouter.d.ts | 2 +- .../routers/static/BundleStaticRouter.d.ts | 2 +- .../static/CustomizationStaticRouter.d.ts | 2 +- .../routers/static/DataStaticRouter.d.ts | 2 +- .../routers/static/DialogStaticRouter.d.ts | 2 +- .../routers/static/GameStaticRouter.d.ts | 2 +- .../routers/static/HealthStaticRouter.d.ts | 2 +- .../routers/static/InraidStaticRouter.d.ts | 2 +- .../routers/static/InsuranceStaticRouter.d.ts | 2 +- .../routers/static/ItemEventStaticRouter.d.ts | 2 +- .../routers/static/LauncherStaticRouter.d.ts | 2 +- .../routers/static/LocationStaticRouter.d.ts | 2 +- .../routers/static/MatchStaticRouter.d.ts | 2 +- .../routers/static/NotifierStaticRouter.d.ts | 2 +- .../routers/static/PresetStaticRouter.d.ts | 2 +- .../routers/static/ProfileStaticRouter.d.ts | 2 +- .../routers/static/QuestStaticRouter.d.ts | 2 +- .../routers/static/RagfairStaticRouter.d.ts | 2 +- .../routers/static/TraderStaticRouter.d.ts | 2 +- .../routers/static/WeatherStaticRouter.d.ts | 2 +- .../types/servers/ConfigServer.d.ts | 8 +- .../types/servers/DatabaseServer.d.ts | 2 +- .../types/servers/HttpServer.d.ts | 40 +- .../types/servers/RagfairServer.d.ts | 18 +- .../types/servers/SaveServer.d.ts | 18 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 82 +++ .../types/services/FenceService.d.ts | 29 +- .../types/services/HashCacheService.d.ts | 14 +- .../types/services/InsuranceService.d.ts | 42 +- .../types/services/LocaleService.d.ts | 14 + .../types/services/MatchLocationService.d.ts | 9 + .../types/services/ModCompilerService.d.ts | 20 + .../types/services/NotificationService.d.ts | 8 +- .../types/services/PaymentService.d.ts | 36 +- .../types/services/PlayerService.d.ts | 4 +- .../types/services/ProfileFixerService.d.ts | 61 ++ .../services/RagfairCategoriesService.d.ts | 40 + .../services/RagfairLinkedItemService.d.ts | 10 + .../types/services/RagfairOfferService.d.ts | 48 +- .../types/services/RagfairPriceService.d.ts | 55 ++ .../services/RagfairRequiredItemsService.d.ts | 8 +- .../types/services/TraderAssortService.d.ts | 2 +- .../types/services/mod/CustomItemService.d.ts | 80 ++ .../mod/dynamicRouter/DynamicRouterMod.d.ts | 0 .../DynamicRouterModService.d.ts | 0 .../services/mod/image/imageRouteService.d.ts | 2 +- .../types/services/mod/onLoad/OnLoadMod.d.ts | 0 .../services/mod/onLoad/OnLoadModService.d.ts | 2 +- .../services/mod/onUpdate/OnUpdateMod.d.ts | 0 .../mod/onUpdate/OnUpdateModService.d.ts | 2 +- .../mod/staticRouter/StaticRouterMod.d.ts | 0 .../staticRouter/StaticRouterModService.d.ts | 2 +- .../types/utils/App.d.ts | 13 +- .../types/utils/AyncQueue.d.ts | 2 +- .../types/utils/DatabaseImporter.d.ts | 26 +- .../types/utils/HashUtil.d.ts | 2 +- .../types/utils/HttpResponseUtil.d.ts | 4 +- .../types/utils/JsonUtil.d.ts | 8 +- .../types/utils/Logger.d.ts | 58 ++ .../types/utils/MathUtil.d.ts | 0 .../types/utils/ObjectId.d.ts | 12 +- .../types/utils/RandomUtil.d.ts | 4 +- .../types/utils/TimeUtil.d.ts | 18 + .../types/utils/UUidGenerator.d.ts | 0 .../types/utils/VFS.d.ts | 5 +- .../types/utils/Watermark.d.ts | 46 ++ .../utils/collections/lists/LinkedList.d.ts | 30 + .../types/utils/decorators/Singleton.d.ts | 0 .../types/utils/decorators/constructor.d.ts | 0 Live/CWX_MasterKey/CWX_MasterKey.csproj | 2 +- Live/CWX_MasterKey/Patch.cs | 2 +- Live/CWX_MasterKey/program.cs | 5 +- Live/CWX_MasterKey/server/dist/package.json | 4 +- Live/CWX_MasterKey/server/dist/src/mod.ts | 13 +- .../dist/types/callbacks/BotCallbacks.d.ts | 4 +- .../dist/types/callbacks/BundleCallbacks.d.ts | 13 +- .../callbacks/CustomizationCallbacks.d.ts | 6 +- .../dist/types/callbacks/DataCallbacks.d.ts | 4 +- .../types/callbacks/DialogueCallbacks.d.ts | 8 +- .../dist/types/callbacks/GameCallbacks.d.ts | 8 +- .../types/callbacks/HandbookCallbacks.d.ts | 2 +- .../dist/types/callbacks/HealthCallbacks.d.ts | 13 +- .../types/callbacks/HideoutCallbacks.d.ts | 7 +- .../dist/types/callbacks/HttpCallbacks.d.ts | 2 +- .../dist/types/callbacks/InraidCallbacks.d.ts | 12 +- .../types/callbacks/InsuranceCallbacks.d.ts | 14 +- .../types/callbacks/InventoryCallbacks.d.ts | 2 +- .../types/callbacks/ItemEventCallbacks.d.ts | 4 +- .../types/callbacks/LauncherCallbacks.d.ts | 8 +- .../types/callbacks/LocationCallbacks.d.ts | 4 +- .../dist/types/callbacks/MatchCallbacks.d.ts | 35 +- .../dist/types/callbacks/ModCallbacks.d.ts | 17 +- .../dist/types/callbacks/NoteCallbacks.d.ts | 2 +- .../types/callbacks/NotifierCallbacks.d.ts | 6 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 7 +- .../dist/types/callbacks/PresetCallbacks.d.ts | 2 +- .../types/callbacks/ProfileCallbacks.d.ts | 16 +- .../dist/types/callbacks/QuestCallbacks.d.ts | 6 +- .../types/callbacks/RagfairCallbacks.d.ts | 21 +- .../dist/types/callbacks/RepairCallbacks.d.ts | 2 +- .../dist/types/callbacks/SaveCallbacks.d.ts | 2 +- .../dist/types/callbacks/TradeCallbacks.d.ts | 2 +- .../dist/types/callbacks/TraderCallbacks.d.ts | 4 +- .../types/callbacks/WeatherCallbacks.d.ts | 4 +- .../types/callbacks/WishlistCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../dist/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../dist/types/controllers/BotController.d.ts | 31 +- .../controllers/CustomizationController.d.ts | 12 +- .../types/controllers/DialogueController.d.ts | 12 +- .../types/controllers/GameController.d.ts | 32 +- .../types/controllers/HandbookController.d.ts | 4 +- .../types/controllers/HealthController.d.ts | 35 +- .../types/controllers/HideoutController.d.ts | 82 ++- .../types/controllers/InraidController.d.ts | 42 +- .../controllers/InsuranceController.d.ts | 37 +- .../controllers/InventoryController.d.ts | 36 +- .../types/controllers/LauncherController.d.ts | 15 +- .../types/controllers/LocationController.d.ts | 10 +- .../types/controllers/MatchController.d.ts | 34 +- .../types/controllers/NoteController.d.ts | 5 +- .../types/controllers/NotifierController.d.ts | 10 +- .../controllers/PresetBuildController.d.ts | 8 +- .../types/controllers/PresetController.d.ts | 4 +- .../types/controllers/ProfileController.d.ts | 28 +- .../types/controllers/QuestController.d.ts | 67 +- .../types/controllers/RagfairController.d.ts | 51 +- .../types/controllers/RepairController.d.ts | 21 +- .../RepeatableQuestController.d.ts | 39 +- .../types/controllers/TradeController.d.ts | 10 +- .../types/controllers/TraderController.d.ts | 16 +- .../types/controllers/WeatherController.d.ts | 7 +- .../types/controllers/WishlistController.d.ts | 2 +- .../dist/types/generators/BotGenerator.d.ts | 110 ++- .../generators/BotInventoryGenerator.d.ts | 24 +- .../types/generators/BotLootGenerator.d.ts | 135 +++- .../types/generators/BotWeaponGenerator.d.ts | 191 ++++- .../types/generators/LocationGenerator.d.ts | 42 +- .../types/generators/PMCLootGenerator.d.ts | 13 +- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 16 +- .../generators/RagfairOfferGenerator.d.ts | 55 +- .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 32 +- .../dist/types/helpers/AssortHelper.d.ts | 32 +- .../types/helpers/BotGeneratorHelper.d.ts | 115 ++- .../server/dist/types/helpers/BotHelper.d.ts | 37 +- .../dist/types/helpers/ContainerHelper.d.ts | 2 +- .../dist/types/helpers/DialogueHelper.d.ts | 33 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 29 +- .../types/helpers/ExtendedProfileHelper.d.ts | 25 +- .../dist/types/helpers/GameEventHelper.d.ts | 4 +- .../dist/types/helpers/HandbookHelper.d.ts | 2 +- .../dist/types/helpers/HealthHelper.d.ts | 50 +- .../dist/types/helpers/HideoutHelper.d.ts | 69 +- .../dist/types/helpers/HttpServerHelper.d.ts | 17 +- .../dist/types/helpers/InRaidHelper.d.ts | 98 ++- .../dist/types/helpers/InventoryHelper.d.ts | 48 +- .../server/dist/types/helpers/ItemHelper.d.ts | 101 ++- .../types/helpers/NotificationSendHelper.d.ts | 4 +- .../dist/types/helpers/NotifierHelper.d.ts | 4 +- .../dist/types/helpers/PresetHelper.d.ts | 8 +- .../dist/types/helpers/ProbabilityHelper.d.ts | 14 + .../dist/types/helpers/ProfileHelper.d.ts | 19 +- .../types/helpers/QuestConditionHelper.d.ts | 2 +- .../dist/types/helpers/QuestHelper.d.ts | 97 ++- .../dist/types/helpers/RagfairHelper.d.ts | 24 +- .../types/helpers/RagfairOfferHelper.d.ts | 51 +- .../dist/types/helpers/RagfairSellHelper.d.ts | 11 +- .../types/helpers/RagfairServerHelper.d.ts | 34 +- .../dist/types/helpers/RagfairSortHelper.d.ts | 16 +- .../dist/types/helpers/RagfairTaxHelper.d.ts | 11 +- .../dist/types/helpers/RepairHelper.d.ts | 21 +- .../types/helpers/SecureContainerHelper.d.ts | 2 +- .../dist/types/helpers/TradeHelper.d.ts | 22 +- .../types/helpers/TraderAssortHelper.d.ts | 56 +- .../dist/types/helpers/TraderHelper.d.ts | 98 ++- .../dist/types/loaders/BundleLoader.d.ts | 8 +- .../dist/types/loaders/PostAkiModLoader.d.ts} | 22 +- .../dist/types/loaders/PostDBModLoader.d.ts | 11 + .../dist/types/loaders/PreAkiModLoader.d.ts | 64 ++ .../dist/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IGlobals.d.ts | 5 +- .../models/eft/common/ILocationBase.d.ts | 9 +- .../types/models/eft/common/IPmcData.d.ts | 342 +-------- .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/common/tables/IMatch.d.ts | 10 + .../eft/common/tables/IProfileTemplate.d.ts | 25 + .../models/eft/common/tables/IQuest.d.ts | 7 +- .../eft/common/tables/ITemplateItem.d.ts | 690 ++++++++++-------- .../eft/game/IReportNicknameRequestData.d.ts | 3 + .../dist/types/models/eft/health/Effect.d.ts | 5 + .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IGetInsuranceCostResponseData.d.ts | 1 + .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../eft/match/ICreateGroupRequestData.d.ts | 6 + .../eft/match/IGetGroupStatusRequestData.d.ts | 9 + .../eft/match/IJoinMatchRequestData.d.ts | 12 + .../models/eft/match/IJoinMatchResult.d.ts | 11 + .../eft/match/IPutMetricsRequestData.d.ts | 10 + .../match/IStartOffineRaidRequestData.d.ts | 9 +- .../eft/match/IUpdatePingRequestData.d.ts | 3 + ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../profile/GetProfileStatusResponseData.d.ts | 11 + .../types/models/eft/profile/IAkiProfile.d.ts | 18 +- .../eft/quests/ICompleteQuestRequestData.d.ts | 1 + .../models/eft/ragfair/IGetOffersResult.d.ts | 2 +- .../ISendRagfairReportRequestData.d.ts | 3 + .../dist/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../dist/types/models/enums/BotAmount.d.ts | 7 + .../types/models/enums/BotDifficulty.d.ts | 8 + .../dist/types/models/enums/ConfigTypes.d.ts | 3 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/QuestRewardType.d.ts | 8 + .../dist/types/models/enums/QuestStatus.d.ts | 11 + .../dist/types/models/enums/RaidMode.d.ts | 5 + .../dist/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 4 + .../types/models/external/IPostDBLoadMod.d.ts | 4 + .../types/models/external/IPreAkiLoadMod.d.ts | 4 + .../types/models/spt/bots/BotLootCache.d.ts | 23 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 32 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInRaidConfig.d.ts | 1 + .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/ILocaleConfig.d.ts | 5 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 6 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 12 +- .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 11 + .../models/spt/logging/LogTextColor.d.ts | 11 + .../types/models/spt/logging/SptLogger.d.ts | 7 + .../dist/types/models/spt/mod/IModLoader.d.ts | 1 - .../models/spt/mod/IPackageJsonData.d.ts | 1 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../models/spt/server/IDatabaseTables.d.ts | 29 +- .../types/models/spt/server/IHttpServer.d.ts | 1 + .../types/models/spt/server/ILocaleBase.d.ts | 2 +- .../models/spt/services/CustomPreset.d.ts | 5 + .../spt/services/CustomTraderAssortData.d.ts | 6 + .../dist/types/models/spt/utils/ILogger.d.ts | 5 +- .../server/dist/types/routers/HttpRouter.d.ts | 15 +- .../dist/types/routers/ImageRouter.d.ts | 4 +- .../dist/types/routers/ItemEventRouter.d.ts | 12 +- .../routers/dynamic/BotDynamicRouter.d.ts | 2 +- .../routers/dynamic/BundleDynamicRouter.d.ts | 2 +- .../dynamic/CustomizationDynamicRouter.d.ts | 2 +- .../routers/dynamic/DataDynamicRouter.d.ts | 2 +- .../routers/dynamic/HttpDynamicRouter.d.ts | 2 +- .../routers/dynamic/InraidDynamicRouter.d.ts | 2 +- .../dynamic/LocationDynamicRouter.d.ts | 2 +- .../dynamic/NotifierDynamicRouter.d.ts | 2 +- .../routers/dynamic/TraderDynamicRouter.d.ts | 2 +- .../CustomizationItemEventRouter.d.ts | 2 +- .../item_events/HealthItemEventRouter.d.ts | 2 +- .../item_events/HideoutItemEventRouter.d.ts | 2 +- .../item_events/InsuranceItemEventRouter.d.ts | 2 +- .../item_events/InventoryItemEventRouter.d.ts | 2 +- .../item_events/NoteItemEventRouter.d.ts | 2 +- .../PresetBuildItemEventRouter.d.ts | 2 +- .../item_events/QuestItemEventRouter.d.ts | 12 +- .../item_events/RagfairItemEventRouter.d.ts | 2 +- .../item_events/RepairItemEventRouter.d.ts | 2 +- .../item_events/TradeItemEventRouter.d.ts | 2 +- .../item_events/WishlistItemEventRouter.d.ts | 2 +- .../routers/serializers/BundleSerializer.d.ts | 4 +- .../routers/serializers/ImageSerializer.d.ts | 2 +- .../routers/serializers/NotifySerializer.d.ts | 6 +- .../types/routers/static/BotStaticRouter.d.ts | 2 +- .../routers/static/BundleStaticRouter.d.ts | 2 +- .../static/CustomizationStaticRouter.d.ts | 2 +- .../routers/static/DataStaticRouter.d.ts | 2 +- .../routers/static/DialogStaticRouter.d.ts | 2 +- .../routers/static/GameStaticRouter.d.ts | 2 +- .../routers/static/HealthStaticRouter.d.ts | 2 +- .../routers/static/InraidStaticRouter.d.ts | 2 +- .../routers/static/InsuranceStaticRouter.d.ts | 2 +- .../routers/static/ItemEventStaticRouter.d.ts | 2 +- .../routers/static/LauncherStaticRouter.d.ts | 2 +- .../routers/static/LocationStaticRouter.d.ts | 2 +- .../routers/static/MatchStaticRouter.d.ts | 2 +- .../routers/static/NotifierStaticRouter.d.ts | 2 +- .../routers/static/PresetStaticRouter.d.ts | 2 +- .../routers/static/ProfileStaticRouter.d.ts | 2 +- .../routers/static/QuestStaticRouter.d.ts | 2 +- .../routers/static/RagfairStaticRouter.d.ts | 2 +- .../routers/static/TraderStaticRouter.d.ts | 2 +- .../routers/static/WeatherStaticRouter.d.ts | 2 +- .../dist/types/servers/ConfigServer.d.ts | 8 +- .../dist/types/servers/DatabaseServer.d.ts | 2 +- .../server/dist/types/servers/HttpServer.d.ts | 40 +- .../dist/types/servers/RagfairServer.d.ts | 18 +- .../server/dist/types/servers/SaveServer.d.ts | 18 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 82 +++ .../dist/types/services/FenceService.d.ts | 29 +- .../dist/types/services/HashCacheService.d.ts | 14 +- .../dist/types/services/InsuranceService.d.ts | 42 +- .../dist/types/services/LocaleService.d.ts | 14 + .../types/services/MatchLocationService.d.ts | 7 +- .../types/services/ModCompilerService.d.ts | 21 +- .../types/services/NotificationService.d.ts | 8 +- .../dist/types/services/PaymentService.d.ts | 36 +- .../dist/types/services/PlayerService.d.ts | 4 +- .../types/services/ProfileFixerService.d.ts | 61 ++ .../services/RagfairCategoriesService.d.ts | 44 +- .../services/RagfairLinkedItemService.d.ts | 9 +- .../types/services/RagfairOfferService.d.ts | 48 +- .../types/services/RagfairPriceService.d.ts | 43 +- .../services/RagfairRequiredItemsService.d.ts | 8 +- .../types/services/TraderAssortService.d.ts | 2 +- .../types/services/mod/CustomItemService.d.ts | 80 ++ .../services/mod/image/imageRouteService.d.ts | 2 +- .../services/mod/onLoad/OnLoadModService.d.ts | 2 +- .../mod/onUpdate/OnUpdateModService.d.ts | 2 +- .../staticRouter/StaticRouterModService.d.ts | 2 +- .../server/dist/types/utils/App.d.ts | 13 +- .../server/dist/types/utils/AyncQueue.d.ts | 2 +- .../dist/types/utils/DatabaseImporter.d.ts | 26 +- .../server/dist/types/utils/HashUtil.d.ts | 2 +- .../dist/types/utils/HttpResponseUtil.d.ts | 4 +- .../server/dist/types/utils/JsonUtil.d.ts | 8 +- .../server/dist/types/utils/Logger.d.ts | 61 +- .../server/dist/types/utils/ObjectId.d.ts | 12 +- .../server/dist/types/utils/RandomUtil.d.ts | 4 +- .../server/dist/types/utils/TimeUtil.d.ts | 10 + .../server/dist/types/utils/VFS.d.ts | 5 +- .../server/dist/types/utils/Watermark.d.ts | 35 +- .../utils/collections/lists/LinkedList.d.ts | 30 + Live/CWX_MasterKey/server/package.json | 4 +- Live/CWX_MasterKey/server/src/mod.ts | 13 +- Live/CWX_MasterKey/server/types/Utils.d.ts | 0 .../server/types/callbacks/BotCallbacks.d.ts | 4 +- .../types/callbacks/BundleCallbacks.d.ts | 13 +- .../callbacks/CustomizationCallbacks.d.ts | 6 +- .../server/types/callbacks/DataCallbacks.d.ts | 4 +- .../types/callbacks/DialogueCallbacks.d.ts | 8 +- .../server/types/callbacks/GameCallbacks.d.ts | 8 +- .../types/callbacks/HandbookCallbacks.d.ts | 2 +- .../types/callbacks/HealthCallbacks.d.ts | 13 +- .../types/callbacks/HideoutCallbacks.d.ts | 7 +- .../server/types/callbacks/HttpCallbacks.d.ts | 2 +- .../types/callbacks/InraidCallbacks.d.ts | 12 +- .../types/callbacks/InsuranceCallbacks.d.ts | 14 +- .../types/callbacks/InventoryCallbacks.d.ts | 2 +- .../types/callbacks/ItemEventCallbacks.d.ts | 4 +- .../types/callbacks/LauncherCallbacks.d.ts | 8 +- .../types/callbacks/LocationCallbacks.d.ts | 4 +- .../types/callbacks/MatchCallbacks.d.ts | 35 +- .../server/types/callbacks/ModCallbacks.d.ts | 17 +- .../server/types/callbacks/NoteCallbacks.d.ts | 2 +- .../types/callbacks/NotifierCallbacks.d.ts | 6 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 7 +- .../types/callbacks/PresetCallbacks.d.ts | 2 +- .../types/callbacks/ProfileCallbacks.d.ts | 16 +- .../types/callbacks/QuestCallbacks.d.ts | 6 +- .../types/callbacks/RagfairCallbacks.d.ts | 21 +- .../types/callbacks/RepairCallbacks.d.ts | 2 +- .../server/types/callbacks/SaveCallbacks.d.ts | 2 +- .../types/callbacks/TradeCallbacks.d.ts | 2 +- .../types/callbacks/TraderCallbacks.d.ts | 4 +- .../types/callbacks/WeatherCallbacks.d.ts | 4 +- .../types/callbacks/WishlistCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../server/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 31 +- .../controllers/CustomizationController.d.ts | 12 +- .../types/controllers/DialogueController.d.ts | 12 +- .../types/controllers/GameController.d.ts | 32 +- .../types/controllers/HandbookController.d.ts | 4 +- .../types/controllers/HealthController.d.ts | 35 +- .../types/controllers/HideoutController.d.ts | 82 ++- .../types/controllers/InraidController.d.ts | 42 +- .../controllers/InsuranceController.d.ts | 37 +- .../controllers/InventoryController.d.ts | 36 +- .../types/controllers/LauncherController.d.ts | 15 +- .../types/controllers/LocationController.d.ts | 10 +- .../types/controllers/MatchController.d.ts | 34 +- .../types/controllers/NoteController.d.ts | 5 +- .../types/controllers/NotifierController.d.ts | 10 +- .../controllers/PresetBuildController.d.ts | 8 +- .../types/controllers/PresetController.d.ts | 4 +- .../types/controllers/ProfileController.d.ts | 28 +- .../types/controllers/QuestController.d.ts | 67 +- .../types/controllers/RagfairController.d.ts | 51 +- .../types/controllers/RepairController.d.ts | 21 +- .../RepeatableQuestController.d.ts | 39 +- .../types/controllers/TradeController.d.ts | 10 +- .../types/controllers/TraderController.d.ts | 16 +- .../types/controllers/WeatherController.d.ts | 7 +- .../types/controllers/WishlistController.d.ts | 2 +- .../server/types/generators/BotGenerator.d.ts | 110 ++- .../generators/BotInventoryGenerator.d.ts | 24 +- .../types/generators/BotLootGenerator.d.ts | 135 +++- .../types/generators/BotWeaponGenerator.d.ts | 191 ++++- .../types/generators/LocationGenerator.d.ts | 42 +- .../types/generators/PMCLootGenerator.d.ts | 13 +- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 16 +- .../generators/RagfairOfferGenerator.d.ts | 55 +- .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 32 +- .../server/types/helpers/AssortHelper.d.ts | 32 +- .../types/helpers/BotGeneratorHelper.d.ts | 115 ++- .../server/types/helpers/BotHelper.d.ts | 37 +- .../server/types/helpers/ContainerHelper.d.ts | 2 +- .../server/types/helpers/DialogueHelper.d.ts | 33 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 29 +- .../types/helpers/ExtendedProfileHelper.d.ts | 22 - .../server/types/helpers/GameEventHelper.d.ts | 4 +- .../server/types/helpers/HandbookHelper.d.ts | 2 +- .../server/types/helpers/HealthHelper.d.ts | 50 +- .../server/types/helpers/HideoutHelper.d.ts | 69 +- .../types/helpers/HttpServerHelper.d.ts | 17 +- .../server/types/helpers/InRaidHelper.d.ts | 98 ++- .../server/types/helpers/InventoryHelper.d.ts | 48 +- .../server/types/helpers/ItemHelper.d.ts | 101 ++- .../types/helpers/NotificationSendHelper.d.ts | 4 +- .../server/types/helpers/NotifierHelper.d.ts | 4 +- .../server/types/helpers/PresetHelper.d.ts | 8 +- .../types/helpers/ProbabilityHelper.d.ts | 14 + .../server/types/helpers/ProfileHelper.d.ts | 19 +- .../types/helpers/QuestConditionHelper.d.ts | 2 +- .../server/types/helpers/QuestHelper.d.ts | 97 ++- .../server/types/helpers/RagfairHelper.d.ts | 24 +- .../types/helpers/RagfairOfferHelper.d.ts | 51 +- .../types/helpers/RagfairSellHelper.d.ts | 11 +- .../types/helpers/RagfairServerHelper.d.ts | 34 +- .../types/helpers/RagfairSortHelper.d.ts | 16 +- .../types/helpers/RagfairTaxHelper.d.ts | 11 +- .../server/types/helpers/RepairHelper.d.ts | 21 +- .../types/helpers/SecureContainerHelper.d.ts | 2 +- .../server/types/helpers/TradeHelper.d.ts | 22 +- .../types/helpers/TraderAssortHelper.d.ts | 56 +- .../server/types/helpers/TraderHelper.d.ts | 98 ++- .../server/types/loaders/BundleLoader.d.ts | 8 +- .../types/loaders/InitialModLoader.d.ts | 58 -- ...edModLoader.d.ts => PostAkiModLoader.d.ts} | 22 +- .../server/types/loaders/PostDBModLoader.d.ts | 11 + .../server/types/loaders/PreAkiModLoader.d.ts | 64 ++ .../server/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IGlobals.d.ts | 5 +- .../models/eft/common/ILocationBase.d.ts | 9 +- .../types/models/eft/common/IPmcData.d.ts | 342 +-------- .../models/eft/common/MemberCategory.d.ts | 13 - .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/common/tables/IMatch.d.ts | 10 + .../eft/common/tables/IProfileTemplate.d.ts | 25 + .../models/eft/common/tables/IQuest.d.ts | 7 +- .../eft/common/tables/ITemplateItem.d.ts | 690 ++++++++++-------- .../eft/game/IReportNicknameRequestData.d.ts | 3 + .../types/models/eft/health/Effect.d.ts | 5 + .../models/eft/hideout/HideoutAreasEnum.d.ts | 25 - .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IGetInsuranceCostResponseData.d.ts | 1 + .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../eft/match/ICreateGroupRequestData.d.ts | 6 + .../eft/match/IGetGroupStatusRequestData.d.ts | 9 + .../eft/match/IJoinMatchRequestData.d.ts | 12 + .../models/eft/match/IJoinMatchResult.d.ts | 11 + .../eft/match/IPutMetricsRequestData.d.ts | 10 + .../match/IStartOffineRaidRequestData.d.ts | 9 +- .../eft/match/IUpdatePingRequestData.d.ts | 3 + ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../profile/GetProfileStatusResponseData.d.ts | 11 + .../types/models/eft/profile/IAkiProfile.d.ts | 18 +- .../eft/quests/ICompleteQuestRequestData.d.ts | 1 + .../models/eft/ragfair/IGetOffersResult.d.ts | 2 +- .../ISendRagfairReportRequestData.d.ts | 3 + .../server/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../server/types/models/enums/BotAmount.d.ts | 7 + .../types/models/enums/BotDifficulty.d.ts | 8 + .../types/models/enums/ConfigTypes.d.ts | 3 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/QuestRewardType.d.ts | 8 + .../types/models/enums/QuestStatus.d.ts | 11 + .../server/types/models/enums/RaidMode.d.ts | 5 + .../server/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 4 + .../types/models/external/IPostDBLoadMod.d.ts | 4 + .../types/models/external/IPreAkiLoadMod.d.ts | 4 + .../server/types/models/external/mod.d.ts | 5 - .../types/models/spt/bots/BotLootCache.d.ts | 23 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 32 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInRaidConfig.d.ts | 1 + .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/ILocaleConfig.d.ts | 5 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 6 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 12 +- .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../types/models/spt/helpers/Traders.d.ts | 10 - .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 11 + .../models/spt/logging/LogTextColor.d.ts | 11 + .../types/models/spt/logging/SptLogger.d.ts | 7 + .../types/models/spt/mod/IModLoader.d.ts | 1 - .../models/spt/mod/IPackageJsonData.d.ts | 1 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../models/spt/server/IDatabaseTables.d.ts | 29 +- .../types/models/spt/server/IHttpServer.d.ts | 1 + .../types/models/spt/server/ILocaleBase.d.ts | 2 +- .../models/spt/services/CustomPreset.d.ts | 5 + .../spt/services/CustomTraderAssortData.d.ts | 6 + .../types/models/spt/utils/ILogger.d.ts | 5 +- .../server/types/routers/HttpRouter.d.ts | 15 +- .../server/types/routers/ImageRouter.d.ts | 4 +- .../server/types/routers/ItemEventRouter.d.ts | 12 +- .../routers/dynamic/BotDynamicRouter.d.ts | 2 +- .../routers/dynamic/BundleDynamicRouter.d.ts | 2 +- .../dynamic/CustomizationDynamicRouter.d.ts | 2 +- .../routers/dynamic/DataDynamicRouter.d.ts | 2 +- .../routers/dynamic/HttpDynamicRouter.d.ts | 2 +- .../routers/dynamic/InraidDynamicRouter.d.ts | 2 +- .../dynamic/LocationDynamicRouter.d.ts | 2 +- .../dynamic/NotifierDynamicRouter.d.ts | 2 +- .../routers/dynamic/TraderDynamicRouter.d.ts | 2 +- .../CustomizationItemEventRouter.d.ts | 2 +- .../item_events/HealthItemEventRouter.d.ts | 2 +- .../item_events/HideoutItemEventRouter.d.ts | 2 +- .../item_events/InsuranceItemEventRouter.d.ts | 2 +- .../item_events/InventoryItemEventRouter.d.ts | 2 +- .../item_events/NoteItemEventRouter.d.ts | 2 +- .../PresetBuildItemEventRouter.d.ts | 2 +- .../item_events/QuestItemEventRouter.d.ts | 12 +- .../item_events/RagfairItemEventRouter.d.ts | 2 +- .../item_events/RepairItemEventRouter.d.ts | 2 +- .../item_events/TradeItemEventRouter.d.ts | 2 +- .../item_events/WishlistItemEventRouter.d.ts | 2 +- .../routers/serializers/BundleSerializer.d.ts | 4 +- .../routers/serializers/ImageSerializer.d.ts | 2 +- .../routers/serializers/NotifySerializer.d.ts | 6 +- .../types/routers/static/BotStaticRouter.d.ts | 2 +- .../routers/static/BundleStaticRouter.d.ts | 2 +- .../static/CustomizationStaticRouter.d.ts | 2 +- .../routers/static/DataStaticRouter.d.ts | 2 +- .../routers/static/DialogStaticRouter.d.ts | 2 +- .../routers/static/GameStaticRouter.d.ts | 2 +- .../routers/static/HealthStaticRouter.d.ts | 2 +- .../routers/static/InraidStaticRouter.d.ts | 2 +- .../routers/static/InsuranceStaticRouter.d.ts | 2 +- .../routers/static/ItemEventStaticRouter.d.ts | 2 +- .../routers/static/LauncherStaticRouter.d.ts | 2 +- .../routers/static/LocationStaticRouter.d.ts | 2 +- .../routers/static/MatchStaticRouter.d.ts | 2 +- .../routers/static/NotifierStaticRouter.d.ts | 2 +- .../routers/static/PresetStaticRouter.d.ts | 2 +- .../routers/static/ProfileStaticRouter.d.ts | 2 +- .../routers/static/QuestStaticRouter.d.ts | 2 +- .../routers/static/RagfairStaticRouter.d.ts | 2 +- .../routers/static/TraderStaticRouter.d.ts | 2 +- .../routers/static/WeatherStaticRouter.d.ts | 2 +- .../server/types/servers/ConfigServer.d.ts | 8 +- .../server/types/servers/DatabaseServer.d.ts | 2 +- .../server/types/servers/HttpServer.d.ts | 40 +- .../server/types/servers/RagfairServer.d.ts | 18 +- .../server/types/servers/SaveServer.d.ts | 18 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 82 +++ .../server/types/services/FenceService.d.ts | 29 +- .../types/services/HashCacheService.d.ts | 14 +- .../types/services/InsuranceService.d.ts | 42 +- .../server/types/services/LocaleService.d.ts | 14 + .../types/services/MatchLocationService.d.ts | 7 +- .../types/services/ModCompilerService.d.ts | 21 +- .../types/services/NotificationService.d.ts | 8 +- .../server/types/services/PaymentService.d.ts | 36 +- .../server/types/services/PlayerService.d.ts | 4 +- .../types/services/ProfileFixerService.d.ts | 61 ++ .../services/RagfairCategoriesService.d.ts | 44 +- .../services/RagfairLinkedItemService.d.ts | 9 +- .../types/services/RagfairOfferService.d.ts | 48 +- .../types/services/RagfairPriceService.d.ts | 43 +- .../services/RagfairRequiredItemsService.d.ts | 8 +- .../types/services/TraderAssortService.d.ts | 2 +- .../types/services/mod/CustomItemService.d.ts | 80 ++ .../services/mod/image/imageRouteService.d.ts | 2 +- .../services/mod/onLoad/OnLoadModService.d.ts | 2 +- .../mod/onUpdate/OnUpdateModService.d.ts | 2 +- .../staticRouter/StaticRouterModService.d.ts | 2 +- .../CWX_MasterKey/server/types/utils/App.d.ts | 13 +- .../server/types/utils/AyncQueue.d.ts | 2 +- .../server/types/utils/DatabaseImporter.d.ts | 26 +- .../server/types/utils/HashUtil.d.ts | 2 +- .../server/types/utils/HttpResponseUtil.d.ts | 4 +- .../server/types/utils/JsonUtil.d.ts | 8 +- .../server/types/utils/Logger.d.ts | 61 +- .../server/types/utils/ObjectId.d.ts | 12 +- .../server/types/utils/RandomUtil.d.ts | 4 +- .../server/types/utils/TimeUtil.d.ts | 10 + .../CWX_MasterKey/server/types/utils/VFS.d.ts | 5 +- .../server/types/utils/Watermark.d.ts | 35 +- .../utils/collections/lists/LinkedList.d.ts | 30 + .../CWX_WeatherPatch.csproj | 2 +- .../BepInEx/plugins/CWX-WeatherPatcher.dll | Bin 7680 -> 0 bytes .../mods/CWX-WeatherPatcher 2.3.0/src/mod.ts | 21 - .../CWX-WeatherPatcher 2.3.0/types/Utils.d.ts | 0 .../types/callbacks/MatchCallbacks.d.ts | 35 - .../types/controllers/BotController.d.ts | 20 - .../types/controllers/GameController.d.ts | 28 - .../types/controllers/InraidController.d.ts | 30 - .../types/controllers/MatchController.d.ts | 28 - .../types/controllers/QuestController.d.ts | 37 - .../types/generators/BotGenerator.d.ts | 36 - .../types/generators/BotLootGenerator.d.ts | 27 - .../types/generators/BotWeaponGenerator.d.ts | 44 -- .../types/generators/WeatherGenerator.d.ts | 19 - .../types/helpers/AssortHelper.d.ts | 16 - .../types/helpers/BotGeneratorHelper.d.ts | 60 -- .../types/helpers/BotHelper.d.ts | 22 - .../types/helpers/DurabilityLimitsHelper.d.ts | 25 - .../types/helpers/ExtendedProfileHelper.d.ts | 22 - .../types/helpers/HealthHelper.d.ts | 23 - .../types/helpers/HttpServerHelper.d.ts | 12 - .../types/helpers/InRaidHelper.d.ts | 33 - .../types/helpers/QuestHelper.d.ts | 68 -- .../types/helpers/RagfairSortHelper.d.ts | 12 - .../types/helpers/RepairHelper.d.ts | 20 - .../types/helpers/TraderAssortHelper.d.ts | 23 - .../types/helpers/TraderHelper.d.ts | 35 - .../types/loaders/InitialModLoader.d.ts | 58 -- .../models/eft/common/MemberCategory.d.ts | 13 - .../models/eft/common/tables/IBotBase.d.ts | 101 --- .../eft/common/tables/ITemplateItem.d.ts | 401 ---------- .../models/eft/hideout/HideoutAreasEnum.d.ts | 25 - .../types/models/enums/MemberCategory.d.ts | 13 - .../types/models/external/mod.d.ts | 5 - .../models/spt/config/IHideoutConfig.d.ts | 27 - .../types/models/spt/helpers/Traders.d.ts | 10 - .../types/routers/HttpRouter.d.ts | 11 - .../types/services/MatchLocationService.d.ts | 8 - .../types/services/ModCompilerService.d.ts | 15 - .../services/RagfairCategoriesService.d.ts | 10 - .../services/RagfairLinkedItemService.d.ts | 9 - .../types/services/RagfairPriceService.d.ts | 30 - .../types/utils/Logger.d.ts | 25 - .../types/utils/TimeUtil.d.ts | 8 - .../types/utils/Watermark.d.ts | 29 - .../BepInEx/plugins/CWX-WeatherPatcher.dll | Bin 0 -> 7168 bytes .../CWX-WeatherPatcher 2.4.1}/LICENSE.txt | 0 .../CWX-WeatherPatcher 2.4.1}/package.json | 4 +- .../mods/CWX-WeatherPatcher 2.4.1/src/mod.ts | 14 + .../types/Program.d.ts | 0 .../types/TYPES.d.ts | 0 .../types/Utils.d.ts | 0 .../types/callbacks/BotCallbacks.d.ts | 4 +- .../types/callbacks/BundleCallbacks.d.ts | 13 +- .../callbacks/CustomizationCallbacks.d.ts | 6 +- .../types/callbacks/DataCallbacks.d.ts | 4 +- .../types/callbacks/DialogueCallbacks.d.ts | 8 +- .../types/callbacks/GameCallbacks.d.ts | 8 +- .../types/callbacks/HandbookCallbacks.d.ts | 2 +- .../types/callbacks/HealthCallbacks.d.ts | 13 +- .../types/callbacks/HideoutCallbacks.d.ts | 7 +- .../types/callbacks/HttpCallbacks.d.ts | 2 +- .../types/callbacks/InraidCallbacks.d.ts | 12 +- .../types/callbacks/InsuranceCallbacks.d.ts | 14 +- .../types/callbacks/InventoryCallbacks.d.ts | 2 +- .../types/callbacks/ItemEventCallbacks.d.ts | 4 +- .../types/callbacks/LauncherCallbacks.d.ts | 8 +- .../types/callbacks/LocationCallbacks.d.ts | 4 +- .../types/callbacks/MatchCallbacks.d.ts | 42 ++ .../types/callbacks/ModCallbacks.d.ts | 17 +- .../types/callbacks/NoteCallbacks.d.ts | 2 +- .../types/callbacks/NotifierCallbacks.d.ts | 6 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 7 +- .../types/callbacks/PresetCallbacks.d.ts | 2 +- .../types/callbacks/ProfileCallbacks.d.ts | 16 +- .../types/callbacks/QuestCallbacks.d.ts | 6 +- .../types/callbacks/RagfairCallbacks.d.ts | 21 +- .../types/callbacks/RepairCallbacks.d.ts | 2 +- .../types/callbacks/SaveCallbacks.d.ts | 2 +- .../types/callbacks/TradeCallbacks.d.ts | 2 +- .../types/callbacks/TraderCallbacks.d.ts | 4 +- .../types/callbacks/WeatherCallbacks.d.ts | 4 +- .../types/callbacks/WishlistCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 35 + .../controllers/CustomizationController.d.ts | 12 +- .../types/controllers/DialogueController.d.ts | 12 +- .../types/controllers/GameController.d.ts | 28 + .../types/controllers/HandbookController.d.ts | 4 +- .../types/controllers/HealthController.d.ts | 35 +- .../types/controllers/HideoutController.d.ts | 82 ++- .../types/controllers/InraidController.d.ts | 44 ++ .../controllers/InsuranceController.d.ts | 37 +- .../controllers/InventoryController.d.ts | 36 +- .../types/controllers/LauncherController.d.ts | 15 +- .../types/controllers/LocationController.d.ts | 10 +- .../types/controllers/MatchController.d.ts | 38 + .../types/controllers/NoteController.d.ts | 5 +- .../types/controllers/NotifierController.d.ts | 10 +- .../controllers/PresetBuildController.d.ts | 8 +- .../types/controllers/PresetController.d.ts | 4 +- .../types/controllers/ProfileController.d.ts | 28 +- .../types/controllers/QuestController.d.ts | 76 ++ .../types/controllers/RagfairController.d.ts | 51 +- .../types/controllers/RepairController.d.ts | 21 +- .../RepeatableQuestController.d.ts | 39 +- .../types/controllers/TradeController.d.ts | 10 +- .../types/controllers/TraderController.d.ts | 16 +- .../types/controllers/WeatherController.d.ts | 7 +- .../types/controllers/WishlistController.d.ts | 2 +- .../types/di/Container.d.ts | 0 .../types/di/OnLoad.d.ts | 0 .../types/di/OnLoadOnUpdate.d.ts | 0 .../types/di/OnUpdate.d.ts | 0 .../types/di/Router.d.ts | 0 .../types/di/Serializer.d.ts | 0 .../types/generators/BotGenerator.d.ts | 96 +++ .../generators/BotInventoryGenerator.d.ts | 24 +- .../types/generators/BotLootGenerator.d.ts | 124 ++++ .../types/generators/BotWeaponGenerator.d.ts | 173 +++++ .../types/generators/LocationGenerator.d.ts | 42 +- .../types/generators/PMCLootGenerator.d.ts | 13 +- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 16 +- .../generators/RagfairOfferGenerator.d.ts | 55 +- .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 33 + .../types/helpers/AssortHelper.d.ts | 36 + .../types/helpers/BotGeneratorHelper.d.ts | 131 ++++ .../types/helpers/BotHelper.d.ts | 45 ++ .../types/helpers/ContainerHelper.d.ts | 2 +- .../types/helpers/DialogueHelper.d.ts | 33 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 26 + .../types/helpers/ExtendedProfileHelper.d.ts | 0 .../types/helpers/GameEventHelper.d.ts | 4 +- .../types/helpers/HandbookHelper.d.ts | 2 +- .../types/helpers/HealthHelper.d.ts | 51 ++ .../types/helpers/HideoutHelper.d.ts | 69 +- .../types/helpers/HttpServerHelper.d.ts | 23 + .../types/helpers/InRaidHelper.d.ts | 97 +++ .../types/helpers/InventoryHelper.d.ts | 48 +- .../types/helpers/ItemHelper.d.ts | 101 ++- .../types/helpers/NotificationSendHelper.d.ts | 4 +- .../types/helpers/NotifierHelper.d.ts | 4 +- .../types/helpers/PaymentHelper.d.ts | 0 .../types/helpers/PresetHelper.d.ts | 8 +- .../types/helpers/ProbabilityHelper.d.ts | 14 + .../types/helpers/ProfileHelper.d.ts | 19 +- .../types/helpers/QuestConditionHelper.d.ts | 2 +- .../types/helpers/QuestHelper.d.ts | 115 +++ .../types/helpers/RagfairHelper.d.ts | 24 +- .../types/helpers/RagfairOfferHelper.d.ts | 51 +- .../types/helpers/RagfairSellHelper.d.ts | 11 +- .../types/helpers/RagfairServerHelper.d.ts | 34 +- .../types/helpers/RagfairSortHelper.d.ts | 14 + .../types/helpers/RagfairTaxHelper.d.ts | 11 +- .../types/helpers/RepairHelper.d.ts | 21 + .../types/helpers/SecureContainerHelper.d.ts | 2 +- .../types/helpers/TradeHelper.d.ts | 22 +- .../types/helpers/TraderAssortHelper.d.ts | 55 ++ .../types/helpers/TraderHelper.d.ts | 109 +++ .../types/helpers/UtilityHelper.d.ts | 0 .../types/helpers/WeightedRandomHelper.d.ts | 0 .../types/ide/BleedingEdgeEntry.d.ts | 0 .../types/ide/Compiler.d.ts | 0 .../types/ide/DebugEntry.d.ts | 0 .../types/ide/ReleaseEntry.d.ts | 0 .../types/ide/TestEntry.d.ts | 0 .../types/loaders/BundleLoader.d.ts | 8 +- .../types/loaders/DelayedModLoader.d.ts | 0 .../types/loaders/InitialModLoader.d.ts | 0 .../types/loaders/PostAkiModLoader.d.ts} | 22 +- .../types/loaders/PostDBModLoader.d.ts | 11 + .../types/loaders/PreAkiModLoader.d.ts | 64 ++ .../types/models/common/MinMax.d.ts | 4 + .../eft/bot/IGenerateBotsRequestData.d.ts | 0 .../models/eft/common/IEmptyRequestData.d.ts | 0 .../types/models/eft/common/IGlobals.d.ts | 5 +- .../types/models/eft/common/ILocation.d.ts | 0 .../models/eft/common/ILocationBase.d.ts | 9 +- .../ILocationsSourceDestinationBase.d.ts | 0 .../types/models/eft/common/ILooseLoot.d.ts | 0 .../models/eft/common/IMetricsTableData.d.ts | 0 .../types/models/eft/common/IPmcData.d.ts | 3 + .../models/eft/common/MemberCategory.d.ts | 0 .../request/IBaseInteractionRequestData.d.ts | 0 .../models/eft/common/tables/IBotBase.d.ts} | 126 ++-- .../models/eft/common/tables/IBotCore.d.ts | 0 .../models/eft/common/tables/IBotType.d.ts | 27 +- .../eft/common/tables/ICustomizationItem.d.ts | 0 .../eft/common/tables/IHandbookBase.d.ts | 0 .../types/models/eft/common/tables/IItem.d.ts | 0 .../eft/common/tables/ILocationsBase.d.ts | 0 .../models/eft/common/tables/ILootBase.d.ts | 0 .../models/eft/common/tables/IMatch.d.ts | 10 + .../eft/common/tables/IProfileTemplate.d.ts | 25 + .../models/eft/common/tables/IQuest.d.ts | 7 +- .../eft/common/tables/IRepeatableQuests.d.ts | 0 .../eft/common/tables/ITemplateItem.d.ts | 455 ++++++++++++ .../models/eft/common/tables/ITrader.d.ts | 0 .../IBuyClothingRequestData.d.ts | 0 .../IWearClothingRequestData.d.ts | 0 .../models/eft/dialog/IFriendRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsRequestData.d.ts | 0 .../dialog/IGetAllAttachmentsResponse.d.ts | 0 .../dialog/IGetChatServerListRequestData.d.ts | 0 .../dialog/IGetFriendListDataResponse.d.ts | 0 .../dialog/IGetMailDialogInfoRequestData.d.ts | 0 .../dialog/IGetMailDialogListRequestData.d.ts | 0 .../dialog/IGetMailDialogViewRequestData.d.ts | 0 .../IGetMailDialogViewResponseData.d.ts | 0 .../eft/dialog/IPinDialogRequestData.d.ts | 0 .../eft/dialog/IRemoveDialogRequestData.d.ts | 0 .../eft/dialog/ISendMessageRequest.d.ts | 0 .../eft/dialog/ISetDialogReadRequestData.d.ts | 0 .../models/eft/game/IGameConfigResponse.d.ts | 0 .../eft/game/IGameEmptyCrcRequestData.d.ts | 0 .../eft/game/IReportNicknameRequestData.d.ts | 3 + .../eft/game/IVersionValidateRequestData.d.ts | 0 .../types/models/eft/health/Effect.d.ts | 5 + .../health/IHealthTreatmentRequestData.d.ts | 0 .../eft/health/IOffraidEatRequestData.d.ts | 0 .../eft/health/IOffraidHealRequestData.d.ts | 0 .../eft/health/ISyncHealthRequestData.d.ts | 0 .../models/eft/hideout/HideoutAreasEnum.d.ts | 0 .../HideoutUpgradeCompleteRequestData.d.ts | 0 .../models/eft/hideout/IHideoutArea.d.ts | 0 ...utContinousProductionStartRequestData.d.ts | 0 .../eft/hideout/IHideoutProduction.d.ts | 0 .../hideout/IHideoutPutItemInRequestData.d.ts | 0 .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IHideoutScavCaseStartRequestData.d.ts | 0 .../eft/hideout/IHideoutSettingsBase.d.ts | 0 ...deoutSingleProductionStartRequestData.d.ts | 0 .../IHideoutTakeItemOutRequestData.d.ts | 0 .../IHideoutTakeProductionRequestData.d.ts | 0 .../IHideoutToggleAreaRequestData.d.ts | 0 .../IHideoutUpgradeCompleteRequestData.d.ts | 0 .../hideout/IHideoutUpgradeRequestData.d.ts | 0 .../httpResponse/IGetBodyResponseData.d.ts | 0 .../eft/httpResponse/INullResponseData.d.ts | 0 .../inRaid/IRegisterPlayerRequestData.d.ts | 0 .../eft/inRaid/ISaveProgressRequestData.d.ts | 0 .../IGetInsuranceCostRequestData.d.ts | 0 .../IGetInsuranceCostResponseData.d.ts | 1 + .../eft/insurance/IInsureRequestData.d.ts | 0 .../eft/inventory/IAddItemRequestData.d.ts | 0 .../inventory/IInventoryAddRequestData.d.ts | 0 .../IInventoryBaseActionRequestData.d.ts | 0 .../inventory/IInventoryBindRequestData.d.ts | 0 .../IInventoryCreateMarkerRequestData.d.ts | 0 .../IInventoryDeleteMarkerRequestData.d.ts | 0 .../IInventoryEditMarkerRequestData.d.ts | 0 .../IInventoryExamineRequestData.d.ts | 0 .../inventory/IInventoryFoldRequestData.d.ts | 0 .../inventory/IInventoryMergeRequestData.d.ts | 0 .../inventory/IInventoryMoveRequestData.d.ts | 0 ...IInventoryReadEncyclopediaRequestData.d.ts | 0 .../IInventoryRemoveRequestData.d.ts | 0 .../inventory/IInventorySortRequestData.d.ts | 0 .../inventory/IInventorySplitRequestData.d.ts | 0 .../inventory/IInventorySwapRequestData.d.ts | 0 .../inventory/IInventoryTagRequestData.d.ts | 0 .../IInventoryToggleRequestData.d.ts | 0 .../IInventoryTransferRequestData.d.ts | 0 .../IEmptyItemEventRouterResponse.d.ts | 0 .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../itemEvent/IItemEventRouterRequest.d.ts | 0 .../itemEvent/IItemEventRouterResponse.d.ts | 0 .../eft/launcher/IChangeRequestData.d.ts | 0 .../launcher/IGetMiniProfileRequestData.d.ts | 0 .../eft/launcher/ILoginRequestData.d.ts | 0 .../models/eft/launcher/IMiniProfile.d.ts | 0 .../models/eft/launcher/IRegisterData.d.ts | 0 .../eft/launcher/IRemoveProfileData.d.ts | 0 .../eft/location/IGetLocationRequestData.d.ts | 0 .../eft/match/ICreateGroupRequestData.d.ts | 6 + .../eft/match/IEndOfflineRaidRequestData.d.ts | 0 .../eft/match/IGetGroupStatusRequestData.d.ts | 9 + .../eft/match/IGetProfileRequestData.d.ts | 0 .../eft/match/IJoinMatchRequestData.d.ts | 12 + .../models/eft/match/IJoinMatchResult.d.ts | 11 + .../eft/match/IPutMetricsRequestData.d.ts | 10 + .../match/IStartOffineRaidRequestData.d.ts | 9 +- .../eft/match/IUpdatePingRequestData.d.ts | 3 + .../models/eft/notes/INoteActionData.d.ts | 0 .../types/models/eft/notifier/INotifier.d.ts | 0 .../notifier/ISelectProfileRequestData.d.ts | 0 ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../IPresetBuildActionRequestData.d.ts | 0 .../profile/GetProfileStatusResponseData.d.ts | 11 + .../types/models/eft/profile/IAkiProfile.d.ts | 18 +- .../IProfileChangeNicknameRequestData.d.ts | 0 .../IProfileChangeVoiceRequestData.d.ts | 0 .../profile/IProfileCreateRequestData.d.ts | 0 .../eft/profile/ISearchFriendRequestData.d.ts | 0 .../eft/profile/ISearchFriendResponse.d.ts | 0 .../profile/IValidateNicknameRequestData.d.ts | 0 .../eft/quests/IAcceptQuestRequestData.d.ts | 0 .../eft/quests/ICompleteQuestRequestData.d.ts | 1 + .../eft/quests/IHandoverQuestRequestData.d.ts | 0 .../eft/quests/IListQuestsRequestData.d.ts | 0 .../quests/IRepeatableQuestChangeRequest.d.ts | 0 .../eft/ragfair/IAddOfferRequestData.d.ts | 0 .../eft/ragfair/IExtendOfferRequestData.d.ts | 0 .../eft/ragfair/IGetItemPriceResult.d.ts | 0 .../ragfair/IGetMarketPriceRequestData.d.ts | 0 .../models/eft/ragfair/IGetOffersResult.d.ts | 2 +- .../models/eft/ragfair/IRagfairOffer.d.ts | 0 .../eft/ragfair/IRemoveOfferRequestData.d.ts | 0 .../eft/ragfair/ISearchRequestData.d.ts | 0 .../ISendRagfairReportRequestData.d.ts | 3 + .../repair/IBaseRepairActionDataRequest.d.ts | 0 .../eft/repair/IRepairActionDataRequest.d.ts | 0 .../ITraderRepairActionDataRequest.d.ts | 0 .../trade/IProcessBaseTradeRequestData.d.ts | 0 .../trade/IProcessBuyTradeRequestData.d.ts | 0 .../IProcessRagfairTradeRequestData.d.ts | 0 .../trade/IProcessSellTradeRequestData.d.ts | 0 .../models/eft/weather/IWeatherData.d.ts | 0 .../eft/wishlist/IWishlistActionData.d.ts | 0 .../types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../types/models/enums/BaseClasses.d.ts | 0 .../types/models/enums/BotAmount.d.ts | 7 + .../types/models/enums/BotDifficulty.d.ts | 8 + .../types/models/enums/ConfigTypes.d.ts | 3 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/ELocationName.d.ts | 0 .../types/models/enums/EquipmentSlots.d.ts | 0 .../types/models/enums/HideoutAreas.d.ts | 0 .../types/models/enums/MemberCategory.d.ts | 0 .../types/models/enums/MessageType.d.ts | 0 .../types/models/enums/Money.d.ts | 0 .../types/models/enums/QuestRewardType.d.ts | 8 + .../types/models/enums/QuestStatus.d.ts | 11 + .../types/models/enums/RaidMode.d.ts | 5 + .../types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/Traders.d.ts | 0 .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 4 + .../types/models/external/IPostDBLoadMod.d.ts | 4 + .../types/models/external/IPreAkiLoadMod.d.ts | 4 + .../types/models/external/mod.d.ts | 0 .../types/models/external/tsyringe.d.ts | 0 .../types/models/spt/bindings/Route.d.ts | 0 .../types/models/spt/bots/BotLootCache.d.ts | 23 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../models/spt/callbacks/IBotCallbacks.d.ts | 0 .../spt/callbacks/IBundleCallbacks.d.ts | 0 .../callbacks/ICustomizationCallbacks.d.ts | 0 .../models/spt/callbacks/IDataCallbacks.d.ts | 0 .../spt/callbacks/IDialogueCallbacks.d.ts | 0 .../models/spt/callbacks/IGameCallbacks.d.ts | 0 .../spt/callbacks/IHandbookCallbacks.d.ts | 0 .../spt/callbacks/IHealthCallbacks.d.ts | 0 .../spt/callbacks/IHideoutCallbacks.d.ts | 0 .../models/spt/callbacks/IHttpCallbacks.d.ts | 0 .../spt/callbacks/IInraidCallbacks.d.ts | 0 .../spt/callbacks/IInsuranceCallbacks.d.ts | 0 .../spt/callbacks/IInventoryCallbacks.d.ts | 0 .../spt/callbacks/IItemEventCallbacks.d.ts | 0 .../spt/callbacks/ILauncherCallbacks.d.ts | 0 .../spt/callbacks/ILocationCallbacks.d.ts | 0 .../models/spt/callbacks/IMatchCallbacks.d.ts | 0 .../models/spt/callbacks/IModCallbacks.d.ts | 0 .../models/spt/callbacks/INoteCallbacks.d.ts | 0 .../spt/callbacks/INotifierCallbacks.d.ts | 0 .../spt/callbacks/IPresetBuildCallbacks.d.ts | 0 .../spt/callbacks/IPresetCallbacks.d.ts | 0 .../spt/callbacks/IProfileCallbacks.d.ts | 0 .../models/spt/callbacks/IQuestCallbacks.d.ts | 0 .../spt/callbacks/IRagfairCallbacks.d.ts | 0 .../spt/callbacks/IRepairCallbacks.d.ts | 0 .../models/spt/callbacks/ISaveCallbacks.d.ts | 0 .../models/spt/callbacks/ITradeCallbacks.d.ts | 0 .../spt/callbacks/ITraderCallbacks.d.ts | 0 .../spt/callbacks/IWeatherCallbacks.d.ts | 0 .../spt/callbacks/IWishlistCallbacks.d.ts | 0 .../models/spt/config/IAirdropConfig.d.ts | 0 .../types/models/spt/config/IBaseConfig.d.ts | 0 .../types/models/spt/config/IBotConfig.d.ts | 32 +- .../types/models/spt/config/ICoreConfig.d.ts | 0 .../models/spt/config/IHealthConfig.d.ts | 0 .../models/spt/config/IHideoutConfig.d.ts | 7 + .../types/models/spt/config/IHttpConfig.d.ts | 0 .../models/spt/config/IInRaidConfig.d.ts | 1 + .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/IInventoryConfig.d.ts | 0 .../models/spt/config/ILocaleConfig.d.ts | 5 + .../models/spt/config/ILocationConfig.d.ts | 0 .../types/models/spt/config/IMatchConfig.d.ts | 0 .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../types/models/spt/config/IQuestConfig.d.ts | 0 .../models/spt/config/IRagfairConfig.d.ts | 6 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 12 +- .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../spt/controllers/IBotController.d.ts | 0 .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../spt/generators/ILocationGenerator.d.ts | 0 .../spt/generators/IPMCLootGenerator.d.ts | 0 .../generators/IRagfairAssortGenerator.d.ts | 0 .../generators/IRagfairOfferGenerator.d.ts | 0 .../types/models/spt/helpers/Traders.d.ts | 0 .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 11 + .../models/spt/logging/LogTextColor.d.ts | 11 + .../types/models/spt/logging/SptLogger.d.ts | 7 + .../types/models/spt/mod/IMod.d.ts | 0 .../types/models/spt/mod/IModLoader.d.ts | 1 - .../models/spt/mod/IPackageJsonData.d.ts | 1 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../spt/ragfair/IRagfairServerPrices.d.ts | 0 .../models/spt/server/IDatabaseTables.d.ts | 29 +- .../types/models/spt/server/IHttpServer.d.ts | 1 + .../types/models/spt/server/ILocaleBase.d.ts | 2 +- .../types/models/spt/server/ILocations.d.ts | 0 .../types/models/spt/server/IServerBase.d.ts | 0 .../models/spt/server/ISettingsBase.d.ts | 0 .../models/spt/services/CustomPreset.d.ts | 5 + .../spt/services/CustomTraderAssortData.d.ts | 6 + .../types/models/spt/utils/IAsyncQueue.d.ts | 0 .../types/models/spt/utils/ICommand.d.ts | 0 .../types/models/spt/utils/ILogger.d.ts | 5 +- .../models/spt/utils/IUuidGenerator.d.ts | 0 .../types/routers/HttpRouter.d.ts | 16 + .../types/routers/ImageRouter.d.ts | 4 +- .../types/routers/ItemEventRouter.d.ts | 12 +- .../routers/dynamic/BotDynamicRouter.d.ts | 2 +- .../routers/dynamic/BundleDynamicRouter.d.ts | 2 +- .../dynamic/CustomizationDynamicRouter.d.ts | 2 +- .../routers/dynamic/DataDynamicRouter.d.ts | 2 +- .../routers/dynamic/HttpDynamicRouter.d.ts | 2 +- .../routers/dynamic/InraidDynamicRouter.d.ts | 2 +- .../dynamic/LocationDynamicRouter.d.ts | 2 +- .../dynamic/NotifierDynamicRouter.d.ts | 2 +- .../routers/dynamic/TraderDynamicRouter.d.ts | 2 +- .../CustomizationItemEventRouter.d.ts | 2 +- .../item_events/HealthItemEventRouter.d.ts | 2 +- .../item_events/HideoutItemEventRouter.d.ts | 2 +- .../item_events/InsuranceItemEventRouter.d.ts | 2 +- .../item_events/InventoryItemEventRouter.d.ts | 2 +- .../item_events/NoteItemEventRouter.d.ts | 2 +- .../PresetBuildItemEventRouter.d.ts | 2 +- .../item_events/QuestItemEventRouter.d.ts | 12 +- .../item_events/RagfairItemEventRouter.d.ts | 2 +- .../item_events/RepairItemEventRouter.d.ts | 2 +- .../item_events/TradeItemEventRouter.d.ts | 2 +- .../item_events/WishlistItemEventRouter.d.ts | 2 +- .../save_load/HealthSaveLoadRouter.d.ts | 0 .../save_load/InraidSaveLoadRouter.d.ts | 0 .../save_load/InsuranceSaveLoadRouter.d.ts | 0 .../save_load/ProfileSaveLoadRouter.d.ts | 0 .../routers/serializers/BundleSerializer.d.ts | 4 +- .../routers/serializers/ImageSerializer.d.ts | 2 +- .../routers/serializers/NotifySerializer.d.ts | 6 +- .../types/routers/static/BotStaticRouter.d.ts | 2 +- .../routers/static/BundleStaticRouter.d.ts | 2 +- .../static/CustomizationStaticRouter.d.ts | 2 +- .../routers/static/DataStaticRouter.d.ts | 2 +- .../routers/static/DialogStaticRouter.d.ts | 2 +- .../routers/static/GameStaticRouter.d.ts | 2 +- .../routers/static/HealthStaticRouter.d.ts | 2 +- .../routers/static/InraidStaticRouter.d.ts | 2 +- .../routers/static/InsuranceStaticRouter.d.ts | 2 +- .../routers/static/ItemEventStaticRouter.d.ts | 2 +- .../routers/static/LauncherStaticRouter.d.ts | 2 +- .../routers/static/LocationStaticRouter.d.ts | 2 +- .../routers/static/MatchStaticRouter.d.ts | 2 +- .../routers/static/NotifierStaticRouter.d.ts | 2 +- .../routers/static/PresetStaticRouter.d.ts | 2 +- .../routers/static/ProfileStaticRouter.d.ts | 2 +- .../routers/static/QuestStaticRouter.d.ts | 2 +- .../routers/static/RagfairStaticRouter.d.ts | 2 +- .../routers/static/TraderStaticRouter.d.ts | 2 +- .../routers/static/WeatherStaticRouter.d.ts | 2 +- .../types/servers/ConfigServer.d.ts | 8 +- .../types/servers/DatabaseServer.d.ts | 2 +- .../types/servers/HttpServer.d.ts | 40 +- .../types/servers/RagfairServer.d.ts | 18 +- .../types/servers/SaveServer.d.ts | 18 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 82 +++ .../types/services/FenceService.d.ts | 29 +- .../types/services/HashCacheService.d.ts | 14 +- .../types/services/InsuranceService.d.ts | 42 +- .../types/services/LocaleService.d.ts | 14 + .../types/services/MatchLocationService.d.ts | 9 + .../types/services/ModCompilerService.d.ts | 20 + .../types/services/NotificationService.d.ts | 8 +- .../types/services/PaymentService.d.ts | 36 +- .../types/services/PlayerService.d.ts | 4 +- .../types/services/ProfileFixerService.d.ts | 61 ++ .../services/RagfairCategoriesService.d.ts | 40 + .../services/RagfairLinkedItemService.d.ts | 10 + .../types/services/RagfairOfferService.d.ts | 48 +- .../types/services/RagfairPriceService.d.ts | 55 ++ .../services/RagfairRequiredItemsService.d.ts | 8 +- .../types/services/TraderAssortService.d.ts | 2 +- .../types/services/mod/CustomItemService.d.ts | 80 ++ .../mod/dynamicRouter/DynamicRouterMod.d.ts | 0 .../DynamicRouterModService.d.ts | 0 .../services/mod/image/imageRouteService.d.ts | 2 +- .../types/services/mod/onLoad/OnLoadMod.d.ts | 0 .../services/mod/onLoad/OnLoadModService.d.ts | 2 +- .../services/mod/onUpdate/OnUpdateMod.d.ts | 0 .../mod/onUpdate/OnUpdateModService.d.ts | 2 +- .../mod/staticRouter/StaticRouterMod.d.ts | 0 .../staticRouter/StaticRouterModService.d.ts | 2 +- .../types/utils/App.d.ts | 13 +- .../types/utils/AyncQueue.d.ts | 2 +- .../types/utils/DatabaseImporter.d.ts | 26 +- .../types/utils/HashUtil.d.ts | 2 +- .../types/utils/HttpResponseUtil.d.ts | 4 +- .../types/utils/JsonUtil.d.ts | 8 +- .../types/utils/Logger.d.ts | 58 ++ .../types/utils/MathUtil.d.ts | 0 .../types/utils/ObjectId.d.ts | 12 +- .../types/utils/RandomUtil.d.ts | 4 +- .../types/utils/TimeUtil.d.ts | 18 + .../types/utils/UUidGenerator.d.ts | 0 .../types/utils/VFS.d.ts | 5 +- .../types/utils/Watermark.d.ts | 46 ++ .../utils/collections/lists/LinkedList.d.ts | 30 + .../types/utils/decorators/Singleton.d.ts | 0 .../types/utils/decorators/constructor.d.ts | 0 .../CustomGlobalFogPatch.cs | 1 - Live/CWX_WeatherPatcher/GClassPatch.cs | 7 +- Live/CWX_WeatherPatcher/GlobalSuppressions.cs | 13 - Live/CWX_WeatherPatcher/LevelSettingsPatch.cs | 1 - Live/CWX_WeatherPatcher/Program.cs | 4 +- .../CWX_WeatherPatcher/TOD_ScatteringPatch.cs | 1 - .../server/dist/package.json | 4 +- .../CWX_WeatherPatcher/server/dist/src/mod.ts | 15 +- .../dist/types/callbacks/BotCallbacks.d.ts | 4 +- .../dist/types/callbacks/BundleCallbacks.d.ts | 13 +- .../callbacks/CustomizationCallbacks.d.ts | 6 +- .../dist/types/callbacks/DataCallbacks.d.ts | 4 +- .../types/callbacks/DialogueCallbacks.d.ts | 8 +- .../dist/types/callbacks/GameCallbacks.d.ts | 8 +- .../types/callbacks/HandbookCallbacks.d.ts | 2 +- .../dist/types/callbacks/HealthCallbacks.d.ts | 13 +- .../types/callbacks/HideoutCallbacks.d.ts | 7 +- .../dist/types/callbacks/HttpCallbacks.d.ts | 2 +- .../dist/types/callbacks/InraidCallbacks.d.ts | 12 +- .../types/callbacks/InsuranceCallbacks.d.ts | 14 +- .../types/callbacks/InventoryCallbacks.d.ts | 2 +- .../types/callbacks/ItemEventCallbacks.d.ts | 4 +- .../types/callbacks/LauncherCallbacks.d.ts | 8 +- .../types/callbacks/LocationCallbacks.d.ts | 4 +- .../dist/types/callbacks/MatchCallbacks.d.ts | 35 +- .../dist/types/callbacks/ModCallbacks.d.ts | 17 +- .../dist/types/callbacks/NoteCallbacks.d.ts | 2 +- .../types/callbacks/NotifierCallbacks.d.ts | 6 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 7 +- .../dist/types/callbacks/PresetCallbacks.d.ts | 2 +- .../types/callbacks/ProfileCallbacks.d.ts | 16 +- .../dist/types/callbacks/QuestCallbacks.d.ts | 6 +- .../types/callbacks/RagfairCallbacks.d.ts | 21 +- .../dist/types/callbacks/RepairCallbacks.d.ts | 2 +- .../dist/types/callbacks/SaveCallbacks.d.ts | 2 +- .../dist/types/callbacks/TradeCallbacks.d.ts | 2 +- .../dist/types/callbacks/TraderCallbacks.d.ts | 4 +- .../types/callbacks/WeatherCallbacks.d.ts | 4 +- .../types/callbacks/WishlistCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../dist/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../dist/types/controllers/BotController.d.ts | 31 +- .../controllers/CustomizationController.d.ts | 12 +- .../types/controllers/DialogueController.d.ts | 12 +- .../types/controllers/GameController.d.ts | 32 +- .../types/controllers/HandbookController.d.ts | 4 +- .../types/controllers/HealthController.d.ts | 35 +- .../types/controllers/HideoutController.d.ts | 82 ++- .../types/controllers/InraidController.d.ts | 42 +- .../controllers/InsuranceController.d.ts | 37 +- .../controllers/InventoryController.d.ts | 36 +- .../types/controllers/LauncherController.d.ts | 15 +- .../types/controllers/LocationController.d.ts | 10 +- .../types/controllers/MatchController.d.ts | 34 +- .../types/controllers/NoteController.d.ts | 5 +- .../types/controllers/NotifierController.d.ts | 10 +- .../controllers/PresetBuildController.d.ts | 8 +- .../types/controllers/PresetController.d.ts | 4 +- .../types/controllers/ProfileController.d.ts | 28 +- .../types/controllers/QuestController.d.ts | 67 +- .../types/controllers/RagfairController.d.ts | 51 +- .../types/controllers/RepairController.d.ts | 21 +- .../RepeatableQuestController.d.ts | 39 +- .../types/controllers/TradeController.d.ts | 10 +- .../types/controllers/TraderController.d.ts | 16 +- .../types/controllers/WeatherController.d.ts | 7 +- .../types/controllers/WishlistController.d.ts | 2 +- .../dist/types/generators/BotGenerator.d.ts | 110 ++- .../generators/BotInventoryGenerator.d.ts | 24 +- .../types/generators/BotLootGenerator.d.ts | 135 +++- .../types/generators/BotWeaponGenerator.d.ts | 191 ++++- .../types/generators/LocationGenerator.d.ts | 42 +- .../types/generators/PMCLootGenerator.d.ts | 13 +- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 16 +- .../generators/RagfairOfferGenerator.d.ts | 55 +- .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 32 +- .../dist/types/helpers/AssortHelper.d.ts | 32 +- .../types/helpers/BotGeneratorHelper.d.ts | 115 ++- .../server/dist/types/helpers/BotHelper.d.ts | 37 +- .../dist/types/helpers/ContainerHelper.d.ts | 2 +- .../dist/types/helpers/DialogueHelper.d.ts | 33 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 29 +- .../types/helpers/ExtendedProfileHelper.d.ts | 25 +- .../dist/types/helpers/GameEventHelper.d.ts | 4 +- .../dist/types/helpers/HandbookHelper.d.ts | 2 +- .../dist/types/helpers/HealthHelper.d.ts | 50 +- .../dist/types/helpers/HideoutHelper.d.ts | 69 +- .../dist/types/helpers/HttpServerHelper.d.ts | 17 +- .../dist/types/helpers/InRaidHelper.d.ts | 98 ++- .../dist/types/helpers/InventoryHelper.d.ts | 48 +- .../server/dist/types/helpers/ItemHelper.d.ts | 101 ++- .../types/helpers/NotificationSendHelper.d.ts | 4 +- .../dist/types/helpers/NotifierHelper.d.ts | 4 +- .../dist/types/helpers/PresetHelper.d.ts | 8 +- .../dist/types/helpers/ProbabilityHelper.d.ts | 14 + .../dist/types/helpers/ProfileHelper.d.ts | 19 +- .../types/helpers/QuestConditionHelper.d.ts | 2 +- .../dist/types/helpers/QuestHelper.d.ts | 97 ++- .../dist/types/helpers/RagfairHelper.d.ts | 24 +- .../types/helpers/RagfairOfferHelper.d.ts | 51 +- .../dist/types/helpers/RagfairSellHelper.d.ts | 11 +- .../types/helpers/RagfairServerHelper.d.ts | 34 +- .../dist/types/helpers/RagfairSortHelper.d.ts | 16 +- .../dist/types/helpers/RagfairTaxHelper.d.ts | 11 +- .../dist/types/helpers/RepairHelper.d.ts | 21 +- .../types/helpers/SecureContainerHelper.d.ts | 2 +- .../dist/types/helpers/TradeHelper.d.ts | 22 +- .../types/helpers/TraderAssortHelper.d.ts | 56 +- .../dist/types/helpers/TraderHelper.d.ts | 98 ++- .../dist/types/loaders/BundleLoader.d.ts | 8 +- .../dist/types/loaders/DelayedModLoader.d.ts | 16 +- .../dist/types/loaders/InitialModLoader.d.ts | 56 +- .../dist/types/loaders/PostAkiModLoader.d.ts | 21 + .../dist/types/loaders/PostDBModLoader.d.ts | 11 + .../dist/types/loaders/PreAkiModLoader.d.ts | 64 ++ .../dist/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IGlobals.d.ts | 5 +- .../models/eft/common/ILocationBase.d.ts | 9 +- .../types/models/eft/common/IPmcData.d.ts | 342 +-------- .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/common/tables/IMatch.d.ts | 10 + .../eft/common/tables/IProfileTemplate.d.ts | 25 + .../models/eft/common/tables/IQuest.d.ts | 7 +- .../eft/common/tables/ITemplateItem.d.ts | 690 ++++++++++-------- .../eft/game/IReportNicknameRequestData.d.ts | 3 + .../dist/types/models/eft/health/Effect.d.ts | 5 + .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IGetInsuranceCostResponseData.d.ts | 1 + .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../eft/match/ICreateGroupRequestData.d.ts | 6 + .../eft/match/IGetGroupStatusRequestData.d.ts | 9 + .../eft/match/IJoinMatchRequestData.d.ts | 12 + .../models/eft/match/IJoinMatchResult.d.ts | 11 + .../eft/match/IPutMetricsRequestData.d.ts | 10 + .../match/IStartOffineRaidRequestData.d.ts | 9 +- .../eft/match/IUpdatePingRequestData.d.ts | 3 + ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../profile/GetProfileStatusResponseData.d.ts | 11 + .../types/models/eft/profile/IAkiProfile.d.ts | 18 +- .../eft/quests/ICompleteQuestRequestData.d.ts | 1 + .../models/eft/ragfair/IGetOffersResult.d.ts | 2 +- .../ISendRagfairReportRequestData.d.ts | 3 + .../dist/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../dist/types/models/enums/BotAmount.d.ts | 7 + .../types/models/enums/BotDifficulty.d.ts | 8 + .../dist/types/models/enums/ConfigTypes.d.ts | 3 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/QuestRewardType.d.ts | 8 + .../dist/types/models/enums/QuestStatus.d.ts | 11 + .../dist/types/models/enums/RaidMode.d.ts | 5 + .../dist/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 4 + .../types/models/external/IPostDBLoadMod.d.ts | 4 + .../types/models/external/IPreAkiLoadMod.d.ts | 4 + .../types/models/spt/bots/BotLootCache.d.ts | 23 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 32 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInRaidConfig.d.ts | 1 + .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/ILocaleConfig.d.ts | 5 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 6 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 12 +- .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 11 + .../models/spt/logging/LogTextColor.d.ts | 11 + .../types/models/spt/logging/SptLogger.d.ts | 7 + .../dist/types/models/spt/mod/IModLoader.d.ts | 1 - .../models/spt/mod/IPackageJsonData.d.ts | 1 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../models/spt/server/IDatabaseTables.d.ts | 29 +- .../types/models/spt/server/IHttpServer.d.ts | 1 + .../types/models/spt/server/ILocaleBase.d.ts | 2 +- .../models/spt/services/CustomPreset.d.ts | 5 + .../spt/services/CustomTraderAssortData.d.ts | 6 + .../dist/types/models/spt/utils/ILogger.d.ts | 5 +- .../server/dist/types/routers/HttpRouter.d.ts | 15 +- .../dist/types/routers/ImageRouter.d.ts | 4 +- .../dist/types/routers/ItemEventRouter.d.ts | 12 +- .../routers/dynamic/BotDynamicRouter.d.ts | 2 +- .../routers/dynamic/BundleDynamicRouter.d.ts | 2 +- .../dynamic/CustomizationDynamicRouter.d.ts | 2 +- .../routers/dynamic/DataDynamicRouter.d.ts | 2 +- .../routers/dynamic/HttpDynamicRouter.d.ts | 2 +- .../routers/dynamic/InraidDynamicRouter.d.ts | 2 +- .../dynamic/LocationDynamicRouter.d.ts | 2 +- .../dynamic/NotifierDynamicRouter.d.ts | 2 +- .../routers/dynamic/TraderDynamicRouter.d.ts | 2 +- .../CustomizationItemEventRouter.d.ts | 2 +- .../item_events/HealthItemEventRouter.d.ts | 2 +- .../item_events/HideoutItemEventRouter.d.ts | 2 +- .../item_events/InsuranceItemEventRouter.d.ts | 2 +- .../item_events/InventoryItemEventRouter.d.ts | 2 +- .../item_events/NoteItemEventRouter.d.ts | 2 +- .../PresetBuildItemEventRouter.d.ts | 2 +- .../item_events/QuestItemEventRouter.d.ts | 12 +- .../item_events/RagfairItemEventRouter.d.ts | 2 +- .../item_events/RepairItemEventRouter.d.ts | 2 +- .../item_events/TradeItemEventRouter.d.ts | 2 +- .../item_events/WishlistItemEventRouter.d.ts | 2 +- .../routers/serializers/BundleSerializer.d.ts | 4 +- .../routers/serializers/ImageSerializer.d.ts | 2 +- .../routers/serializers/NotifySerializer.d.ts | 6 +- .../types/routers/static/BotStaticRouter.d.ts | 2 +- .../routers/static/BundleStaticRouter.d.ts | 2 +- .../static/CustomizationStaticRouter.d.ts | 2 +- .../routers/static/DataStaticRouter.d.ts | 2 +- .../routers/static/DialogStaticRouter.d.ts | 2 +- .../routers/static/GameStaticRouter.d.ts | 2 +- .../routers/static/HealthStaticRouter.d.ts | 2 +- .../routers/static/InraidStaticRouter.d.ts | 2 +- .../routers/static/InsuranceStaticRouter.d.ts | 2 +- .../routers/static/ItemEventStaticRouter.d.ts | 2 +- .../routers/static/LauncherStaticRouter.d.ts | 2 +- .../routers/static/LocationStaticRouter.d.ts | 2 +- .../routers/static/MatchStaticRouter.d.ts | 2 +- .../routers/static/NotifierStaticRouter.d.ts | 2 +- .../routers/static/PresetStaticRouter.d.ts | 2 +- .../routers/static/ProfileStaticRouter.d.ts | 2 +- .../routers/static/QuestStaticRouter.d.ts | 2 +- .../routers/static/RagfairStaticRouter.d.ts | 2 +- .../routers/static/TraderStaticRouter.d.ts | 2 +- .../routers/static/WeatherStaticRouter.d.ts | 2 +- .../dist/types/servers/ConfigServer.d.ts | 8 +- .../dist/types/servers/DatabaseServer.d.ts | 2 +- .../server/dist/types/servers/HttpServer.d.ts | 40 +- .../dist/types/servers/RagfairServer.d.ts | 18 +- .../server/dist/types/servers/SaveServer.d.ts | 18 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 82 +++ .../dist/types/services/FenceService.d.ts | 29 +- .../dist/types/services/HashCacheService.d.ts | 14 +- .../dist/types/services/InsuranceService.d.ts | 42 +- .../dist/types/services/LocaleService.d.ts | 14 + .../types/services/MatchLocationService.d.ts | 7 +- .../types/services/ModCompilerService.d.ts | 21 +- .../types/services/NotificationService.d.ts | 8 +- .../dist/types/services/PaymentService.d.ts | 36 +- .../dist/types/services/PlayerService.d.ts | 4 +- .../types/services/ProfileFixerService.d.ts | 61 ++ .../services/RagfairCategoriesService.d.ts | 44 +- .../services/RagfairLinkedItemService.d.ts | 9 +- .../types/services/RagfairOfferService.d.ts | 48 +- .../types/services/RagfairPriceService.d.ts | 43 +- .../services/RagfairRequiredItemsService.d.ts | 8 +- .../types/services/TraderAssortService.d.ts | 2 +- .../types/services/mod/CustomItemService.d.ts | 80 ++ .../services/mod/image/imageRouteService.d.ts | 2 +- .../services/mod/onLoad/OnLoadModService.d.ts | 2 +- .../mod/onUpdate/OnUpdateModService.d.ts | 2 +- .../staticRouter/StaticRouterModService.d.ts | 2 +- .../server/dist/types/utils/App.d.ts | 13 +- .../server/dist/types/utils/AyncQueue.d.ts | 2 +- .../dist/types/utils/DatabaseImporter.d.ts | 26 +- .../server/dist/types/utils/HashUtil.d.ts | 2 +- .../dist/types/utils/HttpResponseUtil.d.ts | 4 +- .../server/dist/types/utils/JsonUtil.d.ts | 8 +- .../server/dist/types/utils/Logger.d.ts | 61 +- .../server/dist/types/utils/ObjectId.d.ts | 12 +- .../server/dist/types/utils/RandomUtil.d.ts | 4 +- .../server/dist/types/utils/TimeUtil.d.ts | 10 + .../server/dist/types/utils/VFS.d.ts | 5 +- .../server/dist/types/utils/Watermark.d.ts | 35 +- .../utils/collections/lists/LinkedList.d.ts | 30 + Live/CWX_WeatherPatcher/server/package.json | 4 +- Live/CWX_WeatherPatcher/server/src/mod.ts | 15 +- .../server/types/Utils.d.ts | 0 .../server/types/callbacks/BotCallbacks.d.ts | 4 +- .../types/callbacks/BundleCallbacks.d.ts | 13 +- .../callbacks/CustomizationCallbacks.d.ts | 6 +- .../server/types/callbacks/DataCallbacks.d.ts | 4 +- .../types/callbacks/DialogueCallbacks.d.ts | 8 +- .../server/types/callbacks/GameCallbacks.d.ts | 8 +- .../types/callbacks/HandbookCallbacks.d.ts | 2 +- .../types/callbacks/HealthCallbacks.d.ts | 13 +- .../types/callbacks/HideoutCallbacks.d.ts | 7 +- .../server/types/callbacks/HttpCallbacks.d.ts | 2 +- .../types/callbacks/InraidCallbacks.d.ts | 12 +- .../types/callbacks/InsuranceCallbacks.d.ts | 14 +- .../types/callbacks/InventoryCallbacks.d.ts | 2 +- .../types/callbacks/ItemEventCallbacks.d.ts | 4 +- .../types/callbacks/LauncherCallbacks.d.ts | 8 +- .../types/callbacks/LocationCallbacks.d.ts | 4 +- .../types/callbacks/MatchCallbacks.d.ts | 35 +- .../server/types/callbacks/ModCallbacks.d.ts | 17 +- .../server/types/callbacks/NoteCallbacks.d.ts | 2 +- .../types/callbacks/NotifierCallbacks.d.ts | 6 +- .../types/callbacks/PresetBuildCallbacks.d.ts | 7 +- .../types/callbacks/PresetCallbacks.d.ts | 2 +- .../types/callbacks/ProfileCallbacks.d.ts | 16 +- .../types/callbacks/QuestCallbacks.d.ts | 6 +- .../types/callbacks/RagfairCallbacks.d.ts | 21 +- .../types/callbacks/RepairCallbacks.d.ts | 2 +- .../server/types/callbacks/SaveCallbacks.d.ts | 2 +- .../types/callbacks/TradeCallbacks.d.ts | 2 +- .../types/callbacks/TraderCallbacks.d.ts | 4 +- .../types/callbacks/WeatherCallbacks.d.ts | 4 +- .../types/callbacks/WishlistCallbacks.d.ts | 2 +- .../types/context/ApplicationContext.d.ts | 9 + .../server/types/context/ContextVariable.d.ts | 10 + .../types/context/ContextVariableType.d.ts | 4 + .../types/controllers/BotController.d.ts | 31 +- .../controllers/CustomizationController.d.ts | 12 +- .../types/controllers/DialogueController.d.ts | 12 +- .../types/controllers/GameController.d.ts | 32 +- .../types/controllers/HandbookController.d.ts | 4 +- .../types/controllers/HealthController.d.ts | 35 +- .../types/controllers/HideoutController.d.ts | 82 ++- .../types/controllers/InraidController.d.ts | 42 +- .../controllers/InsuranceController.d.ts | 37 +- .../controllers/InventoryController.d.ts | 36 +- .../types/controllers/LauncherController.d.ts | 15 +- .../types/controllers/LocationController.d.ts | 10 +- .../types/controllers/MatchController.d.ts | 34 +- .../types/controllers/NoteController.d.ts | 5 +- .../types/controllers/NotifierController.d.ts | 10 +- .../controllers/PresetBuildController.d.ts | 8 +- .../types/controllers/PresetController.d.ts | 4 +- .../types/controllers/ProfileController.d.ts | 28 +- .../types/controllers/QuestController.d.ts | 67 +- .../types/controllers/RagfairController.d.ts | 51 +- .../types/controllers/RepairController.d.ts | 21 +- .../RepeatableQuestController.d.ts | 39 +- .../types/controllers/TradeController.d.ts | 10 +- .../types/controllers/TraderController.d.ts | 16 +- .../types/controllers/WeatherController.d.ts | 7 +- .../types/controllers/WishlistController.d.ts | 2 +- .../server/types/generators/BotGenerator.d.ts | 110 ++- .../generators/BotInventoryGenerator.d.ts | 24 +- .../types/generators/BotLootGenerator.d.ts | 135 +++- .../types/generators/BotWeaponGenerator.d.ts | 191 ++++- .../types/generators/LocationGenerator.d.ts | 42 +- .../types/generators/PMCLootGenerator.d.ts | 13 +- .../types/generators/PlayerScavGenerator.d.ts | 67 ++ .../generators/RagfairAssortGenerator.d.ts | 16 +- .../generators/RagfairOfferGenerator.d.ts | 55 +- .../generators/ScavCaseRewardGenerator.d.ts | 105 +++ .../types/generators/WeatherGenerator.d.ts | 32 +- .../server/types/helpers/AssortHelper.d.ts | 32 +- .../types/helpers/BotGeneratorHelper.d.ts | 115 ++- .../server/types/helpers/BotHelper.d.ts | 37 +- .../server/types/helpers/ContainerHelper.d.ts | 2 +- .../server/types/helpers/DialogueHelper.d.ts | 33 +- .../types/helpers/DurabilityLimitsHelper.d.ts | 29 +- .../types/helpers/ExtendedProfileHelper.d.ts | 22 - .../server/types/helpers/GameEventHelper.d.ts | 4 +- .../server/types/helpers/HandbookHelper.d.ts | 2 +- .../server/types/helpers/HealthHelper.d.ts | 50 +- .../server/types/helpers/HideoutHelper.d.ts | 69 +- .../types/helpers/HttpServerHelper.d.ts | 17 +- .../server/types/helpers/InRaidHelper.d.ts | 98 ++- .../server/types/helpers/InventoryHelper.d.ts | 48 +- .../server/types/helpers/ItemHelper.d.ts | 101 ++- .../types/helpers/NotificationSendHelper.d.ts | 4 +- .../server/types/helpers/NotifierHelper.d.ts | 4 +- .../server/types/helpers/PresetHelper.d.ts | 8 +- .../types/helpers/ProbabilityHelper.d.ts | 14 + .../server/types/helpers/ProfileHelper.d.ts | 19 +- .../types/helpers/QuestConditionHelper.d.ts | 2 +- .../server/types/helpers/QuestHelper.d.ts | 97 ++- .../server/types/helpers/RagfairHelper.d.ts | 24 +- .../types/helpers/RagfairOfferHelper.d.ts | 51 +- .../types/helpers/RagfairSellHelper.d.ts | 11 +- .../types/helpers/RagfairServerHelper.d.ts | 34 +- .../types/helpers/RagfairSortHelper.d.ts | 16 +- .../types/helpers/RagfairTaxHelper.d.ts | 11 +- .../server/types/helpers/RepairHelper.d.ts | 21 +- .../types/helpers/SecureContainerHelper.d.ts | 2 +- .../server/types/helpers/TradeHelper.d.ts | 22 +- .../types/helpers/TraderAssortHelper.d.ts | 56 +- .../server/types/helpers/TraderHelper.d.ts | 98 ++- .../server/types/loaders/BundleLoader.d.ts | 8 +- .../types/loaders/InitialModLoader.d.ts | 58 -- .../types/loaders/PostAkiModLoader.d.ts | 21 + .../server/types/loaders/PostDBModLoader.d.ts | 11 + .../server/types/loaders/PreAkiModLoader.d.ts | 64 ++ .../server/types/models/common/MinMax.d.ts | 4 + .../types/models/eft/common/IGlobals.d.ts | 5 +- .../models/eft/common/ILocationBase.d.ts | 9 +- .../types/models/eft/common/IPmcData.d.ts | 342 +-------- .../models/eft/common/MemberCategory.d.ts | 13 - .../models/eft/common/tables/IBotBase.d.ts | 290 +++++++- .../models/eft/common/tables/IBotType.d.ts | 27 +- .../models/eft/common/tables/IMatch.d.ts | 10 + .../eft/common/tables/IProfileTemplate.d.ts | 25 + .../models/eft/common/tables/IQuest.d.ts | 7 +- .../eft/common/tables/ITemplateItem.d.ts | 690 ++++++++++-------- .../eft/game/IReportNicknameRequestData.d.ts | 3 + .../types/models/eft/health/Effect.d.ts | 5 + .../models/eft/hideout/HideoutAreasEnum.d.ts | 25 - .../models/eft/hideout/IHideoutScavCase.d.ts | 5 +- .../IGetInsuranceCostResponseData.d.ts | 1 + .../eft/itemEvent/IItemEventRouterBase.d.ts | 2 +- .../eft/match/ICreateGroupRequestData.d.ts | 6 + .../eft/match/IGetGroupStatusRequestData.d.ts | 9 + .../eft/match/IJoinMatchRequestData.d.ts | 12 + .../models/eft/match/IJoinMatchResult.d.ts | 11 + .../eft/match/IPutMetricsRequestData.d.ts | 10 + .../match/IStartOffineRaidRequestData.d.ts | 9 +- .../eft/match/IUpdatePingRequestData.d.ts | 3 + ...IPlayerIncrementSkillLevelRequestData.d.ts | 2 +- .../profile/GetProfileStatusResponseData.d.ts | 11 + .../types/models/eft/profile/IAkiProfile.d.ts | 18 +- .../eft/quests/ICompleteQuestRequestData.d.ts | 1 + .../models/eft/ragfair/IGetOffersResult.d.ts | 2 +- .../ISendRagfairReportRequestData.d.ts | 3 + .../server/types/models/enums/AmmoTypes.d.ts | 208 ++++++ .../server/types/models/enums/BotAmount.d.ts | 7 + .../types/models/enums/BotDifficulty.d.ts | 8 + .../types/models/enums/ConfigTypes.d.ts | 3 + .../types/models/enums/ContainerTypes.d.ts | 29 + .../types/models/enums/QuestRewardType.d.ts | 8 + .../types/models/enums/QuestStatus.d.ts | 11 + .../server/types/models/enums/RaidMode.d.ts | 5 + .../server/types/models/enums/SkillTypes.d.ts | 52 ++ .../types/models/enums/WeaponSkillTypes.d.ts | 14 + .../models/external/IPostAkiLoadMod.d.ts | 4 + .../types/models/external/IPostDBLoadMod.d.ts | 4 + .../types/models/external/IPreAkiLoadMod.d.ts | 4 + .../server/types/models/external/mod.d.ts | 5 - .../types/models/spt/bots/BotLootCache.d.ts | 23 + .../models/spt/bots/GenerateWeaponResult.d.ts | 9 + .../types/models/spt/config/IBotConfig.d.ts | 32 +- .../models/spt/config/IHideoutConfig.d.ts | 22 +- .../models/spt/config/IInRaidConfig.d.ts | 1 + .../models/spt/config/IInsuranceConfig.d.ts | 2 + .../models/spt/config/ILocaleConfig.d.ts | 5 + .../models/spt/config/IPlayerScavConfig.d.ts | 24 + .../models/spt/config/IRagfairConfig.d.ts | 6 +- .../models/spt/config/IRepairConfig.d.ts | 2 + .../models/spt/config/IScavCaseConfig.d.ts | 27 + .../models/spt/config/ITraderConfig.d.ts | 12 +- .../models/spt/config/IWeatherConfig.d.ts | 5 +- .../models/spt/generators/IBotGenerator.d.ts | 2 +- .../types/models/spt/helpers/Traders.d.ts | 10 - .../ScavCaseRewardCountsAndPrices.d.ts | 11 + .../spt/logging/LogBackgroundColor.d.ts | 11 + .../models/spt/logging/LogTextColor.d.ts | 11 + .../types/models/spt/logging/SptLogger.d.ts | 7 + .../types/models/spt/mod/IModLoader.d.ts | 1 - .../models/spt/mod/IPackageJsonData.d.ts | 1 + .../types/models/spt/mod/NewItemDetails.d.ts | 39 + .../models/spt/server/IDatabaseTables.d.ts | 29 +- .../types/models/spt/server/IHttpServer.d.ts | 1 + .../types/models/spt/server/ILocaleBase.d.ts | 2 +- .../models/spt/services/CustomPreset.d.ts | 5 + .../spt/services/CustomTraderAssortData.d.ts | 6 + .../types/models/spt/utils/ILogger.d.ts | 5 +- .../server/types/routers/HttpRouter.d.ts | 15 +- .../server/types/routers/ImageRouter.d.ts | 4 +- .../server/types/routers/ItemEventRouter.d.ts | 12 +- .../routers/dynamic/BotDynamicRouter.d.ts | 2 +- .../routers/dynamic/BundleDynamicRouter.d.ts | 2 +- .../dynamic/CustomizationDynamicRouter.d.ts | 2 +- .../routers/dynamic/DataDynamicRouter.d.ts | 2 +- .../routers/dynamic/HttpDynamicRouter.d.ts | 2 +- .../routers/dynamic/InraidDynamicRouter.d.ts | 2 +- .../dynamic/LocationDynamicRouter.d.ts | 2 +- .../dynamic/NotifierDynamicRouter.d.ts | 2 +- .../routers/dynamic/TraderDynamicRouter.d.ts | 2 +- .../CustomizationItemEventRouter.d.ts | 2 +- .../item_events/HealthItemEventRouter.d.ts | 2 +- .../item_events/HideoutItemEventRouter.d.ts | 2 +- .../item_events/InsuranceItemEventRouter.d.ts | 2 +- .../item_events/InventoryItemEventRouter.d.ts | 2 +- .../item_events/NoteItemEventRouter.d.ts | 2 +- .../PresetBuildItemEventRouter.d.ts | 2 +- .../item_events/QuestItemEventRouter.d.ts | 12 +- .../item_events/RagfairItemEventRouter.d.ts | 2 +- .../item_events/RepairItemEventRouter.d.ts | 2 +- .../item_events/TradeItemEventRouter.d.ts | 2 +- .../item_events/WishlistItemEventRouter.d.ts | 2 +- .../routers/serializers/BundleSerializer.d.ts | 4 +- .../routers/serializers/ImageSerializer.d.ts | 2 +- .../routers/serializers/NotifySerializer.d.ts | 6 +- .../types/routers/static/BotStaticRouter.d.ts | 2 +- .../routers/static/BundleStaticRouter.d.ts | 2 +- .../static/CustomizationStaticRouter.d.ts | 2 +- .../routers/static/DataStaticRouter.d.ts | 2 +- .../routers/static/DialogStaticRouter.d.ts | 2 +- .../routers/static/GameStaticRouter.d.ts | 2 +- .../routers/static/HealthStaticRouter.d.ts | 2 +- .../routers/static/InraidStaticRouter.d.ts | 2 +- .../routers/static/InsuranceStaticRouter.d.ts | 2 +- .../routers/static/ItemEventStaticRouter.d.ts | 2 +- .../routers/static/LauncherStaticRouter.d.ts | 2 +- .../routers/static/LocationStaticRouter.d.ts | 2 +- .../routers/static/MatchStaticRouter.d.ts | 2 +- .../routers/static/NotifierStaticRouter.d.ts | 2 +- .../routers/static/PresetStaticRouter.d.ts | 2 +- .../routers/static/ProfileStaticRouter.d.ts | 2 +- .../routers/static/QuestStaticRouter.d.ts | 2 +- .../routers/static/RagfairStaticRouter.d.ts | 2 +- .../routers/static/TraderStaticRouter.d.ts | 2 +- .../routers/static/WeatherStaticRouter.d.ts | 2 +- .../server/types/servers/ConfigServer.d.ts | 8 +- .../server/types/servers/DatabaseServer.d.ts | 2 +- .../server/types/servers/HttpServer.d.ts | 40 +- .../server/types/servers/RagfairServer.d.ts | 18 +- .../server/types/servers/SaveServer.d.ts | 18 +- .../services/BotEquipmentFilterService.d.ts | 50 ++ .../types/services/BotLootCacheService.d.ts | 82 +++ .../server/types/services/FenceService.d.ts | 29 +- .../types/services/HashCacheService.d.ts | 14 +- .../types/services/InsuranceService.d.ts | 42 +- .../server/types/services/LocaleService.d.ts | 14 + .../types/services/MatchLocationService.d.ts | 7 +- .../types/services/ModCompilerService.d.ts | 21 +- .../types/services/NotificationService.d.ts | 8 +- .../server/types/services/PaymentService.d.ts | 36 +- .../server/types/services/PlayerService.d.ts | 4 +- .../types/services/ProfileFixerService.d.ts | 61 ++ .../services/RagfairCategoriesService.d.ts | 44 +- .../services/RagfairLinkedItemService.d.ts | 9 +- .../types/services/RagfairOfferService.d.ts | 48 +- .../types/services/RagfairPriceService.d.ts | 43 +- .../services/RagfairRequiredItemsService.d.ts | 8 +- .../types/services/TraderAssortService.d.ts | 2 +- .../types/services/mod/CustomItemService.d.ts | 80 ++ .../services/mod/image/imageRouteService.d.ts | 2 +- .../services/mod/onLoad/OnLoadModService.d.ts | 2 +- .../mod/onUpdate/OnUpdateModService.d.ts | 2 +- .../staticRouter/StaticRouterModService.d.ts | 2 +- .../server/types/utils/App.d.ts | 13 +- .../server/types/utils/AyncQueue.d.ts | 2 +- .../server/types/utils/DatabaseImporter.d.ts | 26 +- .../server/types/utils/HashUtil.d.ts | 2 +- .../server/types/utils/HttpResponseUtil.d.ts | 4 +- .../server/types/utils/JsonUtil.d.ts | 8 +- .../server/types/utils/Logger.d.ts | 61 +- .../server/types/utils/ObjectId.d.ts | 12 +- .../server/types/utils/RandomUtil.d.ts | 4 +- .../server/types/utils/TimeUtil.d.ts | 10 + .../server/types/utils/VFS.d.ts | 5 +- .../server/types/utils/Watermark.d.ts | 35 +- .../utils/collections/lists/LinkedList.d.ts | 30 + 3403 files changed, 35863 insertions(+), 15836 deletions(-) delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/bepInEx/plugins/CWX-BushWhacker.dll delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotLootGenerator.d.ts delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotWeaponGenerator.d.ts delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/InRaidHelper.d.ts delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotBase.d.ts delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHideoutConfig.d.ts delete mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/TimeUtil.d.ts create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/bepInEx/plugins/CWX-BushWhacker.dll rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/LICENSE.txt (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/package.json (95%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/src/mod.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/Program.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/TYPES.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/Utils.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/BotCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/BundleCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/CustomizationCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/DataCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/DialogueCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/GameCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/HandbookCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/HealthCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/HideoutCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/HttpCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/InraidCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/InsuranceCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/InventoryCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/ItemEventCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/LauncherCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/LocationCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/MatchCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/ModCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/NoteCallbacks.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/NotifierCallbacks.d.ts (95%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/PresetBuildCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/PresetCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/ProfileCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/QuestCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/RagfairCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/RepairCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/SaveCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/TradeCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/TraderCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/WeatherCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/callbacks/WishlistCallbacks.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariableType.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/BotController.d.ts (95%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/CustomizationController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/DialogueController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/GameController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/HandbookController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/HealthController.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/HideoutController.d.ts (68%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/InraidController.d.ts (57%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/InsuranceController.d.ts (98%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/InventoryController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/LauncherController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/LocationController.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/MatchController.d.ts (92%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/NoteController.d.ts (92%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/NotifierController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/PresetBuildController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/PresetController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/ProfileController.d.ts (85%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/QuestController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/RagfairController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/RepairController.d.ts (97%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/RepeatableQuestController.d.ts (99%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/TradeController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/TraderController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/WeatherController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/controllers/WishlistController.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/di/Container.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/di/OnLoad.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/di/OnLoadOnUpdate.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/di/OnUpdate.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/di/Router.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/di/Serializer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/generators/BotGenerator.d.ts (66%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/generators/BotInventoryGenerator.d.ts (98%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotLootGenerator.d.ts create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotWeaponGenerator.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/generators/LocationGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/generators/PMCLootGenerator.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/PlayerScavGenerator.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/generators/RagfairAssortGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/generators/RagfairOfferGenerator.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/ScavCaseRewardGenerator.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/generators/WeatherGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/AssortHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/BotGeneratorHelper.d.ts (94%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/BotHelper.d.ts (94%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/ContainerHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/DialogueHelper.d.ts (73%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/DurabilityLimitsHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/ExtendedProfileHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/GameEventHelper.d.ts (88%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/HandbookHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/HealthHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/HideoutHelper.d.ts (87%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/HttpServerHelper.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/InRaidHelper.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/InventoryHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/ItemHelper.d.ts (97%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/NotificationSendHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/NotifierHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/PaymentHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/PresetHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/ProbabilityHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/ProfileHelper.d.ts (82%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/QuestConditionHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/QuestHelper.d.ts (81%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/RagfairHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/RagfairOfferHelper.d.ts (98%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/RagfairSellHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/RagfairServerHelper.d.ts (97%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/RagfairSortHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/RagfairTaxHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/RepairHelper.d.ts (95%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/SecureContainerHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/TradeHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/TraderAssortHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/TraderHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/UtilityHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/helpers/WeightedRandomHelper.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/ide/BleedingEdgeEntry.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/ide/Compiler.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/ide/DebugEntry.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/ide/ReleaseEntry.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/ide/TestEntry.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/loaders/BundleLoader.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/loaders/DelayedModLoader.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/loaders/InitialModLoader.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/loaders/PostAkiModLoader.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/loaders/PostDBModLoader.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/loaders/PreAkiModLoader.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/common/MinMax.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/bot/IGenerateBotsRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/IEmptyRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/IGlobals.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/ILocation.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/ILocationBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/ILocationsSourceDestinationBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/ILooseLoot.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/IMetricsTableData.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IPmcData.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/MemberCategory.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/request/IBaseInteractionRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IPmcData.d.ts => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotBase.d.ts} (90%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IBotCore.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IBotType.d.ts (90%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/ICustomizationItem.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IHandbookBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IItem.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/ILocationsBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/ILootBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IMatch.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IProfileTemplate.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IQuest.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/IRepeatableQuests.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/ITemplateItem.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/common/tables/ITrader.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/customization/IBuyClothingRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/customization/IWearClothingRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IFriendRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetChatServerListRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetFriendListDataResponse.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IPinDialogRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/IRemoveDialogRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/ISendMessageRequest.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/dialog/ISetDialogReadRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/game/IGameConfigResponse.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/game/IGameEmptyCrcRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/game/IReportNicknameRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/game/IVersionValidateRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/health/Effect.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/health/IHealthTreatmentRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/health/IOffraidEatRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/health/IOffraidHealRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/health/ISyncHealthRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/HideoutAreasEnum.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutArea.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutProduction.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutScavCase.d.ts (85%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutSettingsBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/httpResponse/IGetBodyResponseData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/httpResponse/INullResponseData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inRaid/ISaveProgressRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/insurance/IInsureRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IAddItemRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryAddRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryBindRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryExamineRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryFoldRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryMergeRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryMoveRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventorySortRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventorySplitRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventorySwapRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryTagRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryToggleRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/inventory/IInventoryTransferRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/itemEvent/IItemEventRouterBase.d.ts (96%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/launcher/IChangeRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/launcher/ILoginRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/launcher/IMiniProfile.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/launcher/IRegisterData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/launcher/IRemoveProfileData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/location/IGetLocationRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/ICreateGroupRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IEndOfflineRaidRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IGetGroupStatusRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IGetProfileRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IJoinMatchRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IJoinMatchResult.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IPutMetricsRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IStartOffineRaidRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/match/IUpdatePingRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/notes/INoteActionData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/notifier/INotifier.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/notifier/ISelectProfileRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts (88%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/GetProfileStatusResponseData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/IAkiProfile.d.ts (94%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/IProfileCreateRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/ISearchFriendRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/ISearchFriendResponse.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/profile/IValidateNicknameRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/quests/IAcceptQuestRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/quests/ICompleteQuestRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/quests/IHandoverQuestRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/quests/IListQuestsRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/IAddOfferRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/IExtendOfferRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/IGetItemPriceResult.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/IGetOffersResult.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/IRagfairOffer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/ISearchRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/repair/IRepairActionDataRequest.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/trade/IProcessSellTradeRequestData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/weather/IWeatherData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/eft/wishlist/IWishlistActionData.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/AmmoTypes.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/BaseClasses.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/BotAmount.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/BotDifficulty.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/ConfigTypes.d.ts (88%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ContainerTypes.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/ELocationName.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/EquipmentSlots.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/HideoutAreas.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/MemberCategory.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/MessageType.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/Money.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/QuestRewardType.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/QuestStatus.d.ts (81%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/RaidMode.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/SkillTypes.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/enums/Traders.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/WeaponSkillTypes.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/external/IPostAkiLoadMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/external/IPostDBLoadMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/external/IPreAkiLoadMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/external/mod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/external/tsyringe.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/bindings/Route.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/bots/BotLootCache.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bots/GenerateWeaponResult.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IBotCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IBundleCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/ICustomizationCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IDataCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IDialogueCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IGameCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IHandbookCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IHealthCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IHideoutCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IHttpCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IInraidCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IInsuranceCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IInventoryCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IItemEventCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/ILauncherCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/ILocationCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IMatchCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IModCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/INoteCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/INotifierCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IPresetCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IProfileCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IQuestCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IRagfairCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IRepairCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/ISaveCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/ITradeCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/ITraderCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IWeatherCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/callbacks/IWishlistCallbacks.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IAirdropConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IBaseConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IBotConfig.d.ts (79%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/ICoreConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IHealthConfig.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHideoutConfig.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IHttpConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IInRaidConfig.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IInsuranceConfig.d.ts (75%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IInventoryConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/ILocaleConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/ILocationConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IMatchConfig.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IPlayerScavConfig.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IQuestConfig.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IRagfairConfig.d.ts (95%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IRepairConfig.d.ts (66%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IScavCaseConfig.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/ITraderConfig.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/config/IWeatherConfig.d.ts (86%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/controllers/IBotController.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/generators/IBotGenerator.d.ts (83%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/generators/ILocationGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/generators/IPMCLootGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/generators/IRagfairAssortGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/generators/IRagfairOfferGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/helpers/Traders.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/logging/LogBackgroundColor.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/logging/LogTextColor.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/logging/SptLogger.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/mod/IMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/mod/IModLoader.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/mod/IPackageJsonData.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/NewItemDetails.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/ragfair/IRagfairServerPrices.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/server/IDatabaseTables.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/server/IHttpServer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/server/ILocaleBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/server/ILocations.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/server/IServerBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/server/ISettingsBase.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/services/CustomPreset.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/services/CustomTraderAssortData.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/utils/IAsyncQueue.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/utils/ICommand.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/utils/ILogger.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/models/spt/utils/IUuidGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/HttpRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/ImageRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/ItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/BotDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/BundleDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/CustomizationDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/DataDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/HttpDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/InraidDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/LocationDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/NotifierDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/dynamic/TraderDynamicRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/CustomizationItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/HealthItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/HideoutItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/InsuranceItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/InventoryItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/NoteItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/PresetBuildItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/QuestItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/RagfairItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/RepairItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/TradeItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/item_events/WishlistItemEventRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/save_load/HealthSaveLoadRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/save_load/InraidSaveLoadRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/save_load/InsuranceSaveLoadRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/save_load/ProfileSaveLoadRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/serializers/BundleSerializer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/serializers/ImageSerializer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/serializers/NotifySerializer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/BotStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/BundleStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/CustomizationStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/DataStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/DialogStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/GameStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/HealthStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/InraidStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/InsuranceStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/ItemEventStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/LauncherStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/LocationStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/MatchStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/NotifierStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/PresetStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/ProfileStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/QuestStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/RagfairStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/TraderStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/routers/static/WeatherStaticRouter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/servers/ConfigServer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/servers/DatabaseServer.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/servers/HttpServer.d.ts (91%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/servers/RagfairServer.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/servers/SaveServer.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/BotEquipmentFilterService.d.ts rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/BotLootCacheService.d.ts (71%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/FenceService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/HashCacheService.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/InsuranceService.d.ts (81%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/LocaleService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/MatchLocationService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/ModCompilerService.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/NotificationService.d.ts (72%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/PaymentService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/PlayerService.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/ProfileFixerService.d.ts (64%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/RagfairCategoriesService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/RagfairLinkedItemService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/RagfairOfferService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/RagfairPriceService.d.ts (98%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/RagfairRequiredItemsService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/TraderAssortService.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/CustomItemService.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/image/imageRouteService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/onLoad/OnLoadMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/onLoad/OnLoadModService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/onUpdate/OnUpdateMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/onUpdate/OnUpdateModService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/staticRouter/StaticRouterMod.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/services/mod/staticRouter/StaticRouterModService.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/App.d.ts (89%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/AyncQueue.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/DatabaseImporter.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/HashUtil.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/HttpResponseUtil.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/JsonUtil.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/Logger.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/MathUtil.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/ObjectId.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/RandomUtil.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/TimeUtil.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/UUidGenerator.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/VFS.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/Watermark.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/collections/lists/LinkedList.d.ts rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/decorators/Singleton.d.ts (100%) rename Live/CWX_BushWhacker/{CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1}/types/utils/decorators/constructor.d.ts (100%) create mode 100644 Live/CWX_BushWhacker/server/dist/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/common/MinMax.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/spt/config/IScavCaseConfig.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_BushWhacker/server/dist/types/utils/collections/lists/LinkedList.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/common/MinMax.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/spt/config/IScavCaseConfig.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_BushWhacker/server/types/utils/collections/lists/LinkedList.d.ts delete mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotLootGenerator.d.ts delete mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotWeaponGenerator.d.ts delete mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/InRaidHelper.d.ts delete mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotBase.d.ts delete mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHideoutConfig.d.ts delete mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/TimeUtil.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1}/bepInEx/plugins/CWX-DeSharpener.dll (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/LICENSE.txt (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/package.json (95%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/src/mod.ts (56%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/Program.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/TYPES.d.ts (100%) rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/Utils.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/BotCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/BundleCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/CustomizationCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/DataCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/DialogueCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/GameCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/HandbookCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/HealthCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/HideoutCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/HttpCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/InraidCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/InsuranceCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/InventoryCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/ItemEventCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/LauncherCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/LocationCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/MatchCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/ModCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/NoteCallbacks.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/NotifierCallbacks.d.ts (95%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/PresetBuildCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/PresetCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/ProfileCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/QuestCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/RagfairCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/RepairCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/SaveCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/TradeCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/TraderCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/WeatherCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/callbacks/WishlistCallbacks.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariableType.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/BotController.d.ts (95%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/CustomizationController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/DialogueController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/GameController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/HandbookController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/HealthController.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/HideoutController.d.ts (68%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/InraidController.d.ts (57%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/InsuranceController.d.ts (98%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/InventoryController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/LauncherController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/LocationController.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/MatchController.d.ts (92%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/NoteController.d.ts (92%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/NotifierController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/PresetBuildController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/PresetController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/ProfileController.d.ts (85%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/QuestController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/RagfairController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/RepairController.d.ts (97%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/RepeatableQuestController.d.ts (99%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/TradeController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/TraderController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/WeatherController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/controllers/WishlistController.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/di/Container.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/di/OnLoad.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/di/OnLoadOnUpdate.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/di/OnUpdate.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/di/Router.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/di/Serializer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/generators/BotGenerator.d.ts (66%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/generators/BotInventoryGenerator.d.ts (98%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotLootGenerator.d.ts create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotWeaponGenerator.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/generators/LocationGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/generators/PMCLootGenerator.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/PlayerScavGenerator.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/generators/RagfairAssortGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/generators/RagfairOfferGenerator.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/ScavCaseRewardGenerator.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/generators/WeatherGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/AssortHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/BotGeneratorHelper.d.ts (94%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/BotHelper.d.ts (94%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/ContainerHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/DialogueHelper.d.ts (73%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/DurabilityLimitsHelper.d.ts (100%) rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/ExtendedProfileHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/GameEventHelper.d.ts (88%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/HandbookHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/HealthHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/HideoutHelper.d.ts (87%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/HttpServerHelper.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/InRaidHelper.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/InventoryHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/ItemHelper.d.ts (97%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/NotificationSendHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/NotifierHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/PaymentHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/PresetHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/ProbabilityHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/ProfileHelper.d.ts (82%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/QuestConditionHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/QuestHelper.d.ts (81%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/RagfairHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/RagfairOfferHelper.d.ts (98%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/RagfairSellHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/RagfairServerHelper.d.ts (97%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/RagfairSortHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/RagfairTaxHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/RepairHelper.d.ts (95%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/SecureContainerHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/TradeHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/TraderAssortHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/TraderHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/UtilityHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/helpers/WeightedRandomHelper.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/ide/BleedingEdgeEntry.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/ide/Compiler.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/ide/DebugEntry.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/ide/ReleaseEntry.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/ide/TestEntry.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/loaders/BundleLoader.d.ts (100%) rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/loaders/DelayedModLoader.d.ts (100%) rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/loaders/InitialModLoader.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/loaders/PostAkiModLoader.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/loaders/PostDBModLoader.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/loaders/PreAkiModLoader.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/common/MinMax.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/bot/IGenerateBotsRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/IEmptyRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/IGlobals.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/ILocation.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/ILocationBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/ILocationsSourceDestinationBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/ILooseLoot.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/IMetricsTableData.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IPmcData.d.ts rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/MemberCategory.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/request/IBaseInteractionRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IPmcData.d.ts => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotBase.d.ts} (90%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IBotCore.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IBotType.d.ts (90%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/ICustomizationItem.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IHandbookBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IItem.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/ILocationsBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/ILootBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IMatch.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IProfileTemplate.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IQuest.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/IRepeatableQuests.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/ITemplateItem.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/common/tables/ITrader.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/customization/IBuyClothingRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/customization/IWearClothingRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IFriendRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetChatServerListRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetFriendListDataResponse.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IPinDialogRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/IRemoveDialogRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/ISendMessageRequest.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/dialog/ISetDialogReadRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/game/IGameConfigResponse.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/game/IGameEmptyCrcRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/game/IReportNicknameRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/game/IVersionValidateRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/health/Effect.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/health/IHealthTreatmentRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/health/IOffraidEatRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/health/IOffraidHealRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/health/ISyncHealthRequestData.d.ts (100%) rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/HideoutAreasEnum.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutArea.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutProduction.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutScavCase.d.ts (85%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutSettingsBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/httpResponse/IGetBodyResponseData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/httpResponse/INullResponseData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inRaid/ISaveProgressRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/insurance/IInsureRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IAddItemRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryAddRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryBindRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryExamineRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryFoldRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryMergeRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryMoveRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventorySortRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventorySplitRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventorySwapRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryTagRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryToggleRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/inventory/IInventoryTransferRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/itemEvent/IItemEventRouterBase.d.ts (96%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/launcher/IChangeRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/launcher/ILoginRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/launcher/IMiniProfile.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/launcher/IRegisterData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/launcher/IRemoveProfileData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/location/IGetLocationRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/ICreateGroupRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IEndOfflineRaidRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IGetGroupStatusRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IGetProfileRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IJoinMatchRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IJoinMatchResult.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IPutMetricsRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IStartOffineRaidRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/match/IUpdatePingRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/notes/INoteActionData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/notifier/INotifier.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/notifier/ISelectProfileRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts (88%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/GetProfileStatusResponseData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/IAkiProfile.d.ts (94%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/IProfileCreateRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/ISearchFriendRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/ISearchFriendResponse.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/profile/IValidateNicknameRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/quests/IAcceptQuestRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/quests/ICompleteQuestRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/quests/IHandoverQuestRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/quests/IListQuestsRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/IAddOfferRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/IExtendOfferRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/IGetItemPriceResult.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/IGetOffersResult.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/IRagfairOffer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/ISearchRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/repair/IRepairActionDataRequest.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/trade/IProcessSellTradeRequestData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/weather/IWeatherData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/eft/wishlist/IWishlistActionData.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/AmmoTypes.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/BaseClasses.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/BotAmount.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/BotDifficulty.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/ConfigTypes.d.ts (88%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ContainerTypes.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/ELocationName.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/EquipmentSlots.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/HideoutAreas.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums}/MemberCategory.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/MessageType.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/Money.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/QuestRewardType.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/QuestStatus.d.ts (81%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/RaidMode.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/SkillTypes.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/enums/Traders.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/WeaponSkillTypes.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/external/IPostAkiLoadMod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/external/IPostDBLoadMod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/external/IPreAkiLoadMod.d.ts (100%) rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/external/mod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/external/tsyringe.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/bindings/Route.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/bots/BotLootCache.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IBotCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IBundleCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/ICustomizationCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IDataCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IDialogueCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IGameCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IHandbookCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IHealthCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IHideoutCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IHttpCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IInraidCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IInsuranceCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IInventoryCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IItemEventCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/ILauncherCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/ILocationCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IMatchCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IModCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/INoteCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/INotifierCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IPresetCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IProfileCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IQuestCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IRagfairCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IRepairCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/ISaveCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/ITradeCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/ITraderCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IWeatherCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/callbacks/IWishlistCallbacks.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IAirdropConfig.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IBaseConfig.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IBotConfig.d.ts (79%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/ICoreConfig.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IHealthConfig.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHideoutConfig.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IHttpConfig.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IInRaidConfig.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IInsuranceConfig.d.ts (75%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IInventoryConfig.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/ILocaleConfig.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/ILocationConfig.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IMatchConfig.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IPlayerScavConfig.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IQuestConfig.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IRagfairConfig.d.ts (95%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IRepairConfig.d.ts (66%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IScavCaseConfig.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/ITraderConfig.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/config/IWeatherConfig.d.ts (86%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/controllers/IBotController.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/generators/IBotGenerator.d.ts (83%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/generators/ILocationGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/generators/IPMCLootGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/generators/IRagfairAssortGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/generators/IRagfairOfferGenerator.d.ts (100%) rename Live/{CWX_BushWhacker/server => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/helpers/Traders.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/logging/LogBackgroundColor.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/logging/LogTextColor.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/logging/SptLogger.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/mod/IMod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/mod/IModLoader.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/mod/IPackageJsonData.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/NewItemDetails.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/ragfair/IRagfairServerPrices.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/server/IDatabaseTables.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/server/IHttpServer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/server/ILocaleBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/server/ILocations.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/server/IServerBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/server/ISettingsBase.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/services/CustomPreset.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/services/CustomTraderAssortData.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/utils/IAsyncQueue.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/utils/ICommand.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/utils/ILogger.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/models/spt/utils/IUuidGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/HttpRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/ImageRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/ItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/BotDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/BundleDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/CustomizationDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/DataDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/HttpDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/InraidDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/LocationDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/NotifierDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/dynamic/TraderDynamicRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/CustomizationItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/HealthItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/HideoutItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/InsuranceItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/InventoryItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/NoteItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/PresetBuildItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/QuestItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/RagfairItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/RepairItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/TradeItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/item_events/WishlistItemEventRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/save_load/HealthSaveLoadRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/save_load/InraidSaveLoadRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/save_load/InsuranceSaveLoadRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/save_load/ProfileSaveLoadRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/serializers/BundleSerializer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/serializers/ImageSerializer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/serializers/NotifySerializer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/BotStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/BundleStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/CustomizationStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/DataStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/DialogStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/GameStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/HealthStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/InraidStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/InsuranceStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/ItemEventStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/LauncherStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/LocationStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/MatchStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/NotifierStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/PresetStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/ProfileStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/QuestStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/RagfairStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/TraderStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/routers/static/WeatherStaticRouter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/servers/ConfigServer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/servers/DatabaseServer.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/servers/HttpServer.d.ts (91%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/servers/RagfairServer.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/servers/SaveServer.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/BotEquipmentFilterService.d.ts rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/BotLootCacheService.d.ts (71%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/FenceService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/HashCacheService.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/InsuranceService.d.ts (81%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/LocaleService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/MatchLocationService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/ModCompilerService.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/NotificationService.d.ts (72%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/PaymentService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/PlayerService.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/ProfileFixerService.d.ts (64%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/RagfairCategoriesService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/RagfairLinkedItemService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/RagfairOfferService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/RagfairPriceService.d.ts (98%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/RagfairRequiredItemsService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/TraderAssortService.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/CustomItemService.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/image/imageRouteService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/onLoad/OnLoadMod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/onLoad/OnLoadModService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/onUpdate/OnUpdateMod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/onUpdate/OnUpdateModService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/staticRouter/StaticRouterMod.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/services/mod/staticRouter/StaticRouterModService.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/App.d.ts (89%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/AyncQueue.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/DatabaseImporter.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/HashUtil.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/HttpResponseUtil.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/JsonUtil.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/Logger.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/MathUtil.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/ObjectId.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/RandomUtil.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/TimeUtil.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/UUidGenerator.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/VFS.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/Watermark.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/collections/lists/LinkedList.d.ts rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/decorators/Singleton.d.ts (100%) rename Live/CWX_DeSharpener/{CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1}/types/utils/decorators/constructor.d.ts (100%) create mode 100644 Live/CWX_DeSharpener/server/dist/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/common/MinMax.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/spt/config/IScavCaseConfig.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_DeSharpener/server/dist/types/utils/collections/lists/LinkedList.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/common/MinMax.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/spt/config/IScavCaseConfig.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_DeSharpener/server/types/utils/collections/lists/LinkedList.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/src/mod.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/Utils.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/MatchCallbacks.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/BotController.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/GameController.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InraidController.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/MatchController.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/QuestController.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotGenerator.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotLootGenerator.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotWeaponGenerator.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/WeatherGenerator.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/AssortHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotGeneratorHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/DurabilityLimitsHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ExtendedProfileHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HealthHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HttpServerHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/InRaidHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/QuestHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairSortHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RepairHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderAssortHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderHelper.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotBase.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ITemplateItem.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/HideoutAreasEnum.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/external/mod.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHideoutConfig.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/helpers/Traders.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/HttpRouter.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/MatchLocationService.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/ModCompilerService.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairCategoriesService.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairLinkedItemService.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairPriceService.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Logger.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/TimeUtil.d.ts delete mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Watermark.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0 => CWX_MasterKey 1.3.2}/bepInEx/plugins/CWX-MasterKey.dll (81%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/LICENSE.txt (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/package.json (95%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/src/mod.ts (56%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/Program.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/TYPES.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/Utils.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/BotCallbacks.d.ts (90%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/BundleCallbacks.d.ts (69%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/CustomizationCallbacks.d.ts (90%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/DataCallbacks.d.ts (96%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/DialogueCallbacks.d.ts (95%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/GameCallbacks.d.ts (83%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/HandbookCallbacks.d.ts (83%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/HealthCallbacks.d.ts (77%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/HideoutCallbacks.d.ts (92%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/HttpCallbacks.d.ts (87%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/InraidCallbacks.d.ts (76%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/InsuranceCallbacks.d.ts (70%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/InventoryCallbacks.d.ts (98%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/ItemEventCallbacks.d.ts (87%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/LauncherCallbacks.d.ts (90%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/LocationCallbacks.d.ts (90%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/MatchCallbacks.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/ModCallbacks.d.ts (58%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/NoteCallbacks.d.ts (93%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/NotifierCallbacks.d.ts (90%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/PresetBuildCallbacks.d.ts (75%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/PresetCallbacks.d.ts (83%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/ProfileCallbacks.d.ts (83%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/QuestCallbacks.d.ts (92%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/RagfairCallbacks.d.ts (74%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/RepairCallbacks.d.ts (93%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/SaveCallbacks.d.ts (88%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/TradeCallbacks.d.ts (94%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/TraderCallbacks.d.ts (92%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/WeatherCallbacks.d.ts (84%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/callbacks/WishlistCallbacks.d.ts (92%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/BotController.d.ts rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/CustomizationController.d.ts (81%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/DialogueController.d.ts (79%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/GameController.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/HandbookController.d.ts (74%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/HealthController.d.ts (63%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/HideoutController.d.ts (51%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InraidController.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/InsuranceController.d.ts (63%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/InventoryController.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/LauncherController.d.ts (74%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/LocationController.d.ts (79%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/MatchController.d.ts rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/NoteController.d.ts (88%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/NotifierController.d.ts (80%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/PresetBuildController.d.ts (86%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/PresetController.d.ts (74%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/ProfileController.d.ts (66%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/QuestController.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/RagfairController.d.ts (73%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/RepairController.d.ts (74%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/RepeatableQuestController.d.ts (91%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/TradeController.d.ts (85%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/TraderController.d.ts (77%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/WeatherController.d.ts (62%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/controllers/WishlistController.d.ts (92%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/di/Container.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/di/OnLoad.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/di/OnLoadOnUpdate.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/di/OnUpdate.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/di/Router.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/di/Serializer.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotGenerator.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/generators/BotInventoryGenerator.d.ts (58%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotLootGenerator.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotWeaponGenerator.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/generators/LocationGenerator.d.ts (54%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/generators/PMCLootGenerator.d.ts (56%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/PlayerScavGenerator.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/generators/RagfairAssortGenerator.d.ts (64%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/generators/RagfairOfferGenerator.d.ts (55%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/WeatherGenerator.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/AssortHelper.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotGeneratorHelper.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotHelper.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/ContainerHelper.d.ts (74%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/DialogueHelper.d.ts (58%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/DurabilityLimitsHelper.d.ts rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/ExtendedProfileHelper.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/GameEventHelper.d.ts (76%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/HandbookHelper.d.ts (95%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HealthHelper.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/HideoutHelper.d.ts (51%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HttpServerHelper.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/InRaidHelper.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/InventoryHelper.d.ts (70%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/ItemHelper.d.ts (63%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/NotificationSendHelper.d.ts (83%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/NotifierHelper.d.ts (89%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/PaymentHelper.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/PresetHelper.d.ts (66%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ProbabilityHelper.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/ProfileHelper.d.ts (67%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/QuestConditionHelper.d.ts (76%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/QuestHelper.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/RagfairHelper.d.ts (74%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/RagfairOfferHelper.d.ts (58%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/RagfairSellHelper.d.ts (69%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/RagfairServerHelper.d.ts (61%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairSortHelper.d.ts rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/RagfairTaxHelper.d.ts (62%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RepairHelper.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/SecureContainerHelper.d.ts (90%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/TradeHelper.d.ts (73%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderAssortHelper.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderHelper.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/UtilityHelper.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/helpers/WeightedRandomHelper.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/ide/BleedingEdgeEntry.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/ide/Compiler.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/ide/DebugEntry.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/ide/ReleaseEntry.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/ide/TestEntry.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/loaders/BundleLoader.d.ts (80%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/loaders/DelayedModLoader.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/loaders/InitialModLoader.d.ts (100%) rename Live/{CWX_DeSharpener/server/types/loaders/DelayedModLoader.d.ts => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostAkiModLoader.d.ts} (80%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostDBModLoader.d.ts rename Live/{CWX_DeSharpener/server/types/loaders/InitialModLoader.d.ts => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PreAkiModLoader.d.ts} (94%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/common/MinMax.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/bot/IGenerateBotsRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/IEmptyRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/IGlobals.d.ts (99%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/ILocation.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/ILocationBase.d.ts (94%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/ILocationsSourceDestinationBase.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/ILooseLoot.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/IMetricsTableData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IPmcData.d.ts rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common}/MemberCategory.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/request/IBaseInteractionRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IPmcData.d.ts => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotBase.d.ts} (88%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/IBotCore.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/IBotType.d.ts (90%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/ICustomizationItem.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/IHandbookBase.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/IItem.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/ILocationsBase.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/ILootBase.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IMatch.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IProfileTemplate.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/IQuest.d.ts (94%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/IRepeatableQuests.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ITemplateItem.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/common/tables/ITrader.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/customization/IBuyClothingRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/customization/IWearClothingRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IFriendRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetChatServerListRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetFriendListDataResponse.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IPinDialogRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/IRemoveDialogRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/ISendMessageRequest.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/dialog/ISetDialogReadRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/game/IGameConfigResponse.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/game/IGameEmptyCrcRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IReportNicknameRequestData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/game/IVersionValidateRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/Effect.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/health/IHealthTreatmentRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/health/IOffraidEatRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/health/IOffraidHealRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/health/ISyncHealthRequestData.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/HideoutAreasEnum.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutArea.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutProduction.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutScavCase.d.ts (85%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutSettingsBase.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/httpResponse/IGetBodyResponseData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/httpResponse/INullResponseData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inRaid/ISaveProgressRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/insurance/IInsureRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IAddItemRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryAddRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryBindRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryExamineRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryFoldRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryMergeRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryMoveRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventorySortRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventorySplitRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventorySwapRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryTagRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryToggleRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/inventory/IInventoryTransferRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/itemEvent/IItemEventRouterBase.d.ts (96%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/launcher/IChangeRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/launcher/ILoginRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/launcher/IMiniProfile.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/launcher/IRegisterData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/launcher/IRemoveProfileData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/location/IGetLocationRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/ICreateGroupRequestData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/match/IEndOfflineRaidRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IGetGroupStatusRequestData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/match/IGetProfileRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchRequestData.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchResult.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IPutMetricsRequestData.d.ts rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/match/IStartOffineRaidRequestData.d.ts (74%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IUpdatePingRequestData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/notes/INoteActionData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/notifier/INotifier.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/notifier/ISelectProfileRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts (88%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/GetProfileStatusResponseData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/profile/IAkiProfile.d.ts (92%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/profile/IProfileCreateRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/profile/ISearchFriendRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/profile/ISearchFriendResponse.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/profile/IValidateNicknameRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/quests/IAcceptQuestRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/quests/ICompleteQuestRequestData.d.ts (85%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/quests/IHandoverQuestRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/quests/IListQuestsRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/IAddOfferRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/IExtendOfferRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/IGetItemPriceResult.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/IGetOffersResult.d.ts (80%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/IRagfairOffer.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/ragfair/ISearchRequestData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/repair/IRepairActionDataRequest.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/trade/IProcessSellTradeRequestData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/weather/IWeatherData.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/eft/wishlist/IWishlistActionData.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/AmmoTypes.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/BaseClasses.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotAmount.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotDifficulty.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/ConfigTypes.d.ts (83%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ContainerTypes.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/ELocationName.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/EquipmentSlots.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/HideoutAreas.d.ts (100%) rename Live/{CWX_DeSharpener/server/types/models/eft/common => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums}/MemberCategory.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/MessageType.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/Money.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestRewardType.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestStatus.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/RaidMode.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/SkillTypes.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/enums/Traders.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostAkiLoadMod.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostDBLoadMod.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPreAkiLoadMod.d.ts rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/external/mod.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/external/tsyringe.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/bindings/Route.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/BotLootCache.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/GenerateWeaponResult.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IBotCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IBundleCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/ICustomizationCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IDataCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IDialogueCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IGameCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IHandbookCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IHealthCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IHideoutCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IHttpCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IInraidCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IInsuranceCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IInventoryCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IItemEventCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/ILauncherCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/ILocationCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IMatchCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IModCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/INoteCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/INotifierCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IPresetCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IProfileCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IQuestCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IRagfairCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IRepairCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/ISaveCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/ITradeCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/ITraderCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IWeatherCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/callbacks/IWishlistCallbacks.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IAirdropConfig.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IBaseConfig.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IBotConfig.d.ts (75%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/ICoreConfig.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IHealthConfig.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHideoutConfig.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IHttpConfig.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IInRaidConfig.d.ts (95%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IInsuranceConfig.d.ts (75%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IInventoryConfig.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ILocaleConfig.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/ILocationConfig.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IMatchConfig.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IPlayerScavConfig.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IQuestConfig.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IRagfairConfig.d.ts (94%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IRepairConfig.d.ts (66%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IScavCaseConfig.d.ts rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/ITraderConfig.d.ts (59%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/config/IWeatherConfig.d.ts (86%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/controllers/IBotController.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/generators/IBotGenerator.d.ts (83%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/generators/ILocationGenerator.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/generators/IPMCLootGenerator.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/generators/IRagfairAssortGenerator.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/generators/IRagfairOfferGenerator.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/helpers/Traders.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogBackgroundColor.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogTextColor.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/SptLogger.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/mod/IMod.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/mod/IModLoader.d.ts (87%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/mod/IPackageJsonData.d.ts (84%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/NewItemDetails.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/ragfair/IRagfairServerPrices.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/server/IDatabaseTables.d.ts (69%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/server/IHttpServer.d.ts (94%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/server/ILocaleBase.d.ts (97%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/server/ILocations.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/server/IServerBase.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/server/ISettingsBase.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomPreset.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomTraderAssortData.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/utils/IAsyncQueue.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/utils/ICommand.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/utils/ILogger.d.ts (59%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/models/spt/utils/IUuidGenerator.d.ts (100%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/HttpRouter.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/ImageRouter.d.ts (88%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/ItemEventRouter.d.ts (72%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/BotDynamicRouter.d.ts (83%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/BundleDynamicRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/CustomizationDynamicRouter.d.ts (81%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/DataDynamicRouter.d.ts (83%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/HttpDynamicRouter.d.ts (83%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/InraidDynamicRouter.d.ts (84%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/LocationDynamicRouter.d.ts (84%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/NotifierDynamicRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/dynamic/TraderDynamicRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/CustomizationItemEventRouter.d.ts (90%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/HealthItemEventRouter.d.ts (92%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/HideoutItemEventRouter.d.ts (92%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/InsuranceItemEventRouter.d.ts (91%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/InventoryItemEventRouter.d.ts (91%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/NoteItemEventRouter.d.ts (92%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/PresetBuildItemEventRouter.d.ts (91%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/QuestItemEventRouter.d.ts (56%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/RagfairItemEventRouter.d.ts (92%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/RepairItemEventRouter.d.ts (92%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/TradeItemEventRouter.d.ts (92%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/item_events/WishlistItemEventRouter.d.ts (91%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/save_load/HealthSaveLoadRouter.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/save_load/InraidSaveLoadRouter.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/save_load/InsuranceSaveLoadRouter.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/save_load/ProfileSaveLoadRouter.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/serializers/BundleSerializer.d.ts (87%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/serializers/ImageSerializer.d.ts (90%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/serializers/NotifySerializer.d.ts (69%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/BotStaticRouter.d.ts (83%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/BundleStaticRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/CustomizationStaticRouter.d.ts (81%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/DataStaticRouter.d.ts (83%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/DialogStaticRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/GameStaticRouter.d.ts (83%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/HealthStaticRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/InraidStaticRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/InsuranceStaticRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/ItemEventStaticRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/LauncherStaticRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/LocationStaticRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/MatchStaticRouter.d.ts (83%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/NotifierStaticRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/PresetStaticRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/ProfileStaticRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/QuestStaticRouter.d.ts (83%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/RagfairStaticRouter.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/TraderStaticRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/routers/static/WeatherStaticRouter.d.ts (82%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/servers/ConfigServer.d.ts (75%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/servers/DatabaseServer.d.ts (80%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/servers/HttpServer.d.ts (63%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/servers/RagfairServer.d.ts (67%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/servers/SaveServer.d.ts (74%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotLootCacheService.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/FenceService.d.ts (66%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/HashCacheService.d.ts (71%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/InsuranceService.d.ts (59%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/LocaleService.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/MatchLocationService.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ModCompilerService.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/NotificationService.d.ts (72%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/PaymentService.d.ts (65%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/PlayerService.d.ts (91%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ProfileFixerService.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairCategoriesService.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairLinkedItemService.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/RagfairOfferService.d.ts (57%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairPriceService.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/RagfairRequiredItemsService.d.ts (71%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/TraderAssortService.d.ts (78%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/CustomItemService.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/image/imageRouteService.d.ts (79%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/onLoad/OnLoadMod.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/onLoad/OnLoadModService.d.ts (82%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/onUpdate/OnUpdateMod.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/onUpdate/OnUpdateModService.d.ts (84%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/staticRouter/StaticRouterMod.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/services/mod/staticRouter/StaticRouterModService.d.ts (86%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/App.d.ts (51%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/AyncQueue.d.ts (85%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/DatabaseImporter.d.ts (52%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/HashUtil.d.ts (91%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/HttpResponseUtil.d.ts (91%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/JsonUtil.d.ts (85%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Logger.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/MathUtil.d.ts (100%) rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/ObjectId.d.ts (55%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/RandomUtil.d.ts (99%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/TimeUtil.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/UUidGenerator.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/VFS.d.ts (95%) create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Watermark.d.ts create mode 100644 Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/collections/lists/LinkedList.d.ts rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/decorators/Singleton.d.ts (100%) rename Live/CWX_MasterKey/{CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2}/types/utils/decorators/constructor.d.ts (100%) create mode 100644 Live/CWX_MasterKey/server/dist/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/helpers/ProbabilityHelper.d.ts rename Live/{CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/DelayedModLoader.d.ts => CWX_MasterKey/server/dist/types/loaders/PostAkiModLoader.d.ts} (51%) create mode 100644 Live/CWX_MasterKey/server/dist/types/loaders/PostDBModLoader.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/loaders/PreAkiModLoader.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/common/MinMax.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IMatch.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/health/Effect.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchResult.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/BotAmount.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/BotDifficulty.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/QuestRewardType.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/QuestStatus.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/RaidMode.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/external/IPostAkiLoadMod.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/external/IPostDBLoadMod.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/external/IPreAkiLoadMod.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/bots/BotLootCache.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/config/ILocaleConfig.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/config/IScavCaseConfig.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogTextColor.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/logging/SptLogger.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomPreset.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/services/BotLootCacheService.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/services/LocaleService.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/services/ProfileFixerService.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_MasterKey/server/dist/types/utils/collections/lists/LinkedList.d.ts delete mode 100644 Live/CWX_MasterKey/server/types/Utils.d.ts create mode 100644 Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_MasterKey/server/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts delete mode 100644 Live/CWX_MasterKey/server/types/helpers/ExtendedProfileHelper.d.ts create mode 100644 Live/CWX_MasterKey/server/types/helpers/ProbabilityHelper.d.ts delete mode 100644 Live/CWX_MasterKey/server/types/loaders/InitialModLoader.d.ts rename Live/CWX_MasterKey/server/types/loaders/{DelayedModLoader.d.ts => PostAkiModLoader.d.ts} (51%) create mode 100644 Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts create mode 100644 Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/common/MinMax.d.ts delete mode 100644 Live/CWX_MasterKey/server/types/models/eft/common/MemberCategory.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/common/tables/IMatch.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/game/IReportNicknameRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts delete mode 100644 Live/CWX_MasterKey/server/types/models/eft/hideout/HideoutAreasEnum.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/match/ICreateGroupRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/match/IPutMetricsRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/match/IUpdatePingRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/BotAmount.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/BotDifficulty.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/RaidMode.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/external/IPostAkiLoadMod.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/external/IPostDBLoadMod.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/external/IPreAkiLoadMod.d.ts delete mode 100644 Live/CWX_MasterKey/server/types/models/external/mod.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/bots/BotLootCache.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/config/ILocaleConfig.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/config/IScavCaseConfig.d.ts delete mode 100644 Live/CWX_MasterKey/server/types/models/spt/helpers/Traders.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/logging/LogBackgroundColor.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/logging/LogTextColor.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/logging/SptLogger.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/services/CustomPreset.d.ts create mode 100644 Live/CWX_MasterKey/server/types/models/spt/services/CustomTraderAssortData.d.ts create mode 100644 Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_MasterKey/server/types/services/BotLootCacheService.d.ts create mode 100644 Live/CWX_MasterKey/server/types/services/LocaleService.d.ts create mode 100644 Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts create mode 100644 Live/CWX_MasterKey/server/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_MasterKey/server/types/utils/collections/lists/LinkedList.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/BepInEx/plugins/CWX-WeatherPatcher.dll delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/src/mod.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/Utils.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/MatchCallbacks.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/BotController.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/GameController.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InraidController.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/MatchController.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/QuestController.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotGenerator.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotLootGenerator.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotWeaponGenerator.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/WeatherGenerator.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/AssortHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotGeneratorHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/DurabilityLimitsHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ExtendedProfileHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HealthHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HttpServerHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/InRaidHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/QuestHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairSortHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RepairHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderAssortHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/InitialModLoader.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/MemberCategory.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotBase.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ITemplateItem.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/HideoutAreasEnum.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/MemberCategory.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/external/mod.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHideoutConfig.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/helpers/Traders.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/HttpRouter.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/MatchLocationService.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/ModCompilerService.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairCategoriesService.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairLinkedItemService.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairPriceService.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Logger.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/TimeUtil.d.ts delete mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Watermark.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/BepInEx/plugins/CWX-WeatherPatcher.dll rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/LICENSE.txt (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/package.json (95%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/src/mod.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/Program.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/TYPES.d.ts (100%) rename Live/{CWX_DeSharpener/server => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/Utils.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/BotCallbacks.d.ts (90%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/BundleCallbacks.d.ts (69%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/CustomizationCallbacks.d.ts (90%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/DataCallbacks.d.ts (96%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/DialogueCallbacks.d.ts (95%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/GameCallbacks.d.ts (83%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/HandbookCallbacks.d.ts (83%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/HealthCallbacks.d.ts (77%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/HideoutCallbacks.d.ts (92%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/HttpCallbacks.d.ts (87%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/InraidCallbacks.d.ts (76%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/InsuranceCallbacks.d.ts (70%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/InventoryCallbacks.d.ts (98%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/ItemEventCallbacks.d.ts (87%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/LauncherCallbacks.d.ts (90%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/LocationCallbacks.d.ts (90%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/MatchCallbacks.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/ModCallbacks.d.ts (58%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/NoteCallbacks.d.ts (93%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/NotifierCallbacks.d.ts (90%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/PresetBuildCallbacks.d.ts (75%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/PresetCallbacks.d.ts (83%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/ProfileCallbacks.d.ts (83%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/QuestCallbacks.d.ts (92%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/RagfairCallbacks.d.ts (74%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/RepairCallbacks.d.ts (93%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/SaveCallbacks.d.ts (88%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/TradeCallbacks.d.ts (94%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/TraderCallbacks.d.ts (92%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/WeatherCallbacks.d.ts (84%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/callbacks/WishlistCallbacks.d.ts (92%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/BotController.d.ts rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/CustomizationController.d.ts (81%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/DialogueController.d.ts (79%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/GameController.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/HandbookController.d.ts (74%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/HealthController.d.ts (63%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/HideoutController.d.ts (51%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InraidController.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/InsuranceController.d.ts (63%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/InventoryController.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/LauncherController.d.ts (74%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/LocationController.d.ts (79%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/MatchController.d.ts rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/NoteController.d.ts (88%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/NotifierController.d.ts (80%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/PresetBuildController.d.ts (86%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/PresetController.d.ts (74%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/ProfileController.d.ts (66%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/QuestController.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/RagfairController.d.ts (73%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/RepairController.d.ts (74%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/RepeatableQuestController.d.ts (91%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/TradeController.d.ts (85%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/TraderController.d.ts (77%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/WeatherController.d.ts (62%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/controllers/WishlistController.d.ts (92%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/di/Container.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/di/OnLoad.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/di/OnLoadOnUpdate.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/di/OnUpdate.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/di/Router.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/di/Serializer.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotGenerator.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/generators/BotInventoryGenerator.d.ts (58%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotLootGenerator.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotWeaponGenerator.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/generators/LocationGenerator.d.ts (54%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/generators/PMCLootGenerator.d.ts (56%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/PlayerScavGenerator.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/generators/RagfairAssortGenerator.d.ts (64%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/generators/RagfairOfferGenerator.d.ts (55%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/WeatherGenerator.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/AssortHelper.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotGeneratorHelper.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotHelper.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/ContainerHelper.d.ts (74%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/DialogueHelper.d.ts (58%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/DurabilityLimitsHelper.d.ts rename Live/{CWX_DeSharpener/server => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/ExtendedProfileHelper.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/GameEventHelper.d.ts (76%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/HandbookHelper.d.ts (95%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HealthHelper.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/HideoutHelper.d.ts (51%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HttpServerHelper.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/InRaidHelper.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/InventoryHelper.d.ts (70%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/ItemHelper.d.ts (63%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/NotificationSendHelper.d.ts (83%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/NotifierHelper.d.ts (89%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/PaymentHelper.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/PresetHelper.d.ts (66%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ProbabilityHelper.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/ProfileHelper.d.ts (67%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/QuestConditionHelper.d.ts (76%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/QuestHelper.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/RagfairHelper.d.ts (74%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/RagfairOfferHelper.d.ts (58%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/RagfairSellHelper.d.ts (69%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/RagfairServerHelper.d.ts (61%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairSortHelper.d.ts rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/RagfairTaxHelper.d.ts (62%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RepairHelper.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/SecureContainerHelper.d.ts (90%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/TradeHelper.d.ts (73%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderAssortHelper.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderHelper.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/UtilityHelper.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/helpers/WeightedRandomHelper.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/ide/BleedingEdgeEntry.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/ide/Compiler.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/ide/DebugEntry.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/ide/ReleaseEntry.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/ide/TestEntry.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/loaders/BundleLoader.d.ts (80%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/loaders/DelayedModLoader.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/loaders/InitialModLoader.d.ts (100%) rename Live/CWX_WeatherPatcher/{server/types/loaders/DelayedModLoader.d.ts => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostAkiModLoader.d.ts} (51%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostDBModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PreAkiModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/common/MinMax.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/bot/IGenerateBotsRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/IEmptyRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/IGlobals.d.ts (99%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/ILocation.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/ILocationBase.d.ts (94%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/ILocationsSourceDestinationBase.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/ILooseLoot.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/IMetricsTableData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IPmcData.d.ts rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/MemberCategory.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/request/IBaseInteractionRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IPmcData.d.ts => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotBase.d.ts} (88%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/IBotCore.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/IBotType.d.ts (90%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/ICustomizationItem.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/IHandbookBase.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/IItem.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/ILocationsBase.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/ILootBase.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IMatch.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IProfileTemplate.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/IQuest.d.ts (94%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/IRepeatableQuests.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ITemplateItem.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/common/tables/ITrader.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/customization/IBuyClothingRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/customization/IWearClothingRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IFriendRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetChatServerListRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetFriendListDataResponse.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IPinDialogRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/IRemoveDialogRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/ISendMessageRequest.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/dialog/ISetDialogReadRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/game/IGameConfigResponse.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/game/IGameEmptyCrcRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IReportNicknameRequestData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/game/IVersionValidateRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/Effect.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/health/IHealthTreatmentRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/health/IOffraidEatRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/health/IOffraidHealRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/health/ISyncHealthRequestData.d.ts (100%) rename Live/{CWX_DeSharpener/server => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/HideoutAreasEnum.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutArea.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutProduction.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts (100%) rename Live/{CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutScavCase.d.ts (85%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutSettingsBase.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/httpResponse/IGetBodyResponseData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/httpResponse/INullResponseData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inRaid/ISaveProgressRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/insurance/IInsureRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IAddItemRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryAddRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryBindRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryExamineRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryFoldRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryMergeRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryMoveRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventorySortRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventorySplitRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventorySwapRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryTagRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryToggleRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/inventory/IInventoryTransferRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts (100%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/itemEvent/IItemEventRouterBase.d.ts (96%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/launcher/IChangeRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/launcher/ILoginRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/launcher/IMiniProfile.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/launcher/IRegisterData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/launcher/IRemoveProfileData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/location/IGetLocationRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/ICreateGroupRequestData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/match/IEndOfflineRaidRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/match/IGetProfileRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchResult.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IPutMetricsRequestData.d.ts rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/match/IStartOffineRaidRequestData.d.ts (74%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IUpdatePingRequestData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/notes/INoteActionData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/notifier/INotifier.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/notifier/ISelectProfileRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts (88%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/profile/IAkiProfile.d.ts (92%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/profile/IProfileCreateRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/profile/ISearchFriendRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/profile/ISearchFriendResponse.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/profile/IValidateNicknameRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/quests/IAcceptQuestRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/quests/ICompleteQuestRequestData.d.ts (85%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/quests/IHandoverQuestRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/quests/IListQuestsRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/IAddOfferRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/IExtendOfferRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/IGetItemPriceResult.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/IGetOffersResult.d.ts (80%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/IRagfairOffer.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/ragfair/ISearchRequestData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/repair/IRepairActionDataRequest.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/trade/IProcessSellTradeRequestData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/weather/IWeatherData.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/eft/wishlist/IWishlistActionData.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/AmmoTypes.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/BaseClasses.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotAmount.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotDifficulty.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/ConfigTypes.d.ts (83%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ContainerTypes.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/ELocationName.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/EquipmentSlots.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/HideoutAreas.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/MemberCategory.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/MessageType.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/Money.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestRewardType.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestStatus.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/RaidMode.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/SkillTypes.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/enums/Traders.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostAkiLoadMod.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostDBLoadMod.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPreAkiLoadMod.d.ts rename Live/{CWX_DeSharpener/server => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/external/mod.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/external/tsyringe.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/bindings/Route.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/BotLootCache.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IBotCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IBundleCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/ICustomizationCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IDataCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IDialogueCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IGameCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IHandbookCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IHealthCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IHideoutCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IHttpCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IInraidCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IInsuranceCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IInventoryCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IItemEventCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/ILauncherCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/ILocationCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IMatchCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IModCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/INoteCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/INotifierCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IPresetCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IProfileCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IQuestCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IRagfairCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IRepairCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/ISaveCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/ITradeCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/ITraderCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IWeatherCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/callbacks/IWishlistCallbacks.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IAirdropConfig.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IBaseConfig.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IBotConfig.d.ts (75%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/ICoreConfig.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IHealthConfig.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHideoutConfig.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IHttpConfig.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IInRaidConfig.d.ts (95%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IInsuranceConfig.d.ts (75%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IInventoryConfig.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ILocaleConfig.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/ILocationConfig.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IMatchConfig.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IPlayerScavConfig.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IQuestConfig.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IRagfairConfig.d.ts (94%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IRepairConfig.d.ts (66%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IScavCaseConfig.d.ts rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/ITraderConfig.d.ts (59%) rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/config/IWeatherConfig.d.ts (86%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/controllers/IBotController.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/generators/IBotGenerator.d.ts (83%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/generators/ILocationGenerator.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/generators/IPMCLootGenerator.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/generators/IRagfairAssortGenerator.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/generators/IRagfairOfferGenerator.d.ts (100%) rename Live/{CWX_DeSharpener/server => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/helpers/Traders.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogBackgroundColor.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogTextColor.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/SptLogger.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/mod/IMod.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/mod/IModLoader.d.ts (87%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/mod/IPackageJsonData.d.ts (84%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/NewItemDetails.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/ragfair/IRagfairServerPrices.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/server/IDatabaseTables.d.ts (69%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/server/IHttpServer.d.ts (94%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/server/ILocaleBase.d.ts (97%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/server/ILocations.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/server/IServerBase.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/server/ISettingsBase.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomPreset.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomTraderAssortData.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/utils/IAsyncQueue.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/utils/ICommand.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/utils/ILogger.d.ts (59%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/models/spt/utils/IUuidGenerator.d.ts (100%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/HttpRouter.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/ImageRouter.d.ts (88%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/ItemEventRouter.d.ts (72%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/BotDynamicRouter.d.ts (83%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/BundleDynamicRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/CustomizationDynamicRouter.d.ts (81%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/DataDynamicRouter.d.ts (83%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/HttpDynamicRouter.d.ts (83%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/InraidDynamicRouter.d.ts (84%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/LocationDynamicRouter.d.ts (84%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/NotifierDynamicRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/dynamic/TraderDynamicRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/CustomizationItemEventRouter.d.ts (90%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/HealthItemEventRouter.d.ts (92%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/HideoutItemEventRouter.d.ts (92%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/InsuranceItemEventRouter.d.ts (91%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/InventoryItemEventRouter.d.ts (91%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/NoteItemEventRouter.d.ts (92%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/PresetBuildItemEventRouter.d.ts (91%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/QuestItemEventRouter.d.ts (56%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/RagfairItemEventRouter.d.ts (92%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/RepairItemEventRouter.d.ts (92%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/TradeItemEventRouter.d.ts (92%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/item_events/WishlistItemEventRouter.d.ts (91%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/save_load/HealthSaveLoadRouter.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/save_load/InraidSaveLoadRouter.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/save_load/InsuranceSaveLoadRouter.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/save_load/ProfileSaveLoadRouter.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/serializers/BundleSerializer.d.ts (87%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/serializers/ImageSerializer.d.ts (90%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/serializers/NotifySerializer.d.ts (69%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/BotStaticRouter.d.ts (83%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/BundleStaticRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/CustomizationStaticRouter.d.ts (81%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/DataStaticRouter.d.ts (83%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/DialogStaticRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/GameStaticRouter.d.ts (83%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/HealthStaticRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/InraidStaticRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/InsuranceStaticRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/ItemEventStaticRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/LauncherStaticRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/LocationStaticRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/MatchStaticRouter.d.ts (83%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/NotifierStaticRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/PresetStaticRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/ProfileStaticRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/QuestStaticRouter.d.ts (83%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/RagfairStaticRouter.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/TraderStaticRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/routers/static/WeatherStaticRouter.d.ts (82%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/servers/ConfigServer.d.ts (75%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/servers/DatabaseServer.d.ts (80%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/servers/HttpServer.d.ts (63%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/servers/RagfairServer.d.ts (67%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/servers/SaveServer.d.ts (74%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotLootCacheService.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/FenceService.d.ts (66%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/HashCacheService.d.ts (71%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/InsuranceService.d.ts (59%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/LocaleService.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/MatchLocationService.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ModCompilerService.d.ts rename Live/{CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/NotificationService.d.ts (72%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/PaymentService.d.ts (65%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/PlayerService.d.ts (91%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ProfileFixerService.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairCategoriesService.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairLinkedItemService.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/RagfairOfferService.d.ts (57%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairPriceService.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/RagfairRequiredItemsService.d.ts (71%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/TraderAssortService.d.ts (78%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/CustomItemService.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/image/imageRouteService.d.ts (79%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/onLoad/OnLoadMod.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/onLoad/OnLoadModService.d.ts (82%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/onUpdate/OnUpdateMod.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/onUpdate/OnUpdateModService.d.ts (84%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/staticRouter/StaticRouterMod.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/services/mod/staticRouter/StaticRouterModService.d.ts (86%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/App.d.ts (51%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/AyncQueue.d.ts (85%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/DatabaseImporter.d.ts (52%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/HashUtil.d.ts (91%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/HttpResponseUtil.d.ts (91%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/JsonUtil.d.ts (85%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Logger.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/MathUtil.d.ts (100%) rename Live/{CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0 => CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/ObjectId.d.ts (55%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/RandomUtil.d.ts (99%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/TimeUtil.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/UUidGenerator.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/VFS.d.ts (95%) create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Watermark.d.ts create mode 100644 Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/collections/lists/LinkedList.d.ts rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/decorators/Singleton.d.ts (100%) rename Live/CWX_WeatherPatcher/{CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0 => CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1}/types/utils/decorators/constructor.d.ts (100%) delete mode 100644 Live/CWX_WeatherPatcher/GlobalSuppressions.cs create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/generators/ScavCaseRewardGenerator.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/helpers/ProbabilityHelper.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/loaders/PostAkiModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/loaders/PostDBModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/loaders/PreAkiModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/common/MinMax.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IMatch.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/health/Effect.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchResult.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotAmount.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotDifficulty.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestRewardType.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestStatus.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/RaidMode.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostAkiLoadMod.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostDBLoadMod.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/external/IPreAkiLoadMod.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/BotLootCache.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ILocaleConfig.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IScavCaseConfig.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogTextColor.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/SptLogger.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomPreset.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/services/BotLootCacheService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/services/LocaleService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/services/ProfileFixerService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/dist/types/utils/collections/lists/LinkedList.d.ts delete mode 100644 Live/CWX_WeatherPatcher/server/types/Utils.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/context/ApplicationContext.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/context/ContextVariable.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/context/ContextVariableType.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/generators/PlayerScavGenerator.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/generators/ScavCaseRewardGenerator.d.ts delete mode 100644 Live/CWX_WeatherPatcher/server/types/helpers/ExtendedProfileHelper.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/helpers/ProbabilityHelper.d.ts delete mode 100644 Live/CWX_WeatherPatcher/server/types/loaders/InitialModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/loaders/PostAkiModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/loaders/PostDBModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/loaders/PreAkiModLoader.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/common/MinMax.d.ts delete mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/common/MemberCategory.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IMatch.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IProfileTemplate.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/game/IReportNicknameRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/health/Effect.d.ts delete mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/hideout/HideoutAreasEnum.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/match/ICreateGroupRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchResult.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/match/IPutMetricsRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/match/IUpdatePingRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/AmmoTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/BotAmount.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/BotDifficulty.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/ContainerTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/QuestRewardType.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/QuestStatus.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/RaidMode.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/SkillTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/enums/WeaponSkillTypes.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/external/IPostAkiLoadMod.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/external/IPostDBLoadMod.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/external/IPreAkiLoadMod.d.ts delete mode 100644 Live/CWX_WeatherPatcher/server/types/models/external/mod.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/bots/BotLootCache.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/bots/GenerateWeaponResult.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/config/ILocaleConfig.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/config/IPlayerScavConfig.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/config/IScavCaseConfig.d.ts delete mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/helpers/Traders.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogBackgroundColor.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogTextColor.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/logging/SptLogger.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/mod/NewItemDetails.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomPreset.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomTraderAssortData.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/services/BotEquipmentFilterService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/services/BotLootCacheService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/services/LocaleService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/services/ProfileFixerService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/services/mod/CustomItemService.d.ts create mode 100644 Live/CWX_WeatherPatcher/server/types/utils/collections/lists/LinkedList.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/bepInEx/plugins/CWX-BushWhacker.dll deleted file mode 100644 index d9f41e92a88b469716ed286a5dce7e9fcc288e94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5632 zcmeHKeQX>@6@Rn$VaJK>_-rRl?IxQzX)kfS*oo6NA*E;gZ0Cr-VqZRMi1*HGdz-!8 z%kExcN2DaGLP`MqDi9J-CH&s( zp6?RVMo1M>CFXA4%=?%(Z{C}EGdp_X3Pp%0ihBDt(JN@Vq$GTAZ~^RwP1hUfx z`5%>MyGdKr)uJ29L5T;{=ey9Vs3}yUwX&}Sb~7OqBf0x2<{OJX@UPbcfG5`)+6_z=m1stD zJvR?b+Ll6x10~mkHY_PvuepZhK#*;v8C2HQf?8ElMEzB$?4D!4qOffW#VEA}Q`8X& zN&W9Zb9aQ=F%09I==D}~l2~D#3%t0gC5edE)pb&Q#}-P)IBGk#D9J_;X~)Cl!T<3j z76+`YTcOh!gk>~Q5}nQ@x}9|tcbXxv`q6!$B}5WStXo61U277tTdf%1))ecUtxaO$ zx@}$c4^~mflIvCy_a@h`ByLUKx02ZCK7b`8H-O{a4^aOptsu!QGzwSisECs+2${-)EZ0Bv(S8x`7T$YjdbMtCclYj|y(}6d3vfT; z((x403utGse>g>k0*TznxCr(T8OgW^J@k*+~J zPKU&0B~EQh0`#kb;gb?xmhev!?gOl&7ZeAQitNYGZ=l~RnP>z36);Zs(<79igOQWU zFga4Qpr0xUnuO=#^fvl&`l5teBRtFNfa~ZVksBC!o*oBf4K%EyMDzyWYYM}+z>U*4 z6dwBw#_~#d?Yv6ry}36-UOOmp--;ENLbG98Nk0N6!|ed@k* zm{ZWR0YZz@;d!S?7C z^xuwr36ihT^CZM?B40)RIT!gRXCX+o)1>kuxUJ$U#-^e#(kf9e;&f5YqS0#l32D?! zzW{8bKLd8q-vK)*Ei~Fq#{oY~vw#E0M;aZJbnI1;q9^DRB2Rg`DB7u;YbAFLcy3db)N~j()>Id*XJWg}{VmT|;zJveP8Gh@#=Zb4^{>ejnT4LJ6kIbU+6Tt&%%Qz)92Bu*NZz9@TM zgOl{Jb3pb4>Cq~LI2PD+2g)5gFc_&a1Unx%mM~`*&m%N3e3wr*P z;cBy%6)K>ttJ@yCQ0@eO8S6KS8GFJiVZRWET5gXJztg5=Qv3_cX*tl{2mC-35L$NP>;TApEekkY0;ZzBL^-Yb*Jz6hdfxKoCE z#>^XDxEbLa_=HhYo*H%tuzu`yu!bxh_bB#>ubZ|f&tz}{q+jN-IYSgS$w-a6X=6?= zSw038ijHmAz7#F$Zn-;9a%F$Y*Il2o4krl2<%}`LPgd#S!9`l$OGD-&=a;r|WWZr$ z?*if6k&m7WXwWPk4s&GUC6EKgG^%HO8Kax+Z_M02QA}OT@4LGF(!|#&stQpXQAxzm zX=-A$A+AP5LqkKfMkMy&T1p&m`dE#sB=m+RV{=VyYhq9&GObOcfZQGuN(CrNe664d zHsWCmcH>$hSbQV3CQbv!gRyv^^YCWiQcF}tCXPuZ=q8pJoQF*futsTM!mSMT~N}{vdrWZX6Z{~h;R#!QkOZZlx`8!c-Q&ClTA=erZ~Kh zFl~?4gU4ETK$i$^Dz-%v)SPz;TK?>!mcxEK8yvt!;9XUCtVi3$!?|1^ed2E=-ajDVG1po83`@HYW>lPw>Et4{I3q)ICwB&hhI^= zf@ip|a&KiRe{BVvleo~*mNkl_8{D{tA#+^7y}b=u?sm&cmG3Ks-;YH2`nhnYTHeBh zH_l2r%N;;HmLhtGgCCZ6lwS0XAQPMf9KHE>Y+zMVyJVVgq z_HhO%{Hm!^D`{y!0j->2hGb?jpwq_7){*?Ja#R*v9aImQM@QB%!L=nHUlq}5C>1hK zx!~9|{~t6xDrLH{?%>ypoCP0H3SJU;4?4(oMLEY3Rup7Do?w8E(lP47$94&`F92Hr zH&3Tz{$qdf__F0`P(5(jj^Z75-b+t6GE7C!5vkp)T4xVlnq0eO<#}5m&z|DE?4s4- zn~LS{J)ee5ZsA9Gqbtxe0v+>G1AC%~mprdv9&1I0mj_@%&Nm*?*~>g%dEJchU2!je zRpt%+J^_6WY$?HKewFq2(!=|gzh~|of4A2vJ|lWm`nM0!@nB~G(YLTl6+4f;SMhXZ Z4Ey>6R@C5I`74io!0i6Nx$lby{tekSnHm59 diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotLootGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotLootGenerator.d.ts deleted file mode 100644 index 2295f51..0000000 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotLootGenerator.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotLootCacheService } from "../services/BotLootCacheService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotLootGenerator { - protected logger: ILogger; - protected hashUtil: HashUtil; - protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; - protected handbookHelper: HandbookHelper; - protected botGeneratorHelper: BotGeneratorHelper; - protected botLootCacheService: BotLootCacheService; - protected configServer: ConfigServer; - protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; - protected getRandomisedCount(min: number, max: number, nValue: number): number; - protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotWeaponGenerator.d.ts deleted file mode 100644 index 80dc37c..0000000 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotWeaponGenerator.d.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -export declare class BotWeaponGenerator { - protected jsonUtil: JsonUtil; - protected logger: ILogger; - protected hashUtil: HashUtil; - protected databaseServer: DatabaseServer; - protected itemHelper: ItemHelper; - protected weightedRandomHelper: WeightedRandomHelper; - protected botGeneratorHelper: BotGeneratorHelper; - protected randomUtil: RandomUtil; - private readonly modMagazineSlotId; - constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** - * Get the mods necessary to kit out a weapon to its preset level - * @param weaponTpl weapon to find preset for - * @param equipmentSlot the slot the weapon will be placed in - * @param weaponParentId - * @returns array of weapon mods - */ - protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; - /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * @param weaponMods - * @param weaponTemplate - * @param magCounts - * @param ammoTpl - * @param inventory - * @returns - */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; - /** - * Get a randomised number of bullets for a specific magazine - * @param magCounts min and max count of magazines - * @param magTemplate magazine to generate bullet count for - * @returns bullet count number - */ - protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; - /** - * Get a randomised count of magazines - * @param magCounts min and max value returned value can be between - * @returns numberical value of magazine count - */ - protected getRandomisedMagazineCount(magCounts: MinMax): number; - /** - * Add ammo to the secure container - * @param stackCount How many stacks of ammo to add - * @param ammoTpl Ammo type to add - * @param stackSize Size of the ammo stack to add - * @param inventory Player inventory - */ - protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; - /** - * Get a weapons magazine tpl from a weapon template - * @param weaponMods mods from a weapon template - * @param weaponTemplate Weapon to get magazine tpl for - * @returns magazine tpl string - */ - protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; - protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; - /** - * Finds and returns compatible ammo tpl - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns compatible ammo tpl - */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; - /** - * Fill existing magazines to full, while replacing their contents with specified ammo - * @param weaponMods - * @param magazine - * @param ammoTpl - */ - protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; - /** - * Fill each Camora with a bullet - * @param weaponMods Weapon mods to find and update camora mod(s) from - * @param magazineId magazine id to find and add to - * @param ammoTpl ammo template id to hydate with - */ - protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/InRaidHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/InRaidHelper.d.ts deleted file mode 100644 index 58e0f6a..0000000 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/InRaidHelper.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { InventoryHelper } from "./InventoryHelper"; -import { PaymentHelper } from "./PaymentHelper"; -export declare class InRaidHelper { - protected logger: ILogger; - protected saveServer: SaveServer; - protected jsonUtil: JsonUtil; - protected databaseServer: DatabaseServer; - protected inventoryHelper: InventoryHelper; - protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - protected removePlayer(sessionID: string): void; - protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; - addUpdToMoneyFromRaid(items: Item[]): void; - /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims - */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; - /** - * Clear pmc inventory of all items except those that are exempt - * @param pmcData Player profile - * @param sessionID Session id - * @returns Player profile with pmc inventory cleared - */ - deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; - /** - * Does the provided items slotId mean its kept on the player after death - * @param slotId slotid of item to check - * @returns true if item is kept after death - */ - isItemKeptAfterDeath(slotId: string): boolean; - getPlayerGear(items: Item[]): Item[]; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotBase.d.ts deleted file mode 100644 index 677fd49..0000000 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotBase.d.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; -export interface IBotBase { - _id: string; - aid: string; - savage: any; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: any; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: any[]; - Hideout: Hideout; - Bonuses: Bonus[]; -} -export interface Info { - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: number; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - NeedWipeOptions: any[]; - lastCompletedWipe: any; - BannedState: boolean; - BannedUntil: number; - IsStreamerModeAvailable: boolean; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: any[]; - Mastering: any[]; - Points: number; -} -export interface Stats { - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; -} -export interface SessionCounters { - Items: any[]; -} -export interface OverallCounters { - Items: any[]; -} -export interface ConditionCounters { - Counters: any[]; -} -export interface Hideout { - Production: Production; - Areas: Area[]; -} -export interface Production { -} -export interface Area { - type: number; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: any[]; - lastRecipe: any; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHideoutConfig.d.ts deleted file mode 100644 index 4658fa6..0000000 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHideoutConfig.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IBaseConfig } from "./IBaseConfig"; -export interface IHideoutConfig extends IBaseConfig { - kind: "aki-hideout"; - runIntervalSeconds: number; - scavCase: ScavCase; - fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/TimeUtil.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/TimeUtil.d.ts deleted file mode 100644 index 9733be9..0000000 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/TimeUtil.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export declare class TimeUtil { - static readonly oneHourAsSeconds = 3600; - formatTime(date: Date): string; - formatDate(date: Date): string; - getDate(): string; - getTime(): string; - getTimestamp(): number; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/bepInEx/plugins/CWX-BushWhacker.dll b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/bepInEx/plugins/CWX-BushWhacker.dll new file mode 100644 index 0000000000000000000000000000000000000000..bf35270a6c796368df5009a7d293a68e838edd6d GIT binary patch literal 6144 zcmeHLYiu0V6+U-%y|y>;I=i+LNJ27+6IkMSy3PXvw5ea~WQ$*TH%@3>Ipg)%9x^+# z%*-Y>>LXA{n@X(^YO7YQD&PmI)CyIoQbQjSr4@Y$QiP}~B&aB=5U8q9sZ`MlIsML^ z*+(26s#H}%;;!zw_dM=7=bn4+V|MJ5_fv$3qNtZH5nVvbrC-AL24}%eZ2w7ue$@KR zjtgS+nH_~C(^Jc?v*_w2wW!;+Q-#kwAJB>yjpVR4Xv#$zAIEcnI#$(5&HZe zuDw{b_A>2M*NF_#22f%F^`eGWMeRprjtZy*elsByBRU(;r#30RW!#4fAO%D$z;J z_1q$e(zkwec%f3L4W%F6Yp!8A5M*EJBr5CLh}uy4i3S@`*?pAbio(7r)I=9{5{Qb2Akv;2$V2>N zX)F@3Eg6NL!yrr}NojO?(&+ZY(~#*&BM3d~sM+a&?E0STQ%brMy*6rfy3o4Uz*ri# z;~mjtbZ;xQrZ)kBR}j1kz21v|YELPv8=-NFb2YPGq?ogr2Q(cTgt1gpdJAJQO2&HE zr&?FL;Ov%UYmbqPr7^wu?%uX*8_45nm|RP|DZTAV;;uA%xMp~}dkcHK9UM;u=xF{w znZ5OLvn|Qyj@C^b>r$=h9dIMLZdIU*jEK+nZcVnl8?Q%f>WC-fd*g^!Ez(WtZj8J6 zvDHhL5bUPajaaj4u=fxR90*brbEX?mkD($DWWlmf3H2CO;z`sh9jUSlItjyRF#icG z6qqQS^QRAJ8Et=Nf8R|^X(9{oGsuHo<0{lg&?jE$9IpAF2lQ`0;w6uap{}%gsZ?Sa*N1mU2{=hlu3;U0Jk^E+~ zFpY9i3A~NbtK#uUjK&p){o;{GJG}r8V{}S9q{Qf;vKRDU3x@Yf_>hD#NiU!urze&3 zklZT!+tE*uh&a&%wE@OxGu?2-zSdi1&MkdW6xAd0_H&PDoU zpRse1bCCgHQJPd)>{qlvuL56|*f;1*^sm6~me{$g9)wLnUk)(39WxR1%~0~S2uuEe z!%bDmR(dcZa6It1s{!M5J>UlFlkg@92PDi%c$j8*`<=y7@kvv?f&kS1Ny zbvliizd)GaOQIY6#v=>(X2zV{D?IlZj6uHA1?v~ayT1Rh?MjiAP;1=2> zH0mZ5u!n5G{qzOETj;BRL-cLHTO~aY*iWCLM?{f|^nJ0FGIS3;K#yT=Pf+wMXJn9r z2qMZo$ci901NDZoj#IOz5EYcCZWE_XoJRLFoF~eVSWUrvRi#0rJvk|J>quj9Rl^su# zrz*B@mW;wm**L1(^ALn4#ztJH6jF}aroWQ47fsuM7p@U_NsZ*mr4`RCdLakKXKlFF zC_*EqJwGvb2d3anEU<<8#9V^{=LdDqpujt{hUdG^O0HBg=1tva!dzu>k=-8far(_w zKpXHpqcmr&6imO797JFQPdDR?%bK-c@SIu@}t6 ziYw*nN`{hQq7Q5)z8I!tST$*$|f5BX?Q>)^vR<~E`jBw>7 z-8bh<3yW0e@)8`?y=mR5VC_c=TF&;7Zpfe02-+!An=%%{bkd|@Tqe~82{mis%q2(O zHWaL{l&7KNCwd1f-qP_Uy?DxSwRy`56;Q#|ZI44p?1o>%290vgp0p~+B;uu(85H7| z`&4tK=4F^6yfn2%?;Xl7>2A3yJZjo^(!`wS>qX1p?PAUwE)6=%wf-8PIoHE|;X5vA zMTX&a8#eVt8;gOgu9B*830Bx}^M-rcEE-;zn1~bN!>B3u76%8|Ao3op5lhEyjhyjy z)Ar=f4R(W!(IOHxMB$TMwF!6FSkNn$k3prfV;ir=tuV+3n- z+8E~txr}ypnQD18VlI!>o3U(v;=(&If&Eu%d(;3Mr(=1M4 z2d@x|OmGayQ2PS<7R^ZvZ~r#NYZwl@h&J*3;nxRl{ffSS;M^_4M=7cb(GpQfG@+AB zGMb2~5s^qFqRk?85Eo?X(@DKqRZ>PGX=a+&ccro-m6LF+D|wqpjitsE*~x*NJSKot zfuh84?q0KvqH&CA-yj5!+eTff3Lq25Vu2=nys(ZAiUm5OD((XKm1rVGNdO9wDgjpl z`CK5DYm&B_R7#z_Pr~z4$&gQFQ#pLO%;@l$6dWV z?%3JoqEY5^rLg2WXFQf`miNV&psm_?wop5=_J+IfV|WeTsO^K2L}!i3N2H~%j3aA0 zd6Zh?s8YI9Q2W|kr?{Xdd4%F+2eW-zAD)>RJVHU22yRgJMHAFfbV^$B%(6Cz96l3l z@OI$64LHW^SGr;E9N`*I@CO_<~%=A8_F7#rt-si zt?N54OzTqvX9s>c_TV1x0oE~e^Gu(n=En1dfzeTQWMXtUJH?bK12>w9{c9TD45mJu zo#v(&JJOpO#i7U8Y{Pjqv0j)fbyZ7k8zJoVV=*choLr-|N z7c$Ym_5Sv%>wovw%1aN2U!FXnpK)L1-j${Lg&J^XahVQV)))?i;I=mmd5Q+yOS_?E zZCI{U`61<9BEWBUB77pBy<8x8H)h^}&T>alPxKSL&50bAw-tQg(KJrTS->p5I`Wjm zKP}_HbAThkzb^Fi=o_n?>D8BMwf%UgCyKT~t)vbE3TWk%cSN4426Wo^ws0hWmweS0 zz|}$ZaOUbbp-pgY$tU_@bOuU=JilFVY+8H=O^2jR2CwMgcL1j~VnF?flEBN`!5vVR zHdZjB;6`8rLv)-@P%r*$slfUYuqAMdbSk(95HB8I^?Vpq4_x-6e3_r`rzeB+vaV-Z zYWEuE*@yQ$*Nm*ZPMwhFNb!B;qSXz5`et4}O-g`W9xXBJ((U^+?ypaI8OIMGgM5c=qrI%; createNotifierChannel(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/PresetBuildCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/PresetBuildCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/PresetBuildCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/PresetCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/PresetCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/PresetCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/ProfileCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/ProfileCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/ProfileCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/QuestCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/QuestCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/QuestCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/RagfairCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/RagfairCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/RagfairCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/RepairCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/RepairCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/RepairCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/SaveCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/SaveCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/SaveCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/TradeCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/TradeCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/TradeCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/TraderCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/TraderCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/TraderCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/WeatherCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/WeatherCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/WeatherCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/WishlistCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/WishlistCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/callbacks/WishlistCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ApplicationContext.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariable.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariableType.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/BotController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/BotController.d.ts similarity index 95% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/BotController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/BotController.d.ts index 09a1788..5e6f05d 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/BotController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/BotController.d.ts @@ -30,6 +30,6 @@ export declare class BotController { */ getBotDifficulty(type: string, difficulty: string): Difficulty; protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/CustomizationController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/CustomizationController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/CustomizationController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/CustomizationController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/DialogueController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/DialogueController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/DialogueController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/DialogueController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/GameController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/GameController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/GameController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/GameController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/HandbookController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/HandbookController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/HandbookController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/HandbookController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/HealthController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/HealthController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/HealthController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/HealthController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/HideoutController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/HideoutController.d.ts similarity index 68% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/HideoutController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/HideoutController.d.ts index f2930ff..3eefe1a 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/HideoutController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/HideoutController.d.ts @@ -1,14 +1,15 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HideoutArea, IPmcData, Product } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -42,26 +43,59 @@ export declare class HideoutController { protected httpResponse: HttpResponseUtil; protected profileHelper: ProfileHelper; protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; - protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; - protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { - [x: string]: number; - }; - protected getRandomisedScavRewards(rarityItemCounter: { - [x: string]: number; - }): Product[]; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InraidController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InraidController.d.ts similarity index 57% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InraidController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InraidController.d.ts index 7f2036c..b899e7d 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InraidController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InraidController.d.ts @@ -1,7 +1,8 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; @@ -12,20 +13,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { protected saveServer: SaveServer; protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected questHelper: QuestHelper; protected itemHelper: ItemHelper; - protected extendedProfileHelper: ExtendedProfileHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; protected healthHelper: HealthHelper; protected traderHelper: TraderHelper; protected insuranceService: InsuranceService; protected inRaidHelper: InRaidHelper; protected configServer: ConfigServer; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InsuranceController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InsuranceController.d.ts similarity index 98% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InsuranceController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InsuranceController.d.ts index af45442..6895383 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InsuranceController.d.ts @@ -41,5 +41,4 @@ export declare class InsuranceController { * @returns response object to send to client */ cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; - doAbsolutelyNothing(): void; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InventoryController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InventoryController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InventoryController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/InventoryController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/LauncherController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/LauncherController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/LauncherController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/LauncherController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/LocationController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/LocationController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/LocationController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/LocationController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/MatchController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/MatchController.d.ts similarity index 92% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/MatchController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/MatchController.d.ts index 0851ab0..71cb7d3 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/MatchController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/MatchController.d.ts @@ -1,3 +1,4 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; @@ -21,9 +22,10 @@ export declare class MatchController { protected traderHelper: TraderHelper; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; createGroup(sessionID: string, info: ICreateGroupRequestData): any; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/NoteController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/NoteController.d.ts similarity index 92% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/NoteController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/NoteController.d.ts index cc78383..ee70541 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/NoteController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { +export declare class NoteController { protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/NotifierController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/NotifierController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/NotifierController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/NotifierController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/PresetBuildController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/PresetBuildController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/PresetBuildController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/PresetBuildController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/PresetController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/PresetController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/PresetController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/PresetController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/ProfileController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/ProfileController.d.ts similarity index 85% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/ProfileController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/ProfileController.d.ts index b40bb7d..8c89a02 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/ProfileController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -21,9 +22,10 @@ export declare class ProfileController { protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; protected traderHelper: TraderHelper; - protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/QuestController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/QuestController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/QuestController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/QuestController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RagfairController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RagfairController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RagfairController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RagfairController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RepairController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RepairController.d.ts similarity index 97% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RepairController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RepairController.d.ts index 330684d..0e78ef6 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RepairController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RepairController.d.ts @@ -21,7 +21,6 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RepeatableQuestController.d.ts similarity index 99% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RepeatableQuestController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RepeatableQuestController.d.ts index 2bb2aa9..98d05dd 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/RepeatableQuestController.d.ts @@ -4,7 +4,8 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/TradeController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/TradeController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/TradeController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/TradeController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/TraderController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/TraderController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/TraderController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/TraderController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/WeatherController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/WeatherController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/WeatherController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/WeatherController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/WishlistController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/WishlistController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/WishlistController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/controllers/WishlistController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/Container.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/Container.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/Container.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/Container.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/OnLoad.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/OnLoad.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/OnLoad.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/OnLoad.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/OnLoadOnUpdate.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/OnLoadOnUpdate.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/OnLoadOnUpdate.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/OnLoadOnUpdate.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/OnUpdate.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/OnUpdate.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/OnUpdate.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/OnUpdate.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/Router.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/Router.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/Router.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/Router.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/Serializer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/Serializer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/di/Serializer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/di/Serializer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotGenerator.d.ts similarity index 66% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotGenerator.d.ts index 28f05a9..a5fc0ad 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotGenerator.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotGenerator.d.ts @@ -1,13 +1,14 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { Health as PmcHealth } from "../models/eft/common/IPmcData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { Health, Inventory, Skills } from "../models/eft/common/tables/IBotType"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -23,19 +24,30 @@ export declare class BotGenerator { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; protected databaseServer: DatabaseServer; protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; protected botHelper: BotHelper; protected gameEventHelper: GameEventHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); /** - * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config - * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns */ - protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; /** * Get a randomised PMC side based on bot config value 'isUsec' * @returns pmc side as string @@ -46,7 +58,7 @@ export declare class BotGenerator { * @returns IBotBase object */ protected getCloneOfBotBase(): IBotBase; - protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; /** * Log the number of PMCs generated to the debug console */ diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotInventoryGenerator.d.ts similarity index 98% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotInventoryGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotInventoryGenerator.d.ts index 783d0c5..35d1ee8 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotInventoryGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotLootGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotLootGenerator.d.ts new file mode 100644 index 0000000..c6a3f29 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotLootGenerator.d.ts @@ -0,0 +1,124 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; +export declare class BotLootGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotWeaponGenerator.d.ts new file mode 100644 index 0000000..9215214 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/BotWeaponGenerator.d.ts @@ -0,0 +1,173 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class BotWeaponGenerator { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/LocationGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/LocationGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/LocationGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/LocationGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/PMCLootGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/PMCLootGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/PMCLootGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/PMCLootGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/RagfairAssortGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/RagfairAssortGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/RagfairAssortGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/RagfairOfferGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/RagfairOfferGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/RagfairOfferGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/WeatherGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/WeatherGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/generators/WeatherGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/generators/WeatherGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/AssortHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/AssortHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/AssortHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/AssortHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/BotGeneratorHelper.d.ts similarity index 94% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/BotGeneratorHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/BotGeneratorHelper.d.ts index 243e7a8..3cd7256 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/BotGeneratorHelper.d.ts @@ -1,5 +1,5 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; @@ -28,20 +28,13 @@ export declare class BotGeneratorHelper { protected configServer: ConfigServer; protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; /** * Is this magazine cylinder related (revolvers and grenade launchers) * @param magazineParentName the name of the magazines parent * @returns true if it is cylinder related */ magazineIsCylinderRelated(magazineParentName: string): boolean; - /** - * Get a list of non black-listed cartridges from the PMC bot config - * @param modSlot mod item slot - * @param itemModPool - * @returns string array of cartridges PMCs can use - */ - protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; /** * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot * never return true for an item that has 0% spawn chance @@ -53,6 +46,7 @@ export declare class BotGeneratorHelper { protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; /** * Get a list of containers that hold ammo + * e.g. mod_magazine * @returns string array */ protected getAmmoContainers(): string[]; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/BotHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/BotHelper.d.ts similarity index 94% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/BotHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/BotHelper.d.ts index 6b92566..9b89481 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/BotHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/BotHelper.d.ts @@ -1,4 +1,4 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -14,6 +14,7 @@ export declare class BotHelper { protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; /** * Randomise the chance the PMC will attack their own side diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ContainerHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ContainerHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ContainerHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ContainerHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/DialogueHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/DialogueHelper.d.ts similarity index 73% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/DialogueHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/DialogueHelper.d.ts index 9776c6a..e3e2bda 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -15,7 +16,25 @@ export declare class DialogueHelper { protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/DurabilityLimitsHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/DurabilityLimitsHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/DurabilityLimitsHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ExtendedProfileHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ExtendedProfileHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ExtendedProfileHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/GameEventHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/GameEventHelper.d.ts similarity index 88% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/GameEventHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/GameEventHelper.d.ts index b2d6377..7613053 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/GameEventHelper.d.ts @@ -2,7 +2,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HandbookHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HandbookHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HandbookHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HandbookHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HealthHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HealthHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HealthHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HealthHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HideoutHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HideoutHelper.d.ts similarity index 87% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HideoutHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HideoutHelper.d.ts index 76b337f..36e4009 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HideoutHelper.d.ts @@ -1,6 +1,6 @@ -import { Common, HideoutArea, IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; import { Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -30,14 +30,10 @@ export declare class HideoutHelper { protected inventoryHelper: InventoryHelper; protected playerService: PlayerService; protected configServer: ConfigServer; - static BITCOIN_FARM: string; - protected WATER_COLLECTOR: string; - protected BITCOIN: string; - protected EXPEDITIONARY_FUEL_TANK: string; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; @@ -64,5 +60,4 @@ export declare class HideoutHelper { protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HttpServerHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HttpServerHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/HttpServerHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/HttpServerHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/InRaidHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/InRaidHelper.d.ts new file mode 100644 index 0000000..c3cbfbb --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/InRaidHelper.d.ts @@ -0,0 +1,97 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { InventoryHelper } from "./InventoryHelper"; +import { PaymentHelper } from "./PaymentHelper"; +export declare class InRaidHelper { + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; + constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ + addUpdToMoneyFromRaid(items: Item[]): void; + /** + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared + */ + deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; + getPlayerGear(items: Item[]): Item[]; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/InventoryHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/InventoryHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/InventoryHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/InventoryHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ItemHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ItemHelper.d.ts similarity index 97% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ItemHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ItemHelper.d.ts index 4e0eba4..1701c62 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ItemHelper.d.ts @@ -1,4 +1,5 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; import { Item, Repairable } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/NotificationSendHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/NotificationSendHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/NotificationSendHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/NotifierHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/NotifierHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/NotifierHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/NotifierHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/PaymentHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/PaymentHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/PaymentHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/PaymentHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/PresetHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/PresetHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/PresetHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/PresetHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ProbabilityHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ProbabilityHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ProbabilityHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ProfileHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ProfileHelper.d.ts similarity index 82% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ProfileHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ProfileHelper.d.ts index b369000..6c150c8 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -36,4 +37,10 @@ export declare class ProfileHelper { getDefaultCounters(): Stats; protected isWiped(sessionID: string): boolean; protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/QuestConditionHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/QuestConditionHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/QuestConditionHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/QuestHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/QuestHelper.d.ts similarity index 81% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/QuestHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/QuestHelper.d.ts index 0b10135..0f68cd5 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/QuestHelper.d.ts @@ -1,8 +1,9 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; @@ -35,8 +36,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected questConfig: IQuestConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -48,11 +48,17 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; protected processReward(reward: Reward): any[]; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; @@ -83,6 +89,13 @@ export declare class QuestHelper { */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; /** * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks * @param pmcData Player profile @@ -91,7 +104,7 @@ export declare class QuestHelper { * @param sessionID Seession id * @returns array of reward objects */ - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; /** * Get the intel center bonus a player has * @param pmcData player profile diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairOfferHelper.d.ts similarity index 98% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairOfferHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairOfferHelper.d.ts index 5a77e13..8d03bee 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairOfferHelper.d.ts @@ -40,7 +40,7 @@ export declare class RagfairOfferHelper { protected ragfairOfferService: RagfairOfferService; protected localeService: LocaleService; protected configServer: ConfigServer; - protected static TPL_GOODS_SOLD: string; + protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairSellHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairSellHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairSellHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairServerHelper.d.ts similarity index 97% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairServerHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairServerHelper.d.ts index a52306b..e4939d1 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairServerHelper.d.ts @@ -26,7 +26,7 @@ export declare class RagfairServerHelper { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - protected static TPL_GOODS_RETURNED: string; + protected static goodsReturnedTemplate: string; constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairSortHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairSortHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairSortHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairTaxHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RagfairTaxHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RagfairTaxHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RepairHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RepairHelper.d.ts similarity index 95% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RepairHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RepairHelper.d.ts index 545108e..9a3ab29 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/RepairHelper.d.ts @@ -14,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/SecureContainerHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/SecureContainerHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/SecureContainerHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/TradeHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/TradeHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/TradeHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/TradeHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/TraderAssortHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/TraderAssortHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/TraderAssortHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/TraderHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/TraderHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/TraderHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/TraderHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/UtilityHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/UtilityHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/UtilityHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/UtilityHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/WeightedRandomHelper.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/WeightedRandomHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/WeightedRandomHelper.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/helpers/WeightedRandomHelper.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/BleedingEdgeEntry.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/BleedingEdgeEntry.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/BleedingEdgeEntry.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/BleedingEdgeEntry.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/Compiler.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/Compiler.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/Compiler.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/Compiler.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/DebugEntry.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/DebugEntry.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/DebugEntry.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/DebugEntry.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/ReleaseEntry.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/ReleaseEntry.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/ReleaseEntry.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/ReleaseEntry.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/TestEntry.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/TestEntry.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/ide/TestEntry.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/ide/TestEntry.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/BundleLoader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/BundleLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/BundleLoader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/BundleLoader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/DelayedModLoader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/DelayedModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/DelayedModLoader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/InitialModLoader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/InitialModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/InitialModLoader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/InitialModLoader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/PostAkiModLoader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/PostAkiModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/PostAkiModLoader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/PostAkiModLoader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/PostDBModLoader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/PostDBModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/PostDBModLoader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/PostDBModLoader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/PreAkiModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/loaders/PreAkiModLoader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/loaders/PreAkiModLoader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/common/MinMax.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IEmptyRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IEmptyRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IGlobals.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IGlobals.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IGlobals.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILocation.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILocation.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILocation.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILocation.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILocationBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILocationBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILooseLoot.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/ILooseLoot.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/ILooseLoot.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IMetricsTableData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IMetricsTableData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IMetricsTableData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IPmcData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IPmcData.d.ts new file mode 100644 index 0000000..5703e4b --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/IPmcData.d.ts @@ -0,0 +1,3 @@ +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/MemberCategory.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/MemberCategory.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IPmcData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotBase.d.ts similarity index 90% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IPmcData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotBase.d.ts index 56bf07f..0ee468e 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotBase.d.ts @@ -1,9 +1,10 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; +export interface IBotBase { _id: string; aid: string; savage?: string; @@ -18,15 +19,15 @@ export interface IPmcData { BackendCounters: Record; InsuredItems: InsuredItem[]; Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; Quests: Quest[]; TradersInfo: Record; RagfairInfo: RagfairInfo; - WishList: string[]; RepeatableQuests: IPmcDataRepeatableQuest[]; + Bonuses: Bonus[]; + Notes: Notes; CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { EntryPoint: string; @@ -45,12 +46,12 @@ export interface Info { LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; + NeedWipeOptions: any[]; + lastCompletedWipe: LastCompleted; Bans: IBan[]; BannedState: boolean; BannedUntil: number; - NeedWipeOptions: any[]; - lastCompletedWipe: LastCompleted; + IsStreamerModeAvailable: boolean; lastCompletedEvent?: LastCompleted; } export interface Settings { @@ -73,13 +74,6 @@ export declare enum BanType { Friends = 5, ChangeNickname = 6 } -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} export interface Customization { Head: string; Body: string; @@ -130,12 +124,16 @@ export interface Skills { export interface Common { Id: string; Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; } export interface Mastering { Id: string; Progress: number; + max?: number; + min?: number; } export interface Stats { CarriedQuestItems: string[]; @@ -186,6 +184,14 @@ export interface CounterKeyValue { Key: string[]; Value: number; } +export interface ConditionCounters { + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} export interface Aggressor { AccountId: string; ProfileId: string; @@ -245,14 +251,6 @@ export interface LastPlayerStateInfo { Level: number; MemberCategory: string; } -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} export interface BackendCounter { id: string; qid?: string; @@ -272,18 +270,19 @@ export interface Productive { inProgress?: boolean; StartTimestamp?: number; } -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} export interface Production extends Productive { RecipeId: string; SkipTime: number; ProductionTime: number; } +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} export interface HideoutArea { type: HideoutAreas; level: number; @@ -295,32 +294,38 @@ export interface HideoutArea { lastRecipe: string; } export interface HideoutSlot { - item: HideoutItem[]; + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; } export interface HideoutItem { _id: string; _tpl: string; upd?: Upd; } -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 } export interface Quest { qid: string; startTime: number; - status: string; - statusTimers?: StatusTimer; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ completedConditions?: string[]; } -export interface StatusTimer { - AvailableForStart?: number; -} export interface TraderInfo { loyaltyLevel: number; salesSum: number; @@ -333,15 +338,16 @@ export interface RagfairInfo { isRatingGrowing: boolean; offers: IRagfairOffer[]; } -export interface CarExtractCounts { +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; } -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface LastCompleted { - $oid: string; +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotCore.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotCore.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotCore.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotType.d.ts similarity index 90% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotType.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ICustomizationItem.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ICustomizationItem.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IHandbookBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IHandbookBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IItem.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IItem.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IItem.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ILocationsBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ILocationsBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ILootBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ILootBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ILootBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IMatch.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IMatch.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IMatch.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IProfileTemplate.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IProfileTemplate.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IProfileTemplate.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IQuest.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IQuest.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/IRepeatableQuests.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ITemplateItem.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ITrader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/common/tables/ITrader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/common/tables/ITrader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/customization/IBuyClothingRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/customization/IBuyClothingRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/customization/IBuyClothingRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/customization/IWearClothingRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/customization/IWearClothingRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IFriendRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IFriendRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IPinDialogRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IPinDialogRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/ISendMessageRequest.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/ISendMessageRequest.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IGameConfigResponse.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IGameConfigResponse.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IReportNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IReportNicknameRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IReportNicknameRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IVersionValidateRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/game/IVersionValidateRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/Effect.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/Effect.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/Effect.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/Effect.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/IOffraidEatRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/IOffraidEatRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/IOffraidHealRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/IOffraidHealRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/ISyncHealthRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/health/ISyncHealthRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/HideoutAreasEnum.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutArea.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutArea.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutProduction.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutProduction.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 85% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutScavCase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/httpResponse/INullResponseData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/httpResponse/INullResponseData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/insurance/IInsureRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/insurance/IInsureRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IAddItemRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IAddItemRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IAddItemRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IAddItemRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventorySortRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventorySortRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 96% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IChangeRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IChangeRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/ILoginRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/ILoginRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IMiniProfile.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IMiniProfile.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IRegisterData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IRegisterData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IRegisterData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IRemoveProfileData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/launcher/IRemoveProfileData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/location/IGetLocationRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/location/IGetLocationRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/ICreateGroupRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/ICreateGroupRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/ICreateGroupRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IGetGroupStatusRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IGetProfileRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IGetProfileRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IGetProfileRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IGetProfileRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IJoinMatchRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IJoinMatchRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IJoinMatchRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IJoinMatchResult.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IJoinMatchResult.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IJoinMatchResult.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IPutMetricsRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IPutMetricsRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IPutMetricsRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IUpdatePingRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/match/IUpdatePingRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/match/IUpdatePingRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/notes/INoteActionData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/notes/INoteActionData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/notes/INoteActionData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/notifier/INotifier.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/notifier/INotifier.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/notifier/INotifier.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 88% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/GetProfileStatusResponseData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IAkiProfile.d.ts similarity index 94% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IAkiProfile.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IAkiProfile.d.ts index 3e0b319..eaa66c1 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -153,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IProfileCreateRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IProfileCreateRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/ISearchFriendRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/ISearchFriendRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/ISearchFriendResponse.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/ISearchFriendResponse.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IListQuestsRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IListQuestsRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IGetOffersResult.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IRagfairOffer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IRagfairOffer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/ISearchRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/ISearchRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/repair/IRepairActionDataRequest.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/repair/IRepairActionDataRequest.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/weather/IWeatherData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/weather/IWeatherData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/weather/IWeatherData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/wishlist/IWishlistActionData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/wishlist/IWishlistActionData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/AmmoTypes.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/BaseClasses.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/BaseClasses.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/BaseClasses.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/BaseClasses.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/BotAmount.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/BotAmount.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/BotAmount.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/BotAmount.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/BotDifficulty.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/BotDifficulty.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/BotDifficulty.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/BotDifficulty.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/ConfigTypes.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ConfigTypes.d.ts similarity index 88% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/ConfigTypes.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ConfigTypes.d.ts index 1c49e62..61d6f99 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ConfigTypes.d.ts @@ -11,9 +11,11 @@ export declare enum ConfigTypes { LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ContainerTypes.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/ELocationName.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ELocationName.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/ELocationName.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/ELocationName.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/EquipmentSlots.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/EquipmentSlots.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/EquipmentSlots.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/EquipmentSlots.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/HideoutAreas.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/HideoutAreas.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/HideoutAreas.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/HideoutAreas.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/MemberCategory.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/MemberCategory.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/MemberCategory.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/MemberCategory.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/MessageType.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/MessageType.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/MessageType.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/MessageType.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/Money.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/Money.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/Money.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/Money.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/QuestRewardType.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/QuestRewardType.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/QuestRewardType.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/QuestRewardType.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/QuestStatus.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/QuestStatus.d.ts similarity index 81% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/QuestStatus.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/QuestStatus.d.ts index 6335c73..ba65933 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/QuestStatus.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/QuestStatus.d.ts @@ -6,5 +6,6 @@ export declare enum QuestStatus { Success = 4, Fail = 5, FailRestartable = 6, - MarkedAsFailed = 7 + MarkedAsFailed = 7, + Expired = 8 } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/RaidMode.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/RaidMode.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/RaidMode.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/RaidMode.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/SkillTypes.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/Traders.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/Traders.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/Traders.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/Traders.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/IPostAkiLoadMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/IPostAkiLoadMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/IPostAkiLoadMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/IPostDBLoadMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/IPostDBLoadMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/IPostDBLoadMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/IPreAkiLoadMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/IPreAkiLoadMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/IPreAkiLoadMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/mod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/mod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/mod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/mod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/tsyringe.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/tsyringe.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/external/tsyringe.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/external/tsyringe.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/bindings/Route.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bindings/Route.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/bindings/Route.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bindings/Route.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bots/BotLootCache.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/bots/BotLootCache.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bots/BotLootCache.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IBotCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IBotCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IBundleCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IBundleCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IDataCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IDataCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IGameCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IGameCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHealthCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHealthCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHttpCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IHttpCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IInraidCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IInraidCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ILocationCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ILocationCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IMatchCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IModCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IModCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/INoteCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/INoteCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/INotifierCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/INotifierCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IPresetCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IPresetCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IProfileCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IProfileCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IQuestCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IQuestCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IRepairCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IRepairCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ISaveCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ISaveCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ITradeCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ITradeCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ITraderCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/ITraderCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IAirdropConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IAirdropConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IAirdropConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IBaseConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IBaseConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IBaseConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IBotConfig.d.ts similarity index 79% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IBotConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IBotConfig.d.ts index f8cf39b..e171087 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -7,8 +8,11 @@ export interface IBotConfig extends IBaseConfig { lootNValue: LootNvalue; revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -90,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -100,18 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ICoreConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ICoreConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ICoreConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHealthConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHealthConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHealthConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHideoutConfig.d.ts new file mode 100644 index 0000000..36d6246 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHideoutConfig.d.ts @@ -0,0 +1,7 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface IHideoutConfig extends IBaseConfig { + kind: "aki-hideout"; + runIntervalSeconds: number; + fuelDrainRateMultipler: number; + hoursForSkillCrafting: number; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHttpConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IHttpConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IHttpConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IInRaidConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IInRaidConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IInsuranceConfig.d.ts similarity index 75% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IInsuranceConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IInventoryConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IInventoryConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IInventoryConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ILocaleConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ILocaleConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ILocaleConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ILocationConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ILocationConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ILocationConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IMatchConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IMatchConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IMatchConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IQuestConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IQuestConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IQuestConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IRagfairConfig.d.ts similarity index 95% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IRagfairConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IRagfairConfig.d.ts index 8518252..c24e617 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -40,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IRepairConfig.d.ts similarity index 66% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IRepairConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/ITraderConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/ITraderConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IWeatherConfig.d.ts similarity index 86% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IWeatherConfig.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/controllers/IBotController.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/controllers/IBotController.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/controllers/IBotController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IBotGenerator.d.ts similarity index 83% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IBotGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/ILocationGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/ILocationGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IPMCLootGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IPMCLootGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/helpers/Traders.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/helpers/Traders.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/helpers/Traders.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/logging/LogBackgroundColor.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/logging/LogBackgroundColor.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/logging/LogBackgroundColor.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/logging/LogTextColor.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/logging/LogTextColor.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/logging/LogTextColor.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/logging/SptLogger.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/logging/SptLogger.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/logging/SptLogger.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/mod/IMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/IMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/mod/IMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/IMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/mod/IModLoader.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/IModLoader.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/mod/IPackageJsonData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/IDatabaseTables.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/IDatabaseTables.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/IHttpServer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/IHttpServer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/ILocaleBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/ILocaleBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/ILocations.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/ILocations.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/ILocations.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/ILocations.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/IServerBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/IServerBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/IServerBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/ISettingsBase.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/server/ISettingsBase.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/server/ISettingsBase.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/services/CustomPreset.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/services/CustomPreset.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/services/CustomPreset.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/services/CustomTraderAssortData.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/services/CustomTraderAssortData.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/services/CustomTraderAssortData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/IAsyncQueue.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/IAsyncQueue.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/ICommand.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/ICommand.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/ICommand.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/ILogger.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/ILogger.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/ILogger.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/IUuidGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/utils/IUuidGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/HttpRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/HttpRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/HttpRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/HttpRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/ImageRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/ImageRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/ImageRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/ImageRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/ItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/ItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/ItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/ItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/BotDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/BotDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/BotDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/BundleDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/BundleDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/BundleDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/CustomizationDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/CustomizationDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/DataDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/DataDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/DataDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/HttpDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/HttpDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/HttpDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/InraidDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/InraidDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/InraidDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/LocationDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/LocationDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/LocationDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/NotifierDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/NotifierDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/NotifierDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/TraderDynamicRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/dynamic/TraderDynamicRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/dynamic/TraderDynamicRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/CustomizationItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/CustomizationItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/CustomizationItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/HealthItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/HealthItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/HealthItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/HideoutItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/HideoutItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/HideoutItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/InsuranceItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/InsuranceItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/InsuranceItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/InventoryItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/InventoryItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/InventoryItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/NoteItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/NoteItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/NoteItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/PresetBuildItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/PresetBuildItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/QuestItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/QuestItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/QuestItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/RagfairItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/RagfairItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/RagfairItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/RepairItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/RepairItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/RepairItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/TradeItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/TradeItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/TradeItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/WishlistItemEventRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/item_events/WishlistItemEventRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/item_events/WishlistItemEventRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/HealthSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/HealthSaveLoadRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/HealthSaveLoadRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/InraidSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/InraidSaveLoadRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/InraidSaveLoadRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/InsuranceSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/InsuranceSaveLoadRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/ProfileSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/save_load/ProfileSaveLoadRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/serializers/BundleSerializer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/serializers/BundleSerializer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/serializers/BundleSerializer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/serializers/ImageSerializer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/serializers/ImageSerializer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/serializers/ImageSerializer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/serializers/NotifySerializer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/serializers/NotifySerializer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/serializers/NotifySerializer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/BotStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/BotStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/BotStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/BundleStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/BundleStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/BundleStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/CustomizationStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/CustomizationStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/CustomizationStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/DataStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/DataStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/DataStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/DialogStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/DialogStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/DialogStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/GameStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/GameStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/GameStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/HealthStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/HealthStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/HealthStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/InraidStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/InraidStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/InraidStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/InsuranceStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/InsuranceStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/InsuranceStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/ItemEventStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/ItemEventStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/ItemEventStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/LauncherStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/LauncherStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/LauncherStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/LocationStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/LocationStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/LocationStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/MatchStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/MatchStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/MatchStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/NotifierStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/NotifierStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/NotifierStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/PresetStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/PresetStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/PresetStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/ProfileStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/ProfileStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/ProfileStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/QuestStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/QuestStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/QuestStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/RagfairStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/RagfairStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/RagfairStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/TraderStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/TraderStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/TraderStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/WeatherStaticRouter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/routers/static/WeatherStaticRouter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/routers/static/WeatherStaticRouter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/ConfigServer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/ConfigServer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/ConfigServer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/ConfigServer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/DatabaseServer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/DatabaseServer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/DatabaseServer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/DatabaseServer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/HttpServer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/HttpServer.d.ts similarity index 91% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/HttpServer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/HttpServer.d.ts index 5234966..44d802b 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/HttpServer.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/HttpServer.d.ts @@ -1,6 +1,7 @@ /// /// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; @@ -25,8 +26,9 @@ export declare class HttpServer implements IHttpServer { protected httpServerHelper: HttpServerHelper; protected serializers: Serializer[]; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); protected buffers: {}; protected onReceive: {}; protected onRespond: {}; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/RagfairServer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/RagfairServer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/RagfairServer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/RagfairServer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/SaveServer.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/SaveServer.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/SaveServer.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/servers/SaveServer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/BotLootCacheService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/BotLootCacheService.d.ts similarity index 71% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/BotLootCacheService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/BotLootCacheService.d.ts index 72eb332..cc71eee 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/BotLootCacheService.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/BotLootCacheService.d.ts @@ -1,6 +1,6 @@ import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -22,19 +22,42 @@ export declare class BotLootCacheService { * Get the fully created loot array, ordered by price low to high * @param botRole bot to get loot for * @param isPmc is the bot a pmc - * @param lootType what type of loot is needed + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) * @param lootPool the full pool of loot (needed when cache is empty) * @returns ITemplateItem array */ getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; /** * Generate loot for a bot and store inside a private class property - * @param botRole - * @param lootType + * @param botRole bots role (assault / pmcBot etc) * @param lootPool the full pool of loot we use to create the various sub-categories with - * @param isPmc + * @param isPmc Is the bot a PMC (alteres what loot is cached) */ - protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; /** * Check if a bot type exists inside the loot cache * @param botRole role to check for diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/FenceService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/FenceService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/FenceService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/FenceService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/HashCacheService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/HashCacheService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/HashCacheService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/HashCacheService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/InsuranceService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/InsuranceService.d.ts similarity index 81% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/InsuranceService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/InsuranceService.d.ts index 0219816..171bf10 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/InsuranceService.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/InsuranceService.d.ts @@ -22,7 +22,6 @@ export declare class InsuranceService { protected dialogueHelper: DialogueHelper; protected configServer: ConfigServer; protected insured: Record>; - protected templatesById: {}; protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; @@ -32,9 +31,19 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/LocaleService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/LocaleService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/LocaleService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/LocaleService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/MatchLocationService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/MatchLocationService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/MatchLocationService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/MatchLocationService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/ModCompilerService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/ModCompilerService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/ModCompilerService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/ModCompilerService.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/NotificationService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/NotificationService.d.ts similarity index 72% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/NotificationService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/NotificationService.d.ts index 9c6c143..65a84dd 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/NotificationService.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - private messageQueue; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/PaymentService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/PaymentService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/PaymentService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/PaymentService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/PlayerService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/PlayerService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/PlayerService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/PlayerService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/ProfileFixerService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/ProfileFixerService.d.ts similarity index 64% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/ProfileFixerService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/ProfileFixerService.d.ts index 313a907..ed1dec7 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/ProfileFixerService.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/ProfileFixerService.d.ts @@ -1,6 +1,8 @@ import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { Watermark } from "../utils/Watermark"; @@ -29,8 +31,27 @@ export declare class ProfileFixerService { protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; /** * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots * @param pmcProfile diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairCategoriesService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairCategoriesService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairCategoriesService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairCategoriesService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairLinkedItemService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairLinkedItemService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairLinkedItemService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairOfferService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairOfferService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairOfferService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairOfferService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairPriceService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairPriceService.d.ts similarity index 98% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairPriceService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairPriceService.d.ts index e33bbb9..679fe1d 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairPriceService.d.ts @@ -27,6 +27,7 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; /** diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairRequiredItemsService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/RagfairRequiredItemsService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/RagfairRequiredItemsService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/TraderAssortService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/TraderAssortService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/TraderAssortService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/TraderAssortService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/CustomItemService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/image/imageRouteService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/image/imageRouteService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/image/imageRouteService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onLoad/OnLoadMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onLoad/OnLoadMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onLoad/OnLoadMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onLoad/OnLoadMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onLoad/OnLoadModService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onLoad/OnLoadModService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onLoad/OnLoadModService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onUpdate/OnUpdateMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onUpdate/OnUpdateMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onUpdate/OnUpdateMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onUpdate/OnUpdateModService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/onUpdate/OnUpdateModService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/onUpdate/OnUpdateModService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/staticRouter/StaticRouterMod.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/staticRouter/StaticRouterMod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/staticRouter/StaticRouterMod.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/staticRouter/StaticRouterMod.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/staticRouter/StaticRouterModService.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/mod/staticRouter/StaticRouterModService.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/services/mod/staticRouter/StaticRouterModService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/App.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/App.d.ts similarity index 89% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/App.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/App.d.ts index 34c141e..dcc2669 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/App.d.ts +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/App.d.ts @@ -11,4 +11,5 @@ export declare class App { constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/AyncQueue.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/AyncQueue.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/AyncQueue.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/AyncQueue.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/DatabaseImporter.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/DatabaseImporter.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/DatabaseImporter.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/DatabaseImporter.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/HashUtil.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/HashUtil.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/HashUtil.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/HashUtil.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/HttpResponseUtil.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/HttpResponseUtil.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/HttpResponseUtil.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/HttpResponseUtil.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/JsonUtil.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/JsonUtil.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/JsonUtil.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/JsonUtil.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/Logger.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/Logger.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/Logger.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/Logger.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/MathUtil.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/MathUtil.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/MathUtil.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/MathUtil.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/ObjectId.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/ObjectId.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/ObjectId.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/ObjectId.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/RandomUtil.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/RandomUtil.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/RandomUtil.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/RandomUtil.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/TimeUtil.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/TimeUtil.d.ts new file mode 100644 index 0000000..eed4e6d --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/TimeUtil.d.ts @@ -0,0 +1,18 @@ +export declare class TimeUtil { + static readonly oneHourAsSeconds = 3600; + formatTime(date: Date): string; + formatDate(date: Date): string; + getDate(): string; + getTime(): string; + getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/UUidGenerator.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/UUidGenerator.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/UUidGenerator.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/UUidGenerator.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/VFS.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/VFS.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/VFS.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/VFS.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/Watermark.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/Watermark.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/Watermark.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/Watermark.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/decorators/Singleton.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/decorators/Singleton.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/decorators/Singleton.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/decorators/Singleton.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/decorators/constructor.d.ts b/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/decorators/constructor.d.ts similarity index 100% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/utils/decorators/constructor.d.ts rename to Live/CWX_BushWhacker/CWX-BushWhacker 1.2.1/user/mods/CWX-BushWhacker 1.2.1/types/utils/decorators/constructor.d.ts diff --git a/Live/CWX_BushWhacker/CWX_BushWhacker.csproj b/Live/CWX_BushWhacker/CWX_BushWhacker.csproj index 78a5d3f..12d38bc 100644 --- a/Live/CWX_BushWhacker/CWX_BushWhacker.csproj +++ b/Live/CWX_BushWhacker/CWX_BushWhacker.csproj @@ -34,6 +34,9 @@ ..\Shared\EFT\UnityEngine.CoreModule.dll + + ..\..\..\AKI-All\Modules\project\Shared\Managed\UnityEngine.PhysicsModule.dll + diff --git a/Live/CWX_BushWhacker/Plugin.cs b/Live/CWX_BushWhacker/Plugin.cs index 1fa2833..c05d74c 100644 --- a/Live/CWX_BushWhacker/Plugin.cs +++ b/Live/CWX_BushWhacker/Plugin.cs @@ -1,6 +1,4 @@ using BepInEx; -using Comfort.Common; -using EFT; using EFT.Interactive; using System.Linq; using UnityEngine; @@ -18,10 +16,22 @@ namespace BushWhacker public static void DisableBushes() { var bushes = FindObjectsOfType().ToList(); + + var swamps = FindObjectsOfType().ToList(); + + foreach (var swamp in swamps) + { + if (swamp.name == "Swamp_collider") + { + DestroyImmediate(swamp); + } + } + foreach (var bushesItem in bushes) { var filbert = bushesItem?.transform?.parent?.gameObject?.name?.Contains("filbert"); var fibert = bushesItem?.transform?.parent?.gameObject?.name?.Contains("fibert"); + if (filbert == true || fibert == true) { DestroyImmediate(bushesItem); diff --git a/Live/CWX_BushWhacker/server/dist/package.json b/Live/CWX_BushWhacker/server/dist/package.json index 4785d25..5dcfca2 100644 --- a/Live/CWX_BushWhacker/server/dist/package.json +++ b/Live/CWX_BushWhacker/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "BushWhacker", "author": "CWX", - "version": "1.2.0", + "version": "1.2.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.1.1", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_BushWhacker/server/dist/src/mod.ts b/Live/CWX_BushWhacker/server/dist/src/mod.ts index ae9d09d..80863d0 100644 --- a/Live/CWX_BushWhacker/server/dist/src/mod.ts +++ b/Live/CWX_BushWhacker/server/dist/src/mod.ts @@ -1,18 +1,14 @@ import { DependencyContainer } from "tsyringe"; import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -class CWX_MasterKey implements IPreAkiLoadMod +class CWX_BushWhacker implements IPreAkiLoadMod { private pkg; public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } } -module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file +module.exports = { mod: new CWX_BushWhacker() } \ No newline at end of file diff --git a/Live/CWX_BushWhacker/server/dist/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_BushWhacker/server/dist/types/callbacks/NotifierCallbacks.d.ts index cd1e736..c42058f 100644 --- a/Live/CWX_BushWhacker/server/dist/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/callbacks/NotifierCallbacks.d.ts @@ -16,7 +16,7 @@ export declare class NotifierCallbacks { * until we actually have something to send because otherwise we'd spam the client * and the client would abort the connection due to spam. */ - sendNotification(_sessionID: string, req: any, resp: any, _data: any): void; + sendNotification(sessionID: string, req: any, resp: any, data: any): void; getNotifier(url: string, info: any, sessionID: string): IGetBodyResponseData; createNotifierChannel(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_BushWhacker/server/dist/types/context/ApplicationContext.d.ts b/Live/CWX_BushWhacker/server/dist/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/context/ContextVariable.d.ts b/Live/CWX_BushWhacker/server/dist/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/context/ContextVariableType.d.ts b/Live/CWX_BushWhacker/server/dist/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/BotController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/BotController.d.ts index 09a1788..5e6f05d 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/BotController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/BotController.d.ts @@ -30,6 +30,6 @@ export declare class BotController { */ getBotDifficulty(type: string, difficulty: string): Difficulty; protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/HideoutController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/HideoutController.d.ts index f2930ff..3eefe1a 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/HideoutController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/HideoutController.d.ts @@ -1,14 +1,15 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HideoutArea, IPmcData, Product } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -42,26 +43,59 @@ export declare class HideoutController { protected httpResponse: HttpResponseUtil; protected profileHelper: ProfileHelper; protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; - protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; - protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { - [x: string]: number; - }; - protected getRandomisedScavRewards(rarityItemCounter: { - [x: string]: number; - }): Product[]; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/InraidController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/InraidController.d.ts index 7f2036c..b899e7d 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/InraidController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/InraidController.d.ts @@ -1,7 +1,8 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; @@ -12,20 +13,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { protected saveServer: SaveServer; protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected questHelper: QuestHelper; protected itemHelper: ItemHelper; - protected extendedProfileHelper: ExtendedProfileHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; protected healthHelper: HealthHelper; protected traderHelper: TraderHelper; protected insuranceService: InsuranceService; protected inRaidHelper: InRaidHelper; protected configServer: ConfigServer; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/InsuranceController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/InsuranceController.d.ts index af45442..6895383 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/InsuranceController.d.ts @@ -41,5 +41,4 @@ export declare class InsuranceController { * @returns response object to send to client */ cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; - doAbsolutelyNothing(): void; } diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/MatchController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/MatchController.d.ts index 0851ab0..71cb7d3 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/MatchController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/MatchController.d.ts @@ -1,3 +1,4 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; @@ -21,9 +22,10 @@ export declare class MatchController { protected traderHelper: TraderHelper; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; createGroup(sessionID: string, info: ICreateGroupRequestData): any; diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/NoteController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/NoteController.d.ts index cc78383..ee70541 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/NoteController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { +export declare class NoteController { protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/ProfileController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/ProfileController.d.ts index b40bb7d..8c89a02 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/ProfileController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -21,9 +22,10 @@ export declare class ProfileController { protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; protected traderHelper: TraderHelper; - protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/RepairController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/RepairController.d.ts index 330684d..0e78ef6 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/RepairController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/RepairController.d.ts @@ -21,7 +21,6 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/Live/CWX_BushWhacker/server/dist/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_BushWhacker/server/dist/types/controllers/RepeatableQuestController.d.ts index 2bb2aa9..98d05dd 100644 --- a/Live/CWX_BushWhacker/server/dist/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/controllers/RepeatableQuestController.d.ts @@ -4,7 +4,8 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; diff --git a/Live/CWX_BushWhacker/server/dist/types/generators/BotGenerator.d.ts b/Live/CWX_BushWhacker/server/dist/types/generators/BotGenerator.d.ts index 28f05a9..a5fc0ad 100644 --- a/Live/CWX_BushWhacker/server/dist/types/generators/BotGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/generators/BotGenerator.d.ts @@ -1,13 +1,14 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { Health as PmcHealth } from "../models/eft/common/IPmcData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { Health, Inventory, Skills } from "../models/eft/common/tables/IBotType"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -23,19 +24,30 @@ export declare class BotGenerator { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; protected databaseServer: DatabaseServer; protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; protected botHelper: BotHelper; protected gameEventHelper: GameEventHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); /** - * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config - * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns */ - protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; /** * Get a randomised PMC side based on bot config value 'isUsec' * @returns pmc side as string @@ -46,7 +58,7 @@ export declare class BotGenerator { * @returns IBotBase object */ protected getCloneOfBotBase(): IBotBase; - protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; /** * Log the number of PMCs generated to the debug console */ diff --git a/Live/CWX_BushWhacker/server/dist/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_BushWhacker/server/dist/types/generators/BotInventoryGenerator.d.ts index 783d0c5..35d1ee8 100644 --- a/Live/CWX_BushWhacker/server/dist/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/generators/BotInventoryGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; diff --git a/Live/CWX_BushWhacker/server/dist/types/generators/BotLootGenerator.d.ts b/Live/CWX_BushWhacker/server/dist/types/generators/BotLootGenerator.d.ts index 2295f51..c6a3f29 100644 --- a/Live/CWX_BushWhacker/server/dist/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/generators/BotLootGenerator.d.ts @@ -1,8 +1,9 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -10,6 +11,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -17,11 +19,106 @@ export declare class BotLootGenerator { protected databaseServer: DatabaseServer; protected handbookHelper: HandbookHelper; protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; protected getRandomisedCount(min: number, max: number, nValue: number): number; - protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_BushWhacker/server/dist/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_BushWhacker/server/dist/types/generators/BotWeaponGenerator.d.ts index 80dc37c..9215214 100644 --- a/Live/CWX_BushWhacker/server/dist/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/generators/BotWeaponGenerator.d.ts @@ -1,15 +1,19 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { protected jsonUtil: JsonUtil; protected logger: ILogger; @@ -19,19 +23,69 @@ export declare class BotWeaponGenerator { protected weightedRandomHelper: WeightedRandomHelper; protected botGeneratorHelper: BotGeneratorHelper; protected randomUtil: RandomUtil; - private readonly modMagazineSlotId; - constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; /** * Get the mods necessary to kit out a weapon to its preset level * @param weaponTpl weapon to find preset for * @param equipmentSlot the slot the weapon will be placed in - * @param weaponParentId + * @param weaponParentId Value used for the parentid * @returns array of weapon mods */ protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; + protected isWeaponValid(weaponItemArray: Item[]): boolean; /** * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. * Additionally, adds extra bullets to SecuredContainer @@ -40,9 +94,10 @@ export declare class BotWeaponGenerator { * @param magCounts * @param ammoTpl * @param inventory + * @param botRole the bot type we're getting generating extra mags for * @returns */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; /** * Get a randomised number of bullets for a specific magazine * @param magCounts min and max count of magazines @@ -68,18 +123,31 @@ export declare class BotWeaponGenerator { * Get a weapons magazine tpl from a weapon template * @param weaponMods mods from a weapon template * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for * @returns magazine tpl string */ - protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; /** - * Finds and returns compatible ammo tpl - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns compatible ammo tpl + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; /** * Fill existing magazines to full, while replacing their contents with specified ammo * @param weaponMods @@ -87,6 +155,14 @@ export declare class BotWeaponGenerator { * @param ammoTpl */ protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; /** * Fill each Camora with a bullet * @param weaponMods Weapon mods to find and update camora mod(s) from diff --git a/Live/CWX_BushWhacker/server/dist/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_BushWhacker/server/dist/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_BushWhacker/server/dist/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/BotGeneratorHelper.d.ts index 243e7a8..3cd7256 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/BotGeneratorHelper.d.ts @@ -1,5 +1,5 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; @@ -28,20 +28,13 @@ export declare class BotGeneratorHelper { protected configServer: ConfigServer; protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; /** * Is this magazine cylinder related (revolvers and grenade launchers) * @param magazineParentName the name of the magazines parent * @returns true if it is cylinder related */ magazineIsCylinderRelated(magazineParentName: string): boolean; - /** - * Get a list of non black-listed cartridges from the PMC bot config - * @param modSlot mod item slot - * @param itemModPool - * @returns string array of cartridges PMCs can use - */ - protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; /** * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot * never return true for an item that has 0% spawn chance @@ -53,6 +46,7 @@ export declare class BotGeneratorHelper { protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; /** * Get a list of containers that hold ammo + * e.g. mod_magazine * @returns string array */ protected getAmmoContainers(): string[]; diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/BotHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/BotHelper.d.ts index 6b92566..9b89481 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/BotHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/BotHelper.d.ts @@ -1,4 +1,4 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -14,6 +14,7 @@ export declare class BotHelper { protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; /** * Randomise the chance the PMC will attack their own side diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/DialogueHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/DialogueHelper.d.ts index 9776c6a..e3e2bda 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -15,7 +16,25 @@ export declare class DialogueHelper { protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/GameEventHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/GameEventHelper.d.ts index b2d6377..7613053 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/GameEventHelper.d.ts @@ -2,7 +2,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/HideoutHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/HideoutHelper.d.ts index 76b337f..36e4009 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/HideoutHelper.d.ts @@ -1,6 +1,6 @@ -import { Common, HideoutArea, IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; import { Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -30,14 +30,10 @@ export declare class HideoutHelper { protected inventoryHelper: InventoryHelper; protected playerService: PlayerService; protected configServer: ConfigServer; - static BITCOIN_FARM: string; - protected WATER_COLLECTOR: string; - protected BITCOIN: string; - protected EXPEDITIONARY_FUEL_TANK: string; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; @@ -64,5 +60,4 @@ export declare class HideoutHelper { protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/InRaidHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/InRaidHelper.d.ts index 58e0f6a..c3cbfbb 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -15,21 +16,72 @@ export declare class InRaidHelper { protected inventoryHelper: InventoryHelper; protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; /** * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death * @param pmcData Player profile * @param sessionID Session id * @returns Player profile with pmc inventory cleared diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/ItemHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/ItemHelper.d.ts index 4e0eba4..1701c62 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/ItemHelper.d.ts @@ -1,4 +1,5 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; import { Item, Repairable } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/ProfileHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/ProfileHelper.d.ts index b369000..6c150c8 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -36,4 +37,10 @@ export declare class ProfileHelper { getDefaultCounters(): Stats; protected isWiped(sessionID: string): boolean; protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/QuestHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/QuestHelper.d.ts index 0b10135..0f68cd5 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/QuestHelper.d.ts @@ -1,8 +1,9 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; @@ -35,8 +36,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected questConfig: IQuestConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -48,11 +48,17 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; protected processReward(reward: Reward): any[]; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; @@ -83,6 +89,13 @@ export declare class QuestHelper { */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; /** * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks * @param pmcData Player profile @@ -91,7 +104,7 @@ export declare class QuestHelper { * @param sessionID Seession id * @returns array of reward objects */ - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; /** * Get the intel center bonus a player has * @param pmcData player profile diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairOfferHelper.d.ts index 5a77e13..8d03bee 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairOfferHelper.d.ts @@ -40,7 +40,7 @@ export declare class RagfairOfferHelper { protected ragfairOfferService: RagfairOfferService; protected localeService: LocaleService; protected configServer: ConfigServer; - protected static TPL_GOODS_SOLD: string; + protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairServerHelper.d.ts index a52306b..e4939d1 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/RagfairServerHelper.d.ts @@ -26,7 +26,7 @@ export declare class RagfairServerHelper { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - protected static TPL_GOODS_RETURNED: string; + protected static goodsReturnedTemplate: string; constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item diff --git a/Live/CWX_BushWhacker/server/dist/types/helpers/RepairHelper.d.ts b/Live/CWX_BushWhacker/server/dist/types/helpers/RepairHelper.d.ts index 545108e..9a3ab29 100644 --- a/Live/CWX_BushWhacker/server/dist/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/helpers/RepairHelper.d.ts @@ -14,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Live/CWX_BushWhacker/server/dist/types/models/common/MinMax.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/eft/common/IPmcData.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/eft/common/IPmcData.d.ts index 56bf07f..5703e4b 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/eft/common/IPmcData.d.ts @@ -1,347 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage?: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; - NeedWipeOptions: any[]; - lastCompletedWipe: LastCompleted; - lastCompletedEvent?: LastCompleted; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface LastCompleted { - $oid: string; +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_BushWhacker/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_BushWhacker/server/dist/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/eft/profile/IAkiProfile.d.ts index 3e0b319..eaa66c1 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -153,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/enums/AmmoTypes.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/enums/ConfigTypes.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/enums/ConfigTypes.d.ts index 1c49e62..61d6f99 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/enums/ConfigTypes.d.ts @@ -11,9 +11,11 @@ export declare enum ConfigTypes { LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/enums/ContainerTypes.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/enums/QuestStatus.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/enums/QuestStatus.d.ts index 6335c73..ba65933 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/enums/QuestStatus.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/enums/QuestStatus.d.ts @@ -6,5 +6,6 @@ export declare enum QuestStatus { Success = 4, Fail = 5, FailRestartable = 6, - MarkedAsFailed = 7 + MarkedAsFailed = 7, + Expired = 8 } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/enums/SkillTypes.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IBotConfig.d.ts index f8cf39b..e171087 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -7,8 +8,11 @@ export interface IBotConfig extends IBaseConfig { lootNValue: LootNvalue; revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -90,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -100,18 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRagfairConfig.d.ts index 8518252..c24e617 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -40,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_BushWhacker/server/dist/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_BushWhacker/server/dist/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/servers/HttpServer.d.ts b/Live/CWX_BushWhacker/server/dist/types/servers/HttpServer.d.ts index 5234966..44d802b 100644 --- a/Live/CWX_BushWhacker/server/dist/types/servers/HttpServer.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/servers/HttpServer.d.ts @@ -1,6 +1,7 @@ /// /// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; @@ -25,8 +26,9 @@ export declare class HttpServer implements IHttpServer { protected httpServerHelper: HttpServerHelper; protected serializers: Serializer[]; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); protected buffers: {}; protected onReceive: {}; protected onRespond: {}; diff --git a/Live/CWX_BushWhacker/server/dist/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_BushWhacker/server/dist/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/services/BotLootCacheService.d.ts b/Live/CWX_BushWhacker/server/dist/types/services/BotLootCacheService.d.ts index 72eb332..cc71eee 100644 --- a/Live/CWX_BushWhacker/server/dist/types/services/BotLootCacheService.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/services/BotLootCacheService.d.ts @@ -1,6 +1,6 @@ import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -22,19 +22,42 @@ export declare class BotLootCacheService { * Get the fully created loot array, ordered by price low to high * @param botRole bot to get loot for * @param isPmc is the bot a pmc - * @param lootType what type of loot is needed + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) * @param lootPool the full pool of loot (needed when cache is empty) * @returns ITemplateItem array */ getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; /** * Generate loot for a bot and store inside a private class property - * @param botRole - * @param lootType + * @param botRole bots role (assault / pmcBot etc) * @param lootPool the full pool of loot we use to create the various sub-categories with - * @param isPmc + * @param isPmc Is the bot a PMC (alteres what loot is cached) */ - protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; /** * Check if a bot type exists inside the loot cache * @param botRole role to check for diff --git a/Live/CWX_BushWhacker/server/dist/types/services/InsuranceService.d.ts b/Live/CWX_BushWhacker/server/dist/types/services/InsuranceService.d.ts index 0219816..171bf10 100644 --- a/Live/CWX_BushWhacker/server/dist/types/services/InsuranceService.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/services/InsuranceService.d.ts @@ -22,7 +22,6 @@ export declare class InsuranceService { protected dialogueHelper: DialogueHelper; protected configServer: ConfigServer; protected insured: Record>; - protected templatesById: {}; protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; @@ -32,9 +31,19 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; diff --git a/Live/CWX_BushWhacker/server/dist/types/services/NotificationService.d.ts b/Live/CWX_BushWhacker/server/dist/types/services/NotificationService.d.ts index 7e2a127..65a84dd 100644 --- a/Live/CWX_BushWhacker/server/dist/types/services/NotificationService.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - protected messageQueue: {}; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_BushWhacker/server/dist/types/services/ProfileFixerService.d.ts b/Live/CWX_BushWhacker/server/dist/types/services/ProfileFixerService.d.ts index 313a907..ed1dec7 100644 --- a/Live/CWX_BushWhacker/server/dist/types/services/ProfileFixerService.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/services/ProfileFixerService.d.ts @@ -1,6 +1,8 @@ import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { Watermark } from "../utils/Watermark"; @@ -29,8 +31,27 @@ export declare class ProfileFixerService { protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; /** * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots * @param pmcProfile diff --git a/Live/CWX_BushWhacker/server/dist/types/services/RagfairPriceService.d.ts b/Live/CWX_BushWhacker/server/dist/types/services/RagfairPriceService.d.ts index e33bbb9..679fe1d 100644 --- a/Live/CWX_BushWhacker/server/dist/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/services/RagfairPriceService.d.ts @@ -27,6 +27,7 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; /** diff --git a/Live/CWX_BushWhacker/server/dist/types/services/mod/CustomItemService.d.ts b/Live/CWX_BushWhacker/server/dist/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_BushWhacker/server/dist/types/utils/App.d.ts b/Live/CWX_BushWhacker/server/dist/types/utils/App.d.ts index 34c141e..dcc2669 100644 --- a/Live/CWX_BushWhacker/server/dist/types/utils/App.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/utils/App.d.ts @@ -11,4 +11,5 @@ export declare class App { constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_BushWhacker/server/dist/types/utils/TimeUtil.d.ts b/Live/CWX_BushWhacker/server/dist/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_BushWhacker/server/dist/types/utils/TimeUtil.d.ts +++ b/Live/CWX_BushWhacker/server/dist/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_BushWhacker/server/dist/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_BushWhacker/server/dist/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_BushWhacker/server/dist/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_BushWhacker/server/package.json b/Live/CWX_BushWhacker/server/package.json index 4785d25..5dcfca2 100644 --- a/Live/CWX_BushWhacker/server/package.json +++ b/Live/CWX_BushWhacker/server/package.json @@ -1,10 +1,10 @@ { "name": "BushWhacker", "author": "CWX", - "version": "1.2.0", + "version": "1.2.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.1.1", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_BushWhacker/server/src/mod.ts b/Live/CWX_BushWhacker/server/src/mod.ts index ae9d09d..80863d0 100644 --- a/Live/CWX_BushWhacker/server/src/mod.ts +++ b/Live/CWX_BushWhacker/server/src/mod.ts @@ -1,18 +1,14 @@ import { DependencyContainer } from "tsyringe"; import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; -class CWX_MasterKey implements IPreAkiLoadMod +class CWX_BushWhacker implements IPreAkiLoadMod { private pkg; public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } } -module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file +module.exports = { mod: new CWX_BushWhacker() } \ No newline at end of file diff --git a/Live/CWX_BushWhacker/server/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_BushWhacker/server/types/callbacks/NotifierCallbacks.d.ts index cd1e736..c42058f 100644 --- a/Live/CWX_BushWhacker/server/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_BushWhacker/server/types/callbacks/NotifierCallbacks.d.ts @@ -16,7 +16,7 @@ export declare class NotifierCallbacks { * until we actually have something to send because otherwise we'd spam the client * and the client would abort the connection due to spam. */ - sendNotification(_sessionID: string, req: any, resp: any, _data: any): void; + sendNotification(sessionID: string, req: any, resp: any, data: any): void; getNotifier(url: string, info: any, sessionID: string): IGetBodyResponseData; createNotifierChannel(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_BushWhacker/server/types/context/ApplicationContext.d.ts b/Live/CWX_BushWhacker/server/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_BushWhacker/server/types/context/ContextVariable.d.ts b/Live/CWX_BushWhacker/server/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_BushWhacker/server/types/context/ContextVariableType.d.ts b/Live/CWX_BushWhacker/server/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_BushWhacker/server/types/controllers/BotController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/BotController.d.ts index 09a1788..5e6f05d 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/BotController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/BotController.d.ts @@ -30,6 +30,6 @@ export declare class BotController { */ getBotDifficulty(type: string, difficulty: string): Difficulty; protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_BushWhacker/server/types/controllers/HideoutController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/HideoutController.d.ts index f2930ff..3eefe1a 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/HideoutController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/HideoutController.d.ts @@ -1,14 +1,15 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HideoutArea, IPmcData, Product } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -42,26 +43,59 @@ export declare class HideoutController { protected httpResponse: HttpResponseUtil; protected profileHelper: ProfileHelper; protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; - protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; - protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { - [x: string]: number; - }; - protected getRandomisedScavRewards(rarityItemCounter: { - [x: string]: number; - }): Product[]; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; diff --git a/Live/CWX_BushWhacker/server/types/controllers/InraidController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/InraidController.d.ts index 7f2036c..b899e7d 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/InraidController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/InraidController.d.ts @@ -1,7 +1,8 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; @@ -12,20 +13,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { protected saveServer: SaveServer; protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected questHelper: QuestHelper; protected itemHelper: ItemHelper; - protected extendedProfileHelper: ExtendedProfileHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; protected healthHelper: HealthHelper; protected traderHelper: TraderHelper; protected insuranceService: InsuranceService; protected inRaidHelper: InRaidHelper; protected configServer: ConfigServer; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_BushWhacker/server/types/controllers/InsuranceController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/InsuranceController.d.ts index af45442..6895383 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/InsuranceController.d.ts @@ -41,5 +41,4 @@ export declare class InsuranceController { * @returns response object to send to client */ cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; - doAbsolutelyNothing(): void; } diff --git a/Live/CWX_BushWhacker/server/types/controllers/MatchController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/MatchController.d.ts index 0851ab0..71cb7d3 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/MatchController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/MatchController.d.ts @@ -1,3 +1,4 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; @@ -21,9 +22,10 @@ export declare class MatchController { protected traderHelper: TraderHelper; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; createGroup(sessionID: string, info: ICreateGroupRequestData): any; diff --git a/Live/CWX_BushWhacker/server/types/controllers/NoteController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/NoteController.d.ts index cc78383..ee70541 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/NoteController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { +export declare class NoteController { protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_BushWhacker/server/types/controllers/ProfileController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/ProfileController.d.ts index b40bb7d..8c89a02 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/ProfileController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -21,9 +22,10 @@ export declare class ProfileController { protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; protected traderHelper: TraderHelper; - protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/Live/CWX_BushWhacker/server/types/controllers/RepairController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/RepairController.d.ts index 330684d..0e78ef6 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/RepairController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/RepairController.d.ts @@ -21,7 +21,6 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/Live/CWX_BushWhacker/server/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_BushWhacker/server/types/controllers/RepeatableQuestController.d.ts index 2bb2aa9..98d05dd 100644 --- a/Live/CWX_BushWhacker/server/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_BushWhacker/server/types/controllers/RepeatableQuestController.d.ts @@ -4,7 +4,8 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; diff --git a/Live/CWX_BushWhacker/server/types/generators/BotGenerator.d.ts b/Live/CWX_BushWhacker/server/types/generators/BotGenerator.d.ts index 28f05a9..a5fc0ad 100644 --- a/Live/CWX_BushWhacker/server/types/generators/BotGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/types/generators/BotGenerator.d.ts @@ -1,13 +1,14 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { Health as PmcHealth } from "../models/eft/common/IPmcData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { Health, Inventory, Skills } from "../models/eft/common/tables/IBotType"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -23,19 +24,30 @@ export declare class BotGenerator { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; protected databaseServer: DatabaseServer; protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; protected botHelper: BotHelper; protected gameEventHelper: GameEventHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); /** - * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config - * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns */ - protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; /** * Get a randomised PMC side based on bot config value 'isUsec' * @returns pmc side as string @@ -46,7 +58,7 @@ export declare class BotGenerator { * @returns IBotBase object */ protected getCloneOfBotBase(): IBotBase; - protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; /** * Log the number of PMCs generated to the debug console */ diff --git a/Live/CWX_BushWhacker/server/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_BushWhacker/server/types/generators/BotInventoryGenerator.d.ts index 783d0c5..35d1ee8 100644 --- a/Live/CWX_BushWhacker/server/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/types/generators/BotInventoryGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; diff --git a/Live/CWX_BushWhacker/server/types/generators/BotLootGenerator.d.ts b/Live/CWX_BushWhacker/server/types/generators/BotLootGenerator.d.ts index 2295f51..c6a3f29 100644 --- a/Live/CWX_BushWhacker/server/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/types/generators/BotLootGenerator.d.ts @@ -1,8 +1,9 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -10,6 +11,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -17,11 +19,106 @@ export declare class BotLootGenerator { protected databaseServer: DatabaseServer; protected handbookHelper: HandbookHelper; protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; protected getRandomisedCount(min: number, max: number, nValue: number): number; - protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_BushWhacker/server/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_BushWhacker/server/types/generators/BotWeaponGenerator.d.ts index 80dc37c..9215214 100644 --- a/Live/CWX_BushWhacker/server/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/types/generators/BotWeaponGenerator.d.ts @@ -1,15 +1,19 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { protected jsonUtil: JsonUtil; protected logger: ILogger; @@ -19,19 +23,69 @@ export declare class BotWeaponGenerator { protected weightedRandomHelper: WeightedRandomHelper; protected botGeneratorHelper: BotGeneratorHelper; protected randomUtil: RandomUtil; - private readonly modMagazineSlotId; - constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; /** * Get the mods necessary to kit out a weapon to its preset level * @param weaponTpl weapon to find preset for * @param equipmentSlot the slot the weapon will be placed in - * @param weaponParentId + * @param weaponParentId Value used for the parentid * @returns array of weapon mods */ protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; + protected isWeaponValid(weaponItemArray: Item[]): boolean; /** * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. * Additionally, adds extra bullets to SecuredContainer @@ -40,9 +94,10 @@ export declare class BotWeaponGenerator { * @param magCounts * @param ammoTpl * @param inventory + * @param botRole the bot type we're getting generating extra mags for * @returns */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; /** * Get a randomised number of bullets for a specific magazine * @param magCounts min and max count of magazines @@ -68,18 +123,31 @@ export declare class BotWeaponGenerator { * Get a weapons magazine tpl from a weapon template * @param weaponMods mods from a weapon template * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for * @returns magazine tpl string */ - protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; /** - * Finds and returns compatible ammo tpl - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns compatible ammo tpl + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; /** * Fill existing magazines to full, while replacing their contents with specified ammo * @param weaponMods @@ -87,6 +155,14 @@ export declare class BotWeaponGenerator { * @param ammoTpl */ protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; /** * Fill each Camora with a bullet * @param weaponMods Weapon mods to find and update camora mod(s) from diff --git a/Live/CWX_BushWhacker/server/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_BushWhacker/server/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_BushWhacker/server/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_BushWhacker/server/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_BushWhacker/server/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/BotGeneratorHelper.d.ts index 243e7a8..3cd7256 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/BotGeneratorHelper.d.ts @@ -1,5 +1,5 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; @@ -28,20 +28,13 @@ export declare class BotGeneratorHelper { protected configServer: ConfigServer; protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; /** * Is this magazine cylinder related (revolvers and grenade launchers) * @param magazineParentName the name of the magazines parent * @returns true if it is cylinder related */ magazineIsCylinderRelated(magazineParentName: string): boolean; - /** - * Get a list of non black-listed cartridges from the PMC bot config - * @param modSlot mod item slot - * @param itemModPool - * @returns string array of cartridges PMCs can use - */ - protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; /** * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot * never return true for an item that has 0% spawn chance @@ -53,6 +46,7 @@ export declare class BotGeneratorHelper { protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; /** * Get a list of containers that hold ammo + * e.g. mod_magazine * @returns string array */ protected getAmmoContainers(): string[]; diff --git a/Live/CWX_BushWhacker/server/types/helpers/BotHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/BotHelper.d.ts index 6b92566..9b89481 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/BotHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/BotHelper.d.ts @@ -1,4 +1,4 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -14,6 +14,7 @@ export declare class BotHelper { protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; /** * Randomise the chance the PMC will attack their own side diff --git a/Live/CWX_BushWhacker/server/types/helpers/DialogueHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/DialogueHelper.d.ts index 9776c6a..e3e2bda 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -15,7 +16,25 @@ export declare class DialogueHelper { protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_BushWhacker/server/types/helpers/GameEventHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/GameEventHelper.d.ts index b2d6377..7613053 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/GameEventHelper.d.ts @@ -2,7 +2,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_BushWhacker/server/types/helpers/HideoutHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/HideoutHelper.d.ts index 76b337f..36e4009 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/HideoutHelper.d.ts @@ -1,6 +1,6 @@ -import { Common, HideoutArea, IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; import { Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -30,14 +30,10 @@ export declare class HideoutHelper { protected inventoryHelper: InventoryHelper; protected playerService: PlayerService; protected configServer: ConfigServer; - static BITCOIN_FARM: string; - protected WATER_COLLECTOR: string; - protected BITCOIN: string; - protected EXPEDITIONARY_FUEL_TANK: string; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; @@ -64,5 +60,4 @@ export declare class HideoutHelper { protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_BushWhacker/server/types/helpers/InRaidHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/InRaidHelper.d.ts index 58e0f6a..c3cbfbb 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -15,21 +16,72 @@ export declare class InRaidHelper { protected inventoryHelper: InventoryHelper; protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; /** * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death * @param pmcData Player profile * @param sessionID Session id * @returns Player profile with pmc inventory cleared diff --git a/Live/CWX_BushWhacker/server/types/helpers/ItemHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/ItemHelper.d.ts index 4e0eba4..1701c62 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/ItemHelper.d.ts @@ -1,4 +1,5 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; import { Item, Repairable } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 diff --git a/Live/CWX_BushWhacker/server/types/helpers/ProfileHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/ProfileHelper.d.ts index b369000..6c150c8 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -36,4 +37,10 @@ export declare class ProfileHelper { getDefaultCounters(): Stats; protected isWiped(sessionID: string): boolean; protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_BushWhacker/server/types/helpers/QuestHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/QuestHelper.d.ts index 0b10135..0f68cd5 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/QuestHelper.d.ts @@ -1,8 +1,9 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; @@ -35,8 +36,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected questConfig: IQuestConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -48,11 +48,17 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; protected processReward(reward: Reward): any[]; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; @@ -83,6 +89,13 @@ export declare class QuestHelper { */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; /** * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks * @param pmcData Player profile @@ -91,7 +104,7 @@ export declare class QuestHelper { * @param sessionID Seession id * @returns array of reward objects */ - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; /** * Get the intel center bonus a player has * @param pmcData player profile diff --git a/Live/CWX_BushWhacker/server/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/RagfairOfferHelper.d.ts index 5a77e13..8d03bee 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/RagfairOfferHelper.d.ts @@ -40,7 +40,7 @@ export declare class RagfairOfferHelper { protected ragfairOfferService: RagfairOfferService; protected localeService: LocaleService; protected configServer: ConfigServer; - protected static TPL_GOODS_SOLD: string; + protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); diff --git a/Live/CWX_BushWhacker/server/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/RagfairServerHelper.d.ts index a52306b..e4939d1 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/RagfairServerHelper.d.ts @@ -26,7 +26,7 @@ export declare class RagfairServerHelper { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - protected static TPL_GOODS_RETURNED: string; + protected static goodsReturnedTemplate: string; constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item diff --git a/Live/CWX_BushWhacker/server/types/helpers/RepairHelper.d.ts b/Live/CWX_BushWhacker/server/types/helpers/RepairHelper.d.ts index 545108e..9a3ab29 100644 --- a/Live/CWX_BushWhacker/server/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_BushWhacker/server/types/helpers/RepairHelper.d.ts @@ -14,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Live/CWX_BushWhacker/server/types/models/common/MinMax.d.ts b/Live/CWX_BushWhacker/server/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_BushWhacker/server/types/models/eft/common/IPmcData.d.ts b/Live/CWX_BushWhacker/server/types/models/eft/common/IPmcData.d.ts index 56bf07f..5703e4b 100644 --- a/Live/CWX_BushWhacker/server/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/eft/common/IPmcData.d.ts @@ -1,347 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage?: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; - NeedWipeOptions: any[]; - lastCompletedWipe: LastCompleted; - lastCompletedEvent?: LastCompleted; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface LastCompleted { - $oid: string; +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_BushWhacker/server/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_BushWhacker/server/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_BushWhacker/server/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_BushWhacker/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_BushWhacker/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_BushWhacker/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_BushWhacker/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_BushWhacker/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_BushWhacker/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_BushWhacker/server/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_BushWhacker/server/types/models/eft/profile/IAkiProfile.d.ts index 3e0b319..eaa66c1 100644 --- a/Live/CWX_BushWhacker/server/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -153,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_BushWhacker/server/types/models/enums/AmmoTypes.d.ts b/Live/CWX_BushWhacker/server/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_BushWhacker/server/types/models/enums/ConfigTypes.d.ts b/Live/CWX_BushWhacker/server/types/models/enums/ConfigTypes.d.ts index 1c49e62..61d6f99 100644 --- a/Live/CWX_BushWhacker/server/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/enums/ConfigTypes.d.ts @@ -11,9 +11,11 @@ export declare enum ConfigTypes { LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_BushWhacker/server/types/models/enums/ContainerTypes.d.ts b/Live/CWX_BushWhacker/server/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_BushWhacker/server/types/models/enums/QuestStatus.d.ts b/Live/CWX_BushWhacker/server/types/models/enums/QuestStatus.d.ts index 6335c73..ba65933 100644 --- a/Live/CWX_BushWhacker/server/types/models/enums/QuestStatus.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/enums/QuestStatus.d.ts @@ -6,5 +6,6 @@ export declare enum QuestStatus { Success = 4, Fail = 5, FailRestartable = 6, - MarkedAsFailed = 7 + MarkedAsFailed = 7, + Expired = 8 } diff --git a/Live/CWX_BushWhacker/server/types/models/enums/SkillTypes.d.ts b/Live/CWX_BushWhacker/server/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_BushWhacker/server/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_BushWhacker/server/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_BushWhacker/server/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IBotConfig.d.ts index f8cf39b..e171087 100644 --- a/Live/CWX_BushWhacker/server/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -7,8 +8,11 @@ export interface IBotConfig extends IBaseConfig { lootNValue: LootNvalue; revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -90,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -100,18 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_BushWhacker/server/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_BushWhacker/server/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IRagfairConfig.d.ts index 8518252..c24e617 100644 --- a/Live/CWX_BushWhacker/server/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -40,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_BushWhacker/server/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_BushWhacker/server/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_BushWhacker/server/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_BushWhacker/server/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_BushWhacker/server/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_BushWhacker/server/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_BushWhacker/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_BushWhacker/server/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_BushWhacker/server/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_BushWhacker/server/types/servers/HttpServer.d.ts b/Live/CWX_BushWhacker/server/types/servers/HttpServer.d.ts index 5234966..44d802b 100644 --- a/Live/CWX_BushWhacker/server/types/servers/HttpServer.d.ts +++ b/Live/CWX_BushWhacker/server/types/servers/HttpServer.d.ts @@ -1,6 +1,7 @@ /// /// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; @@ -25,8 +26,9 @@ export declare class HttpServer implements IHttpServer { protected httpServerHelper: HttpServerHelper; protected serializers: Serializer[]; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); protected buffers: {}; protected onReceive: {}; protected onRespond: {}; diff --git a/Live/CWX_BushWhacker/server/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_BushWhacker/server/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_BushWhacker/server/types/services/BotLootCacheService.d.ts b/Live/CWX_BushWhacker/server/types/services/BotLootCacheService.d.ts index 72eb332..cc71eee 100644 --- a/Live/CWX_BushWhacker/server/types/services/BotLootCacheService.d.ts +++ b/Live/CWX_BushWhacker/server/types/services/BotLootCacheService.d.ts @@ -1,6 +1,6 @@ import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -22,19 +22,42 @@ export declare class BotLootCacheService { * Get the fully created loot array, ordered by price low to high * @param botRole bot to get loot for * @param isPmc is the bot a pmc - * @param lootType what type of loot is needed + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) * @param lootPool the full pool of loot (needed when cache is empty) * @returns ITemplateItem array */ getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; /** * Generate loot for a bot and store inside a private class property - * @param botRole - * @param lootType + * @param botRole bots role (assault / pmcBot etc) * @param lootPool the full pool of loot we use to create the various sub-categories with - * @param isPmc + * @param isPmc Is the bot a PMC (alteres what loot is cached) */ - protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; /** * Check if a bot type exists inside the loot cache * @param botRole role to check for diff --git a/Live/CWX_BushWhacker/server/types/services/InsuranceService.d.ts b/Live/CWX_BushWhacker/server/types/services/InsuranceService.d.ts index 0219816..171bf10 100644 --- a/Live/CWX_BushWhacker/server/types/services/InsuranceService.d.ts +++ b/Live/CWX_BushWhacker/server/types/services/InsuranceService.d.ts @@ -22,7 +22,6 @@ export declare class InsuranceService { protected dialogueHelper: DialogueHelper; protected configServer: ConfigServer; protected insured: Record>; - protected templatesById: {}; protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; @@ -32,9 +31,19 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; diff --git a/Live/CWX_BushWhacker/server/types/services/NotificationService.d.ts b/Live/CWX_BushWhacker/server/types/services/NotificationService.d.ts index 7e2a127..65a84dd 100644 --- a/Live/CWX_BushWhacker/server/types/services/NotificationService.d.ts +++ b/Live/CWX_BushWhacker/server/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - protected messageQueue: {}; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_BushWhacker/server/types/services/ProfileFixerService.d.ts b/Live/CWX_BushWhacker/server/types/services/ProfileFixerService.d.ts index 313a907..ed1dec7 100644 --- a/Live/CWX_BushWhacker/server/types/services/ProfileFixerService.d.ts +++ b/Live/CWX_BushWhacker/server/types/services/ProfileFixerService.d.ts @@ -1,6 +1,8 @@ import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { Watermark } from "../utils/Watermark"; @@ -29,8 +31,27 @@ export declare class ProfileFixerService { protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; /** * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots * @param pmcProfile diff --git a/Live/CWX_BushWhacker/server/types/services/RagfairPriceService.d.ts b/Live/CWX_BushWhacker/server/types/services/RagfairPriceService.d.ts index e33bbb9..679fe1d 100644 --- a/Live/CWX_BushWhacker/server/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_BushWhacker/server/types/services/RagfairPriceService.d.ts @@ -27,6 +27,7 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; /** diff --git a/Live/CWX_BushWhacker/server/types/services/mod/CustomItemService.d.ts b/Live/CWX_BushWhacker/server/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_BushWhacker/server/types/utils/App.d.ts b/Live/CWX_BushWhacker/server/types/utils/App.d.ts index 34c141e..dcc2669 100644 --- a/Live/CWX_BushWhacker/server/types/utils/App.d.ts +++ b/Live/CWX_BushWhacker/server/types/utils/App.d.ts @@ -11,4 +11,5 @@ export declare class App { constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_BushWhacker/server/types/utils/TimeUtil.d.ts b/Live/CWX_BushWhacker/server/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_BushWhacker/server/types/utils/TimeUtil.d.ts +++ b/Live/CWX_BushWhacker/server/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_BushWhacker/server/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_BushWhacker/server/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_BushWhacker/server/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotLootGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotLootGenerator.d.ts deleted file mode 100644 index 2295f51..0000000 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotLootGenerator.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { IBotConfig } from "../models/spt/config/IBotConfig"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { BotLootCacheService } from "../services/BotLootCacheService"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotLootGenerator { - protected logger: ILogger; - protected hashUtil: HashUtil; - protected randomUtil: RandomUtil; - protected databaseServer: DatabaseServer; - protected handbookHelper: HandbookHelper; - protected botGeneratorHelper: BotGeneratorHelper; - protected botLootCacheService: BotLootCacheService; - protected configServer: ConfigServer; - protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; - protected getRandomisedCount(min: number, max: number, nValue: number): number; - protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotWeaponGenerator.d.ts deleted file mode 100644 index 80dc37c..0000000 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotWeaponGenerator.d.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -export declare class BotWeaponGenerator { - protected jsonUtil: JsonUtil; - protected logger: ILogger; - protected hashUtil: HashUtil; - protected databaseServer: DatabaseServer; - protected itemHelper: ItemHelper; - protected weightedRandomHelper: WeightedRandomHelper; - protected botGeneratorHelper: BotGeneratorHelper; - protected randomUtil: RandomUtil; - private readonly modMagazineSlotId; - constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** - * Get the mods necessary to kit out a weapon to its preset level - * @param weaponTpl weapon to find preset for - * @param equipmentSlot the slot the weapon will be placed in - * @param weaponParentId - * @returns array of weapon mods - */ - protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; - /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * @param weaponMods - * @param weaponTemplate - * @param magCounts - * @param ammoTpl - * @param inventory - * @returns - */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; - /** - * Get a randomised number of bullets for a specific magazine - * @param magCounts min and max count of magazines - * @param magTemplate magazine to generate bullet count for - * @returns bullet count number - */ - protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; - /** - * Get a randomised count of magazines - * @param magCounts min and max value returned value can be between - * @returns numberical value of magazine count - */ - protected getRandomisedMagazineCount(magCounts: MinMax): number; - /** - * Add ammo to the secure container - * @param stackCount How many stacks of ammo to add - * @param ammoTpl Ammo type to add - * @param stackSize Size of the ammo stack to add - * @param inventory Player inventory - */ - protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; - /** - * Get a weapons magazine tpl from a weapon template - * @param weaponMods mods from a weapon template - * @param weaponTemplate Weapon to get magazine tpl for - * @returns magazine tpl string - */ - protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; - protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; - /** - * Finds and returns compatible ammo tpl - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns compatible ammo tpl - */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; - /** - * Fill existing magazines to full, while replacing their contents with specified ammo - * @param weaponMods - * @param magazine - * @param ammoTpl - */ - protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; - /** - * Fill each Camora with a bullet - * @param weaponMods Weapon mods to find and update camora mod(s) from - * @param magazineId magazine id to find and add to - * @param ammoTpl ammo template id to hydate with - */ - protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/InRaidHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/InRaidHelper.d.ts deleted file mode 100644 index 58e0f6a..0000000 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/InRaidHelper.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { InventoryHelper } from "./InventoryHelper"; -import { PaymentHelper } from "./PaymentHelper"; -export declare class InRaidHelper { - protected logger: ILogger; - protected saveServer: SaveServer; - protected jsonUtil: JsonUtil; - protected databaseServer: DatabaseServer; - protected inventoryHelper: InventoryHelper; - protected paymentHelper: PaymentHelper; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - protected removePlayer(sessionID: string): void; - protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; - addUpdToMoneyFromRaid(items: Item[]): void; - /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims - */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; - /** - * Clear pmc inventory of all items except those that are exempt - * @param pmcData Player profile - * @param sessionID Session id - * @returns Player profile with pmc inventory cleared - */ - deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; - /** - * Does the provided items slotId mean its kept on the player after death - * @param slotId slotid of item to check - * @returns true if item is kept after death - */ - isItemKeptAfterDeath(slotId: string): boolean; - getPlayerGear(items: Item[]): Item[]; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotBase.d.ts deleted file mode 100644 index 677fd49..0000000 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotBase.d.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; -export interface IBotBase { - _id: string; - aid: string; - savage: any; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: any; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: any[]; - Hideout: Hideout; - Bonuses: Bonus[]; -} -export interface Info { - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: number; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - NeedWipeOptions: any[]; - lastCompletedWipe: any; - BannedState: boolean; - BannedUntil: number; - IsStreamerModeAvailable: boolean; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: any[]; - Mastering: any[]; - Points: number; -} -export interface Stats { - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; -} -export interface SessionCounters { - Items: any[]; -} -export interface OverallCounters { - Items: any[]; -} -export interface ConditionCounters { - Counters: any[]; -} -export interface Hideout { - Production: Production; - Areas: Area[]; -} -export interface Production { -} -export interface Area { - type: number; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: any[]; - lastRecipe: any; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHideoutConfig.d.ts deleted file mode 100644 index 4658fa6..0000000 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHideoutConfig.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IBaseConfig } from "./IBaseConfig"; -export interface IHideoutConfig extends IBaseConfig { - kind: "aki-hideout"; - runIntervalSeconds: number; - scavCase: ScavCase; - fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/TimeUtil.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/TimeUtil.d.ts deleted file mode 100644 index 9733be9..0000000 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/TimeUtil.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export declare class TimeUtil { - static readonly oneHourAsSeconds = 3600; - formatTime(date: Date): string; - formatDate(date: Date): string; - getDate(): string; - getTime(): string; - getTimestamp(): number; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/bepInEx/plugins/CWX-DeSharpener.dll b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/bepInEx/plugins/CWX-DeSharpener.dll similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/bepInEx/plugins/CWX-DeSharpener.dll rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/bepInEx/plugins/CWX-DeSharpener.dll diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/LICENSE.txt b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/LICENSE.txt similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/LICENSE.txt rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/LICENSE.txt diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/package.json b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/package.json similarity index 95% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/package.json rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/package.json index 1f1e7af..f36dcfa 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/package.json +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/package.json @@ -1,10 +1,10 @@ { "name": "DeSharpener", "author": "CWX", - "version": "1.4.0", + "version": "1.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.1.1", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/src/mod.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/src/mod.ts similarity index 56% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/src/mod.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/src/mod.ts index cd4117d..c829f2f 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/src/mod.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/src/mod.ts @@ -1,6 +1,5 @@ import { DependencyContainer } from "tsyringe"; import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; class CWX_Desharpner implements IPreAkiLoadMod { @@ -8,10 +7,7 @@ class CWX_Desharpner implements IPreAkiLoadMod public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/Program.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/Program.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/Program.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/Program.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/TYPES.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/TYPES.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/TYPES.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/TYPES.d.ts diff --git a/Live/CWX_BushWhacker/server/types/Utils.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/Utils.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/Utils.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/Utils.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/BotCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/BotCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/BotCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/BotCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/BundleCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/BundleCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/BundleCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/BundleCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/CustomizationCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/CustomizationCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/CustomizationCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/CustomizationCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/DataCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/DataCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/DataCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/DataCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/DialogueCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/DialogueCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/DialogueCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/GameCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/GameCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/GameCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/GameCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HandbookCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HandbookCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HandbookCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HealthCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HealthCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HealthCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HideoutCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HideoutCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HideoutCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HttpCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/HttpCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/HttpCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/InraidCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/InraidCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/InraidCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/InraidCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/InsuranceCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/InsuranceCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/InsuranceCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/InventoryCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/InventoryCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/InventoryCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/InventoryCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/ItemEventCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/ItemEventCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/ItemEventCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/ItemEventCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/LauncherCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/LauncherCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/LauncherCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/LauncherCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/LocationCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/LocationCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/LocationCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/LocationCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/MatchCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/MatchCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/MatchCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/ModCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/ModCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/ModCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/ModCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/NoteCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/NoteCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/NoteCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/NoteCallbacks.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/NotifierCallbacks.d.ts similarity index 95% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/NotifierCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/NotifierCallbacks.d.ts index cd1e736..c42058f 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/NotifierCallbacks.d.ts @@ -16,7 +16,7 @@ export declare class NotifierCallbacks { * until we actually have something to send because otherwise we'd spam the client * and the client would abort the connection due to spam. */ - sendNotification(_sessionID: string, req: any, resp: any, _data: any): void; + sendNotification(sessionID: string, req: any, resp: any, data: any): void; getNotifier(url: string, info: any, sessionID: string): IGetBodyResponseData; createNotifierChannel(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/PresetBuildCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/PresetBuildCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/PresetBuildCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/PresetCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/PresetCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/PresetCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/ProfileCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/ProfileCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/ProfileCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/QuestCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/QuestCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/QuestCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/RagfairCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/RagfairCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/RagfairCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/RepairCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/RepairCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/RepairCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/SaveCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/SaveCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/SaveCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/TradeCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/TradeCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/TradeCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/TraderCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/TraderCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/TraderCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/WeatherCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/WeatherCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/WeatherCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/WishlistCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/callbacks/WishlistCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/callbacks/WishlistCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ApplicationContext.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariable.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariableType.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/BotController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/BotController.d.ts similarity index 95% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/BotController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/BotController.d.ts index 09a1788..5e6f05d 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/BotController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/BotController.d.ts @@ -30,6 +30,6 @@ export declare class BotController { */ getBotDifficulty(type: string, difficulty: string): Difficulty; protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/CustomizationController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/CustomizationController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/CustomizationController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/CustomizationController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/DialogueController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/DialogueController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/DialogueController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/DialogueController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/GameController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/GameController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/GameController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/GameController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/HandbookController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/HandbookController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/HandbookController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/HandbookController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/HealthController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/HealthController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/HealthController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/HealthController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/HideoutController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/HideoutController.d.ts similarity index 68% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/HideoutController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/HideoutController.d.ts index f2930ff..3eefe1a 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/HideoutController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/HideoutController.d.ts @@ -1,14 +1,15 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HideoutArea, IPmcData, Product } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -42,26 +43,59 @@ export declare class HideoutController { protected httpResponse: HttpResponseUtil; protected profileHelper: ProfileHelper; protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; - protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; - protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { - [x: string]: number; - }; - protected getRandomisedScavRewards(rarityItemCounter: { - [x: string]: number; - }): Product[]; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InraidController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InraidController.d.ts similarity index 57% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InraidController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InraidController.d.ts index 7f2036c..b899e7d 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InraidController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InraidController.d.ts @@ -1,7 +1,8 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; @@ -12,20 +13,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { protected saveServer: SaveServer; protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected questHelper: QuestHelper; protected itemHelper: ItemHelper; - protected extendedProfileHelper: ExtendedProfileHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; protected healthHelper: HealthHelper; protected traderHelper: TraderHelper; protected insuranceService: InsuranceService; protected inRaidHelper: InRaidHelper; protected configServer: ConfigServer; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InsuranceController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InsuranceController.d.ts similarity index 98% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InsuranceController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InsuranceController.d.ts index af45442..6895383 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InsuranceController.d.ts @@ -41,5 +41,4 @@ export declare class InsuranceController { * @returns response object to send to client */ cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; - doAbsolutelyNothing(): void; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InventoryController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InventoryController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/InventoryController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/InventoryController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/LauncherController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/LauncherController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/LauncherController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/LauncherController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/LocationController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/LocationController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/LocationController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/LocationController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/MatchController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/MatchController.d.ts similarity index 92% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/MatchController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/MatchController.d.ts index 0851ab0..71cb7d3 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/controllers/MatchController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/MatchController.d.ts @@ -1,3 +1,4 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; @@ -21,9 +22,10 @@ export declare class MatchController { protected traderHelper: TraderHelper; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; createGroup(sessionID: string, info: ICreateGroupRequestData): any; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/NoteController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/NoteController.d.ts similarity index 92% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/NoteController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/NoteController.d.ts index cc78383..ee70541 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/NoteController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { +export declare class NoteController { protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/NotifierController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/NotifierController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/NotifierController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/NotifierController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/PresetBuildController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/PresetBuildController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/PresetBuildController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/PresetBuildController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/PresetController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/PresetController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/PresetController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/PresetController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/ProfileController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/ProfileController.d.ts similarity index 85% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/ProfileController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/ProfileController.d.ts index b40bb7d..8c89a02 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/ProfileController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -21,9 +22,10 @@ export declare class ProfileController { protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; protected traderHelper: TraderHelper; - protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/QuestController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/QuestController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/QuestController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/QuestController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RagfairController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RagfairController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RagfairController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RagfairController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RepairController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RepairController.d.ts similarity index 97% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RepairController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RepairController.d.ts index 330684d..0e78ef6 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RepairController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RepairController.d.ts @@ -21,7 +21,6 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RepeatableQuestController.d.ts similarity index 99% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RepeatableQuestController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RepeatableQuestController.d.ts index 2bb2aa9..98d05dd 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/RepeatableQuestController.d.ts @@ -4,7 +4,8 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/TradeController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/TradeController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/TradeController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/TradeController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/TraderController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/TraderController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/TraderController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/TraderController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/WeatherController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/WeatherController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/WeatherController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/WeatherController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/WishlistController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/WishlistController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/controllers/WishlistController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/controllers/WishlistController.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/Container.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/Container.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/Container.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/Container.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/OnLoad.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/OnLoad.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/OnLoad.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/OnLoad.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/OnLoadOnUpdate.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/OnLoadOnUpdate.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/OnLoadOnUpdate.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/OnLoadOnUpdate.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/OnUpdate.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/OnUpdate.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/OnUpdate.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/OnUpdate.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/Router.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/Router.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/Router.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/Router.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/Serializer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/Serializer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/di/Serializer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/di/Serializer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotGenerator.d.ts similarity index 66% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotGenerator.d.ts index 28f05a9..a5fc0ad 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotGenerator.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotGenerator.d.ts @@ -1,13 +1,14 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { Health as PmcHealth } from "../models/eft/common/IPmcData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { Health, Inventory, Skills } from "../models/eft/common/tables/IBotType"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -23,19 +24,30 @@ export declare class BotGenerator { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; protected databaseServer: DatabaseServer; protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; protected botHelper: BotHelper; protected gameEventHelper: GameEventHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); /** - * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config - * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns */ - protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; /** * Get a randomised PMC side based on bot config value 'isUsec' * @returns pmc side as string @@ -46,7 +58,7 @@ export declare class BotGenerator { * @returns IBotBase object */ protected getCloneOfBotBase(): IBotBase; - protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; /** * Log the number of PMCs generated to the debug console */ diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotInventoryGenerator.d.ts similarity index 98% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotInventoryGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotInventoryGenerator.d.ts index 783d0c5..35d1ee8 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotInventoryGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotLootGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotLootGenerator.d.ts new file mode 100644 index 0000000..c6a3f29 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotLootGenerator.d.ts @@ -0,0 +1,124 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; +export declare class BotLootGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotWeaponGenerator.d.ts new file mode 100644 index 0000000..9215214 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/BotWeaponGenerator.d.ts @@ -0,0 +1,173 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class BotWeaponGenerator { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/LocationGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/LocationGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/LocationGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/LocationGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/PMCLootGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/PMCLootGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/PMCLootGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/PMCLootGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/RagfairAssortGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/RagfairAssortGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/RagfairAssortGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/RagfairOfferGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/RagfairOfferGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/RagfairOfferGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/WeatherGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/WeatherGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/generators/WeatherGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/generators/WeatherGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/AssortHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/AssortHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/AssortHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/AssortHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/BotGeneratorHelper.d.ts similarity index 94% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/BotGeneratorHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/BotGeneratorHelper.d.ts index 243e7a8..3cd7256 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/BotGeneratorHelper.d.ts @@ -1,5 +1,5 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; @@ -28,20 +28,13 @@ export declare class BotGeneratorHelper { protected configServer: ConfigServer; protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; /** * Is this magazine cylinder related (revolvers and grenade launchers) * @param magazineParentName the name of the magazines parent * @returns true if it is cylinder related */ magazineIsCylinderRelated(magazineParentName: string): boolean; - /** - * Get a list of non black-listed cartridges from the PMC bot config - * @param modSlot mod item slot - * @param itemModPool - * @returns string array of cartridges PMCs can use - */ - protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; /** * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot * never return true for an item that has 0% spawn chance @@ -53,6 +46,7 @@ export declare class BotGeneratorHelper { protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; /** * Get a list of containers that hold ammo + * e.g. mod_magazine * @returns string array */ protected getAmmoContainers(): string[]; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/BotHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/BotHelper.d.ts similarity index 94% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/BotHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/BotHelper.d.ts index 6b92566..9b89481 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/helpers/BotHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/BotHelper.d.ts @@ -1,4 +1,4 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -14,6 +14,7 @@ export declare class BotHelper { protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; /** * Randomise the chance the PMC will attack their own side diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ContainerHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ContainerHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ContainerHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ContainerHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/DialogueHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/DialogueHelper.d.ts similarity index 73% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/DialogueHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/DialogueHelper.d.ts index 9776c6a..e3e2bda 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -15,7 +16,25 @@ export declare class DialogueHelper { protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/DurabilityLimitsHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/DurabilityLimitsHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/DurabilityLimitsHelper.d.ts diff --git a/Live/CWX_BushWhacker/server/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ExtendedProfileHelper.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/helpers/ExtendedProfileHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ExtendedProfileHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/GameEventHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/GameEventHelper.d.ts similarity index 88% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/GameEventHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/GameEventHelper.d.ts index b2d6377..7613053 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/GameEventHelper.d.ts @@ -2,7 +2,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HandbookHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HandbookHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HandbookHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HandbookHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HealthHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HealthHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HealthHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HealthHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HideoutHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HideoutHelper.d.ts similarity index 87% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HideoutHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HideoutHelper.d.ts index 76b337f..36e4009 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HideoutHelper.d.ts @@ -1,6 +1,6 @@ -import { Common, HideoutArea, IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; import { Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -30,14 +30,10 @@ export declare class HideoutHelper { protected inventoryHelper: InventoryHelper; protected playerService: PlayerService; protected configServer: ConfigServer; - static BITCOIN_FARM: string; - protected WATER_COLLECTOR: string; - protected BITCOIN: string; - protected EXPEDITIONARY_FUEL_TANK: string; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; @@ -64,5 +60,4 @@ export declare class HideoutHelper { protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HttpServerHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HttpServerHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/HttpServerHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/HttpServerHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/InRaidHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/InRaidHelper.d.ts new file mode 100644 index 0000000..c3cbfbb --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/InRaidHelper.d.ts @@ -0,0 +1,97 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { InventoryHelper } from "./InventoryHelper"; +import { PaymentHelper } from "./PaymentHelper"; +export declare class InRaidHelper { + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; + constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ + addUpdToMoneyFromRaid(items: Item[]): void; + /** + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared + */ + deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; + getPlayerGear(items: Item[]): Item[]; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/InventoryHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/InventoryHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/InventoryHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/InventoryHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ItemHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ItemHelper.d.ts similarity index 97% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ItemHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ItemHelper.d.ts index 4e0eba4..1701c62 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ItemHelper.d.ts @@ -1,4 +1,5 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; import { Item, Repairable } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/NotificationSendHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/NotificationSendHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/NotificationSendHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/NotifierHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/NotifierHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/NotifierHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/NotifierHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/PaymentHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/PaymentHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/PaymentHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/PaymentHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/PresetHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/PresetHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/PresetHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/PresetHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ProbabilityHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ProbabilityHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ProbabilityHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ProfileHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ProfileHelper.d.ts similarity index 82% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ProfileHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ProfileHelper.d.ts index b369000..6c150c8 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -36,4 +37,10 @@ export declare class ProfileHelper { getDefaultCounters(): Stats; protected isWiped(sessionID: string): boolean; protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/QuestConditionHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/QuestConditionHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/QuestConditionHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/QuestHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/QuestHelper.d.ts similarity index 81% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/QuestHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/QuestHelper.d.ts index 0b10135..0f68cd5 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/QuestHelper.d.ts @@ -1,8 +1,9 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; @@ -35,8 +36,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected questConfig: IQuestConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -48,11 +48,17 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; protected processReward(reward: Reward): any[]; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; @@ -83,6 +89,13 @@ export declare class QuestHelper { */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; /** * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks * @param pmcData Player profile @@ -91,7 +104,7 @@ export declare class QuestHelper { * @param sessionID Seession id * @returns array of reward objects */ - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; /** * Get the intel center bonus a player has * @param pmcData player profile diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairOfferHelper.d.ts similarity index 98% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairOfferHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairOfferHelper.d.ts index 5a77e13..8d03bee 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairOfferHelper.d.ts @@ -40,7 +40,7 @@ export declare class RagfairOfferHelper { protected ragfairOfferService: RagfairOfferService; protected localeService: LocaleService; protected configServer: ConfigServer; - protected static TPL_GOODS_SOLD: string; + protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairSellHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairSellHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairSellHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairServerHelper.d.ts similarity index 97% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairServerHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairServerHelper.d.ts index a52306b..e4939d1 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairServerHelper.d.ts @@ -26,7 +26,7 @@ export declare class RagfairServerHelper { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - protected static TPL_GOODS_RETURNED: string; + protected static goodsReturnedTemplate: string; constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairSortHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairSortHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairSortHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairTaxHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RagfairTaxHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RagfairTaxHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RepairHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RepairHelper.d.ts similarity index 95% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RepairHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RepairHelper.d.ts index 545108e..9a3ab29 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/RepairHelper.d.ts @@ -14,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/SecureContainerHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/SecureContainerHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/SecureContainerHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/TradeHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/TradeHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/TradeHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/TradeHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/TraderAssortHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/TraderAssortHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/TraderAssortHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/TraderHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/TraderHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/TraderHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/TraderHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/UtilityHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/UtilityHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/UtilityHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/UtilityHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/WeightedRandomHelper.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/WeightedRandomHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/WeightedRandomHelper.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/helpers/WeightedRandomHelper.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/BleedingEdgeEntry.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/BleedingEdgeEntry.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/BleedingEdgeEntry.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/BleedingEdgeEntry.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/Compiler.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/Compiler.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/Compiler.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/Compiler.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/DebugEntry.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/DebugEntry.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/DebugEntry.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/DebugEntry.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/ReleaseEntry.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/ReleaseEntry.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/ReleaseEntry.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/ReleaseEntry.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/TestEntry.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/TestEntry.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/ide/TestEntry.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/ide/TestEntry.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/BundleLoader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/BundleLoader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/BundleLoader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/BundleLoader.d.ts diff --git a/Live/CWX_BushWhacker/server/types/loaders/DelayedModLoader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/DelayedModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/DelayedModLoader.d.ts diff --git a/Live/CWX_BushWhacker/server/types/loaders/InitialModLoader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/InitialModLoader.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/loaders/InitialModLoader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/InitialModLoader.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/PostAkiModLoader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/PostAkiModLoader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/PostAkiModLoader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/PostAkiModLoader.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/PostDBModLoader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/PostDBModLoader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/PostDBModLoader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/PostDBModLoader.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/PreAkiModLoader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/PreAkiModLoader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/loaders/PreAkiModLoader.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/common/MinMax.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IEmptyRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IEmptyRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IGlobals.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IGlobals.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IGlobals.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IGlobals.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILocation.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILocation.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILocation.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILocation.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILocationBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILocationBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILocationBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILooseLoot.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/ILooseLoot.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/ILooseLoot.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IMetricsTableData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IMetricsTableData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IMetricsTableData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IPmcData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IPmcData.d.ts new file mode 100644 index 0000000..5703e4b --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/IPmcData.d.ts @@ -0,0 +1,3 @@ +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { +} diff --git a/Live/CWX_BushWhacker/server/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/models/eft/common/MemberCategory.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/MemberCategory.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IPmcData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotBase.d.ts similarity index 90% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IPmcData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotBase.d.ts index 56bf07f..0ee468e 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotBase.d.ts @@ -1,9 +1,10 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; +export interface IBotBase { _id: string; aid: string; savage?: string; @@ -18,15 +19,15 @@ export interface IPmcData { BackendCounters: Record; InsuredItems: InsuredItem[]; Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; Quests: Quest[]; TradersInfo: Record; RagfairInfo: RagfairInfo; - WishList: string[]; RepeatableQuests: IPmcDataRepeatableQuest[]; + Bonuses: Bonus[]; + Notes: Notes; CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { EntryPoint: string; @@ -45,12 +46,12 @@ export interface Info { LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; + NeedWipeOptions: any[]; + lastCompletedWipe: LastCompleted; Bans: IBan[]; BannedState: boolean; BannedUntil: number; - NeedWipeOptions: any[]; - lastCompletedWipe: LastCompleted; + IsStreamerModeAvailable: boolean; lastCompletedEvent?: LastCompleted; } export interface Settings { @@ -73,13 +74,6 @@ export declare enum BanType { Friends = 5, ChangeNickname = 6 } -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} export interface Customization { Head: string; Body: string; @@ -130,12 +124,16 @@ export interface Skills { export interface Common { Id: string; Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; } export interface Mastering { Id: string; Progress: number; + max?: number; + min?: number; } export interface Stats { CarriedQuestItems: string[]; @@ -186,6 +184,14 @@ export interface CounterKeyValue { Key: string[]; Value: number; } +export interface ConditionCounters { + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} export interface Aggressor { AccountId: string; ProfileId: string; @@ -245,14 +251,6 @@ export interface LastPlayerStateInfo { Level: number; MemberCategory: string; } -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} export interface BackendCounter { id: string; qid?: string; @@ -272,18 +270,19 @@ export interface Productive { inProgress?: boolean; StartTimestamp?: number; } -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} export interface Production extends Productive { RecipeId: string; SkipTime: number; ProductionTime: number; } +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} export interface HideoutArea { type: HideoutAreas; level: number; @@ -295,32 +294,38 @@ export interface HideoutArea { lastRecipe: string; } export interface HideoutSlot { - item: HideoutItem[]; + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; } export interface HideoutItem { _id: string; _tpl: string; upd?: Upd; } -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 } export interface Quest { qid: string; startTime: number; - status: string; - statusTimers?: StatusTimer; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ completedConditions?: string[]; } -export interface StatusTimer { - AvailableForStart?: number; -} export interface TraderInfo { loyaltyLevel: number; salesSum: number; @@ -333,15 +338,16 @@ export interface RagfairInfo { isRatingGrowing: boolean; offers: IRagfairOffer[]; } -export interface CarExtractCounts { +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; } -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface LastCompleted { - $oid: string; +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotCore.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotCore.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotCore.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotType.d.ts similarity index 90% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotType.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ICustomizationItem.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ICustomizationItem.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IHandbookBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IHandbookBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IItem.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IItem.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IItem.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ILocationsBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ILocationsBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ILootBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ILootBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ILootBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IMatch.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IMatch.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IMatch.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IProfileTemplate.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IProfileTemplate.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IProfileTemplate.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IQuest.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IQuest.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IQuest.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/IRepeatableQuests.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ITemplateItem.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ITemplateItem.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ITemplateItem.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ITrader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/tables/ITrader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/common/tables/ITrader.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/customization/IBuyClothingRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/customization/IBuyClothingRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/customization/IBuyClothingRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/customization/IWearClothingRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/customization/IWearClothingRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IFriendRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IFriendRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IPinDialogRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IPinDialogRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/ISendMessageRequest.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/ISendMessageRequest.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IGameConfigResponse.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IGameConfigResponse.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IReportNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IReportNicknameRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IReportNicknameRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IVersionValidateRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/game/IVersionValidateRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/Effect.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/Effect.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/Effect.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/Effect.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/IOffraidEatRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/IOffraidEatRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/IOffraidHealRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/IOffraidHealRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/ISyncHealthRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/health/ISyncHealthRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/Live/CWX_BushWhacker/server/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/models/eft/hideout/HideoutAreasEnum.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutArea.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutArea.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutProduction.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutProduction.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 85% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutScavCase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/httpResponse/INullResponseData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/httpResponse/INullResponseData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/insurance/IInsureRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/insurance/IInsureRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IAddItemRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IAddItemRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IAddItemRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IAddItemRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventorySortRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventorySortRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 96% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IChangeRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IChangeRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/ILoginRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/ILoginRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IMiniProfile.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IMiniProfile.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IRegisterData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IRegisterData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IRegisterData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IRemoveProfileData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/launcher/IRemoveProfileData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/location/IGetLocationRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/location/IGetLocationRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/ICreateGroupRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/ICreateGroupRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/ICreateGroupRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IGetGroupStatusRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IGetProfileRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IGetProfileRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IGetProfileRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IGetProfileRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IJoinMatchRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IJoinMatchRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IJoinMatchRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IJoinMatchResult.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IJoinMatchResult.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IJoinMatchResult.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IPutMetricsRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IPutMetricsRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IPutMetricsRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IStartOffineRaidRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IUpdatePingRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/match/IUpdatePingRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/match/IUpdatePingRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/notes/INoteActionData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/notes/INoteActionData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/notes/INoteActionData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/notifier/INotifier.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/notifier/INotifier.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/notifier/INotifier.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 88% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/GetProfileStatusResponseData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IAkiProfile.d.ts similarity index 94% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IAkiProfile.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IAkiProfile.d.ts index 3e0b319..eaa66c1 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -153,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IProfileCreateRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IProfileCreateRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/ISearchFriendRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/ISearchFriendRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/ISearchFriendResponse.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/ISearchFriendResponse.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/ICompleteQuestRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IListQuestsRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IListQuestsRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IGetOffersResult.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IGetOffersResult.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IRagfairOffer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IRagfairOffer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/ISearchRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/ISearchRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/repair/IRepairActionDataRequest.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/repair/IRepairActionDataRequest.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/weather/IWeatherData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/weather/IWeatherData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/weather/IWeatherData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/wishlist/IWishlistActionData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/wishlist/IWishlistActionData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/AmmoTypes.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/BaseClasses.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/BaseClasses.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/BaseClasses.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/BaseClasses.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/BotAmount.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/BotAmount.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/BotAmount.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/BotAmount.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/BotDifficulty.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/BotDifficulty.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/BotDifficulty.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/BotDifficulty.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/ConfigTypes.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ConfigTypes.d.ts similarity index 88% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/ConfigTypes.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ConfigTypes.d.ts index 1c49e62..61d6f99 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ConfigTypes.d.ts @@ -11,9 +11,11 @@ export declare enum ConfigTypes { LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ContainerTypes.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/ELocationName.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ELocationName.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/ELocationName.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/ELocationName.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/EquipmentSlots.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/EquipmentSlots.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/EquipmentSlots.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/EquipmentSlots.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/HideoutAreas.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/HideoutAreas.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/HideoutAreas.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/HideoutAreas.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/MemberCategory.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/common/MemberCategory.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/MemberCategory.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/MessageType.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/MessageType.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/MessageType.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/MessageType.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/Money.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/Money.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/Money.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/Money.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/QuestRewardType.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/QuestRewardType.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/QuestRewardType.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/QuestRewardType.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/QuestStatus.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/QuestStatus.d.ts similarity index 81% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/QuestStatus.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/QuestStatus.d.ts index 6335c73..ba65933 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/QuestStatus.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/QuestStatus.d.ts @@ -6,5 +6,6 @@ export declare enum QuestStatus { Success = 4, Fail = 5, FailRestartable = 6, - MarkedAsFailed = 7 + MarkedAsFailed = 7, + Expired = 8 } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/RaidMode.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/RaidMode.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/RaidMode.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/RaidMode.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/SkillTypes.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/Traders.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/Traders.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/Traders.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/Traders.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/IPostAkiLoadMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/IPostAkiLoadMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/IPostAkiLoadMod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/IPostDBLoadMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/IPostDBLoadMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/IPostDBLoadMod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/IPreAkiLoadMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/IPreAkiLoadMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/IPreAkiLoadMod.d.ts diff --git a/Live/CWX_BushWhacker/server/types/models/external/mod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/mod.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/models/external/mod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/mod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/tsyringe.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/tsyringe.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/tsyringe.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/external/tsyringe.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/bindings/Route.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bindings/Route.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/bindings/Route.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bindings/Route.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bots/BotLootCache.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/bots/BotLootCache.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bots/BotLootCache.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IBotCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IBotCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IBundleCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IBundleCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IDataCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IDataCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IGameCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IGameCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHealthCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHealthCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHttpCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IHttpCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IInraidCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IInraidCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ILocationCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ILocationCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IMatchCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IModCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IModCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/INoteCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/INoteCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/INotifierCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/INotifierCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IPresetCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IPresetCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IProfileCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IProfileCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IQuestCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IQuestCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IRepairCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IRepairCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ISaveCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ISaveCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ITradeCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ITradeCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ITraderCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/ITraderCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IAirdropConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IAirdropConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IAirdropConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IBaseConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IBaseConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IBaseConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IBotConfig.d.ts similarity index 79% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IBotConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IBotConfig.d.ts index f8cf39b..e171087 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -7,8 +8,11 @@ export interface IBotConfig extends IBaseConfig { lootNValue: LootNvalue; revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -90,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -100,18 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ICoreConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ICoreConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ICoreConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHealthConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHealthConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHealthConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHideoutConfig.d.ts new file mode 100644 index 0000000..36d6246 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHideoutConfig.d.ts @@ -0,0 +1,7 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface IHideoutConfig extends IBaseConfig { + kind: "aki-hideout"; + runIntervalSeconds: number; + fuelDrainRateMultipler: number; + hoursForSkillCrafting: number; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHttpConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IHttpConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IHttpConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IInRaidConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IInRaidConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IInRaidConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IInsuranceConfig.d.ts similarity index 75% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IInsuranceConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IInventoryConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IInventoryConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IInventoryConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ILocaleConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ILocaleConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ILocaleConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ILocationConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ILocationConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ILocationConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IMatchConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IMatchConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IMatchConfig.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IQuestConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IQuestConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IQuestConfig.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IRagfairConfig.d.ts similarity index 95% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IRagfairConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IRagfairConfig.d.ts index 8518252..c24e617 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -40,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IRepairConfig.d.ts similarity index 66% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IRepairConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ITraderConfig.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/ITraderConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/ITraderConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IWeatherConfig.d.ts similarity index 86% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IWeatherConfig.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/controllers/IBotController.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/controllers/IBotController.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/controllers/IBotController.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IBotGenerator.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IBotGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/ILocationGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/ILocationGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IPMCLootGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IPMCLootGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/Live/CWX_BushWhacker/server/types/models/spt/helpers/Traders.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from Live/CWX_BushWhacker/server/types/models/spt/helpers/Traders.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/helpers/Traders.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/logging/LogBackgroundColor.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/logging/LogBackgroundColor.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/logging/LogBackgroundColor.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/logging/LogTextColor.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/logging/LogTextColor.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/logging/LogTextColor.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/logging/SptLogger.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/logging/SptLogger.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/logging/SptLogger.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/mod/IMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/IMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/mod/IMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/IMod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/IModLoader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/mod/IModLoader.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/IModLoader.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/IPackageJsonData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/mod/IPackageJsonData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/IPackageJsonData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/IDatabaseTables.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/IDatabaseTables.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/IDatabaseTables.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/IHttpServer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/IHttpServer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/IHttpServer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/ILocaleBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/ILocaleBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/ILocaleBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/ILocations.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/ILocations.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/ILocations.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/ILocations.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/IServerBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/IServerBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/IServerBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/ISettingsBase.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/server/ISettingsBase.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/server/ISettingsBase.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/services/CustomPreset.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/services/CustomPreset.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/services/CustomPreset.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/services/CustomTraderAssortData.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/services/CustomTraderAssortData.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/services/CustomTraderAssortData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/IAsyncQueue.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/IAsyncQueue.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/ICommand.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/ICommand.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/ICommand.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/ILogger.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/ILogger.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/ILogger.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/ILogger.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/IUuidGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/utils/IUuidGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/HttpRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/HttpRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/HttpRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/HttpRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/ImageRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/ImageRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/ImageRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/ImageRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/ItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/ItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/ItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/ItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/BotDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/BotDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/BotDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/BundleDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/BundleDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/BundleDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/CustomizationDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/CustomizationDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/DataDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/DataDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/DataDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/HttpDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/HttpDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/HttpDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/InraidDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/InraidDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/InraidDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/LocationDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/LocationDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/LocationDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/NotifierDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/NotifierDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/NotifierDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/TraderDynamicRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/dynamic/TraderDynamicRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/dynamic/TraderDynamicRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/CustomizationItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/CustomizationItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/CustomizationItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/HealthItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/HealthItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/HealthItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/HideoutItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/HideoutItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/HideoutItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/InsuranceItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/InsuranceItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/InsuranceItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/InventoryItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/InventoryItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/InventoryItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/NoteItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/NoteItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/NoteItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/PresetBuildItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/PresetBuildItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/QuestItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/QuestItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/QuestItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/RagfairItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/RagfairItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/RagfairItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/RepairItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/RepairItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/RepairItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/TradeItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/TradeItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/TradeItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/WishlistItemEventRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/item_events/WishlistItemEventRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/item_events/WishlistItemEventRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/HealthSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/HealthSaveLoadRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/HealthSaveLoadRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/InraidSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/InraidSaveLoadRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/InraidSaveLoadRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/InsuranceSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/InsuranceSaveLoadRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/ProfileSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/save_load/ProfileSaveLoadRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/serializers/BundleSerializer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/serializers/BundleSerializer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/serializers/BundleSerializer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/serializers/ImageSerializer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/serializers/ImageSerializer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/serializers/ImageSerializer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/serializers/NotifySerializer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/serializers/NotifySerializer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/serializers/NotifySerializer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/BotStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/BotStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/BotStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/BundleStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/BundleStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/BundleStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/CustomizationStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/CustomizationStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/CustomizationStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/DataStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/DataStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/DataStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/DialogStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/DialogStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/DialogStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/GameStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/GameStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/GameStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/HealthStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/HealthStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/HealthStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/InraidStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/InraidStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/InraidStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/InsuranceStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/InsuranceStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/InsuranceStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/ItemEventStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/ItemEventStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/ItemEventStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/LauncherStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/LauncherStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/LauncherStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/LocationStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/LocationStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/LocationStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/MatchStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/MatchStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/MatchStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/NotifierStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/NotifierStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/NotifierStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/PresetStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/PresetStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/PresetStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/ProfileStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/ProfileStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/ProfileStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/QuestStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/QuestStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/QuestStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/RagfairStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/RagfairStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/RagfairStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/TraderStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/TraderStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/TraderStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/WeatherStaticRouter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/routers/static/WeatherStaticRouter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/routers/static/WeatherStaticRouter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/ConfigServer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/ConfigServer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/ConfigServer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/ConfigServer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/DatabaseServer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/DatabaseServer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/DatabaseServer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/DatabaseServer.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/HttpServer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/HttpServer.d.ts similarity index 91% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/HttpServer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/HttpServer.d.ts index 5234966..44d802b 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/servers/HttpServer.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/HttpServer.d.ts @@ -1,6 +1,7 @@ /// /// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; @@ -25,8 +26,9 @@ export declare class HttpServer implements IHttpServer { protected httpServerHelper: HttpServerHelper; protected serializers: Serializer[]; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); protected buffers: {}; protected onReceive: {}; protected onRespond: {}; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/RagfairServer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/RagfairServer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/RagfairServer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/RagfairServer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/SaveServer.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/SaveServer.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/servers/SaveServer.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/servers/SaveServer.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/BotLootCacheService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/BotLootCacheService.d.ts similarity index 71% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/BotLootCacheService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/BotLootCacheService.d.ts index 72eb332..cc71eee 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/BotLootCacheService.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/BotLootCacheService.d.ts @@ -1,6 +1,6 @@ import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -22,19 +22,42 @@ export declare class BotLootCacheService { * Get the fully created loot array, ordered by price low to high * @param botRole bot to get loot for * @param isPmc is the bot a pmc - * @param lootType what type of loot is needed + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) * @param lootPool the full pool of loot (needed when cache is empty) * @returns ITemplateItem array */ getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; /** * Generate loot for a bot and store inside a private class property - * @param botRole - * @param lootType + * @param botRole bots role (assault / pmcBot etc) * @param lootPool the full pool of loot we use to create the various sub-categories with - * @param isPmc + * @param isPmc Is the bot a PMC (alteres what loot is cached) */ - protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; /** * Check if a bot type exists inside the loot cache * @param botRole role to check for diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/FenceService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/FenceService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/FenceService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/FenceService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/HashCacheService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/HashCacheService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/HashCacheService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/HashCacheService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/InsuranceService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/InsuranceService.d.ts similarity index 81% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/InsuranceService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/InsuranceService.d.ts index 0219816..171bf10 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/InsuranceService.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/InsuranceService.d.ts @@ -22,7 +22,6 @@ export declare class InsuranceService { protected dialogueHelper: DialogueHelper; protected configServer: ConfigServer; protected insured: Record>; - protected templatesById: {}; protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; @@ -32,9 +31,19 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/LocaleService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/LocaleService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/LocaleService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/LocaleService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/MatchLocationService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/MatchLocationService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/MatchLocationService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/MatchLocationService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/ModCompilerService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/ModCompilerService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/ModCompilerService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/ModCompilerService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/NotificationService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/NotificationService.d.ts similarity index 72% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/NotificationService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/NotificationService.d.ts index 7e2a127..65a84dd 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/NotificationService.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - protected messageQueue: {}; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/PaymentService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/PaymentService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/PaymentService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/PaymentService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/PlayerService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/PlayerService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/PlayerService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/PlayerService.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/ProfileFixerService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/ProfileFixerService.d.ts similarity index 64% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/ProfileFixerService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/ProfileFixerService.d.ts index 313a907..ed1dec7 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/services/ProfileFixerService.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/ProfileFixerService.d.ts @@ -1,6 +1,8 @@ import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { Watermark } from "../utils/Watermark"; @@ -29,8 +31,27 @@ export declare class ProfileFixerService { protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; /** * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots * @param pmcProfile diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairCategoriesService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairCategoriesService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairCategoriesService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairCategoriesService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairLinkedItemService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairLinkedItemService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairLinkedItemService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairOfferService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairOfferService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairOfferService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairOfferService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairPriceService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairPriceService.d.ts similarity index 98% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairPriceService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairPriceService.d.ts index e33bbb9..679fe1d 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairPriceService.d.ts @@ -27,6 +27,7 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; /** diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairRequiredItemsService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/RagfairRequiredItemsService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/RagfairRequiredItemsService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/TraderAssortService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/TraderAssortService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/TraderAssortService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/TraderAssortService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/CustomItemService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/image/imageRouteService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/image/imageRouteService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/image/imageRouteService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onLoad/OnLoadMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onLoad/OnLoadMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onLoad/OnLoadMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onLoad/OnLoadMod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onLoad/OnLoadModService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onLoad/OnLoadModService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onLoad/OnLoadModService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onUpdate/OnUpdateMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onUpdate/OnUpdateMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onUpdate/OnUpdateMod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onUpdate/OnUpdateModService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/onUpdate/OnUpdateModService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/onUpdate/OnUpdateModService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/staticRouter/StaticRouterMod.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/staticRouter/StaticRouterMod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/staticRouter/StaticRouterMod.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/staticRouter/StaticRouterMod.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/staticRouter/StaticRouterModService.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/mod/staticRouter/StaticRouterModService.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/services/mod/staticRouter/StaticRouterModService.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/App.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/App.d.ts similarity index 89% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/App.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/App.d.ts index 34c141e..dcc2669 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/App.d.ts +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/App.d.ts @@ -11,4 +11,5 @@ export declare class App { constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/AyncQueue.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/AyncQueue.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/AyncQueue.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/AyncQueue.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/DatabaseImporter.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/DatabaseImporter.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/DatabaseImporter.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/DatabaseImporter.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/HashUtil.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/HashUtil.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/HashUtil.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/HashUtil.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/HttpResponseUtil.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/HttpResponseUtil.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/HttpResponseUtil.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/HttpResponseUtil.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/JsonUtil.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/JsonUtil.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/JsonUtil.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/JsonUtil.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/Logger.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/Logger.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/Logger.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/Logger.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/MathUtil.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/MathUtil.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/MathUtil.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/MathUtil.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/ObjectId.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/ObjectId.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/ObjectId.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/ObjectId.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/RandomUtil.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/RandomUtil.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/RandomUtil.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/RandomUtil.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/TimeUtil.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/TimeUtil.d.ts new file mode 100644 index 0000000..eed4e6d --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/TimeUtil.d.ts @@ -0,0 +1,18 @@ +export declare class TimeUtil { + static readonly oneHourAsSeconds = 3600; + formatTime(date: Date): string; + formatDate(date: Date): string; + getDate(): string; + getTime(): string; + getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/UUidGenerator.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/UUidGenerator.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/UUidGenerator.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/UUidGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/VFS.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/VFS.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/VFS.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/VFS.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/Watermark.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/Watermark.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/Watermark.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/Watermark.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/decorators/Singleton.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/decorators/Singleton.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/decorators/Singleton.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/decorators/Singleton.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/decorators/constructor.d.ts b/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/decorators/constructor.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/utils/decorators/constructor.d.ts rename to Live/CWX_DeSharpener/CWX-DeSharpener 1.4.1/user/mods/CWX-DeSharpener 1.4.1/types/utils/decorators/constructor.d.ts diff --git a/Live/CWX_DeSharpener/server/dist/package.json b/Live/CWX_DeSharpener/server/dist/package.json index 1f1e7af..f36dcfa 100644 --- a/Live/CWX_DeSharpener/server/dist/package.json +++ b/Live/CWX_DeSharpener/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "DeSharpener", "author": "CWX", - "version": "1.4.0", + "version": "1.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.1.1", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_DeSharpener/server/dist/src/mod.ts b/Live/CWX_DeSharpener/server/dist/src/mod.ts index cd4117d..c829f2f 100644 --- a/Live/CWX_DeSharpener/server/dist/src/mod.ts +++ b/Live/CWX_DeSharpener/server/dist/src/mod.ts @@ -1,6 +1,5 @@ import { DependencyContainer } from "tsyringe"; import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; class CWX_Desharpner implements IPreAkiLoadMod { @@ -8,10 +7,7 @@ class CWX_Desharpner implements IPreAkiLoadMod public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } } diff --git a/Live/CWX_DeSharpener/server/dist/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_DeSharpener/server/dist/types/callbacks/NotifierCallbacks.d.ts index cd1e736..c42058f 100644 --- a/Live/CWX_DeSharpener/server/dist/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/callbacks/NotifierCallbacks.d.ts @@ -16,7 +16,7 @@ export declare class NotifierCallbacks { * until we actually have something to send because otherwise we'd spam the client * and the client would abort the connection due to spam. */ - sendNotification(_sessionID: string, req: any, resp: any, _data: any): void; + sendNotification(sessionID: string, req: any, resp: any, data: any): void; getNotifier(url: string, info: any, sessionID: string): IGetBodyResponseData; createNotifierChannel(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_DeSharpener/server/dist/types/context/ApplicationContext.d.ts b/Live/CWX_DeSharpener/server/dist/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/context/ContextVariable.d.ts b/Live/CWX_DeSharpener/server/dist/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/context/ContextVariableType.d.ts b/Live/CWX_DeSharpener/server/dist/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/BotController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/BotController.d.ts index 09a1788..5e6f05d 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/BotController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/BotController.d.ts @@ -30,6 +30,6 @@ export declare class BotController { */ getBotDifficulty(type: string, difficulty: string): Difficulty; protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/HideoutController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/HideoutController.d.ts index f2930ff..3eefe1a 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/HideoutController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/HideoutController.d.ts @@ -1,14 +1,15 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HideoutArea, IPmcData, Product } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -42,26 +43,59 @@ export declare class HideoutController { protected httpResponse: HttpResponseUtil; protected profileHelper: ProfileHelper; protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; - protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; - protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { - [x: string]: number; - }; - protected getRandomisedScavRewards(rarityItemCounter: { - [x: string]: number; - }): Product[]; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/InraidController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/InraidController.d.ts index 7f2036c..b899e7d 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/InraidController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/InraidController.d.ts @@ -1,7 +1,8 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; @@ -12,20 +13,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { protected saveServer: SaveServer; protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected questHelper: QuestHelper; protected itemHelper: ItemHelper; - protected extendedProfileHelper: ExtendedProfileHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; protected healthHelper: HealthHelper; protected traderHelper: TraderHelper; protected insuranceService: InsuranceService; protected inRaidHelper: InRaidHelper; protected configServer: ConfigServer; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/InsuranceController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/InsuranceController.d.ts index af45442..6895383 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/InsuranceController.d.ts @@ -41,5 +41,4 @@ export declare class InsuranceController { * @returns response object to send to client */ cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; - doAbsolutelyNothing(): void; } diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/MatchController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/MatchController.d.ts index 0851ab0..71cb7d3 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/MatchController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/MatchController.d.ts @@ -1,3 +1,4 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; @@ -21,9 +22,10 @@ export declare class MatchController { protected traderHelper: TraderHelper; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; createGroup(sessionID: string, info: ICreateGroupRequestData): any; diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/NoteController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/NoteController.d.ts index cc78383..ee70541 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/NoteController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { +export declare class NoteController { protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/ProfileController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/ProfileController.d.ts index b40bb7d..8c89a02 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/ProfileController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -21,9 +22,10 @@ export declare class ProfileController { protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; protected traderHelper: TraderHelper; - protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/RepairController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/RepairController.d.ts index 330684d..0e78ef6 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/RepairController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/RepairController.d.ts @@ -21,7 +21,6 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/Live/CWX_DeSharpener/server/dist/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_DeSharpener/server/dist/types/controllers/RepeatableQuestController.d.ts index 2bb2aa9..98d05dd 100644 --- a/Live/CWX_DeSharpener/server/dist/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/controllers/RepeatableQuestController.d.ts @@ -4,7 +4,8 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; diff --git a/Live/CWX_DeSharpener/server/dist/types/generators/BotGenerator.d.ts b/Live/CWX_DeSharpener/server/dist/types/generators/BotGenerator.d.ts index 28f05a9..a5fc0ad 100644 --- a/Live/CWX_DeSharpener/server/dist/types/generators/BotGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/generators/BotGenerator.d.ts @@ -1,13 +1,14 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { Health as PmcHealth } from "../models/eft/common/IPmcData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { Health, Inventory, Skills } from "../models/eft/common/tables/IBotType"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -23,19 +24,30 @@ export declare class BotGenerator { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; protected databaseServer: DatabaseServer; protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; protected botHelper: BotHelper; protected gameEventHelper: GameEventHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); /** - * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config - * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns */ - protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; /** * Get a randomised PMC side based on bot config value 'isUsec' * @returns pmc side as string @@ -46,7 +58,7 @@ export declare class BotGenerator { * @returns IBotBase object */ protected getCloneOfBotBase(): IBotBase; - protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; /** * Log the number of PMCs generated to the debug console */ diff --git a/Live/CWX_DeSharpener/server/dist/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_DeSharpener/server/dist/types/generators/BotInventoryGenerator.d.ts index 783d0c5..35d1ee8 100644 --- a/Live/CWX_DeSharpener/server/dist/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/generators/BotInventoryGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; diff --git a/Live/CWX_DeSharpener/server/dist/types/generators/BotLootGenerator.d.ts b/Live/CWX_DeSharpener/server/dist/types/generators/BotLootGenerator.d.ts index 2295f51..c6a3f29 100644 --- a/Live/CWX_DeSharpener/server/dist/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/generators/BotLootGenerator.d.ts @@ -1,8 +1,9 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -10,6 +11,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -17,11 +19,106 @@ export declare class BotLootGenerator { protected databaseServer: DatabaseServer; protected handbookHelper: HandbookHelper; protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; protected getRandomisedCount(min: number, max: number, nValue: number): number; - protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_DeSharpener/server/dist/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_DeSharpener/server/dist/types/generators/BotWeaponGenerator.d.ts index 80dc37c..9215214 100644 --- a/Live/CWX_DeSharpener/server/dist/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/generators/BotWeaponGenerator.d.ts @@ -1,15 +1,19 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { protected jsonUtil: JsonUtil; protected logger: ILogger; @@ -19,19 +23,69 @@ export declare class BotWeaponGenerator { protected weightedRandomHelper: WeightedRandomHelper; protected botGeneratorHelper: BotGeneratorHelper; protected randomUtil: RandomUtil; - private readonly modMagazineSlotId; - constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; /** * Get the mods necessary to kit out a weapon to its preset level * @param weaponTpl weapon to find preset for * @param equipmentSlot the slot the weapon will be placed in - * @param weaponParentId + * @param weaponParentId Value used for the parentid * @returns array of weapon mods */ protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; + protected isWeaponValid(weaponItemArray: Item[]): boolean; /** * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. * Additionally, adds extra bullets to SecuredContainer @@ -40,9 +94,10 @@ export declare class BotWeaponGenerator { * @param magCounts * @param ammoTpl * @param inventory + * @param botRole the bot type we're getting generating extra mags for * @returns */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; /** * Get a randomised number of bullets for a specific magazine * @param magCounts min and max count of magazines @@ -68,18 +123,31 @@ export declare class BotWeaponGenerator { * Get a weapons magazine tpl from a weapon template * @param weaponMods mods from a weapon template * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for * @returns magazine tpl string */ - protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; /** - * Finds and returns compatible ammo tpl - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns compatible ammo tpl + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; /** * Fill existing magazines to full, while replacing their contents with specified ammo * @param weaponMods @@ -87,6 +155,14 @@ export declare class BotWeaponGenerator { * @param ammoTpl */ protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; /** * Fill each Camora with a bullet * @param weaponMods Weapon mods to find and update camora mod(s) from diff --git a/Live/CWX_DeSharpener/server/dist/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_DeSharpener/server/dist/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_DeSharpener/server/dist/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/BotGeneratorHelper.d.ts index 243e7a8..3cd7256 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/BotGeneratorHelper.d.ts @@ -1,5 +1,5 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; @@ -28,20 +28,13 @@ export declare class BotGeneratorHelper { protected configServer: ConfigServer; protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; /** * Is this magazine cylinder related (revolvers and grenade launchers) * @param magazineParentName the name of the magazines parent * @returns true if it is cylinder related */ magazineIsCylinderRelated(magazineParentName: string): boolean; - /** - * Get a list of non black-listed cartridges from the PMC bot config - * @param modSlot mod item slot - * @param itemModPool - * @returns string array of cartridges PMCs can use - */ - protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; /** * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot * never return true for an item that has 0% spawn chance @@ -53,6 +46,7 @@ export declare class BotGeneratorHelper { protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; /** * Get a list of containers that hold ammo + * e.g. mod_magazine * @returns string array */ protected getAmmoContainers(): string[]; diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/BotHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/BotHelper.d.ts index 6b92566..9b89481 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/BotHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/BotHelper.d.ts @@ -1,4 +1,4 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -14,6 +14,7 @@ export declare class BotHelper { protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; /** * Randomise the chance the PMC will attack their own side diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/DialogueHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/DialogueHelper.d.ts index 9776c6a..e3e2bda 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -15,7 +16,25 @@ export declare class DialogueHelper { protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/GameEventHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/GameEventHelper.d.ts index b2d6377..7613053 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/GameEventHelper.d.ts @@ -2,7 +2,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/HideoutHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/HideoutHelper.d.ts index 76b337f..36e4009 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/HideoutHelper.d.ts @@ -1,6 +1,6 @@ -import { Common, HideoutArea, IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; import { Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -30,14 +30,10 @@ export declare class HideoutHelper { protected inventoryHelper: InventoryHelper; protected playerService: PlayerService; protected configServer: ConfigServer; - static BITCOIN_FARM: string; - protected WATER_COLLECTOR: string; - protected BITCOIN: string; - protected EXPEDITIONARY_FUEL_TANK: string; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; @@ -64,5 +60,4 @@ export declare class HideoutHelper { protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/InRaidHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/InRaidHelper.d.ts index 58e0f6a..c3cbfbb 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -15,21 +16,72 @@ export declare class InRaidHelper { protected inventoryHelper: InventoryHelper; protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; /** * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death * @param pmcData Player profile * @param sessionID Session id * @returns Player profile with pmc inventory cleared diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/ItemHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/ItemHelper.d.ts index 4e0eba4..1701c62 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/ItemHelper.d.ts @@ -1,4 +1,5 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; import { Item, Repairable } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/ProfileHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/ProfileHelper.d.ts index b369000..6c150c8 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -36,4 +37,10 @@ export declare class ProfileHelper { getDefaultCounters(): Stats; protected isWiped(sessionID: string): boolean; protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/QuestHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/QuestHelper.d.ts index 0b10135..0f68cd5 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/QuestHelper.d.ts @@ -1,8 +1,9 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; @@ -35,8 +36,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected questConfig: IQuestConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -48,11 +48,17 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; protected processReward(reward: Reward): any[]; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; @@ -83,6 +89,13 @@ export declare class QuestHelper { */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; /** * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks * @param pmcData Player profile @@ -91,7 +104,7 @@ export declare class QuestHelper { * @param sessionID Seession id * @returns array of reward objects */ - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; /** * Get the intel center bonus a player has * @param pmcData player profile diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairOfferHelper.d.ts index 5a77e13..8d03bee 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairOfferHelper.d.ts @@ -40,7 +40,7 @@ export declare class RagfairOfferHelper { protected ragfairOfferService: RagfairOfferService; protected localeService: LocaleService; protected configServer: ConfigServer; - protected static TPL_GOODS_SOLD: string; + protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairServerHelper.d.ts index a52306b..e4939d1 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/RagfairServerHelper.d.ts @@ -26,7 +26,7 @@ export declare class RagfairServerHelper { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - protected static TPL_GOODS_RETURNED: string; + protected static goodsReturnedTemplate: string; constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item diff --git a/Live/CWX_DeSharpener/server/dist/types/helpers/RepairHelper.d.ts b/Live/CWX_DeSharpener/server/dist/types/helpers/RepairHelper.d.ts index 545108e..9a3ab29 100644 --- a/Live/CWX_DeSharpener/server/dist/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/helpers/RepairHelper.d.ts @@ -14,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Live/CWX_DeSharpener/server/dist/types/models/common/MinMax.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/eft/common/IPmcData.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/eft/common/IPmcData.d.ts index 56bf07f..5703e4b 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/eft/common/IPmcData.d.ts @@ -1,347 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage?: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; - NeedWipeOptions: any[]; - lastCompletedWipe: LastCompleted; - lastCompletedEvent?: LastCompleted; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface LastCompleted { - $oid: string; +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_DeSharpener/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_DeSharpener/server/dist/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/eft/profile/IAkiProfile.d.ts index 3e0b319..eaa66c1 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -153,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/enums/AmmoTypes.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/enums/ConfigTypes.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/enums/ConfigTypes.d.ts index 1c49e62..61d6f99 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/enums/ConfigTypes.d.ts @@ -11,9 +11,11 @@ export declare enum ConfigTypes { LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/enums/ContainerTypes.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/enums/QuestStatus.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/enums/QuestStatus.d.ts index 6335c73..ba65933 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/enums/QuestStatus.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/enums/QuestStatus.d.ts @@ -6,5 +6,6 @@ export declare enum QuestStatus { Success = 4, Fail = 5, FailRestartable = 6, - MarkedAsFailed = 7 + MarkedAsFailed = 7, + Expired = 8 } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/enums/SkillTypes.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IBotConfig.d.ts index f8cf39b..e171087 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -7,8 +8,11 @@ export interface IBotConfig extends IBaseConfig { lootNValue: LootNvalue; revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -90,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -100,18 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRagfairConfig.d.ts index 8518252..c24e617 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -40,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_DeSharpener/server/dist/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_DeSharpener/server/dist/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/servers/HttpServer.d.ts b/Live/CWX_DeSharpener/server/dist/types/servers/HttpServer.d.ts index 5234966..44d802b 100644 --- a/Live/CWX_DeSharpener/server/dist/types/servers/HttpServer.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/servers/HttpServer.d.ts @@ -1,6 +1,7 @@ /// /// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; @@ -25,8 +26,9 @@ export declare class HttpServer implements IHttpServer { protected httpServerHelper: HttpServerHelper; protected serializers: Serializer[]; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); protected buffers: {}; protected onReceive: {}; protected onRespond: {}; diff --git a/Live/CWX_DeSharpener/server/dist/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_DeSharpener/server/dist/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/services/BotLootCacheService.d.ts b/Live/CWX_DeSharpener/server/dist/types/services/BotLootCacheService.d.ts index 72eb332..cc71eee 100644 --- a/Live/CWX_DeSharpener/server/dist/types/services/BotLootCacheService.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/services/BotLootCacheService.d.ts @@ -1,6 +1,6 @@ import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -22,19 +22,42 @@ export declare class BotLootCacheService { * Get the fully created loot array, ordered by price low to high * @param botRole bot to get loot for * @param isPmc is the bot a pmc - * @param lootType what type of loot is needed + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) * @param lootPool the full pool of loot (needed when cache is empty) * @returns ITemplateItem array */ getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; /** * Generate loot for a bot and store inside a private class property - * @param botRole - * @param lootType + * @param botRole bots role (assault / pmcBot etc) * @param lootPool the full pool of loot we use to create the various sub-categories with - * @param isPmc + * @param isPmc Is the bot a PMC (alteres what loot is cached) */ - protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; /** * Check if a bot type exists inside the loot cache * @param botRole role to check for diff --git a/Live/CWX_DeSharpener/server/dist/types/services/InsuranceService.d.ts b/Live/CWX_DeSharpener/server/dist/types/services/InsuranceService.d.ts index 0219816..171bf10 100644 --- a/Live/CWX_DeSharpener/server/dist/types/services/InsuranceService.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/services/InsuranceService.d.ts @@ -22,7 +22,6 @@ export declare class InsuranceService { protected dialogueHelper: DialogueHelper; protected configServer: ConfigServer; protected insured: Record>; - protected templatesById: {}; protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; @@ -32,9 +31,19 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; diff --git a/Live/CWX_DeSharpener/server/dist/types/services/NotificationService.d.ts b/Live/CWX_DeSharpener/server/dist/types/services/NotificationService.d.ts index 7e2a127..65a84dd 100644 --- a/Live/CWX_DeSharpener/server/dist/types/services/NotificationService.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - protected messageQueue: {}; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_DeSharpener/server/dist/types/services/ProfileFixerService.d.ts b/Live/CWX_DeSharpener/server/dist/types/services/ProfileFixerService.d.ts index 313a907..ed1dec7 100644 --- a/Live/CWX_DeSharpener/server/dist/types/services/ProfileFixerService.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/services/ProfileFixerService.d.ts @@ -1,6 +1,8 @@ import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { Watermark } from "../utils/Watermark"; @@ -29,8 +31,27 @@ export declare class ProfileFixerService { protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; /** * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots * @param pmcProfile diff --git a/Live/CWX_DeSharpener/server/dist/types/services/RagfairPriceService.d.ts b/Live/CWX_DeSharpener/server/dist/types/services/RagfairPriceService.d.ts index e33bbb9..679fe1d 100644 --- a/Live/CWX_DeSharpener/server/dist/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/services/RagfairPriceService.d.ts @@ -27,6 +27,7 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; /** diff --git a/Live/CWX_DeSharpener/server/dist/types/services/mod/CustomItemService.d.ts b/Live/CWX_DeSharpener/server/dist/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_DeSharpener/server/dist/types/utils/App.d.ts b/Live/CWX_DeSharpener/server/dist/types/utils/App.d.ts index 34c141e..dcc2669 100644 --- a/Live/CWX_DeSharpener/server/dist/types/utils/App.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/utils/App.d.ts @@ -11,4 +11,5 @@ export declare class App { constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_DeSharpener/server/dist/types/utils/TimeUtil.d.ts b/Live/CWX_DeSharpener/server/dist/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_DeSharpener/server/dist/types/utils/TimeUtil.d.ts +++ b/Live/CWX_DeSharpener/server/dist/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_DeSharpener/server/dist/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_DeSharpener/server/dist/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_DeSharpener/server/dist/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_DeSharpener/server/package.json b/Live/CWX_DeSharpener/server/package.json index 1f1e7af..f36dcfa 100644 --- a/Live/CWX_DeSharpener/server/package.json +++ b/Live/CWX_DeSharpener/server/package.json @@ -1,10 +1,10 @@ { "name": "DeSharpener", "author": "CWX", - "version": "1.4.0", + "version": "1.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.1.1", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_DeSharpener/server/src/mod.ts b/Live/CWX_DeSharpener/server/src/mod.ts index cd4117d..c829f2f 100644 --- a/Live/CWX_DeSharpener/server/src/mod.ts +++ b/Live/CWX_DeSharpener/server/src/mod.ts @@ -1,6 +1,5 @@ import { DependencyContainer } from "tsyringe"; import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; class CWX_Desharpner implements IPreAkiLoadMod { @@ -8,10 +7,7 @@ class CWX_Desharpner implements IPreAkiLoadMod public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } } diff --git a/Live/CWX_DeSharpener/server/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_DeSharpener/server/types/callbacks/NotifierCallbacks.d.ts index cd1e736..c42058f 100644 --- a/Live/CWX_DeSharpener/server/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_DeSharpener/server/types/callbacks/NotifierCallbacks.d.ts @@ -16,7 +16,7 @@ export declare class NotifierCallbacks { * until we actually have something to send because otherwise we'd spam the client * and the client would abort the connection due to spam. */ - sendNotification(_sessionID: string, req: any, resp: any, _data: any): void; + sendNotification(sessionID: string, req: any, resp: any, data: any): void; getNotifier(url: string, info: any, sessionID: string): IGetBodyResponseData; createNotifierChannel(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; selectProfile(url: string, info: ISelectProfileRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_DeSharpener/server/types/context/ApplicationContext.d.ts b/Live/CWX_DeSharpener/server/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_DeSharpener/server/types/context/ContextVariable.d.ts b/Live/CWX_DeSharpener/server/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_DeSharpener/server/types/context/ContextVariableType.d.ts b/Live/CWX_DeSharpener/server/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_DeSharpener/server/types/controllers/BotController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/BotController.d.ts index 09a1788..5e6f05d 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/BotController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/BotController.d.ts @@ -30,6 +30,6 @@ export declare class BotController { */ getBotDifficulty(type: string, difficulty: string): Difficulty; protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_DeSharpener/server/types/controllers/HideoutController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/HideoutController.d.ts index f2930ff..3eefe1a 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/HideoutController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/HideoutController.d.ts @@ -1,14 +1,15 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; -import { HideoutArea, IPmcData, Product } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; -import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeItemOutRequestData } from "../models/eft/hideout/IHideoutTakeItemOutRequestData"; @@ -42,26 +43,59 @@ export declare class HideoutController { protected httpResponse: HttpResponseUtil; protected profileHelper: ProfileHelper; protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; protected hideoutConfig: IHideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; - protected removeItemFromGenerator(sessionID: string, pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; - protected getRandomisedItemRarityCounter(recipe: IHideoutScavCase): { - [x: string]: number; - }; - protected getRandomisedScavRewards(rarityItemCounter: { - [x: string]: number; - }): Product[]; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; diff --git a/Live/CWX_DeSharpener/server/types/controllers/InraidController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/InraidController.d.ts index 7f2036c..b899e7d 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/InraidController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/InraidController.d.ts @@ -1,7 +1,8 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; @@ -12,20 +13,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { protected saveServer: SaveServer; protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; protected databaseServer: DatabaseServer; protected questHelper: QuestHelper; protected itemHelper: ItemHelper; - protected extendedProfileHelper: ExtendedProfileHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; protected healthHelper: HealthHelper; protected traderHelper: TraderHelper; protected insuranceService: InsuranceService; protected inRaidHelper: InRaidHelper; protected configServer: ConfigServer; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_DeSharpener/server/types/controllers/InsuranceController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/InsuranceController.d.ts index af45442..6895383 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/InsuranceController.d.ts @@ -41,5 +41,4 @@ export declare class InsuranceController { * @returns response object to send to client */ cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; - doAbsolutelyNothing(): void; } diff --git a/Live/CWX_DeSharpener/server/types/controllers/MatchController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/MatchController.d.ts index 0851ab0..71cb7d3 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/MatchController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/MatchController.d.ts @@ -1,3 +1,4 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; @@ -21,9 +22,10 @@ export declare class MatchController { protected traderHelper: TraderHelper; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; protected matchConfig: IMatchConfig; protected inraidConfig: IInRaidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; createGroup(sessionID: string, info: ICreateGroupRequestData): any; diff --git a/Live/CWX_DeSharpener/server/types/controllers/NoteController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/NoteController.d.ts index cc78383..ee70541 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/NoteController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { +export declare class NoteController { protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_DeSharpener/server/types/controllers/ProfileController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/ProfileController.d.ts index b40bb7d..8c89a02 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/ProfileController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -21,9 +22,10 @@ export declare class ProfileController { protected databaseServer: DatabaseServer; protected itemHelper: ItemHelper; protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; protected traderHelper: TraderHelper; - protected extendedProfileHelper: ExtendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; diff --git a/Live/CWX_DeSharpener/server/types/controllers/RepairController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/RepairController.d.ts index 330684d..0e78ef6 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/RepairController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/RepairController.d.ts @@ -21,7 +21,6 @@ export declare class RepairController { protected repairHelper: RepairHelper; protected configServer: ConfigServer; protected repairConfig: IRepairConfig; - protected readonly WEAPON_SKILL_REPAIR_GAIN: number; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader diff --git a/Live/CWX_DeSharpener/server/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_DeSharpener/server/types/controllers/RepeatableQuestController.d.ts index 2bb2aa9..98d05dd 100644 --- a/Live/CWX_DeSharpener/server/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_DeSharpener/server/types/controllers/RepeatableQuestController.d.ts @@ -4,7 +4,8 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; diff --git a/Live/CWX_DeSharpener/server/types/generators/BotGenerator.d.ts b/Live/CWX_DeSharpener/server/types/generators/BotGenerator.d.ts index 28f05a9..a5fc0ad 100644 --- a/Live/CWX_DeSharpener/server/types/generators/BotGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/types/generators/BotGenerator.d.ts @@ -1,13 +1,14 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { Health as PmcHealth } from "../models/eft/common/IPmcData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { Health, Inventory, Skills } from "../models/eft/common/tables/IBotType"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -23,19 +24,30 @@ export declare class BotGenerator { protected hashUtil: HashUtil; protected randomUtil: RandomUtil; protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; protected databaseServer: DatabaseServer; protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; protected botHelper: BotHelper; protected gameEventHelper: GameEventHelper; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); /** - * Choose if a bot should become a Pmc by checking if bot type is allowed to become a Pmc in bot config - * @param isPlayerScav is a player scav being generated, forces choice returned to never be a pmc + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns */ - protected shouldBotBePmc(isPlayerScav: boolean, role: string): boolean; + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; /** * Get a randomised PMC side based on bot config value 'isUsec' * @returns pmc side as string @@ -46,7 +58,7 @@ export declare class BotGenerator { * @returns IBotBase object */ protected getCloneOfBotBase(): IBotBase; - protected generateBot(bot: IBotBase, role: string, isPmc: boolean): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; /** * Log the number of PMCs generated to the debug console */ diff --git a/Live/CWX_DeSharpener/server/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_DeSharpener/server/types/generators/BotInventoryGenerator.d.ts index 783d0c5..35d1ee8 100644 --- a/Live/CWX_DeSharpener/server/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/types/generators/BotInventoryGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; diff --git a/Live/CWX_DeSharpener/server/types/generators/BotLootGenerator.d.ts b/Live/CWX_DeSharpener/server/types/generators/BotLootGenerator.d.ts index 2295f51..c6a3f29 100644 --- a/Live/CWX_DeSharpener/server/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/types/generators/BotLootGenerator.d.ts @@ -1,8 +1,9 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -10,6 +11,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { protected logger: ILogger; protected hashUtil: HashUtil; @@ -17,11 +19,106 @@ export declare class BotLootGenerator { protected databaseServer: DatabaseServer; protected handbookHelper: HandbookHelper; protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; protected botLootCacheService: BotLootCacheService; protected configServer: ConfigServer; protected botConfig: IBotConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, inventory: PmcInventory): void; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; protected getRandomisedCount(min: number, max: number, nValue: number): number; - protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], count: number, inventory: PmcInventory, totalValueLimit?: number, useLimits?: boolean): void; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_DeSharpener/server/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_DeSharpener/server/types/generators/BotWeaponGenerator.d.ts index 80dc37c..9215214 100644 --- a/Live/CWX_DeSharpener/server/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/types/generators/BotWeaponGenerator.d.ts @@ -1,15 +1,19 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, MinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { protected jsonUtil: JsonUtil; protected logger: ILogger; @@ -19,19 +23,69 @@ export declare class BotWeaponGenerator { protected weightedRandomHelper: WeightedRandomHelper; protected botGeneratorHelper: BotGeneratorHelper; protected randomUtil: RandomUtil; - private readonly modMagazineSlotId; - constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; /** * Get the mods necessary to kit out a weapon to its preset level * @param weaponTpl weapon to find preset for * @param equipmentSlot the slot the weapon will be placed in - * @param weaponParentId + * @param weaponParentId Value used for the parentid * @returns array of weapon mods */ protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; /** Checks if all required slots are occupied on a weapon and all it's mods */ - protected isWeaponValid(itemList: Item[]): boolean; + protected isWeaponValid(weaponItemArray: Item[]): boolean; /** * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. * Additionally, adds extra bullets to SecuredContainer @@ -40,9 +94,10 @@ export declare class BotWeaponGenerator { * @param magCounts * @param ammoTpl * @param inventory + * @param botRole the bot type we're getting generating extra mags for * @returns */ - protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory): void; + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; /** * Get a randomised number of bullets for a specific magazine * @param magCounts min and max count of magazines @@ -68,18 +123,31 @@ export declare class BotWeaponGenerator { * Get a weapons magazine tpl from a weapon template * @param weaponMods mods from a weapon template * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for * @returns magazine tpl string */ - protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; /** - * Finds and returns compatible ammo tpl - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns compatible ammo tpl + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun */ - protected getCompatibleAmmo(weaponMods: Item[], weaponTemplate: ITemplateItem): string; + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; /** * Fill existing magazines to full, while replacing their contents with specified ammo * @param weaponMods @@ -87,6 +155,14 @@ export declare class BotWeaponGenerator { * @param ammoTpl */ protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; /** * Fill each Camora with a bullet * @param weaponMods Weapon mods to find and update camora mod(s) from diff --git a/Live/CWX_DeSharpener/server/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_DeSharpener/server/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_DeSharpener/server/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_DeSharpener/server/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_DeSharpener/server/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/BotGeneratorHelper.d.ts index 243e7a8..3cd7256 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/BotGeneratorHelper.d.ts @@ -1,5 +1,5 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; @@ -28,20 +28,13 @@ export declare class BotGeneratorHelper { protected configServer: ConfigServer; protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; /** * Is this magazine cylinder related (revolvers and grenade launchers) * @param magazineParentName the name of the magazines parent * @returns true if it is cylinder related */ magazineIsCylinderRelated(magazineParentName: string): boolean; - /** - * Get a list of non black-listed cartridges from the PMC bot config - * @param modSlot mod item slot - * @param itemModPool - * @returns string array of cartridges PMCs can use - */ - protected getNonBlacklistedCartridges(modSlot: string, itemModPool: Record): string[]; /** * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot * never return true for an item that has 0% spawn chance @@ -53,6 +46,7 @@ export declare class BotGeneratorHelper { protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; /** * Get a list of containers that hold ammo + * e.g. mod_magazine * @returns string array */ protected getAmmoContainers(): string[]; diff --git a/Live/CWX_DeSharpener/server/types/helpers/BotHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/BotHelper.d.ts index 6b92566..9b89481 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/BotHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/BotHelper.d.ts @@ -1,4 +1,4 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; @@ -14,6 +14,7 @@ export declare class BotHelper { protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; /** * Randomise the chance the PMC will attack their own side diff --git a/Live/CWX_DeSharpener/server/types/helpers/DialogueHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/DialogueHelper.d.ts index 9776c6a..e3e2bda 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -15,7 +16,25 @@ export declare class DialogueHelper { protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_DeSharpener/server/types/helpers/GameEventHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/GameEventHelper.d.ts index b2d6377..7613053 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/GameEventHelper.d.ts @@ -2,7 +2,7 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_DeSharpener/server/types/helpers/HideoutHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/HideoutHelper.d.ts index 76b337f..36e4009 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/HideoutHelper.d.ts @@ -1,6 +1,6 @@ -import { Common, HideoutArea, IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; import { Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -30,14 +30,10 @@ export declare class HideoutHelper { protected inventoryHelper: InventoryHelper; protected playerService: PlayerService; protected configServer: ConfigServer; - static BITCOIN_FARM: string; - protected WATER_COLLECTOR: string; - protected BITCOIN: string; - protected EXPEDITIONARY_FUEL_TANK: string; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; @@ -64,5 +60,4 @@ export declare class HideoutHelper { protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_DeSharpener/server/types/helpers/InRaidHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/InRaidHelper.d.ts index 58e0f6a..c3cbfbb 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -15,21 +16,72 @@ export declare class InRaidHelper { protected inventoryHelper: InventoryHelper; protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; /** * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death * @param pmcData Player profile * @param sessionID Session id * @returns Player profile with pmc inventory cleared diff --git a/Live/CWX_DeSharpener/server/types/helpers/ItemHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/ItemHelper.d.ts index 4e0eba4..1701c62 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/ItemHelper.d.ts @@ -1,4 +1,5 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; import { Item, Repairable } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 diff --git a/Live/CWX_DeSharpener/server/types/helpers/ProfileHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/ProfileHelper.d.ts index b369000..6c150c8 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -36,4 +37,10 @@ export declare class ProfileHelper { getDefaultCounters(): Stats; protected isWiped(sessionID: string): boolean; protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_DeSharpener/server/types/helpers/QuestHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/QuestHelper.d.ts index 0b10135..0f68cd5 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/QuestHelper.d.ts @@ -1,8 +1,9 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; @@ -35,8 +36,7 @@ export declare class QuestHelper { protected configServer: ConfigServer; protected questConfig: IQuestConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -48,11 +48,17 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; protected processReward(reward: Reward): any[]; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; @@ -83,6 +89,13 @@ export declare class QuestHelper { */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; /** * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks * @param pmcData Player profile @@ -91,7 +104,7 @@ export declare class QuestHelper { * @param sessionID Seession id * @returns array of reward objects */ - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): Reward[]; + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; /** * Get the intel center bonus a player has * @param pmcData player profile diff --git a/Live/CWX_DeSharpener/server/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/RagfairOfferHelper.d.ts index 5a77e13..8d03bee 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/RagfairOfferHelper.d.ts @@ -40,7 +40,7 @@ export declare class RagfairOfferHelper { protected ragfairOfferService: RagfairOfferService; protected localeService: LocaleService; protected configServer: ConfigServer; - protected static TPL_GOODS_SOLD: string; + protected static goodSoldTemplate: string; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); diff --git a/Live/CWX_DeSharpener/server/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/RagfairServerHelper.d.ts index a52306b..e4939d1 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/RagfairServerHelper.d.ts @@ -26,7 +26,7 @@ export declare class RagfairServerHelper { protected configServer: ConfigServer; protected ragfairConfig: IRagfairConfig; protected questConfig: IQuestConfig; - protected static TPL_GOODS_RETURNED: string; + protected static goodsReturnedTemplate: string; constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item diff --git a/Live/CWX_DeSharpener/server/types/helpers/RepairHelper.d.ts b/Live/CWX_DeSharpener/server/types/helpers/RepairHelper.d.ts index 545108e..9a3ab29 100644 --- a/Live/CWX_DeSharpener/server/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_DeSharpener/server/types/helpers/RepairHelper.d.ts @@ -14,7 +14,7 @@ export declare class RepairHelper { protected configServer: ConfigServer; protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean): Item; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; diff --git a/Live/CWX_DeSharpener/server/types/models/common/MinMax.d.ts b/Live/CWX_DeSharpener/server/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_DeSharpener/server/types/models/eft/common/IPmcData.d.ts b/Live/CWX_DeSharpener/server/types/models/eft/common/IPmcData.d.ts index 56bf07f..5703e4b 100644 --- a/Live/CWX_DeSharpener/server/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/eft/common/IPmcData.d.ts @@ -1,347 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage?: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; - NeedWipeOptions: any[]; - lastCompletedWipe: LastCompleted; - lastCompletedEvent?: LastCompleted; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface LastCompleted { - $oid: string; +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_DeSharpener/server/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_DeSharpener/server/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_DeSharpener/server/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_DeSharpener/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_DeSharpener/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_DeSharpener/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_DeSharpener/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_DeSharpener/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_DeSharpener/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_DeSharpener/server/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_DeSharpener/server/types/models/eft/profile/IAkiProfile.d.ts index 3e0b319..eaa66c1 100644 --- a/Live/CWX_DeSharpener/server/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -153,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_DeSharpener/server/types/models/enums/AmmoTypes.d.ts b/Live/CWX_DeSharpener/server/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_DeSharpener/server/types/models/enums/ConfigTypes.d.ts b/Live/CWX_DeSharpener/server/types/models/enums/ConfigTypes.d.ts index 1c49e62..61d6f99 100644 --- a/Live/CWX_DeSharpener/server/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/enums/ConfigTypes.d.ts @@ -11,9 +11,11 @@ export declare enum ConfigTypes { LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_DeSharpener/server/types/models/enums/ContainerTypes.d.ts b/Live/CWX_DeSharpener/server/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_DeSharpener/server/types/models/enums/QuestStatus.d.ts b/Live/CWX_DeSharpener/server/types/models/enums/QuestStatus.d.ts index 6335c73..ba65933 100644 --- a/Live/CWX_DeSharpener/server/types/models/enums/QuestStatus.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/enums/QuestStatus.d.ts @@ -6,5 +6,6 @@ export declare enum QuestStatus { Success = 4, Fail = 5, FailRestartable = 6, - MarkedAsFailed = 7 + MarkedAsFailed = 7, + Expired = 8 } diff --git a/Live/CWX_DeSharpener/server/types/models/enums/SkillTypes.d.ts b/Live/CWX_DeSharpener/server/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_DeSharpener/server/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_DeSharpener/server/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_DeSharpener/server/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IBotConfig.d.ts index f8cf39b..e171087 100644 --- a/Live/CWX_DeSharpener/server/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -7,8 +8,11 @@ export interface IBotConfig extends IBaseConfig { lootNValue: LootNvalue; revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -90,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -100,18 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_DeSharpener/server/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_DeSharpener/server/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IRagfairConfig.d.ts index 8518252..c24e617 100644 --- a/Live/CWX_DeSharpener/server/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -40,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_DeSharpener/server/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_DeSharpener/server/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_DeSharpener/server/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_DeSharpener/server/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_DeSharpener/server/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_DeSharpener/server/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_DeSharpener/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_DeSharpener/server/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_DeSharpener/server/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_DeSharpener/server/types/servers/HttpServer.d.ts b/Live/CWX_DeSharpener/server/types/servers/HttpServer.d.ts index 5234966..44d802b 100644 --- a/Live/CWX_DeSharpener/server/types/servers/HttpServer.d.ts +++ b/Live/CWX_DeSharpener/server/types/servers/HttpServer.d.ts @@ -1,6 +1,7 @@ /// /// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; @@ -25,8 +26,9 @@ export declare class HttpServer implements IHttpServer { protected httpServerHelper: HttpServerHelper; protected serializers: Serializer[]; protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); protected buffers: {}; protected onReceive: {}; protected onRespond: {}; diff --git a/Live/CWX_DeSharpener/server/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_DeSharpener/server/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_DeSharpener/server/types/services/BotLootCacheService.d.ts b/Live/CWX_DeSharpener/server/types/services/BotLootCacheService.d.ts index 72eb332..cc71eee 100644 --- a/Live/CWX_DeSharpener/server/types/services/BotLootCacheService.d.ts +++ b/Live/CWX_DeSharpener/server/types/services/BotLootCacheService.d.ts @@ -1,6 +1,6 @@ import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { Items } from "../models/eft/common/tables/IBotType"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -22,19 +22,42 @@ export declare class BotLootCacheService { * Get the fully created loot array, ordered by price low to high * @param botRole bot to get loot for * @param isPmc is the bot a pmc - * @param lootType what type of loot is needed + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) * @param lootPool the full pool of loot (needed when cache is empty) * @returns ITemplateItem array */ getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; /** * Generate loot for a bot and store inside a private class property - * @param botRole - * @param lootType + * @param botRole bots role (assault / pmcBot etc) * @param lootPool the full pool of loot we use to create the various sub-categories with - * @param isPmc + * @param isPmc Is the bot a PMC (alteres what loot is cached) */ - protected addLootToCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): void; + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; /** * Check if a bot type exists inside the loot cache * @param botRole role to check for diff --git a/Live/CWX_DeSharpener/server/types/services/InsuranceService.d.ts b/Live/CWX_DeSharpener/server/types/services/InsuranceService.d.ts index 0219816..171bf10 100644 --- a/Live/CWX_DeSharpener/server/types/services/InsuranceService.d.ts +++ b/Live/CWX_DeSharpener/server/types/services/InsuranceService.d.ts @@ -22,7 +22,6 @@ export declare class InsuranceService { protected dialogueHelper: DialogueHelper; protected configServer: ConfigServer; protected insured: Record>; - protected templatesById: {}; protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; @@ -32,9 +31,19 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; diff --git a/Live/CWX_DeSharpener/server/types/services/NotificationService.d.ts b/Live/CWX_DeSharpener/server/types/services/NotificationService.d.ts index 7e2a127..65a84dd 100644 --- a/Live/CWX_DeSharpener/server/types/services/NotificationService.d.ts +++ b/Live/CWX_DeSharpener/server/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - protected messageQueue: {}; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_DeSharpener/server/types/services/ProfileFixerService.d.ts b/Live/CWX_DeSharpener/server/types/services/ProfileFixerService.d.ts index 313a907..ed1dec7 100644 --- a/Live/CWX_DeSharpener/server/types/services/ProfileFixerService.d.ts +++ b/Live/CWX_DeSharpener/server/types/services/ProfileFixerService.d.ts @@ -1,6 +1,8 @@ import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { Watermark } from "../utils/Watermark"; @@ -29,8 +31,27 @@ export declare class ProfileFixerService { protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; /** * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots * @param pmcProfile diff --git a/Live/CWX_DeSharpener/server/types/services/RagfairPriceService.d.ts b/Live/CWX_DeSharpener/server/types/services/RagfairPriceService.d.ts index e33bbb9..679fe1d 100644 --- a/Live/CWX_DeSharpener/server/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_DeSharpener/server/types/services/RagfairPriceService.d.ts @@ -27,6 +27,7 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; /** diff --git a/Live/CWX_DeSharpener/server/types/services/mod/CustomItemService.d.ts b/Live/CWX_DeSharpener/server/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_DeSharpener/server/types/utils/App.d.ts b/Live/CWX_DeSharpener/server/types/utils/App.d.ts index 34c141e..dcc2669 100644 --- a/Live/CWX_DeSharpener/server/types/utils/App.d.ts +++ b/Live/CWX_DeSharpener/server/types/utils/App.d.ts @@ -11,4 +11,5 @@ export declare class App { constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_DeSharpener/server/types/utils/TimeUtil.d.ts b/Live/CWX_DeSharpener/server/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_DeSharpener/server/types/utils/TimeUtil.d.ts +++ b/Live/CWX_DeSharpener/server/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_DeSharpener/server/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_DeSharpener/server/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_DeSharpener/server/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/src/mod.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/src/mod.ts deleted file mode 100644 index 8a3bdce..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/src/mod.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; - -class CWX_MasterKey implements IMod -{ - private pkg; - - public load(container: DependencyContainer): void - { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); - this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); - } - - public delayedLoad(container: DependencyContainer): void - { return } -} - -module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/Utils.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/Utils.d.ts deleted file mode 100644 index e69de29..0000000 diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/MatchCallbacks.d.ts deleted file mode 100644 index 63d38d9..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/MatchCallbacks.d.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { MatchController } from "../controllers/MatchController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -export declare class MatchCallbacks { - private httpResponse; - private jsonUtil; - private matchController; - private databaseServer; - constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; - getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; - getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; - deleteGroup(url: string, info: any, sessionID: string): INullResponseData; - startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; - endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/BotController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/BotController.d.ts deleted file mode 100644 index 8ecb97f..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/BotController.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { BotGenerator } from "../generators/BotGenerator"; -import { BotHelper } from "../helpers/BotHelper"; -import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { IBotCore } from "../models/eft/common/tables/IBotCore"; -import { Difficulty } from "../models/eft/common/tables/IBotType"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class BotController { - private databaseServer; - private botGenerator; - private botHelper; - private configServer; - private botConfig; - constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); - getBotLimit(type: string): number; - getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - getBotCap(): number; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/GameController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/GameController.d.ts deleted file mode 100644 index bb2a55a..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/GameController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { Watermark } from "../utils/Watermark"; -export declare class GameController { - private logger; - private watermark; - private httpServerHelper; - private profileHelper; - private configServer; - private httpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); - gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - private addMissingBonusesProperty; - private addMissingRepeatableQuestsProperty; - private addMissingWeaponRepairSkill; - private addMissingAkiVersionTagToProfile; - private addMissingArmorRepairSkill; - private fixNullTraderSalesSums; - private removeDanglingConditionCounters; - private removeDanglingBackendCounters; - getGameConfig(sessionID: string): IGameConfigResponse; - getServer(): any[]; - private getActiveRepeatableQuests; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InraidController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InraidController.d.ts deleted file mode 100644 index c1cd6f5..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InraidController.d.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; -import { HealthHelper } from "../helpers/HealthHelper"; -import { InRaidHelper } from "../helpers/InRaidHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { JsonUtil } from "../utils/JsonUtil"; -export declare class InraidController { - private saveServer; - private jsonUtil; - private databaseServer; - private questHelper; - private itemHelper; - private extendedProfileHelper; - private healthHelper; - private traderHelper; - private insuranceService; - private inRaidHelper; - private configServer; - private inraidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); - addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; - saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/MatchController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/MatchController.d.ts deleted file mode 100644 index 84abbe3..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/MatchController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { MatchLocationService } from "../services/MatchLocationService"; -export declare class MatchController { - private saveServer; - private profileHelper; - private matchLocationService; - private traderHelper; - private configServer; - private matchConfig; - private inraidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); - getEnabled(): boolean; - getProfile(info: IGetProfileRequestData): IPmcData[]; - private getMatch; - createGroup(sessionID: string, info: any): any; - deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; - startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; - endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/QuestController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/QuestController.d.ts deleted file mode 100644 index d8caee5..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/QuestController.d.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PlayerService } from "../services/PlayerService"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class QuestController { - private logger; - private timeUtil; - private itemEventRouter; - private databaseServer; - private itemHelper; - private dialogueHelper; - private profileHelper; - private questHelper; - private questConditionHelper; - private playerService; - private configServer; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); - getClientQuests(sessionID: string): IQuest[]; - acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; - acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; - completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; - handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotGenerator.d.ts deleted file mode 100644 index e2565b7..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotGenerator.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { BotHelper } from "../helpers/BotHelper"; -import { GameEventHelper } from "../helpers/GameEventHelper"; -import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotInventoryGenerator } from "./BotInventoryGenerator"; -export declare class BotGenerator { - private logger; - private hashUtil; - private randomUtil; - private jsonUtil; - private databaseServer; - private botInventoryGenerator; - private botHelper; - private gameEventHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - private generateBot; - private generateRandomLevel; - /** Converts health object to the required format */ - private generateHealth; - private generateSkills; - private getPmcRole; - private removeChristmasItemsFromBotInventory; - private generateId; - private generateInventoryID; - private getPMCDifficulty; - private generateDogtag; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotLootGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotLootGenerator.d.ts deleted file mode 100644 index 1d8c8e1..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotLootGenerator.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotLootGenerator { - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private botGeneratorHelper; - private pmcLootGenerator; - private configServer; - private botConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; - private getRandomisedCount; - private addLootFromPool; - /** Compares two item templates by their price to spawn chance ratio */ - private compareByValue; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotWeaponGenerator.d.ts deleted file mode 100644 index e8f91cb..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotWeaponGenerator.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotWeaponGenerator { - private logger; - private hashUtil; - private databaseServer; - private itemHelper; - private weightedRandomHelper; - private botGeneratorHelper; - private randomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - private isWeaponValid; - /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - private generateExtraMagazines; - private addBullets; - /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns - */ - private getCompatibleAmmo; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - private fillExistingMagazines; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/WeatherGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/WeatherGenerator.d.ts deleted file mode 100644 index b9faa3a..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/WeatherGenerator.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../models/eft/weather/IWeatherData"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class WeatherGenerator { - private weightedRandomHelper; - private randomUtil; - private timeUtil; - private configServer; - private weatherConfig; - constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); - calculateTime(data: IWeatherData): IWeatherData; - generateWeather(data: IWeatherData): IWeatherData; - private getWeightedFog; - private getWeightedRain; - private getRandomFloat; - private getRandomInt; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/AssortHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/AssortHelper.d.ts deleted file mode 100644 index 33cb5c6..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/AssortHelper.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemHelper } from "./ItemHelper"; -import { QuestHelper } from "./QuestHelper"; -export declare class AssortHelper { - private logger; - private itemHelper; - private databaseServer; - private questHelper; - constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); - removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; - stripQuestAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; - stripLoyaltyAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotGeneratorHelper.d.ts deleted file mode 100644 index 141f71d..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotGeneratorHelper.d.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { ContainerHelper } from "./ContainerHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { ItemHelper } from "./ItemHelper"; -export declare class BotGeneratorHelper { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private durabilityLimitsHelper; - private itemHelper; - private inventoryHelper; - private containerHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; - /** - * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. - * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. - * Ammo is not put into the magazine directly but assigned to the magazine's slots: The "camora_xxx" slots. - * This function is a helper called by generateModsForItem for mods with parent type "CylinderMagazine" - * - * @param {object} items The items where the CylinderMagazine's camora are appended to - * @param {object} modPool modPool which should include available cartrigdes - * @param {string} parentId The CylinderMagazine's UID - * @param {object} parentTemplate The CylinderMagazine's template - */ - private fillCamora; - generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { - "upd"?: Upd; - }; - private getModTplFromItemDb; - isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. - * Returns a `boolean` indicating success. */ - addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; - private itemAllowedInContainer; -} -export declare class ExhaustableArray { - private itemPool; - private randomUtil; - private jsonUtil; - private pool; - constructor(itemPool: T[], randomUtil: RandomUtil, jsonUtil: JsonUtil); - getRandomValue(): T; - getFirstValue(): T; - hasValues(): boolean; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotHelper.d.ts deleted file mode 100644 index d901362..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/BotHelper.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotHelper { - private logger; - private jsonUtil; - private databaseServer; - private randomUtil; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); - getBotDifficultySettings(type: string, difficulty: string): Difficulty; - getPmcDifficultySettings(type: string, difficulty: string): Difficulty; - randomisePmcHostility(difficultySettings: Difficulty): void; - isBotPmc(botRole: string): boolean; - isBotBoss(botRole: string): boolean; - isBotFollower(botRole: string): boolean; - addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/DurabilityLimitsHelper.d.ts deleted file mode 100644 index 609bc7d..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/DurabilityLimitsHelper.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotHelper } from "./BotHelper"; -export declare class DurabilityLimitsHelper { - private randomUtil; - private botHelper; - private configServer; - private botConfig; - constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); - getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; - getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; - getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - private generateMaxWeaponDurability; - private generateMaxPmcArmorDurability; - private getLowestMaxWeaponFromConfig; - private getHighestMaxWeaponDurabilityFromConfig; - private generateWeaponDurability; - private generateArmorDurability; - private getMinWeaponDeltaFromConfig; - private getMaxWeaponDeltaFromConfig; - private getMinArmorDeltaFromConfig; - private getMaxArmorDeltaFromConfig; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ExtendedProfileHelper.d.ts deleted file mode 100644 index 4dd7d3a..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ExtendedProfileHelper.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { BotGenerator } from "../generators/BotGenerator"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { Watermark } from "../utils/Watermark"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class ExtendedProfileHelper extends ProfileHelper { - private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); - generatePlayerScav(sessionID: string): IPmcData; - private getScavSkills; - private removeSecureContainer; - private getDefaultScavSkills; - private getScavStats; - private getScavLevel; - private getScavExperience; - private setScavCooldownTimer; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HealthHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HealthHelper.d.ts deleted file mode 100644 index bb160a3..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HealthHelper.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class HealthHelper { - private jsonUtil; - private logger; - private timeUtil; - private saveServer; - private configServer; - private healthConfig; - constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); - resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - private saveHealth; - private saveEffects; - private addEffect; - private isEmpty; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HttpServerHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HttpServerHelper.d.ts deleted file mode 100644 index 2e40814..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HttpServerHelper.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { ConfigServer } from "../servers/ConfigServer"; -export declare class HttpServerHelper { - private configServer; - private httpConfig; - private mime; - constructor(configServer: ConfigServer); - getMimeText(key: string): string; - buildUrl(): string; - getBackendUrl(): string; - getWebsocketUrl(): string; - sendTextJson(resp: any, output: any): void; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/InRaidHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/InRaidHelper.d.ts deleted file mode 100644 index e79d384..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/InRaidHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { InventoryHelper } from "./InventoryHelper"; -import { PaymentHelper } from "./PaymentHelper"; -export declare class InRaidHelper { - private logger; - private saveServer; - private jsonUtil; - private databaseServer; - private inventoryHelper; - private paymentHelper; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - private removePlayer; - private removeMapAccessKey; - addUpdToMoneyFromRaid(items: Item[]): void; - /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims - */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; - deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; - getPlayerGear(items: Item[]): Item[]; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/QuestHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/QuestHelper.d.ts deleted file mode 100644 index 9e2dd5e..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/QuestHelper.d.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class QuestHelper { - private logger; - private jsonUtil; - private timeUtil; - private hashUtil; - private itemHelper; - private itemEventRouter; - private databaseServer; - private ragfairServerHelper; - private dialogueHelper; - private profileHelper; - private paymentHelper; - private traderHelper; - private configServer; - private questConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; - /** - * returns true is the condition is satisfied - */ - evaluateLevel(pmcProfile: IPmcData, cond: AvailableForConditions): boolean; - getDeltaQuests(before: IQuest[], after: IQuest[]): IQuest[]; - rewardSkillPoints(sessionID: string, pmcData: IPmcData, output: IItemEventRouterResponse, skillName: string, progress: number): void; - getQuestLocale(questId: string): any; - /** - * Debug Routine for showing some information on the - * quest list in question. - */ - dumpQuests(quests: any, label?: any): void; - loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; - private processReward; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; - acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; - failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; - applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; - changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; - /** - * Get List of All Quests as an array - */ - questValues(): IQuest[]; - private cleanQuestList; - cleanQuestConditions(quest: IQuest): IQuest; - failQuest(pmcData: IPmcData, body: any, sessionID: string): any; - getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; - getFindItemIdForQuestItem(itemTpl: string): string; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairSortHelper.d.ts deleted file mode 100644 index e9d8069..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairSortHelper.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class RagfairSortHelper { - private databaseServer; - constructor(databaseServer: DatabaseServer); - sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; - private sortOffersByID; - private sortOffersByRating; - private sortOffersByName; - private sortOffersByPrice; - private sortOffersByExpiry; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RepairHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RepairHelper.d.ts deleted file mode 100644 index 47123e1..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RepairHelper.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class RepairHelper { - private logger; - private jsonUtil; - private randomUtil; - private databaseServer; - private configServer; - private repairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; - private getRandomisedArmorRepairDegredationValue; - private getRandomisedWeaponRepairDegredationValue; - isWeaponTemplate(tpl: string): boolean; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderAssortHelper.d.ts deleted file mode 100644 index d95879c..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderAssortHelper.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; -import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { FenceService } from "../services/FenceService"; -import { TraderAssortService } from "../services/TraderAssortService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { AssortHelper } from "./AssortHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderAssortHelper { - private logger; - private jsonUtil; - private databaseServer; - private profileHelper; - private assortHelper; - private ragfairAssortGenerator; - private ragfairOfferGenerator; - private traderAssortService; - private fenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); - getAssort(sessionId: string, traderId: string): ITraderAssort; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderHelper.d.ts deleted file mode 100644 index ec64d59..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TraderHelper.d.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { PlayerService } from "../services/PlayerService"; -import { HandbookHelper } from "./HandbookHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderHelper { - private logger; - private databaseServer; - private saveServer; - private profileHelper; - private paymentHelper; - private itemHelper; - private handbookHelper; - private playerService; - private fenceService; - private configServer; - private traderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); - getTrader(traderID: string, sessionID: string): ITraderBase; - getTraderAssortsById(traderId: string): ITraderAssort; - resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; - getPurchasesData(traderID: string, sessionID: string): Record; - lvlUp(traderID: string, sessionID: string): void; - getTraderUpdateSeconds(traderId: string): number; - traderFilter(traderFilters: string[], tplToCheck: string): boolean; - getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotBase.d.ts deleted file mode 100644 index 677fd49..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotBase.d.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; -export interface IBotBase { - _id: string; - aid: string; - savage: any; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: any; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: any[]; - Hideout: Hideout; - Bonuses: Bonus[]; -} -export interface Info { - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: number; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - NeedWipeOptions: any[]; - lastCompletedWipe: any; - BannedState: boolean; - BannedUntil: number; - IsStreamerModeAvailable: boolean; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: any[]; - Mastering: any[]; - Points: number; -} -export interface Stats { - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; -} -export interface SessionCounters { - Items: any[]; -} -export interface OverallCounters { - Items: any[]; -} -export interface ConditionCounters { - Counters: any[]; -} -export interface Hideout { - Production: Production; - Areas: Area[]; -} -export interface Production { -} -export interface Area { - type: number; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: any[]; - lastRecipe: any; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ITemplateItem.d.ts deleted file mode 100644 index c2ba762..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ITemplateItem.d.ts +++ /dev/null @@ -1,401 +0,0 @@ -export interface ITemplateItem { - _id: string; - _name: string; - _parent: string; - _type: string; - _props: Props; - _proto: string; -} -export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; - Rarity?: string; - SpawnChance?: number; - CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; - Resource?: number; - CoolFactor?: number; - foodUseTime?: number; - foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; -} -export interface Prefab { - path: string; - rcid: string; -} -export interface Grid { - _name: string; - _id: string; - _parent: string; - _props: GridProps; - _proto: string; -} -export interface GridProps { - filters: GridFilter[]; - cellsH: number; - cellsV: number; - minCount: number; - maxCount: number; - maxWeight: number; - isSortingTable: boolean; -} -export interface GridFilter { - Filter: string[]; - ExcludedFilter: string[]; -} -export interface Slot { - _name: string; - _id: string; - _parent: string; - _props: SlotProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface SlotProps { - filters: Filter[]; -} -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { - Filter: string[]; -} -export interface Xyz { - x: number; - y: number; - z: number; -} -export interface StackSlot { - _name?: string; - _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; - _max_count: number; - _props?: StackSlotProps; - _proto?: string; - upd: any; -} -export interface StackSlotProps { - filters: Filter[]; -} -export interface EffectsHealth { - Hydration: Hydration; -} -export interface Hydration { - value: number; -} -export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; -} -export interface Pain { - delay: number; - duration: number; - fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; -} -export interface Color { - r: number; - g: number; - b: number; - a: number; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/HideoutAreasEnum.d.ts deleted file mode 100644 index 10f851b..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/HideoutAreasEnum.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export declare enum HideoutAreasEnum { - NOTSET = -1, - VENTS = 0, - SECURITY = 1, - LAVATORY = 2, - STASH = 3, - GENERATOR = 4, - HEATING = 5, - WATER_COLLECTOR = 6, - MEDSTATION = 7, - NUTRITION_UNIT = 8, - REST_SPACE = 9, - WORKBENCH = 10, - INTEL_CENTER = 11, - SHOOTING_RANGE = 12, - LIBRARY = 13, - SCAV_CASE = 14, - ILLUMINATION = 15, - PLACE_OF_FAME = 16, - AIR_FILTERING = 17, - SOLAR_POWER = 18, - BOOZE_GENERATOR = 19, - BITCOIN_FARM = 20, - CHRISTMAS_TREE = 21 -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/external/mod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/external/mod.d.ts deleted file mode 100644 index ecef460..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/external/mod.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { DependencyContainer } from "./tsyringe"; -export interface IMod { - load: (container: DependencyContainer) => void; - delayedLoad: (container: DependencyContainer) => void; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHideoutConfig.d.ts deleted file mode 100644 index 4658fa6..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHideoutConfig.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IBaseConfig } from "./IBaseConfig"; -export interface IHideoutConfig extends IBaseConfig { - kind: "aki-hideout"; - runIntervalSeconds: number; - scavCase: ScavCase; - fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/helpers/Traders.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/helpers/Traders.d.ts deleted file mode 100644 index e935d29..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/helpers/Traders.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export declare const enum Traders { - PRAPOR = "54cb50c76803fa8b248b4571", - THERAPIST = "54cb57776803fa99248b456e", - FENCE = "579dc571d53a0658a154fbec", - SKIER = "58330581ace78e27b8b10cee", - PEACEKEEPER = "5935c25fb3acc3127c3d8cd9", - MECHANIC = "5a7c2eca46aef81a7ca2145d", - RAGMAN = "5ac3b934156ae10c4430e83c", - JAEGER = "5c0647fdd443bc2504c2d371" -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/HttpRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/HttpRouter.d.ts deleted file mode 100644 index 44edc0b..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/HttpRouter.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -/// -import { IncomingMessage } from "http"; -import { DynamicRouter, StaticRouter } from "../di/Router"; -export declare class HttpRouter { - private staticRouters; - private dynamicRoutes; - constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); - private groupBy; - getResponse(req: IncomingMessage, info: any, sessionID: string): string; - private handleRoute; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/MatchLocationService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/MatchLocationService.d.ts deleted file mode 100644 index f7b7d3b..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/MatchLocationService.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { TimeUtil } from "../utils/TimeUtil"; -export declare class MatchLocationService { - private timeUtil; - private locations; - constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; - deleteGroup(info: any): void; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/ModCompilerService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/ModCompilerService.d.ts deleted file mode 100644 index cf7cc21..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/ModCompilerService.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ILogger } from "../models/spt/utils/ILogger"; -import { VFS } from "../utils/VFS"; -import { HashCacheService } from "./HashCacheService"; -export declare class ModCompilerService { - private logger; - private hashCacheService; - private vfs; - constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); - compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; - private compile; - private buildDepth; - private calculateDepth; - private areFilesReady; - private delay; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairCategoriesService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairCategoriesService.d.ts deleted file mode 100644 index fb9efa2..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairCategoriesService.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - private categories; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairLinkedItemService.d.ts deleted file mode 100644 index 3dbcf6f..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairLinkedItemService.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class RagfairLinkedItemService { - private databaseServer; - private linkedItemsCache; - constructor(databaseServer: DatabaseServer); - getLinkedItems(linkedSearchId: string): Iterable; - private buildLinkedItemTable; - private getFilters; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairPriceService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairPriceService.d.ts deleted file mode 100644 index 7cdf854..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairPriceService.d.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IBarterScheme } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class RagfairPriceService { - private handbookHelper; - private databaseServer; - private logger; - private itemHelper; - private presetHelper; - private randomUtil; - private configServer; - private ragfairConfig; - private prices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); - generateStaticPrices(): void; - generateDynamicPrices(): void; - hasDynamicPrices(): boolean; - getDynamicPrice(itemTpl: string): number; - getAllFleaPrices(): Record; - getFleaPriceForItem(tplId: string): number; - getBarterPrice(barterScheme: IBarterScheme[]): number; - getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; - getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Logger.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Logger.d.ts deleted file mode 100644 index 9d5b32a..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Logger.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -/// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; -import fs from "fs"; -export declare class WinstonLogger implements ILogger { - private asyncQueue; - private uuidGenerator; - private showDebugInConsole; - private folderPath; - private file; - private filePath; - private logLevels; - private logger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; - constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); - writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; - error(data: string | Record): Promise; - warning(data: string | Record): Promise; - success(data: string | Record): Promise; - info(data: string | Record): Promise; - debug(data: string | Record, onlyShowInConsole?: boolean): Promise; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/TimeUtil.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/TimeUtil.d.ts deleted file mode 100644 index 9733be9..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/TimeUtil.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export declare class TimeUtil { - static readonly oneHourAsSeconds = 3600; - formatTime(date: Date): string; - formatDate(date: Date): string; - getDate(): string; - getTime(): string; - getTimestamp(): number; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Watermark.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Watermark.d.ts deleted file mode 100644 index 3a8cb3a..0000000 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/Watermark.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -export declare class WatermarkLocale { - private locales; - getLocale(): string; - getDescription(): string[]; - getWarning(): string[]; - getModding(): string[]; -} -export declare class Watermark { - private logger; - private configServer; - private watermarkLocale?; - private akiConfig; - constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); - private text; - private versionLabel; - initialize(): void; - getVersionTag(): string; - getVersionLabel(): string; - /** Set window title */ - setTitle(): void; - /** Reset console cursor to top */ - resetCursor(): void; - /** Draw the watermark */ - draw(): void; - /** Caculate text length */ - private textLength; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/bepInEx/plugins/CWX-MasterKey.dll b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/bepInEx/plugins/CWX-MasterKey.dll similarity index 81% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/bepInEx/plugins/CWX-MasterKey.dll rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/bepInEx/plugins/CWX-MasterKey.dll index 92c7a55eb588d48af3e8639e27dd6c3d3d3bcbd3..10d6a53035fd54f7d11cdd8bd2ba9c6e1d6a954b 100644 GIT binary patch delta 296 zcmZoLXfT-2!Lt16h0havWEh(!t_)|?o6N{q&)6}!5lAL&W@I|e%s6B6S=MI8C7T1; za+sKmO*Zf6sALlL%}*)KNexIWNzP#KO)M@+E%HvS-0aJJn^8cNyKF^)`5(8fm+rGX z`7up;vjy)*MhRm*0|qFVkh|_O1EX&M6Oi9L*^ytKja`p{fn8v78o!cx{{f}jEq{&u zTN51BSvU?|W&|p7wu&*-Q}FZ)4srDHQE>D3ad8a-i3Ft<dA) S`o+xDVz*gP>^F>{NtaT#;>Gzu~0i)@PDr3 zssnuXlm1jLU<4|1wu%WYPAw{qNiIsvOphtfFD*(=jVVek$e+BQ-`@zTh4B?s3($Oa z?ZVqRwgtPSUvac9_tk^h%)pQiVk=Bk6l08>94?@}xly2(aiRgoW("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/Program.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/Program.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/Program.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/Program.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/TYPES.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/TYPES.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/TYPES.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/TYPES.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/Utils.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/Utils.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/Utils.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/Utils.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/BotCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/BotCallbacks.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/BotCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/BotCallbacks.d.ts index 9602975..2db60dc 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/BotCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/BotCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { - private botController; - private httpResponse; + protected botController: BotController; + protected httpResponse: HttpResponseUtil; constructor(botController: BotController, httpResponse: HttpResponseUtil); getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string; getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/BundleCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/BundleCallbacks.d.ts similarity index 69% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/BundleCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/BundleCallbacks.d.ts index b007ab8..b28abe1 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/BundleCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/BundleCallbacks.d.ts @@ -1,15 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BundleCallbacks { - private logger; - private httpResponse; - private httpServer; - private bundleLoader; - private configServer; - private httpConfig; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); sendBundle(sessionID: string, req: any, resp: any, body: any): any; getBundles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/CustomizationCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/CustomizationCallbacks.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/CustomizationCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/CustomizationCallbacks.d.ts index 918b8b6..3bab8c0 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/CustomizationCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/CustomizationCallbacks.d.ts @@ -9,9 +9,9 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { - private customizationController; - private saveServer; - private httpResponse; + protected customizationController: CustomizationController; + protected saveServer: SaveServer; + protected httpResponse: HttpResponseUtil; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/DataCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/DataCallbacks.d.ts similarity index 96% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/DataCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/DataCallbacks.d.ts index 018420e..cfb1c16 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/DataCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/DataCallbacks.d.ts @@ -12,8 +12,8 @@ import { ISettingsBase } from "../models/spt/server/ISettingsBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { - private httpResponse; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/DialogueCallbacks.d.ts similarity index 95% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/DialogueCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/DialogueCallbacks.d.ts index 3b6fbd1..634f90b 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/DialogueCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/DialogueCallbacks.d.ts @@ -21,10 +21,10 @@ import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { - private hashUtil; - private timeUtil; - private httpResponse; - private dialogueController; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected dialogueController: DialogueController; constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/GameCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/GameCallbacks.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/GameCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/GameCallbacks.d.ts index 44a30ea..06da1b5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/GameCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/GameCallbacks.d.ts @@ -2,15 +2,16 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { - private httpResponse; - private watermark; - private gameController; + protected httpResponse: HttpResponseUtil; + protected watermark: Watermark; + protected gameController: GameController; constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HandbookCallbacks.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HandbookCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HandbookCallbacks.d.ts index 0db5fec..891e375 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HandbookCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HandbookCallbacks.d.ts @@ -1,7 +1,7 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; export declare class HandbookCallbacks extends OnLoad { - private handbookController; + protected handbookController: HandbookController; constructor(handbookController: HandbookController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HealthCallbacks.d.ts similarity index 77% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HealthCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HealthCallbacks.d.ts index a50dd42..8672be7 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HealthCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HealthCallbacks.d.ts @@ -9,10 +9,17 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { - private httpResponse; - private profileHelper; - private healthController; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HideoutCallbacks.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HideoutCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HideoutCallbacks.d.ts index 3698176..99ab4c9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HideoutCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HideoutCallbacks.d.ts @@ -11,11 +11,12 @@ import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutTog import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HideoutCallbacks extends OnUpdate { - private hideoutController; - private configServer; - private hideoutConfig; + protected hideoutController: HideoutController; + protected configServer: ConfigServer; + protected hideoutConfig: IHideoutConfig; constructor(hideoutController: HideoutController, // TODO: delay needed configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HttpCallbacks.d.ts similarity index 87% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HttpCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HttpCallbacks.d.ts index 9fe387d..94c97bd 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HttpCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/HttpCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoad } from "../di/OnLoad"; import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { - private httpServer; + protected httpServer: IHttpServer; constructor(httpServer: IHttpServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InraidCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InraidCallbacks.d.ts similarity index 76% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InraidCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InraidCallbacks.d.ts index 2d53227..05bcce4 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InraidCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InraidCallbacks.d.ts @@ -3,14 +3,16 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { - private inraidController; - private httpResponse; - private configServer; - private airdropConfig; - private inraidConfig; + protected inraidController: InraidController; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected airdropConfig: IAirdropConfig; + protected inraidConfig: IInRaidConfig; constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InsuranceCallbacks.d.ts similarity index 70% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InsuranceCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InsuranceCallbacks.d.ts index 79feb67..6819960 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InsuranceCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InsuranceCallbacks.d.ts @@ -3,20 +3,22 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { InsuranceService } from "../services/InsuranceService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { - private insuranceController; - private insuranceService; - private httpResponse; - private configServer; - private insuranceConfig; + protected insuranceController: InsuranceController; + protected insuranceService: InsuranceService; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InventoryCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InventoryCallbacks.d.ts similarity index 98% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InventoryCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InventoryCallbacks.d.ts index 9795aa0..9ab1486 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InventoryCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/InventoryCallbacks.d.ts @@ -18,7 +18,7 @@ import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryT import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { - private inventoryController; + protected inventoryController: InventoryController; constructor(inventoryController: InventoryController); moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ItemEventCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ItemEventCallbacks.d.ts similarity index 87% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ItemEventCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ItemEventCallbacks.d.ts index 74e79c4..f4f04f9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ItemEventCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ItemEventCallbacks.d.ts @@ -4,8 +4,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { - private httpResponse; - private itemEventRouter; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/LauncherCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/LauncherCallbacks.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/LauncherCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/LauncherCallbacks.d.ts index 4bd5e2c..c022325 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/LauncherCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/LauncherCallbacks.d.ts @@ -8,10 +8,10 @@ import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { - private httpResponse; - private launcherController; - private saveServer; - private watermark; + protected httpResponse: HttpResponseUtil; + protected launcherController: LauncherController; + protected saveServer: SaveServer; + protected watermark: Watermark; constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/LocationCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/LocationCallbacks.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/LocationCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/LocationCallbacks.d.ts index 5ecab74..cc69369 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/LocationCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/LocationCallbacks.d.ts @@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { - private httpResponse; - private locationController; + protected httpResponse: HttpResponseUtil; + protected locationController: LocationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/MatchCallbacks.d.ts new file mode 100644 index 0000000..2a92ef5 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/MatchCallbacks.d.ts @@ -0,0 +1,42 @@ +import { MatchController } from "../controllers/MatchController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +export declare class MatchCallbacks { + protected httpResponse: HttpResponseUtil; + protected jsonUtil: JsonUtil; + protected matchController: MatchController; + protected databaseServer: DatabaseServer; + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; + acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; + cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; + getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; + getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; + deleteGroup(url: string, info: any, sessionID: string): INullResponseData; + startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; + endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ModCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ModCallbacks.d.ts similarity index 58% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ModCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ModCallbacks.d.ts index 2011f0e..58342dc 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ModCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ModCallbacks.d.ts @@ -1,17 +1,18 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { - private logger; - private httpResponse; - private httpServer; - private modLoader; - private configServer; - private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected postAkiModLoader: PostAkiModLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/NoteCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/NoteCallbacks.d.ts similarity index 93% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/NoteCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/NoteCallbacks.d.ts index fd7c5ca..d39d400 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/NoteCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/NoteCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { - private noteController; + protected noteController: NoteController; constructor(noteController: NoteController); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/NotifierCallbacks.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/NotifierCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/NotifierCallbacks.d.ts index 416e6a3..c42058f 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/NotifierCallbacks.d.ts @@ -6,9 +6,9 @@ import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { - private httpServerHelper; - private httpResponse; - private notifierController; + protected httpServerHelper: HttpServerHelper; + protected httpResponse: HttpResponseUtil; + protected notifierController: NotifierController; constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/PresetBuildCallbacks.d.ts similarity index 75% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/PresetBuildCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/PresetBuildCallbacks.d.ts index 639c33f..541715a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; @@ -6,10 +7,10 @@ import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPreset import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { - private httpResponse; - private presetBuildController; + protected httpResponse: HttpResponseUtil; + protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/PresetCallbacks.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/PresetCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/PresetCallbacks.d.ts index f62afd6..4553f8f 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/PresetCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/PresetCallbacks.d.ts @@ -1,7 +1,7 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; export declare class PresetCallbacks extends OnLoad { - private presetController; + protected presetController: PresetController; constructor(presetController: PresetController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ProfileCallbacks.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ProfileCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ProfileCallbacks.d.ts index efce47d..6a86fc0 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ProfileCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -12,9 +13,9 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { - private httpResponse; - private timeUtil; - private profileController; + protected httpResponse: HttpResponseUtil; + protected timeUtil: TimeUtil; + protected profileController: ProfileController; constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/QuestCallbacks.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/QuestCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/QuestCallbacks.d.ts index f742096..559c29e 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/QuestCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/QuestCallbacks.d.ts @@ -13,9 +13,9 @@ import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestD import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { - private httpResponse; - private questController; - private repeatableQuestController; + protected httpResponse: HttpResponseUtil; + protected questController: QuestController; + protected repeatableQuestController: RepeatableQuestController; constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/RagfairCallbacks.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/RagfairCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/RagfairCallbacks.d.ts index 152475f..3a405c9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/RagfairCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/RagfairCallbacks.d.ts @@ -3,34 +3,39 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairCallbacks extends OnLoadOnUpdate { - private httpResponse; - private logger; - private jsonUtil; - private ragfairServer; - private ragfairController; - private configServer; - private ragfairConfig; + protected httpResponse: HttpResponseUtil; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected ragfairServer: RagfairServer; + protected ragfairController: RagfairController; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/RepairCallbacks.d.ts similarity index 93% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/RepairCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/RepairCallbacks.d.ts index f63ec18..63733fa 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/RepairCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/RepairCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; export declare class RepairCallbacks { - private repairController; + protected repairController: RepairController; constructor(repairController: RepairController); traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/SaveCallbacks.d.ts similarity index 88% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/SaveCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/SaveCallbacks.d.ts index b7219a0..bbb6e53 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/SaveCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/SaveCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { - private saveServer; + protected saveServer: SaveServer; constructor(saveServer: SaveServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/TradeCallbacks.d.ts similarity index 94% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/TradeCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/TradeCallbacks.d.ts index 9928951..272ae46 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/TradeCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/TradeCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { - private tradeController; + protected tradeController: TradeController; constructor(tradeController: TradeController); processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/TraderCallbacks.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/TraderCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/TraderCallbacks.d.ts index 2a8af7f..128d9b2 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/TraderCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/TraderCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { - private httpResponse; - private traderController; + protected httpResponse: HttpResponseUtil; + protected traderController: TraderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/WeatherCallbacks.d.ts similarity index 84% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/WeatherCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/WeatherCallbacks.d.ts index e40ab3e..ae784c8 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/WeatherCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/WeatherCallbacks.d.ts @@ -3,8 +3,8 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { - private httpResponse; - private weatherController; + protected httpResponse: HttpResponseUtil; + protected weatherController: WeatherController; constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/WishlistCallbacks.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/WishlistCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/WishlistCallbacks.d.ts index e0249fd..c2cc2a8 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/WishlistCallbacks.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/callbacks/WishlistCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; export declare class WishlistCallbacks { - private wishlistController; + protected wishlistController: WishlistController; constructor(wishlistController: WishlistController); addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ApplicationContext.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariable.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariableType.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/BotController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/BotController.d.ts new file mode 100644 index 0000000..5e6f05d --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/BotController.d.ts @@ -0,0 +1,35 @@ +import { BotGenerator } from "../generators/BotGenerator"; +import { BotHelper } from "../helpers/BotHelper"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +export declare class BotController { + protected databaseServer: DatabaseServer; + protected botGenerator: BotGenerator; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); + /** + * Return the number of bot loadout varieties to be generated + * @param type bot Type we want the loadout gen count for + * @returns + */ + getBotPresetGenerationLimit(type: string): number; + getBotCoreDifficulty(): IBotCore; + /** + * Get bot difficulty settings + * adjust PMC settings to ensure they engage the correct bot types + * @param type what bot the server is requesting settings for + * @param difficulty difficulty level server requested settings for + * @returns Difficulty object + */ + getBotDifficulty(type: string, difficulty: string): Difficulty; + protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + getBotCap(): number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/CustomizationController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/CustomizationController.d.ts similarity index 81% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/CustomizationController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/CustomizationController.d.ts index 698e6be..a6c4730 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/CustomizationController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/CustomizationController.d.ts @@ -9,14 +9,14 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; export declare class CustomizationController { - private logger; - private itemEventRouter; - private databaseServer; - private saveServer; - private profileHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper); getTraderSuits(traderID: string, sessionID: string): ISuit[]; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; - private getAllTraderSuits; + protected getAllTraderSuits(sessionID: string): ISuit[]; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/DialogueController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/DialogueController.d.ts similarity index 79% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/DialogueController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/DialogueController.d.ts index 235594f..b15c4b6 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/DialogueController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/DialogueController.d.ts @@ -3,13 +3,13 @@ import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachme import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { - private httpResponse; - private saveServer; - private dialogueHelper; + protected httpResponse: HttpResponseUtil; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; @@ -19,7 +19,7 @@ export declare class DialogueController { setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void; setRead(dialogueIDs: string[], sessionID: string): void; getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse; - private messagesHaveUncollectedRewards; - private removeExpiredItems; + protected messagesHaveUncollectedRewards(messages: Message[]): boolean; + protected removeExpiredItems(sessionID: string): void; update(): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/GameController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/GameController.d.ts new file mode 100644 index 0000000..85ec418 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/GameController.d.ts @@ -0,0 +1,28 @@ +import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; +import { Watermark } from "../utils/Watermark"; +export declare class GameController { + protected logger: ILogger; + protected watermark: Watermark; + protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); + gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; + protected logProfileDetails(fullProfile: IAkiProfile): void; + getGameConfig(sessionID: string): IGameConfigResponse; + getServer(): any[]; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HandbookController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HandbookController.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HandbookController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HandbookController.d.ts index f473437..52d2dd8 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HandbookController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HandbookController.d.ts @@ -1,8 +1,8 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class HandbookController { - private databaseServer; - private handbookHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper); load(): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HealthController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HealthController.d.ts similarity index 63% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HealthController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HealthController.d.ts index ca049f6..cc13603 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HealthController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HealthController.d.ts @@ -11,15 +11,36 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { - private logger; - private itemEventRouter; - private itemHelper; - private paymentService; - private inventoryHelper; - private healthHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected inventoryHelper: InventoryHelper; + protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HideoutController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HideoutController.d.ts similarity index 51% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HideoutController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HideoutController.d.ts index f35c23b..3eefe1a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HideoutController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/HideoutController.d.ts @@ -1,11 +1,14 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -14,6 +17,7 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -25,32 +29,74 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HideoutController { - private logger; - private hashUtil; - private timeUtil; - private databaseServer; - private randomUtil; - private inventoryHelper; - private saveServer; - private playerService; - private presetHelper; - private paymentHelper; - private itemEventRouter; - private httpResponse; - private profileHelper; - private hideoutHelper; - private configServer; - private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected inventoryHelper: InventoryHelper; + protected saveServer: SaveServer; + protected playerService: PlayerService; + protected presetHelper: PresetHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; + protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; + protected hideoutConfig: IHideoutConfig; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InraidController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InraidController.d.ts new file mode 100644 index 0000000..b899e7d --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InraidController.d.ts @@ -0,0 +1,44 @@ +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; +import { HealthHelper } from "../helpers/HealthHelper"; +import { InRaidHelper } from "../helpers/InRaidHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { QuestHelper } from "../helpers/QuestHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { InsuranceService } from "../services/InsuranceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class InraidController { + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; + protected healthHelper: HealthHelper; + protected traderHelper: TraderHelper; + protected insuranceService: InsuranceService; + protected inRaidHelper: InRaidHelper; + protected configServer: ConfigServer; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; + saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InsuranceController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InsuranceController.d.ts similarity index 63% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InsuranceController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InsuranceController.d.ts index b175a06..6895383 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InsuranceController.d.ts @@ -3,8 +3,10 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,23 +17,28 @@ import { PaymentService } from "../services/PaymentService"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceController { - private logger; - private randomUtil; - private itemEventRouter; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private profileHelper; - private dialogueHelper; - private paymentService; - private insuranceService; - private configServer; - private insuranceConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected itemEventRouter: ItemEventRouter; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected dialogueHelper: DialogueHelper; + protected paymentService: PaymentService; + protected insuranceService: InsuranceService; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; - doAbsolutelyNothing(): void; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InventoryController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InventoryController.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InventoryController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InventoryController.d.ts index 8235082..f57f731 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InventoryController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/InventoryController.d.ts @@ -24,19 +24,23 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; - private presetHelper; - private inventoryHelper; - private profileHelper; - private paymentHelper; - private itemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected fenceService: FenceService; + protected presetHelper: PresetHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/LauncherController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/LauncherController.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/LauncherController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/LauncherController.d.ts index 2a30713..1af1f56 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/LauncherController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/LauncherController.d.ts @@ -3,23 +3,24 @@ import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { Info } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class LauncherController { - private hashUtil; - private saveServer; - private httpServerHelper; - private databaseServer; - private configServer; - private coreConfig; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected httpServerHelper: HttpServerHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected coreConfig: ICoreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; login(info: ILoginRequestData): string; register(info: IRegisterData): string; - private createAccount; + protected createAccount(info: IRegisterData): string; changeUsername(info: IChangeRequestData): string; changePassword(info: IChangeRequestData): string; wipe(info: IRegisterData): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/LocationController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/LocationController.d.ts similarity index 79% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/LocationController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/LocationController.d.ts index 41a8719..90b6d7a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/LocationController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/LocationController.d.ts @@ -6,11 +6,11 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class LocationController { - private jsonUtil; - private logger; - private locationGenerator; - private databaseServer; - private timeUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected locationGenerator: LocationGenerator; + protected databaseServer: DatabaseServer; + protected timeUtil: TimeUtil; constructor(jsonUtil: JsonUtil, logger: ILogger, locationGenerator: LocationGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil); get(location: string): ILocationBase; generate(name: string): ILocationBase; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/MatchController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/MatchController.d.ts new file mode 100644 index 0000000..71cb7d3 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/MatchController.d.ts @@ -0,0 +1,38 @@ +import { ApplicationContext } from "../context/ApplicationContext"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "../models/spt/config/IMatchConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { MatchLocationService } from "../services/MatchLocationService"; +export declare class MatchController { + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected matchLocationService: MatchLocationService; + protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; + protected matchConfig: IMatchConfig; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); + getEnabled(): boolean; + getProfile(info: IGetProfileRequestData): IPmcData[]; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; + deleteGroup(info: any): void; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; + startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; + endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/NoteController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/NoteController.d.ts similarity index 88% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/NoteController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/NoteController.d.ts index 4d3420e..ee70541 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/NoteController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { - private itemEventRouter; +export declare class NoteController { + protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/NotifierController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/NotifierController.d.ts similarity index 80% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/NotifierController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/NotifierController.d.ts index 36fef66..31d7bfe 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/NotifierController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/NotifierController.d.ts @@ -3,11 +3,11 @@ import { NotificationService } from "../services/NotificationService"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { - private notifierHelper; - private httpServerHelper; - private notificationService; - private pollInterval; - private timeout; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected notificationService: NotificationService; + protected pollInterval: number; + protected timeout: number; constructor(notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, notificationService: NotificationService); /** * Resolve an array of session notifications. diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/PresetBuildController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/PresetBuildController.d.ts similarity index 86% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/PresetBuildController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/PresetBuildController.d.ts index 11c5c3e..adf4084 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/PresetBuildController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/PresetBuildController.d.ts @@ -7,10 +7,10 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class PresetBuildController { - private hashUtil; - private itemEventRouter; - private itemHelper; - private saveServer; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer); getUserBuilds(sessionID: string): WeaponBuild[]; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/PresetController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/PresetController.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/PresetController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/PresetController.d.ts index 6ec8c55..ca1af1a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/PresetController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/PresetController.d.ts @@ -1,8 +1,8 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetController { - private presetHelper; - private databaseServer; + protected presetHelper: PresetHelper; + protected databaseServer: DatabaseServer; constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer); initialize(): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/ProfileController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/ProfileController.d.ts similarity index 66% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/ProfileController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/ProfileController.d.ts index c8bd5f1..8c89a02 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/ProfileController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -11,21 +12,30 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { - private hashUtil; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private traderHelper; - private extendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; + protected traderHelper: TraderHelper; + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/QuestController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/QuestController.d.ts new file mode 100644 index 0000000..2cbccfb --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/QuestController.d.ts @@ -0,0 +1,76 @@ +import { DialogueHelper } from "../helpers/DialogueHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; +import { QuestHelper } from "../helpers/QuestHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; +import { PlayerService } from "../services/PlayerService"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class QuestController { + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected questHelper: QuestHelper; + protected questConditionHelper: QuestConditionHelper; + protected playerService: PlayerService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ + getClientQuests(sessionID: string): IQuest[]; + acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ + completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void; + /** + * Returns a list of quests that should be failed when a quest is completed + * @param completedQuestId quest completed id + * @returns array of quests + */ + protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[]; + /** + * Fail the quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; + handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RagfairController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RagfairController.d.ts similarity index 73% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RagfairController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RagfairController.d.ts index 5b94a95..c4ffc15 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RagfairController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RagfairController.d.ts @@ -20,6 +20,7 @@ import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPric import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -33,32 +34,34 @@ import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsSer import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { - private logger; - private timeUtil; - private httpResponse; - private itemEventRouter; - private ragfairServer; - private ragfairPriceService; - private databaseServer; - private itemHelper; - private saveServer; - private ragfairSellHelper; - private ragfairTaxHelper; - private ragfairSortHelper; - private ragfairOfferHelper; - private profileHelper; - private paymentService; - private handbookHelper; - private paymentHelper; - private inventoryHelper; - private ragfairHelper; - private ragfairOfferService; - private ragfairRequiredItemsService; - private ragfairOfferGenerator; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; + protected ragfairServer: RagfairServer; + protected ragfairPriceService: RagfairPriceService; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; + protected ragfairSellHelper: RagfairSellHelper; + protected ragfairTaxHelper: RagfairTaxHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairOfferHelper: RagfairOfferHelper; + protected profileHelper: ProfileHelper; + protected paymentService: PaymentService; + protected handbookHelper: HandbookHelper; + protected paymentHelper: PaymentHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RepairController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RepairController.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RepairController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RepairController.d.ts index 77dd47a..0e78ef6 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RepairController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RepairController.d.ts @@ -5,21 +5,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; export declare class RepairController { - private logger; - private itemEventRouter; - private databaseServer; - private questHelper; - private traderHelper; - private paymentService; - private repairHelper; - private configServer; - private repairConfig; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected traderHelper: TraderHelper; + protected paymentService: PaymentService; + protected repairHelper: RepairHelper; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -36,5 +37,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RepeatableQuestController.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RepeatableQuestController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RepeatableQuestController.d.ts index 2dedc7e..98d05dd 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/RepeatableQuestController.d.ts @@ -4,17 +4,19 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { ELocationName } from "../models/enums/ELocationName"; -import { IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -48,22 +50,23 @@ export interface ITargetLocation { locations: string[]; } export declare class RepeatableQuestController { - private timeUtil; - private logger; - private randomUtil; - private mathUtil; - private jsonUtil; - private databaseServer; - private itemHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private itemEventRouter; - private paymentService; - private objectId; - private configServer; - private questConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + protected timeUtil: TimeUtil; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected mathUtil: MathUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected ragfairServerHelper: RagfairServerHelper; + protected itemEventRouter: ItemEventRouter; + protected paymentService: PaymentService; + protected objectId: ObjectId; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/TradeController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/TradeController.d.ts similarity index 85% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/TradeController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/TradeController.d.ts index f0a177b..c86745c 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/TradeController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/TradeController.d.ts @@ -9,11 +9,11 @@ import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTr import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { - private logger; - private itemEventRouter; - private tradeHelper; - private profileHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected tradeHelper: TradeHelper; + protected profileHelper: ProfileHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer); confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse; confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/TraderController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/TraderController.d.ts similarity index 77% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/TraderController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/TraderController.d.ts index 36eac75..7bab158 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/TraderController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/TraderController.d.ts @@ -8,14 +8,14 @@ import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { - private logger; - private databaseServer; - private traderAssortHelper; - private profileHelper; - private traderHelper; - private timeUtil; - private traderAssortService; - private jsonUtil; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected traderAssortHelper: TraderAssortHelper; + protected profileHelper: ProfileHelper; + protected traderHelper: TraderHelper; + protected timeUtil: TimeUtil; + protected traderAssortService: TraderAssortService; + protected jsonUtil: JsonUtil; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/WeatherController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/WeatherController.d.ts similarity index 62% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/WeatherController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/WeatherController.d.ts index 312c3a3..ca7f5eb 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/WeatherController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/WeatherController.d.ts @@ -1,10 +1,11 @@ import { WeatherGenerator } from "../generators/WeatherGenerator"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WeatherController { - private weatherGenerator; - private configServer; - private weatherConfig; + protected weatherGenerator: WeatherGenerator; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/WishlistController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/WishlistController.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/WishlistController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/WishlistController.d.ts index 5ef8df3..a96c522 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/WishlistController.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/controllers/WishlistController.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class WishlistController { - private itemEvenRouter; + protected itemEvenRouter: ItemEventRouter; constructor(itemEvenRouter: ItemEventRouter); addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/Container.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/Container.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/Container.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/Container.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/OnLoad.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/OnLoad.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/OnLoad.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/OnLoad.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/OnLoadOnUpdate.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/OnLoadOnUpdate.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/OnLoadOnUpdate.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/OnLoadOnUpdate.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/OnUpdate.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/OnUpdate.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/OnUpdate.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/OnUpdate.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/Router.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/Router.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/Router.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/Router.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/Serializer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/Serializer.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/di/Serializer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/di/Serializer.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotGenerator.d.ts new file mode 100644 index 0000000..a5fc0ad --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotGenerator.d.ts @@ -0,0 +1,96 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotInventoryGenerator } from "./BotInventoryGenerator"; +declare namespace BotGenerator { + interface IRandomisedBotLevelResult { + level: number; + exp: number; + } +} +export declare class BotGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected databaseServer: DatabaseServer; + protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; + protected botHelper: BotHelper; + protected gameEventHelper: GameEventHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); + /** + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns + */ + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; + protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ + protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; + protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ + protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ + protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; + protected generateId(bot: IBotBase): IBotBase; + protected generateInventoryID(profile: IBotBase): IBotBase; + protected getPMCDifficulty(requestedDifficulty: string): string; + /** + * Add a side-specific (usec/bear) dogtag item to a bots inventory + * @param bot bot to add dogtag to + * @returns Bot with dogtag added + */ + protected generateDogtag(bot: IBotBase): IBotBase; +} +export {}; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotInventoryGenerator.d.ts similarity index 58% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotInventoryGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotInventoryGenerator.d.ts index 0cdbacb..35d1ee8 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotInventoryGenerator.d.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; @@ -9,16 +9,16 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botWeaponGenerator; - private botLootGenerator; - private botGeneratorHelper; - private weightedRandomHelper; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootGenerator: BotLootGenerator; + protected botGeneratorHelper: BotGeneratorHelper; + protected weightedRandomHelper: WeightedRandomHelper; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; - private generateEquipment; - private generateInventoryBase; + protected generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + protected generateInventoryBase(): PmcInventory; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotLootGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotLootGenerator.d.ts new file mode 100644 index 0000000..c6a3f29 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotLootGenerator.d.ts @@ -0,0 +1,124 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; +export declare class BotLootGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotWeaponGenerator.d.ts new file mode 100644 index 0000000..9215214 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/BotWeaponGenerator.d.ts @@ -0,0 +1,173 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class BotWeaponGenerator { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/LocationGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/LocationGenerator.d.ts similarity index 54% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/LocationGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/LocationGenerator.d.ts index 4b96792..bd368b5 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/LocationGenerator.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/LocationGenerator.d.ts @@ -6,6 +6,8 @@ import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; import { Item } from "../models/eft/common/tables/IItem"; import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILocationConfig } from "../models/spt/config/ILocationConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; @@ -18,27 +20,27 @@ export interface IContainerItem { height: number; } export declare class LocationGenerator { - private logger; - private jsonUtil; - private objectId; - private randomUtil; - private ragfairServerHelper; - private itemHelper; - private mathUtil; - private gameEventHelper; - private containerHelper; - private presetHelper; - private configServer; - private locationConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected objectId: ObjectId; + protected randomUtil: RandomUtil; + protected ragfairServerHelper: RagfairServerHelper; + protected itemHelper: ItemHelper; + protected mathUtil: MathUtil; + protected gameEventHelper: GameEventHelper; + protected containerHelper: ContainerHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected locationConfig: ILocationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; - private getLooseLootMultiplerForLocation; - private getStaticLootMultiplerForLocation; + protected getLooseLootMultiplerForLocation(location: string): number; + protected getStaticLootMultiplerForLocation(location: string): number; generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record, locationName: string): SpawnpointTemplate[]; - private createItem; - private getRandomCompatibleCaliberTemplateId; - private getRandomValidCaliber; - private drawAmmoTpl; - private createRandomMagCartridges; - private createCartidges; + protected createItem(tpl: string, staticAmmoDist: Record, parentId?: string): IContainerItem; + protected getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string; + protected getRandomValidCaliber(magTemplate: ITemplateItem): string; + protected drawAmmoTpl(caliber: string, staticAmmoDist: Record): string; + protected createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record, caliber?: string): Item; + protected createCartidges(parentId: string, ammoTpl: string, stackCount: number): Item; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/PMCLootGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/PMCLootGenerator.d.ts similarity index 56% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/PMCLootGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/PMCLootGenerator.d.ts index 601431b..64e6f7f 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/PMCLootGenerator.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/PMCLootGenerator.d.ts @@ -1,13 +1,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; export declare class PMCLootGenerator { - private itemHelper; - private databaseServer; - private configServer; - private pocketLootPool; - private backpackLootPool; - private botConfig; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected pocketLootPool: string[]; + protected backpackLootPool: string[]; + protected botConfig: IBotConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/RagfairAssortGenerator.d.ts similarity index 64% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/RagfairAssortGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/RagfairAssortGenerator.d.ts index 06d3250..cbdd7f2 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/RagfairAssortGenerator.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/RagfairAssortGenerator.d.ts @@ -4,22 +4,22 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairAssortGenerator { - private jsonUtil; - private hashUtil; - private itemHelper; - private databaseServer; - private generatedAssortItems; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected generatedAssortItems: Item[]; constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer); /** * Get an array of unique items that can be sold on the flea * @returns array of unique items */ getAssortItems(): Item[]; - private assortsAreGenerated; + protected assortsAreGenerated(): boolean; /** * Generate an array of items the flea can sell * @returns array of unique items */ - private generateRagfairAssortItems; - private createRagfairAssortItem; + protected generateRagfairAssortItems(): Item[]; + protected createRagfairAssortItem(tplId: string, id?: string): Item; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/RagfairOfferGenerator.d.ts similarity index 55% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/RagfairOfferGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/RagfairOfferGenerator.d.ts index e3fbe4a..3e7f4cc 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/generators/RagfairOfferGenerator.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/RagfairOfferGenerator.d.ts @@ -2,13 +2,16 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -17,37 +20,41 @@ import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairAssortGenerator } from "./RagfairAssortGenerator"; export declare class RagfairOfferGenerator { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private timeUtil; - private databaseServer; - private ragfairServerHelper; - private saveServer; - private presetHelper; - private ragfairAssortGenerator; - private ragfairOfferService; - private ragfairPriceService; - private fenceService; - private itemHelper; - private configServer; - private ragfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected ragfairServerHelper: RagfairServerHelper; + protected saveServer: SaveServer; + protected presetHelper: PresetHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected fenceService: FenceService; + protected itemHelper: ItemHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; - private getTraderId; - private getRating; - private getRatingGrowing; - private getOfferEndTime; + protected getTraderId(userID: string): string; + protected getRating(userID: string): number; + protected getRatingGrowing(userID: string): boolean; + protected getOfferEndTime(userID: string, time: number): number; /** * Create multiple offers for items by using a unique list of items we've generated previously * @param expiredOffers */ generateDynamicOffers(expiredOffers?: Item[]): void; generateTraderOffers(traderID: string): void; - private getItemCondition; - private addMissingCondition; - private getOfferRequirements; + protected getItemCondition(userID: string, items: Item[], itemDetails: ITemplateItem): Item[]; + protected addMissingCondition(item: Item): Item; + protected getOfferRequirements(items: Item[]): { + count: number; + _tpl: string; + }[]; /** * Create a flea offer and store it in the Ragfair server offers array */ diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/WeatherGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/WeatherGenerator.d.ts new file mode 100644 index 0000000..44cecbb --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/generators/WeatherGenerator.d.ts @@ -0,0 +1,33 @@ +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { ConfigServer } from "../servers/ConfigServer"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; +import { RandomUtil } from "../utils/RandomUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class WeatherGenerator { + protected weightedRandomHelper: WeightedRandomHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; + constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); + calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; + generateWeather(data: IWeatherData): IWeatherData; + protected getWeightedFog(): string; + protected getWeightedRain(): number; + protected getRandomFloat(node: string): number; + protected getRandomInt(node: string): number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/AssortHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/AssortHelper.d.ts new file mode 100644 index 0000000..15586b9 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/AssortHelper.d.ts @@ -0,0 +1,36 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { ItemHelper } from "./ItemHelper"; +import { QuestHelper } from "./QuestHelper"; +export declare class AssortHelper { + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort assort items from a trader + * @returns assort items minus locked quest assorts + */ + stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort traders assorts + * @returns traders assorts minus locked loyality assorts + */ + stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove an item from an assort + * @param assort assort to modify + * @param itemID item id to remove from asort + * @returns Modified assort + */ + removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotGeneratorHelper.d.ts new file mode 100644 index 0000000..3cd7256 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotGeneratorHelper.d.ts @@ -0,0 +1,131 @@ +import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; +import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { ContainerHelper } from "./ContainerHelper"; +import { InventoryHelper } from "./InventoryHelper"; +import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; +export declare class BotGeneratorHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; + protected databaseServer: DatabaseServer; + protected durabilityLimitsHelper: DurabilityLimitsHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected containerHelper: ContainerHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot + * never return true for an item that has 0% spawn chance + * @param itemSlot slot the item sits in + * @param modSlot slot the mod sits in + * @param modSpawnChances Chances for various mod spawns + * @returns boolean true if it should spawn + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * e.g. mod_magazine + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; + /** + * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. + * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. + * Ammo is not put into the magazine directly but assigned to the magazine's slots: The "camora_xxx" slots. + * This function is a helper called by generateModsForItem for mods with parent type "CylinderMagazine" + * + * @param {object} items The items where the CylinderMagazine's camora are appended to + * @param {object} modPool modPool which should include available cartrigdes + * @param {string} parentId The CylinderMagazine's UID + * @param {object} parentTemplate The CylinderMagazine's template + */ + protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void; + /** + * Take a record of camoras and merge the compatable shells into one array + * @param camorasWithShells camoras we want to merge into one array + * @returns string array of shells fro luitple camora sources + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; + generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { + upd?: Upd; + }; + /** + * Create a repairable object for a weapon that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateWeaponRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + /** + * Create a repairable object for an armor that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string; + /** + * Sort by spawn chance, highest to lowest, higher is more common + * @param unsortedModArray String array to sort + * @returns Sorted string array + */ + protected sortModArray(unsortedModArray: string[]): string[]; + /** + * Can an item be added to an item without issue + * @param items + * @param tplToCheck + * @param equipmentSlot + * @returns true if possible + */ + isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; + /** + * Adds an item with all its childern into specified equipmentSlots, wherever it fits. + * @param equipmentSlots + * @param parentId + * @param parentTpl + * @param itemWithChildren + * @param inventory + * @returns a `boolean` indicating item was added + */ + addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; + protected itemAllowedInContainer(slot: Grid, itemTpl: string): boolean; +} +export declare class ExhaustableArray { + private itemPool; + private randomUtil; + private jsonUtil; + private pool; + constructor(itemPool: T[], randomUtil: RandomUtil, jsonUtil: JsonUtil); + getRandomValue(): T; + getFirstValue(): T; + hasValues(): boolean; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotHelper.d.ts new file mode 100644 index 0000000..9b89481 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/BotHelper.d.ts @@ -0,0 +1,45 @@ +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class BotHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); + getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; + getPmcDifficultySettings(type: string, difficulty: string): Difficulty; + /** + * Randomise the chance the PMC will attack their own side + * @param difficultySettings pmc difficulty settings + */ + randomisePmcHostility(difficultySettings: Difficulty): void; + isBotPmc(botRole: string): boolean; + isBotBoss(botRole: string): boolean; + isBotFollower(botRole: string): boolean; + /** + * Add a bot to the FRIENDLY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typeToAdd bot type to add to friendly list + */ + addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; + /** + * Add a bot to the ENEMY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to enemy list + */ + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; + /** + * Add a bot to the REVENGE_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to revenge list + */ + addBotToRevengeList(difficultySettings: Difficulty, typesToAdd: string[]): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ContainerHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ContainerHelper.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ContainerHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ContainerHelper.d.ts index 34cd1e4..3c2ee93 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ContainerHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ContainerHelper.d.ts @@ -6,7 +6,7 @@ export declare class FindSlotResult { constructor(success?: boolean, x?: any, y?: any, rotation?: boolean); } export declare class ContainerHelper { - private locateSlot; + protected locateSlot(container2D: number[][], containerX: number, containerY: number, x: number, y: number, itemW: number, itemH: number): boolean; findSlotForItem(container2D: number[][], itemWidth: number, itemHeight: number): FindSlotResult; fillContainerMapWithItem(container2D: number[][], x: number, y: number, itemW: number, itemH: number, rotate: boolean): any; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/DialogueHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/DialogueHelper.d.ts similarity index 58% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/DialogueHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/DialogueHelper.d.ts index ae1f581..e3e2bda 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -7,15 +8,33 @@ import { ItemHelper } from "./ItemHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; import { NotifierHelper } from "./NotifierHelper"; export declare class DialogueHelper { - private hashUtil; - private saveServer; - private databaseServer; - private notifierHelper; - private notificationSendHelper; - private itemHelper; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected notificationSendHelper: NotificationSendHelper; + protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/DurabilityLimitsHelper.d.ts new file mode 100644 index 0000000..07a5db1 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/DurabilityLimitsHelper.d.ts @@ -0,0 +1,26 @@ +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotHelper } from "./BotHelper"; +export declare class DurabilityLimitsHelper { + protected randomUtil: RandomUtil; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); + getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; + getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; + getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; + getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; + protected generateMaxWeaponDurability(botRole: string): number; + protected generateMaxPmcArmorDurability(itemMaxDurability: number): number; + protected getLowestMaxWeaponFromConfig(botRole: string): number; + protected getHighestMaxWeaponDurabilityFromConfig(botRole: string): number; + protected generateWeaponDurability(botRole: string, maxDurability: number): number; + protected generateArmorDurability(botRole: string, maxDurability: number): number; + protected getMinWeaponDeltaFromConfig(botRole: string): number; + protected getMaxWeaponDeltaFromConfig(botRole: string): number; + protected getMinArmorDeltaFromConfig(botRole: string): number; + protected getMaxArmorDeltaFromConfig(botRole: string): number; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ExtendedProfileHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/helpers/ExtendedProfileHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ExtendedProfileHelper.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/GameEventHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/GameEventHelper.d.ts similarity index 76% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/GameEventHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/GameEventHelper.d.ts index 8131d31..7613053 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/GameEventHelper.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { - private databaseServer; + protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HandbookHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HandbookHelper.d.ts similarity index 95% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HandbookHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HandbookHelper.d.ts index aed6984..b47d466 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HandbookHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HandbookHelper.d.ts @@ -9,7 +9,7 @@ export declare class LookupCollection { constructor(); } export declare class HandbookHelper { - private lookup; + protected lookup: LookupCollection; hydrateLookup(lookup: LookupCollection): void; getTemplatePrice(x: string): number; templatesWithParent(x: string): string[]; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HealthHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HealthHelper.d.ts new file mode 100644 index 0000000..3116c9c --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HealthHelper.d.ts @@ -0,0 +1,51 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class HealthHelper { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ + resetVitality(sessionID: string): IAkiProfile; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HideoutHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HideoutHelper.d.ts similarity index 51% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HideoutHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HideoutHelper.d.ts index d6a4414..36e4009 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HideoutHelper.d.ts @@ -1,10 +1,12 @@ -import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; +import { Upd } from "../models/eft/common/tables/IItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -17,26 +19,22 @@ import { TimeUtil } from "../utils/TimeUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class HideoutHelper { - private logger; - private hashUtil; - private timeUtil; - private randomUtil; - private databaseServer; - private itemEventRouter; - private httpResponse; - private profileHelper; - private inventoryHelper; - private playerService; - private configServer; - static BITCOIN_FARM: string; - private WATER_COLLECTOR; - private BITCOIN; - private EXPEDITIONARY_FUEL_TANK; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; - private hideoutConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected inventoryHelper: InventoryHelper; + protected playerService: PlayerService; + protected configServer: ConfigServer; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; + protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** @@ -46,21 +44,20 @@ export declare class HideoutHelper { initProduction(recipeId: string, productionTime: number): Production; isProductionType(productive: Productive): productive is Production; applyPlayerUpgradesBonuses(pmcData: IPmcData, bonus: StageBonus): void; - private applySkillXPBoost; + protected applySkillXPBoost(pmcData: IPmcData, bonus: StageBonus): void; updatePlayerHideout(sessionID: string): void; - private updateWaterCollector; - private doesWaterCollectorHaveFilter; - private updateFuel; - private updateWaterFilters; - private getAreaUpdObject; - private updateAirFilters; - private updateBitcoinFarm; - private getBTCSlots; - private getManagementSkillsSlots; - private hasManagementSkillSlots; - private getHideoutManagementSkill; - private getHideoutManagementConsumptionBonus; + protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void; + protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean; + protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateWaterFilters(waterFilterArea: HideoutArea, pwProd: Production, isGeneratorOn: boolean, pmcData: IPmcData): HideoutArea; + protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd; + protected updateAirFilters(airFilterArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production; + protected getBTCSlots(pmcData: IPmcData): number; + protected getManagementSkillsSlots(): number; + protected hasManagementSkillSlots(pmcData: IPmcData): boolean; + protected getHideoutManagementSkill(pmcData: IPmcData): Common; + protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HttpServerHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HttpServerHelper.d.ts new file mode 100644 index 0000000..c6e5296 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/HttpServerHelper.d.ts @@ -0,0 +1,23 @@ +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class HttpServerHelper { + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected mime: { + css: string; + bin: string; + html: string; + jpg: string; + js: string; + json: string; + png: string; + svg: string; + txt: string; + }; + constructor(configServer: ConfigServer); + getMimeText(key: string): string; + buildUrl(): string; + getBackendUrl(): string; + getWebsocketUrl(): string; + sendTextJson(resp: any, output: any): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/InRaidHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/InRaidHelper.d.ts new file mode 100644 index 0000000..c3cbfbb --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/InRaidHelper.d.ts @@ -0,0 +1,97 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { InventoryHelper } from "./InventoryHelper"; +import { PaymentHelper } from "./PaymentHelper"; +export declare class InRaidHelper { + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; + constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ + addUpdToMoneyFromRaid(items: Item[]): void; + /** + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared + */ + deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; + getPlayerGear(items: Item[]): Item[]; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/InventoryHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/InventoryHelper.d.ts similarity index 70% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/InventoryHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/InventoryHelper.d.ts index 00e95d3..dc7cbca 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/InventoryHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/InventoryHelper.d.ts @@ -5,6 +5,7 @@ import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMe import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInventoryConfig } from "../models/spt/config/IInventoryConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -25,26 +26,26 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class InventoryHelper { - private logger; - private jsonUtil; - private hashUtil; - private httpResponse; - private fenceService; - private databaseServer; - private paymentHelper; - private traderAssortHelper; - private dialogueHelper; - private itemHelper; - private containerHelper; - private profileHelper; - private configServer; - private inventoryConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected httpResponse: HttpResponseUtil; + protected fenceService: FenceService; + protected databaseServer: DatabaseServer; + protected paymentHelper: PaymentHelper; + protected traderAssortHelper: TraderAssortHelper; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected containerHelper: ContainerHelper; + protected profileHelper: ProfileHelper; + protected configServer: ConfigServer; + protected inventoryConfig: IInventoryConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; - private getSizeByInventoryItemHash; - private getInventoryItemHash; + protected getSizeByInventoryItemHash(itemTpl: string, itemID: string, inventoryItemHash: InventoryHelper.InventoryItemHash): Record; + protected getInventoryItemHash(inventoryItem: Item[]): InventoryHelper.InventoryItemHash; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. @@ -56,9 +57,9 @@ export declare class InventoryHelper { * @param {string} sessionID * @returns Array */ - private getStashSlotMap; - private getStashType; - private getPlayerStashSize; + protected getStashSlotMap(pmcData: IPmcData, sessionID: string): number[][]; + protected getStashType(sessionID: string): string; + protected getPlayerStashSize(sessionID: string): Record; /** * Internal helper function to transfer an item from one profile to another. * fromProfileData: Profile of the source. @@ -73,5 +74,12 @@ export declare class InventoryHelper { /** * Internal helper function to handle cartridges in inventory if any of them exist. */ - private handleCartridges; + protected handleCartridges(items: Item[], body: IInventoryMoveRequestData): void; } +declare namespace InventoryHelper { + interface InventoryItemHash { + byItemId: Record; + byParentId: Record; + } +} +export {}; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ItemHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ItemHelper.d.ts similarity index 63% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ItemHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ItemHelper.d.ts index 5ff64b6..1701c62 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ItemHelper.d.ts @@ -1,15 +1,16 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; declare class ItemHelper { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); /** * Checks if a id is a valid item. Valid meaning that it's an item that be stored in stash @@ -18,7 +19,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward * or content of bot loot. Items that are tested as valid may be in a player backpack or stash. * @param {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 @@ -82,27 +83,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +163,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +189,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/NotificationSendHelper.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/NotificationSendHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/NotificationSendHelper.d.ts index b9298da..34e62d9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/NotificationSendHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/NotificationSendHelper.d.ts @@ -2,8 +2,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { - private httpServer; - private notificationService; + protected httpServer: IHttpServer; + protected notificationService: NotificationService; constructor(httpServer: IHttpServer, notificationService: NotificationService); /** * Send notification message to the appropiate channel diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/NotifierHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/NotifierHelper.d.ts similarity index 89% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/NotifierHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/NotifierHelper.d.ts index 0d524e9..738b69a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/NotifierHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/NotifierHelper.d.ts @@ -2,11 +2,11 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { - private httpServerHelper; + protected httpServerHelper: HttpServerHelper; /** * The default notification sent when waiting times out. */ - private defaultNotification; + protected defaultNotification: INotification; constructor(httpServerHelper: HttpServerHelper); getDefaultNotification(): INotification; /** Creates a new notification that displays the "Your offer was sold!" prompt and removes sold offer from "My Offers" on clientside */ diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/PaymentHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/PaymentHelper.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/PaymentHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/PaymentHelper.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/PresetHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/PresetHelper.d.ts similarity index 66% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/PresetHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/PresetHelper.d.ts index 0a24128..a469582 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/PresetHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { - private databaseServer; - private lookup; - constructor(databaseServer: DatabaseServer); + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected lookup: Record; + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ProfileHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ProfileHelper.d.ts similarity index 67% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ProfileHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ProfileHelper.d.ts index 508443c..6c150c8 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -20,6 +21,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; @@ -28,6 +35,12 @@ export declare class ProfileHelper { getPmcProfile(sessionID: string): IPmcData; getScavProfile(sessionID: string): IPmcData; getDefaultCounters(): Stats; - private isWiped; - private getServerVersion; + protected isWiped(sessionID: string): boolean; + protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/QuestConditionHelper.d.ts similarity index 76% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/QuestConditionHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/QuestConditionHelper.d.ts index 2a0ee94..90ee560 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/QuestConditionHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/QuestConditionHelper.d.ts @@ -3,5 +3,5 @@ export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLoyaltyConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; - private filterConditions; + protected filterConditions(q: AvailableForConditions[], questType: string, furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/QuestHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/QuestHelper.d.ts new file mode 100644 index 0000000..0f68cd5 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/QuestHelper.d.ts @@ -0,0 +1,115 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { TraderHelper } from "./TraderHelper"; +export declare class QuestHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + protected ragfairServerHelper: RagfairServerHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected traderHelper: TraderHelper; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + questStatus(pmcData: IPmcData, questID: string): QuestStatus; + /** + * returns true is the condition is satisfied + */ + evaluateLevel(pmcProfile: IPmcData, cond: AvailableForConditions): boolean; + getDeltaQuests(before: IQuest[], after: IQuest[]): IQuest[]; + rewardSkillPoints(sessionID: string, pmcData: IPmcData, output: IItemEventRouterResponse, skillName: string, progress: number): void; + getQuestLocale(questId: string): any; + /** + * Debug Routine for showing some information on the + * quest list in question. + */ + dumpQuests(quests: any): void; + loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; + protected processReward(reward: Reward): any[]; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; + acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; + failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; + applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; + changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; + /** + * Get List of All Quests as an array + * @returns Array of IQuest objects + */ + questValues(): IQuest[]; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ + protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ + cleanQuestConditions(quest: IQuest): IQuest; + failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ + getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; + getFindItemIdForQuestItem(itemTpl: string): string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairHelper.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairHelper.d.ts index 8e70bcd..2c8dbb5 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairHelper.d.ts @@ -2,6 +2,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,16 +13,16 @@ import { ItemHelper } from "./ItemHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { - private logger; - private jsonUtil; - private traderAssortHelper; - private databaseServer; - private handbookHelper; - private itemHelper; - private ragfairLinkedItemService; - private utilityHelper; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected traderAssortHelper: TraderAssortHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected ragfairLinkedItemService: RagfairLinkedItemService; + protected utilityHelper: UtilityHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, traderAssortHelper: TraderAssortHelper, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, ragfairLinkedItemService: RagfairLinkedItemService, utilityHelper: UtilityHelper, configServer: ConfigServer); /** * Gets currency TAG from TPL @@ -31,7 +32,7 @@ export declare class RagfairHelper { getCurrencyTag(currency: string): string; filterCategories(sessionID: string, info: ISearchRequestData): string[]; getDisplayableAssorts(sessionID: string): Record; - private getCategoryList; + protected getCategoryList(handbookId: string): string[]; countCategories(result: IGetOffersResult): void; /** * Merges Root Items @@ -39,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairOfferHelper.d.ts similarity index 58% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairOfferHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairOfferHelper.d.ts index 3bf8add..8d03bee 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairOfferHelper.d.ts @@ -1,12 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -19,31 +23,32 @@ import { RagfairHelper } from "./RagfairHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { - private logger; - private timeUtil; - private hashUtil; - private itemEventRouter; - private databaseServer; - private saveServer; - private dialogueHelper; - private itemHelper; - private paymentHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private ragfairSortHelper; - private ragfairHelper; - private ragfairOfferService; - private configServer; - private static TPL_GOODS_SOLD; - private ragfairConfig; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected paymentHelper: PaymentHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected static goodSoldTemplate: string; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; - private getProfileOffers; - private deleteOfferByOfferId; - private completeOffer; + protected getProfileOffers(sessionID: string): IRagfairOffer[]; + protected deleteOfferByOfferId(sessionID: string, offerId: string): void; + protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, offer: IRagfairOffer, pmcProfile: IPmcData): boolean; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairSellHelper.d.ts similarity index 69% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairSellHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairSellHelper.d.ts index 929d112..6ec004a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairSellHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairSellHelper.d.ts @@ -1,14 +1,15 @@ import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairSellHelper { - private logger; - private randomUtil; - private timeUtil; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairServerHelper.d.ts similarity index 61% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairServerHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairServerHelper.d.ts index d29ba42..e4939d1 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairServerHelper.d.ts @@ -1,9 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -11,26 +14,27 @@ import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { - private randomUtil; - private hashUtil; - private saveServer; - private databaseServer; - private profileHelper; - private itemHelper; - private dialogueHelper; - private jsonUtil; - private configServer; - private ragfairConfig; - private questConfig; - private static TPL_GOODS_RETURNED; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected itemHelper: ItemHelper; + protected localeService: LocaleService; + protected dialogueHelper: DialogueHelper; + protected jsonUtil: JsonUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + protected static goodsReturnedTemplate: string; + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails * @returns boolean */ isItemValidRagfairItem(itemDetails: [boolean, ITemplateItem]): boolean; - private isItemBlacklisted; + protected isItemBlacklisted(itemTemplateId: string): boolean; isTrader(userID: string): boolean; isPlayer(userID: string): boolean; returnItems(sessionID: string, items: any[]): void; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairSortHelper.d.ts new file mode 100644 index 0000000..d20e10c --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairSortHelper.d.ts @@ -0,0 +1,14 @@ +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; +export declare class RagfairSortHelper { + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); + sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; + protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByName(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByPrice(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByExpiry(a: IRagfairOffer, b: IRagfairOffer): number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairTaxHelper.d.ts similarity index 62% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairTaxHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairTaxHelper.d.ts index e87334f..820facb 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairTaxHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RagfairTaxHelper.d.ts @@ -1,15 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { - private logger; - private databaseServer; - private ragfairPriceService; - private itemHelper; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected itemHelper: ItemHelper; constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); calculateTax(item: Item, pmcData: IPmcData, requirementsValue: number, offerItemCount: number, sellInOnePiece: boolean): number; - private calculateItemWorth; + protected calculateItemWorth(item: Item, itemTemplate: ITemplateItem, itemCount: number, pmcData: IPmcData, isRootItem?: boolean): number; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RepairHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RepairHelper.d.ts new file mode 100644 index 0000000..9a3ab29 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/RepairHelper.d.ts @@ -0,0 +1,21 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class RepairHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; + protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; + protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; + isWeaponTemplate(tpl: string): boolean; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/SecureContainerHelper.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/SecureContainerHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/SecureContainerHelper.d.ts index 8f246b6..9e2bc32 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/SecureContainerHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/SecureContainerHelper.d.ts @@ -7,7 +7,7 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class SecureContainerHelper { - private itemHelper; + protected itemHelper: ItemHelper; constructor(itemHelper: ItemHelper); getSecureContainerItems(items: Item[]): string[]; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TradeHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TradeHelper.d.ts similarity index 73% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TradeHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TradeHelper.d.ts index 475390b..975062b 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/TradeHelper.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TradeHelper.d.ts @@ -2,7 +2,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { Upd } from "../models/eft/common/tables/IItem"; +import { Item, Upd } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -12,14 +12,14 @@ import { RagfairServer } from "../servers/RagfairServer"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { - private logger; - private itemEventRouter; - private traderHelper; - private itemHelper; - private paymentService; - private fenceService; - private inventoryHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected fenceService: FenceService; + protected inventoryHelper: InventoryHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer); /** * Buy item from flea or trader @@ -39,6 +39,6 @@ export declare class TradeHelper { * @returns */ sellItem(pmcData: IPmcData, body: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; - private incrementAssortBuyCount; - private checkPurchaseIsWithinTraderItemLimit; + protected incrementAssortBuyCount(assortBeingPurchased: Item, itemsPurchasedCount: number): void; + protected checkPurchaseIsWithinTraderItemLimit(assortBeingPurchased: Item, assortId: string, count: number): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderAssortHelper.d.ts new file mode 100644 index 0000000..91ba6b9 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderAssortHelper.d.ts @@ -0,0 +1,55 @@ +import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; +import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { TraderAssortService } from "../services/TraderAssortService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; +import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class TraderAssortHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected traderAssortService: TraderAssortService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); + /** + * Get a traders assorts + * Can be used for returning ragfair / fence assorts + * @param sessionId session id + * @param traderId trader id + * @returns a traders assorts + */ + getAssort(sessionId: string, traderId: string): ITraderAssort; + /** + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) + * @param traderId trader id + * @returns array of Items + */ + protected getPristineTraderAssorts(traderId: string): Item[]; + /** + * Returns generated ragfair offers in a trader assort format + * @returns Trader assort object + */ + protected getRagfairDataAsTraderAssort(): ITraderAssort; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderHelper.d.ts new file mode 100644 index 0000000..b2e9d38 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/TraderHelper.d.ts @@ -0,0 +1,109 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; +import { PlayerService } from "../services/PlayerService"; +import { HandbookHelper } from "./HandbookHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class TraderHelper { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); + getTrader(traderID: string, sessionID: string): ITraderBase; + getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ + resetTrader(sessionID: string, traderID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ + getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ + lvlUp(traderID: string, sessionID: string): void; + getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ + traderFilter(traderFilters: string[], tplToCheck: string): boolean; + getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/UtilityHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/UtilityHelper.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/UtilityHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/UtilityHelper.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/WeightedRandomHelper.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/WeightedRandomHelper.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/WeightedRandomHelper.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/helpers/WeightedRandomHelper.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/BleedingEdgeEntry.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/BleedingEdgeEntry.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/BleedingEdgeEntry.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/BleedingEdgeEntry.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/Compiler.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/Compiler.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/Compiler.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/Compiler.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/DebugEntry.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/DebugEntry.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/DebugEntry.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/DebugEntry.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/ReleaseEntry.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/ReleaseEntry.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/ReleaseEntry.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/ReleaseEntry.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/TestEntry.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/TestEntry.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/ide/TestEntry.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/ide/TestEntry.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/loaders/BundleLoader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/BundleLoader.d.ts similarity index 80% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/loaders/BundleLoader.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/BundleLoader.d.ts index 4f7664c..06ad698 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/loaders/BundleLoader.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/BundleLoader.d.ts @@ -10,10 +10,10 @@ declare class BundleInfo { constructor(modpath: string, bundle: any, bundlePath: string, bundleFilepath: string); } export declare class BundleLoader { - private httpServerHelper; - private vfs; - private jsonUtil; - private bundles; + protected httpServerHelper: HttpServerHelper; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected bundles: Record; constructor(httpServerHelper: HttpServerHelper, vfs: VFS, jsonUtil: JsonUtil); getBundles(local: boolean): BundleInfo[]; getBundle(key: string, local: boolean): BundleInfo; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/loaders/DelayedModLoader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/DelayedModLoader.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/DelayedModLoader.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/loaders/InitialModLoader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/InitialModLoader.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/loaders/InitialModLoader.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/InitialModLoader.d.ts diff --git a/Live/CWX_DeSharpener/server/types/loaders/DelayedModLoader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostAkiModLoader.d.ts similarity index 80% rename from Live/CWX_DeSharpener/server/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostAkiModLoader.d.ts index 2a05604..edc6e5d 100644 --- a/Live/CWX_DeSharpener/server/types/loaders/DelayedModLoader.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostAkiModLoader.d.ts @@ -4,14 +4,14 @@ import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; -import { InitialModLoader } from "./InitialModLoader"; -export declare class DelayedModLoader implements IModLoader { +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { protected bundleLoader: BundleLoader; protected handbookController: HandbookController; protected vfs: VFS; protected modCompilerService: ModCompilerService; - protected initialModLoader: InitialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; getModPath(mod: string): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostDBModLoader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Live/CWX_DeSharpener/server/types/loaders/InitialModLoader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PreAkiModLoader.d.ts similarity index 94% rename from Live/CWX_DeSharpener/server/types/loaders/InitialModLoader.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PreAkiModLoader.d.ts index 68e47fe..6ded3c6 100644 --- a/Live/CWX_DeSharpener/server/types/loaders/InitialModLoader.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/loaders/PreAkiModLoader.d.ts @@ -9,7 +9,7 @@ import { ModCompilerService } from "../services/ModCompilerService"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; -export declare class InitialModLoader implements IModLoader { +export declare class PreAkiModLoader implements IModLoader { protected logger: ILogger; protected vfs: VFS; protected jsonUtil: JsonUtil; @@ -50,12 +50,12 @@ export declare class InitialModLoader implements IModLoader { * @param modToValidate package.json details * @returns boolean */ - protected isModSpt300Compatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; protected executeMods(container: DependencyContainer): void; sortModsLoadOrder(): string[]; protected addMod(mod: string): Promise; - protected areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: Record): boolean; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; protected validMod(mod: string): boolean; protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/common/MinMax.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IEmptyRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IEmptyRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IGlobals.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IGlobals.d.ts similarity index 99% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IGlobals.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IGlobals.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILocation.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILocation.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILocation.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILocation.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILocationBase.d.ts similarity index 94% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILocationBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILocationBase.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILooseLoot.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILooseLoot.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/ILooseLoot.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IMetricsTableData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IMetricsTableData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IMetricsTableData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IPmcData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IPmcData.d.ts new file mode 100644 index 0000000..5703e4b --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/IPmcData.d.ts @@ -0,0 +1,3 @@ +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/MemberCategory.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/enums/MemberCategory.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/MemberCategory.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IPmcData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotBase.d.ts similarity index 88% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IPmcData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotBase.d.ts index adc2aa5..0ee468e 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotBase.d.ts @@ -1,12 +1,13 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; +export interface IBotBase { _id: string; aid: string; - savage: string; + savage?: string; Info: Info; Customization: Customization; Health: Health; @@ -18,22 +19,15 @@ export interface IPmcData { BackendCounters: Record; InsuredItems: InsuredItem[]; Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; Quests: Quest[]; TradersInfo: Record; RagfairInfo: RagfairInfo; - WishList: string[]; RepeatableQuests: IPmcDataRepeatableQuest[]; + Bonuses: Bonus[]; + Notes: Notes; CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 + WishList: string[]; } export interface Info { EntryPoint: string; @@ -52,10 +46,13 @@ export interface Info { LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; + NeedWipeOptions: any[]; + lastCompletedWipe: LastCompleted; Bans: IBan[]; BannedState: boolean; BannedUntil: number; + IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -77,13 +74,6 @@ export declare enum BanType { Friends = 5, ChangeNickname = 6 } -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} export interface Customization { Head: string; Body: string; @@ -134,12 +124,16 @@ export interface Skills { export interface Common { Id: string; Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; } export interface Mastering { Id: string; Progress: number; + max?: number; + min?: number; } export interface Stats { CarriedQuestItems: string[]; @@ -190,6 +184,14 @@ export interface CounterKeyValue { Key: string[]; Value: number; } +export interface ConditionCounters { + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} export interface Aggressor { AccountId: string; ProfileId: string; @@ -249,14 +251,6 @@ export interface LastPlayerStateInfo { Level: number; MemberCategory: string; } -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} export interface BackendCounter { id: string; qid?: string; @@ -276,18 +270,19 @@ export interface Productive { inProgress?: boolean; StartTimestamp?: number; } -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} export interface Production extends Productive { RecipeId: string; SkipTime: number; ProductionTime: number; } +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} export interface HideoutArea { type: HideoutAreas; level: number; @@ -299,32 +294,38 @@ export interface HideoutArea { lastRecipe: string; } export interface HideoutSlot { - item: HideoutItem[]; + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; } export interface HideoutItem { _id: string; _tpl: string; upd?: Upd; } -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 } export interface Quest { qid: string; startTime: number; - status: string; - statusTimers?: StatusTimer; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ completedConditions?: string[]; } -export interface StatusTimer { - AvailableForStart?: number; -} export interface TraderInfo { loyaltyLevel: number; salesSum: number; @@ -337,5 +338,16 @@ export interface RagfairInfo { isRatingGrowing: boolean; offers: IRagfairOffer[]; } -export interface CarExtractCounts { +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotCore.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotCore.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotCore.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotType.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotType.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ICustomizationItem.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ICustomizationItem.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IHandbookBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IHandbookBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IItem.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IItem.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IItem.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ILocationsBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ILocationsBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ILootBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ILootBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ILootBase.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IQuest.d.ts similarity index 94% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IQuest.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IQuest.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/IRepeatableQuests.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ITemplateItem.d.ts new file mode 100644 index 0000000..23a1a14 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ITemplateItem.d.ts @@ -0,0 +1,455 @@ +export interface ITemplateItem { + _id: string; + _name: string; + _parent: string; + _type: string; + _props: Props; + _proto: string; +} +export interface Props { + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; + Rarity?: string; + SpawnChance?: number; + CreditsPrice?: number; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; + Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; + CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; + foodUseTime?: number; + foodEffectType?: string; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; +} +export interface Prefab { + path: string; + rcid: string; +} +export interface Grid { + _name: string; + _id: string; + _parent: string; + _props: GridProps; + _proto: string; +} +export interface GridProps { + filters: GridFilter[]; + cellsH: number; + cellsV: number; + minCount: number; + maxCount: number; + maxWeight: number; + isSortingTable: boolean; +} +export interface GridFilter { + Filter: string[]; + ExcludedFilter: string[]; +} +export interface Slot { + _name: string; + _id: string; + _parent: string; + _props: SlotProps; + _max_count?: number; + _required: boolean; + _mergeSlotWithChildren: boolean; + _proto: string; +} +export interface SlotProps { + filters: SlotFilter[]; +} +export interface SlotFilter { + Shift?: number; + Filter: string[]; + AnimationIndex?: number; +} +export interface Xyz { + x: number; + y: number; + z: number; +} +export interface StackSlot { + _name?: string; + _id: string; + _parent: string; + _max_count: number; + _props: StackSlotProps; + _proto: string; + upd: any; +} +export interface StackSlotProps { + filters: SlotFilter[]; +} +export interface EffectsHealth { + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; +} +export interface EffectsHealthProps { + value: number; +} +export interface EffectsDamage { + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; +} +export interface EffectDamageProps { + delay: number; + duration: number; + fadeOut: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; +} +export interface Color { + r: number; + g: number; + b: number; + a: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ITrader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/tables/ITrader.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/common/tables/ITrader.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/customization/IBuyClothingRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/customization/IBuyClothingRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/customization/IBuyClothingRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/customization/IWearClothingRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/customization/IWearClothingRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IFriendRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IFriendRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IPinDialogRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IPinDialogRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/ISendMessageRequest.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/ISendMessageRequest.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/game/IGameConfigResponse.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/game/IGameConfigResponse.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/game/IVersionValidateRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/game/IVersionValidateRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/Effect.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/IOffraidEatRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/IOffraidEatRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/IOffraidHealRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/IOffraidHealRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/ISyncHealthRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/health/ISyncHealthRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/HideoutAreasEnum.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutArea.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutArea.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutProduction.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutProduction.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 85% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutScavCase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/httpResponse/INullResponseData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/httpResponse/INullResponseData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/insurance/IInsureRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/insurance/IInsureRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IAddItemRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IAddItemRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IAddItemRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IAddItemRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventorySortRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventorySortRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 96% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IChangeRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IChangeRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/ILoginRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/ILoginRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IMiniProfile.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IMiniProfile.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IRegisterData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IRegisterData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IRegisterData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IRemoveProfileData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/launcher/IRemoveProfileData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/location/IGetLocationRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/location/IGetLocationRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/match/IGetProfileRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IGetProfileRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/match/IGetProfileRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IGetProfileRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/notes/INoteActionData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/notes/INoteActionData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/notes/INoteActionData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/notifier/INotifier.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/notifier/INotifier.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/notifier/INotifier.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 88% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IAkiProfile.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IAkiProfile.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IAkiProfile.d.ts index 80dd02d..eaa66c1 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -126,12 +126,16 @@ export interface Chest { export interface Stomach { } export interface LeftArm { + Fracture?: number; } export interface RightArm { + Fracture?: number; } export interface LeftLeg { + Fracture?: number; } export interface RightLeg { + Fracture?: number; } export interface Inraid { location: string; @@ -149,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IProfileCreateRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IProfileCreateRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/ISearchFriendRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/ISearchFriendRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/ISearchFriendResponse.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/ISearchFriendResponse.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 85% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IListQuestsRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IListQuestsRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 80% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IGetOffersResult.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IRagfairOffer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IRagfairOffer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/ISearchRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/ragfair/ISearchRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/repair/IRepairActionDataRequest.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/repair/IRepairActionDataRequest.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/weather/IWeatherData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/weather/IWeatherData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/weather/IWeatherData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/wishlist/IWishlistActionData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/wishlist/IWishlistActionData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/AmmoTypes.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/BaseClasses.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BaseClasses.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/BaseClasses.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BaseClasses.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotAmount.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotDifficulty.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/ConfigTypes.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ConfigTypes.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/ConfigTypes.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ConfigTypes.d.ts index 6bd31e8..61d6f99 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ConfigTypes.d.ts @@ -8,11 +8,14 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ContainerTypes.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/ELocationName.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ELocationName.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/ELocationName.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/ELocationName.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/EquipmentSlots.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/EquipmentSlots.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/EquipmentSlots.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/EquipmentSlots.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/HideoutAreas.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/HideoutAreas.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/HideoutAreas.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/HideoutAreas.d.ts diff --git a/Live/CWX_DeSharpener/server/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/MemberCategory.d.ts similarity index 100% rename from Live/CWX_DeSharpener/server/types/models/eft/common/MemberCategory.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/MemberCategory.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/MessageType.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/MessageType.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/MessageType.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/MessageType.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/Money.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/Money.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/Money.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/Money.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestRewardType.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestStatus.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..ba65933 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,11 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7, + Expired = 8 +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/RaidMode.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/SkillTypes.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/Traders.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/Traders.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/Traders.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/Traders.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/mod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/mod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/external/mod.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/mod.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/external/tsyringe.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/tsyringe.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/external/tsyringe.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/external/tsyringe.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/bindings/Route.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bindings/Route.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/bindings/Route.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bindings/Route.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IBotCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IBotCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IBundleCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IBundleCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IDataCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IDataCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IGameCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IGameCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHealthCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHealthCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHttpCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IHttpCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IInraidCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IInraidCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ILocationCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ILocationCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IMatchCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IModCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IModCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/INoteCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/INoteCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/INotifierCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/INotifierCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IPresetCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IPresetCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IProfileCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IProfileCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IQuestCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IQuestCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IRepairCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IRepairCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ISaveCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ISaveCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ITradeCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ITradeCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ITraderCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/ITraderCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IAirdropConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IAirdropConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IAirdropConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IBaseConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IBaseConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IBaseConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IBotConfig.d.ts similarity index 75% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IBotConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IBotConfig.d.ts index f8ea940..e171087 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -5,9 +6,13 @@ export interface IBotConfig extends IBaseConfig { bosses: string[]; durability: Durability; lootNValue: LootNvalue; + revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -17,6 +22,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -27,6 +33,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; @@ -86,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -96,17 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; + enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/ICoreConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/ICoreConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ICoreConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHealthConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHealthConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHealthConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHideoutConfig.d.ts new file mode 100644 index 0000000..36d6246 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHideoutConfig.d.ts @@ -0,0 +1,7 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface IHideoutConfig extends IBaseConfig { + kind: "aki-hideout"; + runIntervalSeconds: number; + fuelDrainRateMultipler: number; + hoursForSkillCrafting: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHttpConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IHttpConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IHttpConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInRaidConfig.d.ts similarity index 95% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInRaidConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInRaidConfig.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInsuranceConfig.d.ts similarity index 75% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInsuranceConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInventoryConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IInventoryConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IInventoryConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/ILocationConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/ILocationConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ILocationConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IMatchConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IMatchConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IMatchConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IQuestConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IQuestConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IQuestConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IRagfairConfig.d.ts similarity index 94% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IRagfairConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..c24e617 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -30,6 +31,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; @@ -39,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IRepairConfig.d.ts similarity index 66% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IRepairConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ITraderConfig.d.ts similarity index 59% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/ITraderConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/ITraderConfig.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IWeatherConfig.d.ts similarity index 86% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IWeatherConfig.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/controllers/IBotController.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/controllers/IBotController.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/controllers/IBotController.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IBotGenerator.d.ts similarity index 83% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IBotGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/ILocationGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/ILocationGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IPMCLootGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IPMCLootGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/helpers/Traders.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/helpers/Traders.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/helpers/Traders.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IMod.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IMod.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IMod.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IModLoader.d.ts similarity index 87% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IModLoader.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IModLoader.d.ts index 5398c9b..40a5e19 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IModLoader.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IModLoader.d.ts @@ -3,6 +3,5 @@ export interface IModLoader { load(container: DependencyContainer): void; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IPackageJsonData.d.ts similarity index 84% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IPackageJsonData.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IDatabaseTables.d.ts similarity index 69% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IDatabaseTables.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IDatabaseTables.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IHttpServer.d.ts similarity index 94% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IHttpServer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IHttpServer.d.ts index 50e5c91..c828399 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IHttpServer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IHttpServer.d.ts @@ -1,4 +1,5 @@ /// +/// import http, { ServerResponse } from "http"; import { INotification } from "../../eft/notifier/INotifier"; export interface IHttpServer { diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/ILocaleBase.d.ts similarity index 97% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/ILocaleBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/ILocaleBase.d.ts index a20084d..8887c06 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/ILocaleBase.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/ILocaleBase.d.ts @@ -1,5 +1,5 @@ export interface ILocaleBase { - global: ILocaleGlobalBase; + global: Record; menu: Record; languages: ILanguageBase[]; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/ILocations.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/ILocations.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/ILocations.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/ILocations.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IServerBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IServerBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/IServerBase.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/ISettingsBase.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/ISettingsBase.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/server/ISettingsBase.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/IAsyncQueue.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/IAsyncQueue.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/ICommand.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/ICommand.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/ICommand.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/ILogger.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/ILogger.d.ts similarity index 59% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/ILogger.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/ILogger.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/IUuidGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/IUuidGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/HttpRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/HttpRouter.d.ts new file mode 100644 index 0000000..f75a47d --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/HttpRouter.d.ts @@ -0,0 +1,16 @@ +/// +import { IncomingMessage } from "http"; +import { DynamicRouter, Router, StaticRouter } from "../di/Router"; +export declare class HttpRouter { + protected staticRouters: StaticRouter[]; + protected dynamicRoutes: DynamicRouter[]; + constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); + protected groupBy(list: T[], keyGetter: (t: T) => string): Map; + getResponse(req: IncomingMessage, info: any, sessionID: string): string; + protected handleRoute(url: string, info: any, sessionID: string, wrapper: ResponseWrapper, routers: Router[], dynamic: boolean): boolean; +} +declare class ResponseWrapper { + output: string; + constructor(output: string); +} +export {}; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/ImageRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/ImageRouter.d.ts similarity index 88% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/ImageRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/ImageRouter.d.ts index 97e580d..ab03977 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/ImageRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/ImageRouter.d.ts @@ -4,8 +4,8 @@ import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ImageRouteService } from "../services/mod/image/ImageRouteService"; import { VFS } from "../utils/VFS"; export declare class ImageRouter { - private vfs; - private imageRouteService; + protected vfs: VFS; + protected imageRouteService: ImageRouteService; constructor(vfs: VFS, imageRouteService: ImageRouteService); addRoute(key: string, valueToAdd: string): void; sendImage(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any, httpServer: IHttpServer): void; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/ItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/ItemEventRouter.d.ts similarity index 72% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/ItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/ItemEventRouter.d.ts index bb20152..b1ac5d9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/ItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/ItemEventRouter.d.ts @@ -5,13 +5,13 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { - private logger; - private jsonUtil; - private profileHelper; - private itemEventRouters; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected itemEventRouters: ItemEventRouterDefinition[]; constructor(logger: ILogger, jsonUtil: JsonUtil, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[]); - private output; + protected output: IItemEventRouterResponse; handleEvents(info: IItemEventRouterRequest, sessionID: string): IItemEventRouterResponse; getOutput(sessionID: string): IItemEventRouterResponse; - private resetOutput; + protected resetOutput(sessionID: string): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/BotDynamicRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/BotDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/BotDynamicRouter.d.ts index dd2f68a..6d0ab4b 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/BundleDynamicRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/BundleDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/BundleDynamicRouter.d.ts index be27008..a765410 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/CustomizationDynamicRouter.d.ts similarity index 81% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/CustomizationDynamicRouter.d.ts index 03a5967..2db7cc5 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/DataDynamicRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/DataDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/DataDynamicRouter.d.ts index c30501a..836ed8d 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/HttpDynamicRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/HttpDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/HttpDynamicRouter.d.ts index b2933e9..a152b4d 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/InraidDynamicRouter.d.ts similarity index 84% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/InraidDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/InraidDynamicRouter.d.ts index ea4a9ae..7c0561f 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/LocationDynamicRouter.d.ts similarity index 84% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/LocationDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/LocationDynamicRouter.d.ts index 30741db..b8e5cdf 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/NotifierDynamicRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/NotifierDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/NotifierDynamicRouter.d.ts index 4786817..83c60c5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/TraderDynamicRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/TraderDynamicRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/TraderDynamicRouter.d.ts index a100b4c..5b7cc1b 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/CustomizationItemEventRouter.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/CustomizationItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/CustomizationItemEventRouter.d.ts index 3025e2c..e78445e 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/HealthItemEventRouter.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/HealthItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/HealthItemEventRouter.d.ts index bad9af2..99847c6 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/HealthItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HealthItemEventRouter extends ItemEventRouterDefinition { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/HideoutItemEventRouter.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/HideoutItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/HideoutItemEventRouter.d.ts index 2cec18b..e1e98af 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HideoutItemEventRouter extends ItemEventRouterDefinition { - private hideoutCallbacks; + protected hideoutCallbacks: HideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/InsuranceItemEventRouter.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/InsuranceItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/InsuranceItemEventRouter.d.ts index 8efc2c2..a922cc0 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/InventoryItemEventRouter.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/InventoryItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/InventoryItemEventRouter.d.ts index 1d93e7b..2619bb9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { - private inventoryCallbacks; + protected inventoryCallbacks: InventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/NoteItemEventRouter.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/NoteItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/NoteItemEventRouter.d.ts index 12af594..59bf598 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/NoteItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class NoteItemEventRouter extends ItemEventRouterDefinition { - private noteCallbacks; + protected noteCallbacks: NoteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/PresetBuildItemEventRouter.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7298c52..277db44 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { - private presetBuildCallbacks; + protected presetBuildCallbacks: PresetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/QuestItemEventRouter.d.ts similarity index 56% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/QuestItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/QuestItemEventRouter.d.ts index 9944ae9..a092aa6 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { - private questCallbacks; - constructor(questCallbacks: QuestCallbacks); + protected logger: ILogger; + protected questCallbacks: QuestCallbacks; + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/RagfairItemEventRouter.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/RagfairItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/RagfairItemEventRouter.d.ts index 88e52ba..9216cc5 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/RepairItemEventRouter.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/RepairItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/RepairItemEventRouter.d.ts index b292ded..5196ba9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/RepairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RepairItemEventRouter extends ItemEventRouterDefinition { - private repairCallbacks; + protected repairCallbacks: RepairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/TradeItemEventRouter.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/TradeItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/TradeItemEventRouter.d.ts index 1bca2b8..a43bb0a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/TradeItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class TradeItemEventRouter extends ItemEventRouterDefinition { - private tradeCallbacks; + protected tradeCallbacks: TradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/WishlistItemEventRouter.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/WishlistItemEventRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/WishlistItemEventRouter.d.ts index 38831f6..38497fb 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { - private wishlistCallbacks; + protected wishlistCallbacks: WishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/HealthSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/HealthSaveLoadRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/HealthSaveLoadRouter.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/InraidSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/InraidSaveLoadRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/InraidSaveLoadRouter.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/InsuranceSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/InsuranceSaveLoadRouter.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/ProfileSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/save_load/ProfileSaveLoadRouter.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/BundleSerializer.d.ts similarity index 87% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/BundleSerializer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/BundleSerializer.d.ts index 7952e9c..912db83 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/BundleSerializer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/BundleSerializer.d.ts @@ -3,8 +3,8 @@ import { BundleLoader } from "../../loaders/BundleLoader"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { ILogger } from "../../models/spt/utils/ILogger"; export declare class BundleSerializer extends Serializer { - private logger; - private bundleLoader; + protected logger: ILogger; + protected bundleLoader: BundleLoader; constructor(logger: ILogger, bundleLoader: BundleLoader); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/ImageSerializer.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/ImageSerializer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/ImageSerializer.d.ts index 29340d0..0e040d4 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/ImageSerializer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/ImageSerializer.d.ts @@ -2,7 +2,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/NotifySerializer.d.ts similarity index 69% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/NotifySerializer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/NotifySerializer.d.ts index 8be8ac2..1779ac9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/NotifySerializer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/serializers/NotifySerializer.d.ts @@ -3,9 +3,9 @@ import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { - private notifierController; - private httpServerHelper; + protected notifierController: NotifierController; + protected httpServerHelper: HttpServerHelper; constructor(notifierController: NotifierController, httpServerHelper: HttpServerHelper); - serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; + serialize(_sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/BotStaticRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/BotStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/BotStaticRouter.d.ts index d8b0bf4..aeea220 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/BotStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/BotStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/BundleStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/BundleStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/BundleStaticRouter.d.ts index 3905b82..fb682fc 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/BundleStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/BundleStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/CustomizationStaticRouter.d.ts similarity index 81% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/CustomizationStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/CustomizationStaticRouter.d.ts index 46c71b8..21bc4bb 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/CustomizationStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/DataStaticRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/DataStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/DataStaticRouter.d.ts index a493d3a..84ba7fd 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/DataStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/DataStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/DialogStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/DialogStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/DialogStaticRouter.d.ts index a59fb14..546cdf1 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/DialogStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/DialogStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { - private dialogueCallbacks; + protected dialogueCallbacks: DialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/GameStaticRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/GameStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/GameStaticRouter.d.ts index 988b673..a9a7496 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/GameStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/GameStaticRouter.d.ts @@ -1,6 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { - private gameCallbacks; + protected gameCallbacks: GameCallbacks; constructor(gameCallbacks: GameCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/HealthStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/HealthStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/HealthStaticRouter.d.ts index e644861..863fd5e 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/HealthStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/HealthStaticRouter.d.ts @@ -1,6 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/InraidStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/InraidStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/InraidStaticRouter.d.ts index 66ed860..b29ad23 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/InraidStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/InraidStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/InsuranceStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/InsuranceStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/InsuranceStaticRouter.d.ts index 8da26b3..5676499 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/InsuranceStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/ItemEventStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/ItemEventStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/ItemEventStaticRouter.d.ts index 08ba6bb..c30a7fc 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/ItemEventStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { - private itemEventCallbacks; + protected itemEventCallbacks: ItemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/LauncherStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/LauncherStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/LauncherStaticRouter.d.ts index 9d07f78..0040cbd 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/LauncherStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/LauncherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { - private launcherCallbacks; + protected launcherCallbacks: LauncherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/LocationStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/LocationStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/LocationStaticRouter.d.ts index 9c5c52e..b6de956 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/LocationStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/LocationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/MatchStaticRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/MatchStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/MatchStaticRouter.d.ts index d746381..9920a92 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/MatchStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/MatchStaticRouter.d.ts @@ -1,6 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { - private matchCallbacks; + protected matchCallbacks: MatchCallbacks; constructor(matchCallbacks: MatchCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/NotifierStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/NotifierStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/NotifierStaticRouter.d.ts index 1c8566d..8f1f5cc 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/NotifierStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/NotifierStaticRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/PresetStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/PresetStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/PresetStaticRouter.d.ts index 2272f82..a9e7458 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/PresetStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/PresetStaticRouter.d.ts @@ -1,6 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { - private presetCallbacks; + protected presetCallbacks: PresetBuildCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/ProfileStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/ProfileStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/ProfileStaticRouter.d.ts index fd787f1..83403f2 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/ProfileStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/ProfileStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { - private profileCallbacks; + protected profileCallbacks: ProfileCallbacks; constructor(profileCallbacks: ProfileCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/QuestStaticRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/QuestStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/QuestStaticRouter.d.ts index fda3c23..8f7ca0a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/QuestStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/QuestStaticRouter.d.ts @@ -1,6 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { - private questCallbacks; + protected questCallbacks: QuestCallbacks; constructor(questCallbacks: QuestCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/RagfairStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/RagfairStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/RagfairStaticRouter.d.ts index 618374f..6c41467 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/RagfairStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/RagfairStaticRouter.d.ts @@ -1,6 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/TraderStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/TraderStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/TraderStaticRouter.d.ts index 18f0629..41728a1 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/TraderStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/TraderStaticRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/WeatherStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/WeatherStaticRouter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/WeatherStaticRouter.d.ts index 61b904d..72ed851 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/WeatherStaticRouter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/routers/static/WeatherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { - private weatherCallbacks; + protected weatherCallbacks: WeatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/ConfigServer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/ConfigServer.d.ts similarity index 75% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/ConfigServer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/ConfigServer.d.ts index 83af38d..a079be8 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/ConfigServer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/ConfigServer.d.ts @@ -3,10 +3,10 @@ import { VFS } from "../utils/VFS"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigTypes } from "../models/enums/ConfigTypes"; export declare class ConfigServer { - private logger; - private vfs; - private jsonUtil; - private configs; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected configs: Record; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil); getConfig(configType: ConfigTypes): T; getConfigByString(configType: string): T; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/DatabaseServer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/DatabaseServer.d.ts similarity index 80% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/DatabaseServer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/DatabaseServer.d.ts index 521bcf9..aa152d0 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/DatabaseServer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/DatabaseServer.d.ts @@ -1,6 +1,6 @@ import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { - private tableData; + protected tableData: IDatabaseTables; getTables(): IDatabaseTables; setTables(any: any): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/HttpServer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/HttpServer.d.ts similarity index 63% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/HttpServer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/HttpServer.d.ts index d0db7e4..44d802b 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/HttpServer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/HttpServer.d.ts @@ -1,9 +1,12 @@ /// +/// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; @@ -13,24 +16,25 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { - private httpRouter; - private logger; - private randomUtil; - private jsonUtil; - private httpResponse; - private databaseServer; - private notifierHelper; - private httpServerHelper; - private serializers; - private configServer; + protected httpRouter: HttpRouter; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected serializers: Serializer[]; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); - private buffers; - private onReceive; - private onRespond; - private httpConfig; - private webSockets; - private websocketPingHandler; + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); + protected buffers: {}; + protected onReceive: {}; + protected onRespond: {}; + protected httpConfig: IHttpConfig; + protected webSockets: {}; + protected websocketPingHandler: any; getCookies(req: http.IncomingMessage): any; resetBuffer(sessionID: string): void; putInBuffer(sessionID: any, data: any, bufLength: number): boolean; @@ -42,6 +46,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; - private getRandomisedMessage; + protected getRandomisedMessage(): string; wsOnConnection(ws: any, req: any): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/RagfairServer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/RagfairServer.d.ts similarity index 67% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/RagfairServer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/RagfairServer.d.ts index cf56d64..bc86cdb 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/RagfairServer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/RagfairServer.d.ts @@ -1,22 +1,24 @@ import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; import { ConfigServer } from "./ConfigServer"; export declare class RagfairServer { - private logger; - private ragfairOfferGenerator; - private ragfairOfferService; - private ragfairCategoriesService; - private ragfairRequiredItemsService; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/SaveServer.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/SaveServer.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/SaveServer.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/SaveServer.d.ts index fdf92e4..cb28f49 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/SaveServer.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/servers/SaveServer.d.ts @@ -5,15 +5,15 @@ import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { - private vfs; - private saveLoadRouters; - private jsonUtil; - private hashUtil; - private logger; - private profileFilepath; - private profiles; - private onSave; - private saveMd5; + protected vfs: VFS; + protected saveLoadRouters: SaveLoadRouter[]; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected profileFilepath: string; + protected profiles: {}; + protected onSave: {}; + protected saveMd5: {}; constructor(vfs: VFS, saveLoadRouters: SaveLoadRouter[], jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger); load(): void; save(): void; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotLootCacheService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..cc71eee --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/BotLootCacheService.d.ts @@ -0,0 +1,82 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole bots role (assault / pmcBot etc) + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc Is the bot a PMC (alteres what loot is cached) + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/FenceService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/FenceService.d.ts similarity index 66% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/FenceService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/FenceService.d.ts index 27d14ef..79058c6 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/FenceService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/FenceService.d.ts @@ -4,6 +4,7 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +12,25 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class FenceService { - private logger; - private hashUtil; - private jsonUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private itemHelper; - private presetHelper; - private configServer; - private fenceAssort; - private traderConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected fenceAssort: ITraderAssort; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, configServer: ConfigServer); - private setFenceAssort; + protected setFenceAssort(fenceAssort: ITraderAssort): void; getFenceAssorts(): ITraderAssort; hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/HashCacheService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/HashCacheService.d.ts similarity index 71% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/HashCacheService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/HashCacheService.d.ts index c9b0170..5320f28 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/HashCacheService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/HashCacheService.d.ts @@ -3,13 +3,13 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; export declare class HashCacheService { - private vfs; - private hashUtil; - private jsonUtil; - private logger; - private jsonHashes; - private modHashes; - private readonly modCachePath; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected jsonHashes: any; + protected modHashes: any; + protected readonly modCachePath = "./user/cache/modCache.json"; constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); getStoredModHash(modName: string): string; modContentMatchesStoredHash(modName: string, modContent: string): boolean; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/InsuranceService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/InsuranceService.d.ts similarity index 59% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/InsuranceService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/InsuranceService.d.ts index 160faba..171bf10 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/InsuranceService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/InsuranceService.d.ts @@ -4,6 +4,7 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,18 +12,17 @@ import { SaveServer } from "../servers/SaveServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { - private logger; - private databaseServer; - private secureContainerHelper; - private randomUtil; - private timeUtil; - private saveServer; - private traderHelper; - private dialogueHelper; - private configServer; - private insured; - private templatesById; - private insuranceConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected secureContainerHelper: SecureContainerHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected traderHelper: TraderHelper; + protected dialogueHelper: DialogueHelper; + protected configServer: ConfigServer; + protected insured: Record>; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; @@ -31,11 +31,21 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - private addGearToSend; + protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/LocaleService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/MatchLocationService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/MatchLocationService.d.ts new file mode 100644 index 0000000..c027bec --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/MatchLocationService.d.ts @@ -0,0 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class MatchLocationService { + protected timeUtil: TimeUtil; + protected locations: {}; + constructor(timeUtil: TimeUtil); + createGroup(sessionID: string, info: ICreateGroupRequestData): any; + deleteGroup(info: any): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ModCompilerService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..26cb4ac --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ModCompilerService.d.ts @@ -0,0 +1,20 @@ +import * as ts from "typescript"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; +export declare class ModCompilerService { + protected logger: ILogger; + protected hashCacheService: HashCacheService; + protected vfs: VFS; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; + protected compile(fileNames: string[], options: ts.CompilerOptions): Promise; + protected buildDepth(depth: number): string; + protected getNodesModulesPath(depth: number): string; + protected getAkiPath(depth: number): string; + protected getAkiFolder(): string; + protected getNodesModulesFolder(): string; + protected calculateDepth(file: string): number; + protected areFilesReady(fileNames: string[]): boolean; + protected delay(ms: number): Promise; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/NotificationService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/NotificationService.d.ts similarity index 72% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/NotificationService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/NotificationService.d.ts index 9c6c143..65a84dd 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/NotificationService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - private messageQueue; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/PaymentService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/PaymentService.d.ts similarity index 65% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/PaymentService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/PaymentService.d.ts index 0a6c4d6..a5e538f 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/PaymentService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/PaymentService.d.ts @@ -4,6 +4,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -11,14 +12,14 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { - private logger; - private httpResponse; - private databaseServer; - private handbookHelper; - private traderHelper; - private itemHelper; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request @@ -43,6 +44,23 @@ export declare class PaymentService { * inside the stash, that is it has the stash as * ancestor with slotId=hideout */ - private isItemInStash; + protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/PlayerService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/PlayerService.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/PlayerService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/PlayerService.d.ts index 99e5986..519b7e5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/PlayerService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/PlayerService.d.ts @@ -3,8 +3,8 @@ import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPla import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PlayerService { - private logger; - private databaseServer; + protected logger: ILogger; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, databaseServer: DatabaseServer); /** * increases the profile skill and updates any output diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ProfileFixerService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..ed1dec7 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/ProfileFixerService.d.ts @@ -0,0 +1,61 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairCategoriesService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairCategoriesService.d.ts new file mode 100644 index 0000000..83910e5 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairCategoriesService.d.ts @@ -0,0 +1,40 @@ +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; +export declare class RagfairCategoriesService { + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairLinkedItemService.d.ts new file mode 100644 index 0000000..6c34ee0 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairLinkedItemService.d.ts @@ -0,0 +1,10 @@ +import { DatabaseServer } from "../servers/DatabaseServer"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +export declare class RagfairLinkedItemService { + protected databaseServer: DatabaseServer; + protected linkedItemsCache: Record>; + constructor(databaseServer: DatabaseServer); + getLinkedItems(linkedSearchId: string): Iterable; + protected buildLinkedItemTable(): void; + protected getFilters(item: ITemplateItem, slot: string): string[]; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairOfferService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairOfferService.d.ts similarity index 57% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairOfferService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairOfferService.d.ts index 9b1bf8d..7398a8f 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairOfferService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairOfferService.d.ts @@ -1,7 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -9,27 +11,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { - private logger; - private timeUtil; - private databaseServer; - private saveServer; - private ragfairServerHelper; - private profileHelper; - private itemEventRouter; - private httpResponse; - private configServer; - private playerOffersLoaded; - private toUpdate; - private expiredOffers; - private offers; - private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; + protected profileHelper: ProfileHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected playerOffersLoaded: boolean; + protected toUpdate: Record; + protected expiredOffers: Item[]; + protected offers: IRagfairOffer[]; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; @@ -57,8 +65,8 @@ export declare class RagfairOfferService { * Get an array of stale offers that are still shown to player * @returns IRagfairOffer array */ - private getStaleOffers; - private isStale; - private processStaleOffer; - private returnPlayerOffer; + protected getStaleOffers(): IRagfairOffer[]; + protected isStale(offer: IRagfairOffer, time: number): boolean; + protected processStaleOffer(staleOffer: IRagfairOffer): void; + protected returnPlayerOffer(offer: IRagfairOffer): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairPriceService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairPriceService.d.ts new file mode 100644 index 0000000..679fe1d --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairPriceService.d.ts @@ -0,0 +1,55 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "../models/spt/ragfair/IRagfairServerPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class RagfairPriceService { + protected handbookHelper: HandbookHelper; + protected databaseServer: DatabaseServer; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected prices: IRagfairServerPrices; + constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); + generateStaticPrices(): void; + generateDynamicPrices(): void; + hasDynamicPrices(): boolean; + getDynamicPrice(itemTpl: string): number; + getAllFleaPrices(): Record; + getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; + getBarterPrice(barterScheme: IBarterScheme[]): number; + getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ + getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairRequiredItemsService.d.ts similarity index 71% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairRequiredItemsService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairRequiredItemsService.d.ts index e4582d0..b05fc65 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/RagfairRequiredItemsService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/RagfairRequiredItemsService.d.ts @@ -2,10 +2,10 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { - private logger; - private paymentHelper; - private ragfairOfferService; - private requiredItemsCache; + protected logger: ILogger; + protected paymentHelper: PaymentHelper; + protected ragfairOfferService: RagfairOfferService; + protected requiredItemsCache: {}; constructor(logger: ILogger, paymentHelper: PaymentHelper, ragfairOfferService: RagfairOfferService); getRequiredItems(searchId: string): any; buildRequiredItemTable(): void; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/TraderAssortService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/TraderAssortService.d.ts similarity index 78% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/TraderAssortService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/TraderAssortService.d.ts index ccb9e45..5ba2d05 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/TraderAssortService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/TraderAssortService.d.ts @@ -1,6 +1,6 @@ import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { - private pristineTraderAssorts; + protected pristineTraderAssorts: Record; getPristineTraderAssort(traderId: string): ITraderAssort; setPristineTraderAssort(traderId: string, assort: ITraderAssort): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/CustomItemService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/image/imageRouteService.d.ts similarity index 79% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/image/imageRouteService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/image/imageRouteService.d.ts index 854083c..29569b2 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/image/imageRouteService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/image/imageRouteService.d.ts @@ -1,5 +1,5 @@ export declare class ImageRouteService { - private routes; + protected routes: Record; addRoute(urlKey: string, route: string): void; getByKey(urlKey: string): string; existsByKey(urlKey: string): boolean; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onLoad/OnLoadMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onLoad/OnLoadMod.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onLoad/OnLoadMod.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onLoad/OnLoadMod.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onLoad/OnLoadModService.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onLoad/OnLoadModService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onLoad/OnLoadModService.d.ts index 89bad14..f402103 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onLoad/OnLoadModService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onLoad/OnLoadModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnLoadModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onUpdate/OnUpdateMod.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onUpdate/OnUpdateMod.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onUpdate/OnUpdateMod.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onUpdate/OnUpdateModService.d.ts similarity index 84% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onUpdate/OnUpdateModService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onUpdate/OnUpdateModService.d.ts index 32419f4..05d735b 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onUpdate/OnUpdateModService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnUpdateModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/staticRouter/StaticRouterMod.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/staticRouter/StaticRouterMod.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/staticRouter/StaticRouterMod.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/staticRouter/StaticRouterMod.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/staticRouter/StaticRouterModService.d.ts similarity index 86% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/staticRouter/StaticRouterModService.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/staticRouter/StaticRouterModService.d.ts index d4c42aa..f28fd45 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,7 +1,7 @@ import { DependencyContainer } from "tsyringe"; import { RouteAction } from "../../../di/Router"; export declare class StaticRouterModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/App.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/App.d.ts similarity index 51% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/App.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/App.d.ts index a11f576..dcc2669 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/App.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/App.d.ts @@ -3,12 +3,13 @@ import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { - private logger; - private timeUtil; - private onLoadComponents; - private onUpdateComponents; - private onUpdateLastRun; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected onLoadComponents: OnLoad[]; + protected onUpdateComponents: OnUpdate[]; + protected onUpdateLastRun: {}; constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; - private update; + protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/AyncQueue.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/AyncQueue.d.ts similarity index 85% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/AyncQueue.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/AyncQueue.d.ts index a99aa37..da6ab18 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/AyncQueue.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - private commandsQueue; + protected commandsQueue: ICommand[]; constructor(); waitFor(command: ICommand): Promise; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/DatabaseImporter.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/DatabaseImporter.d.ts similarity index 52% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/DatabaseImporter.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/DatabaseImporter.d.ts index 97dda30..483e135 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/DatabaseImporter.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/DatabaseImporter.d.ts @@ -1,18 +1,24 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { - private logger; - private vfs; - private jsonUtil; - private databaseServer; - private imageRouter; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/HashUtil.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/HashUtil.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/HashUtil.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/HashUtil.d.ts index cf92b47..bacbf2a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/HashUtil.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/HashUtil.d.ts @@ -2,7 +2,7 @@ import crypto from "crypto"; import { TimeUtil } from "./TimeUtil"; export declare class HashUtil { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); generate(): string; generateMd5ForData(data: string): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/HttpResponseUtil.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/HttpResponseUtil.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/HttpResponseUtil.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/HttpResponseUtil.d.ts index 85c28bd..29502be 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/HttpResponseUtil.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/HttpResponseUtil.d.ts @@ -3,9 +3,9 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HttpResponseUtil { - private jsonUtil; + protected jsonUtil: JsonUtil; constructor(jsonUtil: JsonUtil); - private clearString; + protected clearString(s: string): any; noBody(data: any): any; getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; getUnclearedBody(data: any, err?: number, errmsg?: any): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/JsonUtil.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/JsonUtil.d.ts similarity index 85% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/JsonUtil.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/JsonUtil.d.ts index 20b7448..71e95f6 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/JsonUtil.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/JsonUtil.d.ts @@ -2,10 +2,10 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { - private vfs; - private hashUtil; - private logger; - private fileHashes; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected fileHashes: any; constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Logger.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Logger.d.ts new file mode 100644 index 0000000..3d9013f --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Logger.d.ts @@ -0,0 +1,58 @@ +/// +import fs from "fs"; +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; +export declare class WinstonLogger implements ILogger { + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + protected showDebugInConsole: boolean; + protected folderPath: string; + protected file: string; + protected filePath: string; + protected logLevels: { + levels: { + error: number; + warn: number; + succ: number; + info: number; + custom: number; + debug: number; + }; + colors: { + error: string; + warn: string; + succ: string; + info: string; + custom: string; + debug: string; + }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; + }; + protected logger: winston.Logger & SptLogger; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); + writeToLogFile(data: string | Daum): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; + error(data: string | Record): Promise; + warning(data: string | Record): Promise; + success(data: string | Record): Promise; + info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; + debug(data: string | Record, onlyShowInConsole?: boolean): Promise; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/MathUtil.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/MathUtil.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/MathUtil.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/MathUtil.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/ObjectId.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/ObjectId.d.ts similarity index 55% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/ObjectId.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/ObjectId.d.ts index b100572..03aae56 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/ObjectId.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/ObjectId.d.ts @@ -1,13 +1,13 @@ /// import { TimeUtil } from "./TimeUtil"; export declare class ObjectId { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); - private randomBytes; - private constglobalCounter; - private consttime; - private globalCounter; - private time; + protected randomBytes: Buffer; + protected constglobalCounter: number; + protected consttime: number; + protected globalCounter: number; + protected time: number; incGlobalCounter(): number; toHexString(byteArray: string | any[] | Buffer): string; generate(): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/RandomUtil.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/RandomUtil.d.ts similarity index 99% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/RandomUtil.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/RandomUtil.d.ts index 3a3ecb6..c24dd60 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/RandomUtil.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/RandomUtil.d.ts @@ -103,8 +103,8 @@ export declare class ProbabilityObject { constructor(key: K, relativeProbability: number, data?: V); } export declare class RandomUtil { - private jsonUtil; - private logger; + protected jsonUtil: JsonUtil; + protected logger: ILogger; constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/TimeUtil.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/TimeUtil.d.ts new file mode 100644 index 0000000..eed4e6d --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/TimeUtil.d.ts @@ -0,0 +1,18 @@ +export declare class TimeUtil { + static readonly oneHourAsSeconds = 3600; + formatTime(date: Date): string; + formatDate(date: Date): string; + getDate(): string; + getTime(): string; + getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/UUidGenerator.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/UUidGenerator.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/UUidGenerator.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/UUidGenerator.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/VFS.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/VFS.d.ts similarity index 95% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/VFS.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/VFS.d.ts index d567615..e5eaf02 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/VFS.d.ts +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/VFS.d.ts @@ -1,11 +1,12 @@ /// +/// import "reflect-metadata"; import fs from "fs"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { - private asyncQueue; - private uuidGenerator; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; accessFilePromisify: (path: fs.PathLike, mode?: number) => Promise; copyFilePromisify: (src: fs.PathLike, dst: fs.PathLike, flags?: number) => Promise; mkdirPromisify: (path: fs.PathLike, options: fs.MakeDirectoryOptions & { diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Watermark.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Watermark.d.ts new file mode 100644 index 0000000..c6dc120 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/Watermark.d.ts @@ -0,0 +1,46 @@ +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class WatermarkLocale { + protected locales: { + "en-US": { + description: string[]; + warning: string[]; + modding: string[]; + }; + "zh-CN": { + description: string[]; + warning: string[]; + modding: string[]; + }; + }; + getLocale(): string; + getDescription(): string[]; + getWarning(): string[]; + getModding(): string[]; +} +export declare class Watermark { + protected logger: ILogger; + protected configServer: ConfigServer; + protected watermarkLocale?: WatermarkLocale; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); + protected text: string[]; + protected versionLabel: string; + initialize(): void; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; + getVersionLabel(): string; + /** Set window title */ + setTitle(): void; + /** Reset console cursor to top */ + resetCursor(): void; + /** Draw the watermark */ + draw(): void; + /** Caculate text length */ + protected textLength(s: string): number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/decorators/Singleton.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/decorators/Singleton.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/decorators/Singleton.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/decorators/Singleton.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/decorators/constructor.d.ts b/Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/decorators/constructor.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/decorators/constructor.d.ts rename to Live/CWX_MasterKey/CWX_MasterKey 1.3.2/user/mods/CWX-MasterKeys 1.3.2/types/utils/decorators/constructor.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey.csproj b/Live/CWX_MasterKey/CWX_MasterKey.csproj index ee2fe4f..f5b1ca4 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey.csproj +++ b/Live/CWX_MasterKey/CWX_MasterKey.csproj @@ -15,7 +15,7 @@ ..\Shared\AKI\Aki.Reflection.dll - ..\Shared\EFT\Assembly-CSharp.dll + ..\..\..\ALT-Mods\Shared\EFT\Assembly-CSharp.dll ..\Shared\BepInEx\BepInEx.dll diff --git a/Live/CWX_MasterKey/Patch.cs b/Live/CWX_MasterKey/Patch.cs index fa7c707..00c10bf 100644 --- a/Live/CWX_MasterKey/Patch.cs +++ b/Live/CWX_MasterKey/Patch.cs @@ -4,7 +4,7 @@ using EFT; namespace CWX_MasterKey { - public class GameWorldPatch : ModulePatch + public class MasterKeyPatch : ModulePatch { protected override MethodBase GetTargetMethod() { diff --git a/Live/CWX_MasterKey/program.cs b/Live/CWX_MasterKey/program.cs index 0692ec4..3a3d1e9 100644 --- a/Live/CWX_MasterKey/program.cs +++ b/Live/CWX_MasterKey/program.cs @@ -1,14 +1,13 @@ using BepInEx; -using UnityEngine; namespace CWX_MasterKey { - [BepInPlugin("com.CWX.MasterKey", "CWX-MasterKey", "1.0.0")] + [BepInPlugin("com.CWX.MasterKey", "CWX-MasterKey", "1.3.0")] public class Plugin : BaseUnityPlugin { private void Awake() { - new GameWorldPatch().Enable(); + new MasterKeyPatch().Enable(); } } } diff --git a/Live/CWX_MasterKey/server/dist/package.json b/Live/CWX_MasterKey/server/dist/package.json index 0151e10..7669d0e 100644 --- a/Live/CWX_MasterKey/server/dist/package.json +++ b/Live/CWX_MasterKey/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "MasterKey", "author": "CWX", - "version": "1.2.0", + "version": "1.3.2", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.0.0", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_MasterKey/server/dist/src/mod.ts b/Live/CWX_MasterKey/server/dist/src/mod.ts index 8a3bdce..4ab8fbd 100644 --- a/Live/CWX_MasterKey/server/dist/src/mod.ts +++ b/Live/CWX_MasterKey/server/dist/src/mod.ts @@ -1,21 +1,14 @@ import { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -class CWX_MasterKey implements IMod +class CWX_MasterKey implements IPreAkiLoadMod { private pkg; - public load(container: DependencyContainer): void + public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } - - public delayedLoad(container: DependencyContainer): void - { return } } module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/BotCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/BotCallbacks.d.ts index 9602975..2db60dc 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/BotCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/BotCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { - private botController; - private httpResponse; + protected botController: BotController; + protected httpResponse: HttpResponseUtil; constructor(botController: BotController, httpResponse: HttpResponseUtil); getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string; getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/BundleCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/BundleCallbacks.d.ts index b007ab8..b28abe1 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/BundleCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/BundleCallbacks.d.ts @@ -1,15 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BundleCallbacks { - private logger; - private httpResponse; - private httpServer; - private bundleLoader; - private configServer; - private httpConfig; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); sendBundle(sessionID: string, req: any, resp: any, body: any): any; getBundles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/CustomizationCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/CustomizationCallbacks.d.ts index 918b8b6..3bab8c0 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/CustomizationCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/CustomizationCallbacks.d.ts @@ -9,9 +9,9 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { - private customizationController; - private saveServer; - private httpResponse; + protected customizationController: CustomizationController; + protected saveServer: SaveServer; + protected httpResponse: HttpResponseUtil; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/DataCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/DataCallbacks.d.ts index 018420e..cfb1c16 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/DataCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/DataCallbacks.d.ts @@ -12,8 +12,8 @@ import { ISettingsBase } from "../models/spt/server/ISettingsBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { - private httpResponse; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/DialogueCallbacks.d.ts index 3b6fbd1..634f90b 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/DialogueCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/DialogueCallbacks.d.ts @@ -21,10 +21,10 @@ import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { - private hashUtil; - private timeUtil; - private httpResponse; - private dialogueController; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected dialogueController: DialogueController; constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/GameCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/GameCallbacks.d.ts index 44a30ea..06da1b5 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/GameCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/GameCallbacks.d.ts @@ -2,15 +2,16 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { - private httpResponse; - private watermark; - private gameController; + protected httpResponse: HttpResponseUtil; + protected watermark: Watermark; + protected gameController: GameController; constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/HandbookCallbacks.d.ts index 0db5fec..891e375 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/HandbookCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/HandbookCallbacks.d.ts @@ -1,7 +1,7 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; export declare class HandbookCallbacks extends OnLoad { - private handbookController; + protected handbookController: HandbookController; constructor(handbookController: HandbookController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/HealthCallbacks.d.ts index a50dd42..8672be7 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/HealthCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/HealthCallbacks.d.ts @@ -9,10 +9,17 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { - private httpResponse; - private profileHelper; - private healthController; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/HideoutCallbacks.d.ts index 3698176..99ab4c9 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/HideoutCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/HideoutCallbacks.d.ts @@ -11,11 +11,12 @@ import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutTog import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HideoutCallbacks extends OnUpdate { - private hideoutController; - private configServer; - private hideoutConfig; + protected hideoutController: HideoutController; + protected configServer: ConfigServer; + protected hideoutConfig: IHideoutConfig; constructor(hideoutController: HideoutController, // TODO: delay needed configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/HttpCallbacks.d.ts index 9fe387d..94c97bd 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/HttpCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/HttpCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoad } from "../di/OnLoad"; import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { - private httpServer; + protected httpServer: IHttpServer; constructor(httpServer: IHttpServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/InraidCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/InraidCallbacks.d.ts index 2d53227..05bcce4 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/InraidCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/InraidCallbacks.d.ts @@ -3,14 +3,16 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { - private inraidController; - private httpResponse; - private configServer; - private airdropConfig; - private inraidConfig; + protected inraidController: InraidController; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected airdropConfig: IAirdropConfig; + protected inraidConfig: IInRaidConfig; constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/InsuranceCallbacks.d.ts index 79feb67..6819960 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/InsuranceCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/InsuranceCallbacks.d.ts @@ -3,20 +3,22 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { InsuranceService } from "../services/InsuranceService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { - private insuranceController; - private insuranceService; - private httpResponse; - private configServer; - private insuranceConfig; + protected insuranceController: InsuranceController; + protected insuranceService: InsuranceService; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/InventoryCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/InventoryCallbacks.d.ts index 9795aa0..9ab1486 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/InventoryCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/InventoryCallbacks.d.ts @@ -18,7 +18,7 @@ import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryT import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { - private inventoryController; + protected inventoryController: InventoryController; constructor(inventoryController: InventoryController); moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/ItemEventCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/ItemEventCallbacks.d.ts index 74e79c4..f4f04f9 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/ItemEventCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/ItemEventCallbacks.d.ts @@ -4,8 +4,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { - private httpResponse; - private itemEventRouter; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/LauncherCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/LauncherCallbacks.d.ts index 4bd5e2c..c022325 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/LauncherCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/LauncherCallbacks.d.ts @@ -8,10 +8,10 @@ import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { - private httpResponse; - private launcherController; - private saveServer; - private watermark; + protected httpResponse: HttpResponseUtil; + protected launcherController: LauncherController; + protected saveServer: SaveServer; + protected watermark: Watermark; constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/LocationCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/LocationCallbacks.d.ts index 5ecab74..cc69369 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/LocationCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/LocationCallbacks.d.ts @@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { - private httpResponse; - private locationController; + protected httpResponse: HttpResponseUtil; + protected locationController: LocationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/MatchCallbacks.d.ts index 63d38d9..2a92ef5 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/MatchCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/MatchCallbacks.d.ts @@ -1,34 +1,41 @@ import { MatchController } from "../controllers/MatchController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { - private httpResponse; - private jsonUtil; - private matchController; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected jsonUtil: JsonUtil; + protected matchController: MatchController; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; deleteGroup(url: string, info: any, sessionID: string): INullResponseData; startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/ModCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/ModCallbacks.d.ts index 2011f0e..58342dc 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/ModCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/ModCallbacks.d.ts @@ -1,17 +1,18 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { - private logger; - private httpResponse; - private httpServer; - private modLoader; - private configServer; - private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected postAkiModLoader: PostAkiModLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/NoteCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/NoteCallbacks.d.ts index fd7c5ca..d39d400 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/NoteCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/NoteCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { - private noteController; + protected noteController: NoteController; constructor(noteController: NoteController); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/NotifierCallbacks.d.ts index 416e6a3..c42058f 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/NotifierCallbacks.d.ts @@ -6,9 +6,9 @@ import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { - private httpServerHelper; - private httpResponse; - private notifierController; + protected httpServerHelper: HttpServerHelper; + protected httpResponse: HttpResponseUtil; + protected notifierController: NotifierController; constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/PresetBuildCallbacks.d.ts index 639c33f..541715a 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; @@ -6,10 +7,10 @@ import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPreset import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { - private httpResponse; - private presetBuildController; + protected httpResponse: HttpResponseUtil; + protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/PresetCallbacks.d.ts index f62afd6..4553f8f 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/PresetCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/PresetCallbacks.d.ts @@ -1,7 +1,7 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; export declare class PresetCallbacks extends OnLoad { - private presetController; + protected presetController: PresetController; constructor(presetController: PresetController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/ProfileCallbacks.d.ts index efce47d..6a86fc0 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/ProfileCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -12,9 +13,9 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { - private httpResponse; - private timeUtil; - private profileController; + protected httpResponse: HttpResponseUtil; + protected timeUtil: TimeUtil; + protected profileController: ProfileController; constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/QuestCallbacks.d.ts index f742096..559c29e 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/QuestCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/QuestCallbacks.d.ts @@ -13,9 +13,9 @@ import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestD import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { - private httpResponse; - private questController; - private repeatableQuestController; + protected httpResponse: HttpResponseUtil; + protected questController: QuestController; + protected repeatableQuestController: RepeatableQuestController; constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/RagfairCallbacks.d.ts index 152475f..3a405c9 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/RagfairCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/RagfairCallbacks.d.ts @@ -3,34 +3,39 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairCallbacks extends OnLoadOnUpdate { - private httpResponse; - private logger; - private jsonUtil; - private ragfairServer; - private ragfairController; - private configServer; - private ragfairConfig; + protected httpResponse: HttpResponseUtil; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected ragfairServer: RagfairServer; + protected ragfairController: RagfairController; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/RepairCallbacks.d.ts index f63ec18..63733fa 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/RepairCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/RepairCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; export declare class RepairCallbacks { - private repairController; + protected repairController: RepairController; constructor(repairController: RepairController); traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/SaveCallbacks.d.ts index b7219a0..bbb6e53 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/SaveCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/SaveCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { - private saveServer; + protected saveServer: SaveServer; constructor(saveServer: SaveServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/TradeCallbacks.d.ts index 9928951..272ae46 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/TradeCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/TradeCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { - private tradeController; + protected tradeController: TradeController; constructor(tradeController: TradeController); processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/TraderCallbacks.d.ts index 2a8af7f..128d9b2 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/TraderCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/TraderCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { - private httpResponse; - private traderController; + protected httpResponse: HttpResponseUtil; + protected traderController: TraderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/WeatherCallbacks.d.ts index e40ab3e..ae784c8 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/WeatherCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/WeatherCallbacks.d.ts @@ -3,8 +3,8 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { - private httpResponse; - private weatherController; + protected httpResponse: HttpResponseUtil; + protected weatherController: WeatherController; constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_MasterKey/server/dist/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_MasterKey/server/dist/types/callbacks/WishlistCallbacks.d.ts index e0249fd..c2cc2a8 100644 --- a/Live/CWX_MasterKey/server/dist/types/callbacks/WishlistCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/callbacks/WishlistCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; export declare class WishlistCallbacks { - private wishlistController; + protected wishlistController: WishlistController; constructor(wishlistController: WishlistController); addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/context/ApplicationContext.d.ts b/Live/CWX_MasterKey/server/dist/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/context/ContextVariable.d.ts b/Live/CWX_MasterKey/server/dist/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_MasterKey/server/dist/types/context/ContextVariableType.d.ts b/Live/CWX_MasterKey/server/dist/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/BotController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/BotController.d.ts index 8ecb97f..5e6f05d 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/BotController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/BotController.d.ts @@ -4,17 +4,32 @@ import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequest import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class BotController { - private databaseServer; - private botGenerator; - private botHelper; - private configServer; - private botConfig; + protected databaseServer: DatabaseServer; + protected botGenerator: BotGenerator; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); - getBotLimit(type: string): number; - getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + /** + * Return the number of bot loadout varieties to be generated + * @param type bot Type we want the loadout gen count for + * @returns + */ + getBotPresetGenerationLimit(type: string): number; + getBotCoreDifficulty(): IBotCore; + /** + * Get bot difficulty settings + * adjust PMC settings to ensure they engage the correct bot types + * @param type what bot the server is requesting settings for + * @param difficulty difficulty level server requested settings for + * @returns Difficulty object + */ + getBotDifficulty(type: string, difficulty: string): Difficulty; + protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/CustomizationController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/CustomizationController.d.ts index 698e6be..a6c4730 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/CustomizationController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/CustomizationController.d.ts @@ -9,14 +9,14 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; export declare class CustomizationController { - private logger; - private itemEventRouter; - private databaseServer; - private saveServer; - private profileHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper); getTraderSuits(traderID: string, sessionID: string): ISuit[]; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; - private getAllTraderSuits; + protected getAllTraderSuits(sessionID: string): ISuit[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/DialogueController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/DialogueController.d.ts index 235594f..b15c4b6 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/DialogueController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/DialogueController.d.ts @@ -3,13 +3,13 @@ import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachme import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { - private httpResponse; - private saveServer; - private dialogueHelper; + protected httpResponse: HttpResponseUtil; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; @@ -19,7 +19,7 @@ export declare class DialogueController { setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void; setRead(dialogueIDs: string[], sessionID: string): void; getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse; - private messagesHaveUncollectedRewards; - private removeExpiredItems; + protected messagesHaveUncollectedRewards(messages: Message[]): boolean; + protected removeExpiredItems(sessionID: string): void; update(): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/GameController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/GameController.d.ts index bb2a55a..85ec418 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/GameController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/GameController.d.ts @@ -2,27 +2,27 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { Watermark } from "../utils/Watermark"; export declare class GameController { - private logger; - private watermark; - private httpServerHelper; - private profileHelper; - private configServer; - private httpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + protected logger: ILogger; + protected watermark: Watermark; + protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - private addMissingBonusesProperty; - private addMissingRepeatableQuestsProperty; - private addMissingWeaponRepairSkill; - private addMissingAkiVersionTagToProfile; - private addMissingArmorRepairSkill; - private fixNullTraderSalesSums; - private removeDanglingConditionCounters; - private removeDanglingBackendCounters; + protected logProfileDetails(fullProfile: IAkiProfile): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; - private getActiveRepeatableQuests; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/HandbookController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/HandbookController.d.ts index f473437..52d2dd8 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/HandbookController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/HandbookController.d.ts @@ -1,8 +1,8 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class HandbookController { - private databaseServer; - private handbookHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper); load(): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/HealthController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/HealthController.d.ts index ca049f6..cc13603 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/HealthController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/HealthController.d.ts @@ -11,15 +11,36 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { - private logger; - private itemEventRouter; - private itemHelper; - private paymentService; - private inventoryHelper; - private healthHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected inventoryHelper: InventoryHelper; + protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/HideoutController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/HideoutController.d.ts index f35c23b..3eefe1a 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/HideoutController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/HideoutController.d.ts @@ -1,11 +1,14 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -14,6 +17,7 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -25,32 +29,74 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HideoutController { - private logger; - private hashUtil; - private timeUtil; - private databaseServer; - private randomUtil; - private inventoryHelper; - private saveServer; - private playerService; - private presetHelper; - private paymentHelper; - private itemEventRouter; - private httpResponse; - private profileHelper; - private hideoutHelper; - private configServer; - private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected inventoryHelper: InventoryHelper; + protected saveServer: SaveServer; + protected playerService: PlayerService; + protected presetHelper: PresetHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; + protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; + protected hideoutConfig: IHideoutConfig; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/InraidController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/InraidController.d.ts index c1cd6f5..b899e7d 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/InraidController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/InraidController.d.ts @@ -1,30 +1,44 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { - private saveServer; - private jsonUtil; - private databaseServer; - private questHelper; - private itemHelper; - private extendedProfileHelper; - private healthHelper; - private traderHelper; - private insuranceService; - private inRaidHelper; - private configServer; - private inraidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; + protected healthHelper: HealthHelper; + protected traderHelper: TraderHelper; + protected insuranceService: InsuranceService; + protected inRaidHelper: InRaidHelper; + protected configServer: ConfigServer; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/InsuranceController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/InsuranceController.d.ts index b175a06..6895383 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/InsuranceController.d.ts @@ -3,8 +3,10 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,23 +17,28 @@ import { PaymentService } from "../services/PaymentService"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceController { - private logger; - private randomUtil; - private itemEventRouter; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private profileHelper; - private dialogueHelper; - private paymentService; - private insuranceService; - private configServer; - private insuranceConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected itemEventRouter: ItemEventRouter; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected dialogueHelper: DialogueHelper; + protected paymentService: PaymentService; + protected insuranceService: InsuranceService; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; - doAbsolutelyNothing(): void; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/InventoryController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/InventoryController.d.ts index 8235082..f57f731 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/InventoryController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/InventoryController.d.ts @@ -24,19 +24,23 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; - private presetHelper; - private inventoryHelper; - private profileHelper; - private paymentHelper; - private itemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected fenceService: FenceService; + protected presetHelper: PresetHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/LauncherController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/LauncherController.d.ts index 2a30713..1af1f56 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/LauncherController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/LauncherController.d.ts @@ -3,23 +3,24 @@ import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { Info } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class LauncherController { - private hashUtil; - private saveServer; - private httpServerHelper; - private databaseServer; - private configServer; - private coreConfig; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected httpServerHelper: HttpServerHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected coreConfig: ICoreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; login(info: ILoginRequestData): string; register(info: IRegisterData): string; - private createAccount; + protected createAccount(info: IRegisterData): string; changeUsername(info: IChangeRequestData): string; changePassword(info: IChangeRequestData): string; wipe(info: IRegisterData): string; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/LocationController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/LocationController.d.ts index 41a8719..90b6d7a 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/LocationController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/LocationController.d.ts @@ -6,11 +6,11 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class LocationController { - private jsonUtil; - private logger; - private locationGenerator; - private databaseServer; - private timeUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected locationGenerator: LocationGenerator; + protected databaseServer: DatabaseServer; + protected timeUtil: TimeUtil; constructor(jsonUtil: JsonUtil, logger: ILogger, locationGenerator: LocationGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil); get(location: string): ILocationBase; generate(name: string): ILocationBase; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/MatchController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/MatchController.d.ts index 84abbe3..71cb7d3 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/MatchController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/MatchController.d.ts @@ -1,28 +1,38 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "../models/spt/config/IMatchConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { - private saveServer; - private profileHelper; - private matchLocationService; - private traderHelper; - private configServer; - private matchConfig; - private inraidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected matchLocationService: MatchLocationService; + protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; + protected matchConfig: IMatchConfig; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; - private getMatch; - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/NoteController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/NoteController.d.ts index 4d3420e..ee70541 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/NoteController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { - private itemEventRouter; +export declare class NoteController { + protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/NotifierController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/NotifierController.d.ts index 36fef66..31d7bfe 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/NotifierController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/NotifierController.d.ts @@ -3,11 +3,11 @@ import { NotificationService } from "../services/NotificationService"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { - private notifierHelper; - private httpServerHelper; - private notificationService; - private pollInterval; - private timeout; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected notificationService: NotificationService; + protected pollInterval: number; + protected timeout: number; constructor(notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, notificationService: NotificationService); /** * Resolve an array of session notifications. diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/PresetBuildController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/PresetBuildController.d.ts index 11c5c3e..adf4084 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/PresetBuildController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/PresetBuildController.d.ts @@ -7,10 +7,10 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class PresetBuildController { - private hashUtil; - private itemEventRouter; - private itemHelper; - private saveServer; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer); getUserBuilds(sessionID: string): WeaponBuild[]; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/PresetController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/PresetController.d.ts index 6ec8c55..ca1af1a 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/PresetController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/PresetController.d.ts @@ -1,8 +1,8 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetController { - private presetHelper; - private databaseServer; + protected presetHelper: PresetHelper; + protected databaseServer: DatabaseServer; constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer); initialize(): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/ProfileController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/ProfileController.d.ts index c8bd5f1..8c89a02 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/ProfileController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -11,21 +12,30 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { - private hashUtil; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private traderHelper; - private extendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; + protected traderHelper: TraderHelper; + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/QuestController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/QuestController.d.ts index d8caee5..2cbccfb 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/QuestController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/QuestController.d.ts @@ -4,34 +4,73 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { PlayerService } from "../services/PlayerService"; import { TimeUtil } from "../utils/TimeUtil"; export declare class QuestController { - private logger; - private timeUtil; - private itemEventRouter; - private databaseServer; - private itemHelper; - private dialogueHelper; - private profileHelper; - private questHelper; - private questConditionHelper; - private playerService; - private configServer; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected questHelper: QuestHelper; + protected questConditionHelper: QuestConditionHelper; + protected playerService: PlayerService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ getClientQuests(sessionID: string): IQuest[]; acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void; + /** + * Returns a list of quests that should be failed when a quest is completed + * @param completedQuestId quest completed id + * @returns array of quests + */ + protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[]; + /** + * Fail the quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/RagfairController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/RagfairController.d.ts index 5b94a95..c4ffc15 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/RagfairController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/RagfairController.d.ts @@ -20,6 +20,7 @@ import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPric import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -33,32 +34,34 @@ import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsSer import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { - private logger; - private timeUtil; - private httpResponse; - private itemEventRouter; - private ragfairServer; - private ragfairPriceService; - private databaseServer; - private itemHelper; - private saveServer; - private ragfairSellHelper; - private ragfairTaxHelper; - private ragfairSortHelper; - private ragfairOfferHelper; - private profileHelper; - private paymentService; - private handbookHelper; - private paymentHelper; - private inventoryHelper; - private ragfairHelper; - private ragfairOfferService; - private ragfairRequiredItemsService; - private ragfairOfferGenerator; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; + protected ragfairServer: RagfairServer; + protected ragfairPriceService: RagfairPriceService; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; + protected ragfairSellHelper: RagfairSellHelper; + protected ragfairTaxHelper: RagfairTaxHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairOfferHelper: RagfairOfferHelper; + protected profileHelper: ProfileHelper; + protected paymentService: PaymentService; + protected handbookHelper: HandbookHelper; + protected paymentHelper: PaymentHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/RepairController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/RepairController.d.ts index 77dd47a..0e78ef6 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/RepairController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/RepairController.d.ts @@ -5,21 +5,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; export declare class RepairController { - private logger; - private itemEventRouter; - private databaseServer; - private questHelper; - private traderHelper; - private paymentService; - private repairHelper; - private configServer; - private repairConfig; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected traderHelper: TraderHelper; + protected paymentService: PaymentService; + protected repairHelper: RepairHelper; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -36,5 +37,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/RepeatableQuestController.d.ts index 2dedc7e..98d05dd 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/RepeatableQuestController.d.ts @@ -4,17 +4,19 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { ELocationName } from "../models/enums/ELocationName"; -import { IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -48,22 +50,23 @@ export interface ITargetLocation { locations: string[]; } export declare class RepeatableQuestController { - private timeUtil; - private logger; - private randomUtil; - private mathUtil; - private jsonUtil; - private databaseServer; - private itemHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private itemEventRouter; - private paymentService; - private objectId; - private configServer; - private questConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + protected timeUtil: TimeUtil; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected mathUtil: MathUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected ragfairServerHelper: RagfairServerHelper; + protected itemEventRouter: ItemEventRouter; + protected paymentService: PaymentService; + protected objectId: ObjectId; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/TradeController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/TradeController.d.ts index f0a177b..c86745c 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/TradeController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/TradeController.d.ts @@ -9,11 +9,11 @@ import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTr import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { - private logger; - private itemEventRouter; - private tradeHelper; - private profileHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected tradeHelper: TradeHelper; + protected profileHelper: ProfileHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer); confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse; confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/TraderController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/TraderController.d.ts index 36eac75..7bab158 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/TraderController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/TraderController.d.ts @@ -8,14 +8,14 @@ import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { - private logger; - private databaseServer; - private traderAssortHelper; - private profileHelper; - private traderHelper; - private timeUtil; - private traderAssortService; - private jsonUtil; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected traderAssortHelper: TraderAssortHelper; + protected profileHelper: ProfileHelper; + protected traderHelper: TraderHelper; + protected timeUtil: TimeUtil; + protected traderAssortService: TraderAssortService; + protected jsonUtil: JsonUtil; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/WeatherController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/WeatherController.d.ts index 312c3a3..ca7f5eb 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/WeatherController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/WeatherController.d.ts @@ -1,10 +1,11 @@ import { WeatherGenerator } from "../generators/WeatherGenerator"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WeatherController { - private weatherGenerator; - private configServer; - private weatherConfig; + protected weatherGenerator: WeatherGenerator; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/Live/CWX_MasterKey/server/dist/types/controllers/WishlistController.d.ts b/Live/CWX_MasterKey/server/dist/types/controllers/WishlistController.d.ts index 5ef8df3..a96c522 100644 --- a/Live/CWX_MasterKey/server/dist/types/controllers/WishlistController.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/controllers/WishlistController.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class WishlistController { - private itemEvenRouter; + protected itemEvenRouter: ItemEventRouter; constructor(itemEvenRouter: ItemEventRouter); addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/generators/BotGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/BotGenerator.d.ts index e2565b7..a5fc0ad 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/BotGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/BotGenerator.d.ts @@ -1,36 +1,96 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; -export declare class BotGenerator { - private logger; - private hashUtil; - private randomUtil; - private jsonUtil; - private databaseServer; - private botInventoryGenerator; - private botHelper; - private gameEventHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - private generateBot; - private generateRandomLevel; - /** Converts health object to the required format */ - private generateHealth; - private generateSkills; - private getPmcRole; - private removeChristmasItemsFromBotInventory; - private generateId; - private generateInventoryID; - private getPMCDifficulty; - private generateDogtag; +declare namespace BotGenerator { + interface IRandomisedBotLevelResult { + level: number; + exp: number; + } } +export declare class BotGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected databaseServer: DatabaseServer; + protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; + protected botHelper: BotHelper; + protected gameEventHelper: GameEventHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); + /** + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns + */ + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; + protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ + protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; + protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ + protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ + protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; + protected generateId(bot: IBotBase): IBotBase; + protected generateInventoryID(profile: IBotBase): IBotBase; + protected getPMCDifficulty(requestedDifficulty: string): string; + /** + * Add a side-specific (usec/bear) dogtag item to a bots inventory + * @param bot bot to add dogtag to + * @returns Bot with dogtag added + */ + protected generateDogtag(bot: IBotBase): IBotBase; +} +export {}; diff --git a/Live/CWX_MasterKey/server/dist/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/BotInventoryGenerator.d.ts index 0cdbacb..35d1ee8 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/BotInventoryGenerator.d.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; @@ -9,16 +9,16 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botWeaponGenerator; - private botLootGenerator; - private botGeneratorHelper; - private weightedRandomHelper; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootGenerator: BotLootGenerator; + protected botGeneratorHelper: BotGeneratorHelper; + protected weightedRandomHelper: WeightedRandomHelper; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; - private generateEquipment; - private generateInventoryBase; + protected generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + protected generateInventoryBase(): PmcInventory; } diff --git a/Live/CWX_MasterKey/server/dist/types/generators/BotLootGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/BotLootGenerator.d.ts index 1d8c8e1..c6a3f29 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/BotLootGenerator.d.ts @@ -1,27 +1,124 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private botGeneratorHelper; - private pmcLootGenerator; - private configServer; - private botConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; - private getRandomisedCount; - private addLootFromPool; - /** Compares two item templates by their price to spawn chance ratio */ - private compareByValue; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_MasterKey/server/dist/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/BotWeaponGenerator.d.ts index e8f91cb..9215214 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/BotWeaponGenerator.d.ts @@ -1,44 +1,173 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { - private logger; - private hashUtil; - private databaseServer; - private itemHelper; - private weightedRandomHelper; - private botGeneratorHelper; - private randomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - private isWeaponValid; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - private generateExtraMagazines; - private addBullets; + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values * @returns */ - private getCompatibleAmmo; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - private fillExistingMagazines; + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/generators/LocationGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/LocationGenerator.d.ts index 4b96792..bd368b5 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/LocationGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/LocationGenerator.d.ts @@ -6,6 +6,8 @@ import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; import { Item } from "../models/eft/common/tables/IItem"; import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILocationConfig } from "../models/spt/config/ILocationConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; @@ -18,27 +20,27 @@ export interface IContainerItem { height: number; } export declare class LocationGenerator { - private logger; - private jsonUtil; - private objectId; - private randomUtil; - private ragfairServerHelper; - private itemHelper; - private mathUtil; - private gameEventHelper; - private containerHelper; - private presetHelper; - private configServer; - private locationConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected objectId: ObjectId; + protected randomUtil: RandomUtil; + protected ragfairServerHelper: RagfairServerHelper; + protected itemHelper: ItemHelper; + protected mathUtil: MathUtil; + protected gameEventHelper: GameEventHelper; + protected containerHelper: ContainerHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected locationConfig: ILocationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; - private getLooseLootMultiplerForLocation; - private getStaticLootMultiplerForLocation; + protected getLooseLootMultiplerForLocation(location: string): number; + protected getStaticLootMultiplerForLocation(location: string): number; generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record, locationName: string): SpawnpointTemplate[]; - private createItem; - private getRandomCompatibleCaliberTemplateId; - private getRandomValidCaliber; - private drawAmmoTpl; - private createRandomMagCartridges; - private createCartidges; + protected createItem(tpl: string, staticAmmoDist: Record, parentId?: string): IContainerItem; + protected getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string; + protected getRandomValidCaliber(magTemplate: ITemplateItem): string; + protected drawAmmoTpl(caliber: string, staticAmmoDist: Record): string; + protected createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record, caliber?: string): Item; + protected createCartidges(parentId: string, ammoTpl: string, stackCount: number): Item; } diff --git a/Live/CWX_MasterKey/server/dist/types/generators/PMCLootGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/PMCLootGenerator.d.ts index 601431b..64e6f7f 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/PMCLootGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/PMCLootGenerator.d.ts @@ -1,13 +1,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; export declare class PMCLootGenerator { - private itemHelper; - private databaseServer; - private configServer; - private pocketLootPool; - private backpackLootPool; - private botConfig; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected pocketLootPool: string[]; + protected backpackLootPool: string[]; + protected botConfig: IBotConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/Live/CWX_MasterKey/server/dist/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_MasterKey/server/dist/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/RagfairAssortGenerator.d.ts index 06d3250..cbdd7f2 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/RagfairAssortGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/RagfairAssortGenerator.d.ts @@ -4,22 +4,22 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairAssortGenerator { - private jsonUtil; - private hashUtil; - private itemHelper; - private databaseServer; - private generatedAssortItems; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected generatedAssortItems: Item[]; constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer); /** * Get an array of unique items that can be sold on the flea * @returns array of unique items */ getAssortItems(): Item[]; - private assortsAreGenerated; + protected assortsAreGenerated(): boolean; /** * Generate an array of items the flea can sell * @returns array of unique items */ - private generateRagfairAssortItems; - private createRagfairAssortItem; + protected generateRagfairAssortItems(): Item[]; + protected createRagfairAssortItem(tplId: string, id?: string): Item; } diff --git a/Live/CWX_MasterKey/server/dist/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/RagfairOfferGenerator.d.ts index e3fbe4a..3e7f4cc 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/RagfairOfferGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/RagfairOfferGenerator.d.ts @@ -2,13 +2,16 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -17,37 +20,41 @@ import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairAssortGenerator } from "./RagfairAssortGenerator"; export declare class RagfairOfferGenerator { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private timeUtil; - private databaseServer; - private ragfairServerHelper; - private saveServer; - private presetHelper; - private ragfairAssortGenerator; - private ragfairOfferService; - private ragfairPriceService; - private fenceService; - private itemHelper; - private configServer; - private ragfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected ragfairServerHelper: RagfairServerHelper; + protected saveServer: SaveServer; + protected presetHelper: PresetHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected fenceService: FenceService; + protected itemHelper: ItemHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; - private getTraderId; - private getRating; - private getRatingGrowing; - private getOfferEndTime; + protected getTraderId(userID: string): string; + protected getRating(userID: string): number; + protected getRatingGrowing(userID: string): boolean; + protected getOfferEndTime(userID: string, time: number): number; /** * Create multiple offers for items by using a unique list of items we've generated previously * @param expiredOffers */ generateDynamicOffers(expiredOffers?: Item[]): void; generateTraderOffers(traderID: string): void; - private getItemCondition; - private addMissingCondition; - private getOfferRequirements; + protected getItemCondition(userID: string, items: Item[], itemDetails: ITemplateItem): Item[]; + protected addMissingCondition(item: Item): Item; + protected getOfferRequirements(items: Item[]): { + count: number; + _tpl: string; + }[]; /** * Create a flea offer and store it in the Ragfair server offers array */ diff --git a/Live/CWX_MasterKey/server/dist/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/generators/WeatherGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/generators/WeatherGenerator.d.ts index b9faa3a..44cecbb 100644 --- a/Live/CWX_MasterKey/server/dist/types/generators/WeatherGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/generators/WeatherGenerator.d.ts @@ -1,19 +1,33 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { - private weightedRandomHelper; - private randomUtil; - private timeUtil; - private configServer; - private weatherConfig; + protected weightedRandomHelper: WeightedRandomHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; generateWeather(data: IWeatherData): IWeatherData; - private getWeightedFog; - private getWeightedRain; - private getRandomFloat; - private getRandomInt; + protected getWeightedFog(): string; + protected getWeightedRain(): number; + protected getRandomFloat(node: string): number; + protected getRandomInt(node: string): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/AssortHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/AssortHelper.d.ts index 33cb5c6..15586b9 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/AssortHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/AssortHelper.d.ts @@ -5,12 +5,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; export declare class AssortHelper { - private logger; - private itemHelper; - private databaseServer; - private questHelper; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort assort items from a trader + * @returns assort items minus locked quest assorts + */ + stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort traders assorts + * @returns traders assorts minus locked loyality assorts + */ + stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove an item from an assort + * @param assort assort to modify + * @param itemID item id to remove from asort + * @returns Modified assort + */ removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; - stripQuestAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; - stripLoyaltyAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/BotGeneratorHelper.d.ts index 141f71d..3cd7256 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/BotGeneratorHelper.d.ts @@ -1,8 +1,9 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; +import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,20 +13,50 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ContainerHelper } from "./ContainerHelper"; import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; export declare class BotGeneratorHelper { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private durabilityLimitsHelper; - private itemHelper; - private inventoryHelper; - private containerHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; + protected databaseServer: DatabaseServer; + protected durabilityLimitsHelper: DurabilityLimitsHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected containerHelper: ContainerHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot + * never return true for an item that has 0% spawn chance + * @param itemSlot slot the item sits in + * @param modSlot slot the mod sits in + * @param modSpawnChances Chances for various mod spawns + * @returns boolean true if it should spawn + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * e.g. mod_magazine + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; /** * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. @@ -37,16 +68,56 @@ export declare class BotGeneratorHelper { * @param {string} parentId The CylinderMagazine's UID * @param {object} parentTemplate The CylinderMagazine's template */ - private fillCamora; + protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void; + /** + * Take a record of camoras and merge the compatable shells into one array + * @param camorasWithShells camoras we want to merge into one array + * @returns string array of shells fro luitple camora sources + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { - "upd"?: Upd; + upd?: Upd; }; - private getModTplFromItemDb; + /** + * Create a repairable object for a weapon that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateWeaponRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + /** + * Create a repairable object for an armor that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string; + /** + * Sort by spawn chance, highest to lowest, higher is more common + * @param unsortedModArray String array to sort + * @returns Sorted string array + */ + protected sortModArray(unsortedModArray: string[]): string[]; + /** + * Can an item be added to an item without issue + * @param items + * @param tplToCheck + * @param equipmentSlot + * @returns true if possible + */ isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. - * Returns a `boolean` indicating success. */ + /** + * Adds an item with all its childern into specified equipmentSlots, wherever it fits. + * @param equipmentSlots + * @param parentId + * @param parentTpl + * @param itemWithChildren + * @param inventory + * @returns a `boolean` indicating item was added + */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; - private itemAllowedInContainer; + protected itemAllowedInContainer(slot: Grid, itemTpl: string): boolean; } export declare class ExhaustableArray { private itemPool; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/BotHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/BotHelper.d.ts index d901362..9b89481 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/BotHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/BotHelper.d.ts @@ -1,22 +1,45 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotHelper { - private logger; - private jsonUtil; - private databaseServer; - private randomUtil; - private configServer; - private botConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; + /** + * Randomise the chance the PMC will attack their own side + * @param difficultySettings pmc difficulty settings + */ randomisePmcHostility(difficultySettings: Difficulty): void; isBotPmc(botRole: string): boolean; isBotBoss(botRole: string): boolean; isBotFollower(botRole: string): boolean; + /** + * Add a bot to the FRIENDLY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typeToAdd bot type to add to friendly list + */ addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; + /** + * Add a bot to the ENEMY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to enemy list + */ + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; + /** + * Add a bot to the REVENGE_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to revenge list + */ + addBotToRevengeList(difficultySettings: Difficulty, typesToAdd: string[]): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/ContainerHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/ContainerHelper.d.ts index 34cd1e4..3c2ee93 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/ContainerHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/ContainerHelper.d.ts @@ -6,7 +6,7 @@ export declare class FindSlotResult { constructor(success?: boolean, x?: any, y?: any, rotation?: boolean); } export declare class ContainerHelper { - private locateSlot; + protected locateSlot(container2D: number[][], containerX: number, containerY: number, x: number, y: number, itemW: number, itemH: number): boolean; findSlotForItem(container2D: number[][], itemWidth: number, itemHeight: number): FindSlotResult; fillContainerMapWithItem(container2D: number[][], x: number, y: number, itemW: number, itemH: number, rotate: boolean): any; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/DialogueHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/DialogueHelper.d.ts index ae1f581..e3e2bda 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -7,15 +8,33 @@ import { ItemHelper } from "./ItemHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; import { NotifierHelper } from "./NotifierHelper"; export declare class DialogueHelper { - private hashUtil; - private saveServer; - private databaseServer; - private notifierHelper; - private notificationSendHelper; - private itemHelper; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected notificationSendHelper: NotificationSendHelper; + protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/DurabilityLimitsHelper.d.ts index 609bc7d..07a5db1 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/DurabilityLimitsHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,25 +1,26 @@ import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { - private randomUtil; - private botHelper; - private configServer; - private botConfig; + protected randomUtil: RandomUtil; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - private generateMaxWeaponDurability; - private generateMaxPmcArmorDurability; - private getLowestMaxWeaponFromConfig; - private getHighestMaxWeaponDurabilityFromConfig; - private generateWeaponDurability; - private generateArmorDurability; - private getMinWeaponDeltaFromConfig; - private getMaxWeaponDeltaFromConfig; - private getMinArmorDeltaFromConfig; - private getMaxArmorDeltaFromConfig; + protected generateMaxWeaponDurability(botRole: string): number; + protected generateMaxPmcArmorDurability(itemMaxDurability: number): number; + protected getLowestMaxWeaponFromConfig(botRole: string): number; + protected getHighestMaxWeaponDurabilityFromConfig(botRole: string): number; + protected generateWeaponDurability(botRole: string, maxDurability: number): number; + protected generateArmorDurability(botRole: string, maxDurability: number): number; + protected getMinWeaponDeltaFromConfig(botRole: string): number; + protected getMaxWeaponDeltaFromConfig(botRole: string): number; + protected getMinArmorDeltaFromConfig(botRole: string): number; + protected getMaxArmorDeltaFromConfig(botRole: string): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/ExtendedProfileHelper.d.ts index 4dd7d3a..c05d88e 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/ExtendedProfileHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/ExtendedProfileHelper.d.ts @@ -1,22 +1,27 @@ import { BotGenerator } from "../generators/BotGenerator"; -import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData, Skills, Stats } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; +/** + * This class needs to exist outside of ProfileHelper to ensure cyclic deps don't cause the server to fail on load + */ export declare class ExtendedProfileHelper extends ProfileHelper { - private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, botLootCacheService: BotLootCacheService, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; - private getScavSkills; - private removeSecureContainer; - private getDefaultScavSkills; - private getScavStats; - private getScavLevel; - private getScavExperience; - private setScavCooldownTimer; + protected getScavSkills(sessionID: string): Skills; + protected removeSecureContainer(profile: IPmcData): IPmcData; + protected getDefaultScavSkills(): Skills; + protected getScavStats(sessionID: string): Stats; + protected getScavLevel(sessionID: string): number; + protected getScavExperience(sessionID: string): number; + protected setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/GameEventHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/GameEventHelper.d.ts index 8131d31..7613053 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/GameEventHelper.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { - private databaseServer; + protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/HandbookHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/HandbookHelper.d.ts index aed6984..b47d466 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/HandbookHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/HandbookHelper.d.ts @@ -9,7 +9,7 @@ export declare class LookupCollection { constructor(); } export declare class HandbookHelper { - private lookup; + protected lookup: LookupCollection; hydrateLookup(lookup: LookupCollection): void; getTemplatePrice(x: string): number; templatesWithParent(x: string): string[]; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/HealthHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/HealthHelper.d.ts index bb160a3..3116c9c 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/HealthHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/HealthHelper.d.ts @@ -1,23 +1,51 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HealthHelper { - private jsonUtil; - private logger; - private timeUtil; - private saveServer; - private configServer; - private healthConfig; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - private saveHealth; - private saveEffects; - private addEffect; - private isEmpty; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/HideoutHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/HideoutHelper.d.ts index d6a4414..36e4009 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/HideoutHelper.d.ts @@ -1,10 +1,12 @@ -import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; +import { Upd } from "../models/eft/common/tables/IItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -17,26 +19,22 @@ import { TimeUtil } from "../utils/TimeUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class HideoutHelper { - private logger; - private hashUtil; - private timeUtil; - private randomUtil; - private databaseServer; - private itemEventRouter; - private httpResponse; - private profileHelper; - private inventoryHelper; - private playerService; - private configServer; - static BITCOIN_FARM: string; - private WATER_COLLECTOR; - private BITCOIN; - private EXPEDITIONARY_FUEL_TANK; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; - private hideoutConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected inventoryHelper: InventoryHelper; + protected playerService: PlayerService; + protected configServer: ConfigServer; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; + protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** @@ -46,21 +44,20 @@ export declare class HideoutHelper { initProduction(recipeId: string, productionTime: number): Production; isProductionType(productive: Productive): productive is Production; applyPlayerUpgradesBonuses(pmcData: IPmcData, bonus: StageBonus): void; - private applySkillXPBoost; + protected applySkillXPBoost(pmcData: IPmcData, bonus: StageBonus): void; updatePlayerHideout(sessionID: string): void; - private updateWaterCollector; - private doesWaterCollectorHaveFilter; - private updateFuel; - private updateWaterFilters; - private getAreaUpdObject; - private updateAirFilters; - private updateBitcoinFarm; - private getBTCSlots; - private getManagementSkillsSlots; - private hasManagementSkillSlots; - private getHideoutManagementSkill; - private getHideoutManagementConsumptionBonus; + protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void; + protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean; + protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateWaterFilters(waterFilterArea: HideoutArea, pwProd: Production, isGeneratorOn: boolean, pmcData: IPmcData): HideoutArea; + protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd; + protected updateAirFilters(airFilterArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production; + protected getBTCSlots(pmcData: IPmcData): number; + protected getManagementSkillsSlots(): number; + protected hasManagementSkillSlots(pmcData: IPmcData): boolean; + protected getHideoutManagementSkill(pmcData: IPmcData): Common; + protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/HttpServerHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/HttpServerHelper.d.ts index 2e40814..c6e5296 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/HttpServerHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/HttpServerHelper.d.ts @@ -1,8 +1,19 @@ +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HttpServerHelper { - private configServer; - private httpConfig; - private mime; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected mime: { + css: string; + bin: string; + html: string; + jpg: string; + js: string; + json: string; + png: string; + svg: string; + txt: string; + }; constructor(configServer: ConfigServer); getMimeText(key: string): string; buildUrl(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/InRaidHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/InRaidHelper.d.ts index e79d384..c3cbfbb 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -8,26 +9,89 @@ import { JsonUtil } from "../utils/JsonUtil"; import { InventoryHelper } from "./InventoryHelper"; import { PaymentHelper } from "./PaymentHelper"; export declare class InRaidHelper { - private logger; - private saveServer; - private jsonUtil; - private databaseServer; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - private removePlayer; - private removeMapAccessKey; + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; getPlayerGear(items: Item[]): Item[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/InventoryHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/InventoryHelper.d.ts index 00e95d3..dc7cbca 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/InventoryHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/InventoryHelper.d.ts @@ -5,6 +5,7 @@ import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMe import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInventoryConfig } from "../models/spt/config/IInventoryConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -25,26 +26,26 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class InventoryHelper { - private logger; - private jsonUtil; - private hashUtil; - private httpResponse; - private fenceService; - private databaseServer; - private paymentHelper; - private traderAssortHelper; - private dialogueHelper; - private itemHelper; - private containerHelper; - private profileHelper; - private configServer; - private inventoryConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected httpResponse: HttpResponseUtil; + protected fenceService: FenceService; + protected databaseServer: DatabaseServer; + protected paymentHelper: PaymentHelper; + protected traderAssortHelper: TraderAssortHelper; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected containerHelper: ContainerHelper; + protected profileHelper: ProfileHelper; + protected configServer: ConfigServer; + protected inventoryConfig: IInventoryConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; - private getSizeByInventoryItemHash; - private getInventoryItemHash; + protected getSizeByInventoryItemHash(itemTpl: string, itemID: string, inventoryItemHash: InventoryHelper.InventoryItemHash): Record; + protected getInventoryItemHash(inventoryItem: Item[]): InventoryHelper.InventoryItemHash; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. @@ -56,9 +57,9 @@ export declare class InventoryHelper { * @param {string} sessionID * @returns Array */ - private getStashSlotMap; - private getStashType; - private getPlayerStashSize; + protected getStashSlotMap(pmcData: IPmcData, sessionID: string): number[][]; + protected getStashType(sessionID: string): string; + protected getPlayerStashSize(sessionID: string): Record; /** * Internal helper function to transfer an item from one profile to another. * fromProfileData: Profile of the source. @@ -73,5 +74,12 @@ export declare class InventoryHelper { /** * Internal helper function to handle cartridges in inventory if any of them exist. */ - private handleCartridges; + protected handleCartridges(items: Item[], body: IInventoryMoveRequestData): void; } +declare namespace InventoryHelper { + interface InventoryItemHash { + byItemId: Record; + byParentId: Record; + } +} +export {}; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/ItemHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/ItemHelper.d.ts index 5ff64b6..1701c62 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/ItemHelper.d.ts @@ -1,15 +1,16 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; declare class ItemHelper { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); /** * Checks if a id is a valid item. Valid meaning that it's an item that be stored in stash @@ -18,7 +19,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward * or content of bot loot. Items that are tested as valid may be in a player backpack or stash. * @param {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 @@ -82,27 +83,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +163,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +189,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/NotificationSendHelper.d.ts index b9298da..34e62d9 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/NotificationSendHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/NotificationSendHelper.d.ts @@ -2,8 +2,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { - private httpServer; - private notificationService; + protected httpServer: IHttpServer; + protected notificationService: NotificationService; constructor(httpServer: IHttpServer, notificationService: NotificationService); /** * Send notification message to the appropiate channel diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/NotifierHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/NotifierHelper.d.ts index 0d524e9..738b69a 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/NotifierHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/NotifierHelper.d.ts @@ -2,11 +2,11 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { - private httpServerHelper; + protected httpServerHelper: HttpServerHelper; /** * The default notification sent when waiting times out. */ - private defaultNotification; + protected defaultNotification: INotification; constructor(httpServerHelper: HttpServerHelper); getDefaultNotification(): INotification; /** Creates a new notification that displays the "Your offer was sold!" prompt and removes sold offer from "My Offers" on clientside */ diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/PresetHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/PresetHelper.d.ts index 0a24128..a469582 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/PresetHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { - private databaseServer; - private lookup; - constructor(databaseServer: DatabaseServer); + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected lookup: Record; + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/ProfileHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/ProfileHelper.d.ts index 508443c..6c150c8 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -20,6 +21,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; @@ -28,6 +35,12 @@ export declare class ProfileHelper { getPmcProfile(sessionID: string): IPmcData; getScavProfile(sessionID: string): IPmcData; getDefaultCounters(): Stats; - private isWiped; - private getServerVersion; + protected isWiped(sessionID: string): boolean; + protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/QuestConditionHelper.d.ts index 2a0ee94..90ee560 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/QuestConditionHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/QuestConditionHelper.d.ts @@ -3,5 +3,5 @@ export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLoyaltyConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; - private filterConditions; + protected filterConditions(q: AvailableForConditions[], questType: string, furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/QuestHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/QuestHelper.d.ts index 9e2dd5e..0f68cd5 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/QuestHelper.d.ts @@ -1,12 +1,15 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -17,23 +20,23 @@ import { ProfileHelper } from "./ProfileHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { - private logger; - private jsonUtil; - private timeUtil; - private hashUtil; - private itemHelper; - private itemEventRouter; - private databaseServer; - private ragfairServerHelper; - private dialogueHelper; - private profileHelper; - private paymentHelper; - private traderHelper; - private configServer; - private questConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + protected ragfairServerHelper: RagfairServerHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected traderHelper: TraderHelper; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -45,24 +48,68 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; - private processReward; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + protected processReward(reward: Reward): any[]; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; /** * Get List of All Quests as an array + * @returns Array of IQuest objects */ questValues(): IQuest[]; - private cleanQuestList; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ + protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ cleanQuestConditions(quest: IQuest): IQuest; failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; getFindItemIdForQuestItem(itemTpl: string): string; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairHelper.d.ts index 8e70bcd..2c8dbb5 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairHelper.d.ts @@ -2,6 +2,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,16 +13,16 @@ import { ItemHelper } from "./ItemHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { - private logger; - private jsonUtil; - private traderAssortHelper; - private databaseServer; - private handbookHelper; - private itemHelper; - private ragfairLinkedItemService; - private utilityHelper; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected traderAssortHelper: TraderAssortHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected ragfairLinkedItemService: RagfairLinkedItemService; + protected utilityHelper: UtilityHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, traderAssortHelper: TraderAssortHelper, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, ragfairLinkedItemService: RagfairLinkedItemService, utilityHelper: UtilityHelper, configServer: ConfigServer); /** * Gets currency TAG from TPL @@ -31,7 +32,7 @@ export declare class RagfairHelper { getCurrencyTag(currency: string): string; filterCategories(sessionID: string, info: ISearchRequestData): string[]; getDisplayableAssorts(sessionID: string): Record; - private getCategoryList; + protected getCategoryList(handbookId: string): string[]; countCategories(result: IGetOffersResult): void; /** * Merges Root Items @@ -39,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairOfferHelper.d.ts index 3bf8add..8d03bee 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairOfferHelper.d.ts @@ -1,12 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -19,31 +23,32 @@ import { RagfairHelper } from "./RagfairHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { - private logger; - private timeUtil; - private hashUtil; - private itemEventRouter; - private databaseServer; - private saveServer; - private dialogueHelper; - private itemHelper; - private paymentHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private ragfairSortHelper; - private ragfairHelper; - private ragfairOfferService; - private configServer; - private static TPL_GOODS_SOLD; - private ragfairConfig; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected paymentHelper: PaymentHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected static goodSoldTemplate: string; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; - private getProfileOffers; - private deleteOfferByOfferId; - private completeOffer; + protected getProfileOffers(sessionID: string): IRagfairOffer[]; + protected deleteOfferByOfferId(sessionID: string, offerId: string): void; + protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, offer: IRagfairOffer, pmcProfile: IPmcData): boolean; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSellHelper.d.ts index 929d112..6ec004a 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSellHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSellHelper.d.ts @@ -1,14 +1,15 @@ import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairSellHelper { - private logger; - private randomUtil; - private timeUtil; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairServerHelper.d.ts index d29ba42..e4939d1 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairServerHelper.d.ts @@ -1,9 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -11,26 +14,27 @@ import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { - private randomUtil; - private hashUtil; - private saveServer; - private databaseServer; - private profileHelper; - private itemHelper; - private dialogueHelper; - private jsonUtil; - private configServer; - private ragfairConfig; - private questConfig; - private static TPL_GOODS_RETURNED; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected itemHelper: ItemHelper; + protected localeService: LocaleService; + protected dialogueHelper: DialogueHelper; + protected jsonUtil: JsonUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + protected static goodsReturnedTemplate: string; + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails * @returns boolean */ isItemValidRagfairItem(itemDetails: [boolean, ITemplateItem]): boolean; - private isItemBlacklisted; + protected isItemBlacklisted(itemTemplateId: string): boolean; isTrader(userID: string): boolean; isPlayer(userID: string): boolean; returnItems(sessionID: string, items: any[]): void; diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSortHelper.d.ts index e9d8069..d20e10c 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSortHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairSortHelper.d.ts @@ -1,12 +1,14 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; export declare class RagfairSortHelper { - private databaseServer; - constructor(databaseServer: DatabaseServer); + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; - private sortOffersByID; - private sortOffersByRating; - private sortOffersByName; - private sortOffersByPrice; - private sortOffersByExpiry; + protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByName(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByPrice(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByExpiry(a: IRagfairOffer, b: IRagfairOffer): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairTaxHelper.d.ts index e87334f..820facb 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/RagfairTaxHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/RagfairTaxHelper.d.ts @@ -1,15 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { - private logger; - private databaseServer; - private ragfairPriceService; - private itemHelper; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected itemHelper: ItemHelper; constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); calculateTax(item: Item, pmcData: IPmcData, requirementsValue: number, offerItemCount: number, sellInOnePiece: boolean): number; - private calculateItemWorth; + protected calculateItemWorth(item: Item, itemTemplate: ITemplateItem, itemCount: number, pmcData: IPmcData, isRootItem?: boolean): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/RepairHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/RepairHelper.d.ts index 47123e1..9a3ab29 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/RepairHelper.d.ts @@ -1,20 +1,21 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RepairHelper { - private logger; - private jsonUtil; - private randomUtil; - private databaseServer; - private configServer; - private repairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; - private getRandomisedArmorRepairDegredationValue; - private getRandomisedWeaponRepairDegredationValue; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; + protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; + protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/SecureContainerHelper.d.ts index 8f246b6..9e2bc32 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/SecureContainerHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/SecureContainerHelper.d.ts @@ -7,7 +7,7 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class SecureContainerHelper { - private itemHelper; + protected itemHelper: ItemHelper; constructor(itemHelper: ItemHelper); getSecureContainerItems(items: Item[]): string[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/TradeHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/TradeHelper.d.ts index 475390b..975062b 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/TradeHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/TradeHelper.d.ts @@ -2,7 +2,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { Upd } from "../models/eft/common/tables/IItem"; +import { Item, Upd } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -12,14 +12,14 @@ import { RagfairServer } from "../servers/RagfairServer"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { - private logger; - private itemEventRouter; - private traderHelper; - private itemHelper; - private paymentService; - private fenceService; - private inventoryHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected fenceService: FenceService; + protected inventoryHelper: InventoryHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer); /** * Buy item from flea or trader @@ -39,6 +39,6 @@ export declare class TradeHelper { * @returns */ sellItem(pmcData: IPmcData, body: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; - private incrementAssortBuyCount; - private checkPurchaseIsWithinTraderItemLimit; + protected incrementAssortBuyCount(assortBeingPurchased: Item, itemsPurchasedCount: number): void; + protected checkPurchaseIsWithinTraderItemLimit(assortBeingPurchased: Item, assortId: string, count: number): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/TraderAssortHelper.d.ts index d95879c..91ba6b9 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/TraderAssortHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/TraderAssortHelper.d.ts @@ -1,23 +1,55 @@ -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderAssortHelper { - private logger; - private jsonUtil; - private databaseServer; - private profileHelper; - private assortHelper; - private ragfairAssortGenerator; - private ragfairOfferGenerator; - private traderAssortService; - private fenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected traderAssortService: TraderAssortService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); + /** + * Get a traders assorts + * Can be used for returning ragfair / fence assorts + * @param sessionId session id + * @param traderId trader id + * @returns a traders assorts + */ getAssort(sessionId: string, traderId: string): ITraderAssort; + /** + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) + * @param traderId trader id + * @returns array of Items + */ + protected getPristineTraderAssorts(traderId: string): Item[]; + /** + * Returns generated ragfair offers in a trader assort format + * @returns Trader assort object + */ + protected getRagfairDataAsTraderAssort(): ITraderAssort; } diff --git a/Live/CWX_MasterKey/server/dist/types/helpers/TraderHelper.d.ts b/Live/CWX_MasterKey/server/dist/types/helpers/TraderHelper.d.ts index ec64d59..b2e9d38 100644 --- a/Live/CWX_MasterKey/server/dist/types/helpers/TraderHelper.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/helpers/TraderHelper.d.ts @@ -1,5 +1,8 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +14,96 @@ import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderHelper { - private logger; - private databaseServer; - private saveServer; - private profileHelper; - private paymentHelper; - private itemHelper; - private handbookHelper; - private playerService; - private fenceService; - private configServer; - private traderConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); getTrader(traderID: string, sessionID: string): ITraderBase; getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ lvlUp(traderID: string, sessionID: string): void; getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ traderFilter(traderFilters: string[], tplToCheck: string): boolean; getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; } diff --git a/Live/CWX_MasterKey/server/dist/types/loaders/BundleLoader.d.ts b/Live/CWX_MasterKey/server/dist/types/loaders/BundleLoader.d.ts index 4f7664c..06ad698 100644 --- a/Live/CWX_MasterKey/server/dist/types/loaders/BundleLoader.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/loaders/BundleLoader.d.ts @@ -10,10 +10,10 @@ declare class BundleInfo { constructor(modpath: string, bundle: any, bundlePath: string, bundleFilepath: string); } export declare class BundleLoader { - private httpServerHelper; - private vfs; - private jsonUtil; - private bundles; + protected httpServerHelper: HttpServerHelper; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected bundles: Record; constructor(httpServerHelper: HttpServerHelper, vfs: VFS, jsonUtil: JsonUtil); getBundles(local: boolean): BundleInfo[]; getBundle(key: string, local: boolean): BundleInfo; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/DelayedModLoader.d.ts b/Live/CWX_MasterKey/server/dist/types/loaders/PostAkiModLoader.d.ts similarity index 51% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_MasterKey/server/dist/types/loaders/PostAkiModLoader.d.ts index 7d0009f..edc6e5d 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/DelayedModLoader.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/loaders/PostAkiModLoader.d.ts @@ -1,21 +1,21 @@ +import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; -import { InitialModLoader } from "./InitialModLoader"; -export declare class DelayedModLoader implements IModLoader { - private bundleLoader; - private handbookController; - private vfs; - private modCompilerService; - private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; load(): void; - private executeMods; - private addBundles; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/loaders/PostDBModLoader.d.ts b/Live/CWX_MasterKey/server/dist/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_MasterKey/server/dist/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/common/MinMax.d.ts b/Live/CWX_MasterKey/server/dist/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/IGlobals.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/common/IGlobals.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/common/ILocationBase.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/IPmcData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/IPmcData.d.ts index adc2aa5..5703e4b 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/IPmcData.d.ts @@ -1,341 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IQuest.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts index c2ba762..23a1a14 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts @@ -7,284 +7,362 @@ export interface ITemplateItem { _proto: string; } export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; Rarity?: string; SpawnChance?: number; CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; foodUseTime?: number; foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; } export interface Prefab { path: string; @@ -315,27 +393,18 @@ export interface Slot { _id: string; _parent: string; _props: SlotProps; + _max_count?: number; _required: boolean; _mergeSlotWithChildren: boolean; _proto: string; } export interface SlotProps { - filters: Filter[]; + filters: SlotFilter[]; } -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { +export interface SlotFilter { + Shift?: number; Filter: string[]; + AnimationIndex?: number; } export interface Xyz { x: number; @@ -345,53 +414,38 @@ export interface Xyz { export interface StackSlot { _name?: string; _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; + _parent: string; _max_count: number; - _props?: StackSlotProps; - _proto?: string; + _props: StackSlotProps; + _proto: string; upd: any; } export interface StackSlotProps { - filters: Filter[]; + filters: SlotFilter[]; } export interface EffectsHealth { - Hydration: Hydration; + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; } -export interface Hydration { +export interface EffectsHealthProps { value: number; } export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; } -export interface Pain { +export interface EffectDamageProps { delay: number; duration: number; fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; } export interface Color { r: number; diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/health/Effect.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/profile/IAkiProfile.d.ts index 80dd02d..eaa66c1 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -126,12 +126,16 @@ export interface Chest { export interface Stomach { } export interface LeftArm { + Fracture?: number; } export interface RightArm { + Fracture?: number; } export interface LeftLeg { + Fracture?: number; } export interface RightLeg { + Fracture?: number; } export interface Inraid { location: string; @@ -149,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/AmmoTypes.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/BotAmount.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/BotDifficulty.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/ConfigTypes.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/ConfigTypes.d.ts index 6bd31e8..61d6f99 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/ConfigTypes.d.ts @@ -8,11 +8,14 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/ContainerTypes.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/QuestRewardType.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/QuestStatus.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..ba65933 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,11 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7, + Expired = 8 +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/RaidMode.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/SkillTypes.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_MasterKey/server/dist/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_MasterKey/server/dist/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_MasterKey/server/dist/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_MasterKey/server/dist/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IBotConfig.d.ts index f8ea940..e171087 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -5,9 +6,13 @@ export interface IBotConfig extends IBaseConfig { bosses: string[]; durability: Durability; lootNValue: LootNvalue; + revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -17,6 +22,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -27,6 +33,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; @@ -86,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -96,17 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; + enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInRaidConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..c24e617 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -30,6 +31,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; @@ -39,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/ITraderConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IModLoader.d.ts index 5398c9b..40a5e19 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IModLoader.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IModLoader.d.ts @@ -3,6 +3,5 @@ export interface IModLoader { load(container: DependencyContainer): void; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/server/IDatabaseTables.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/server/IHttpServer.d.ts index 50e5c91..c828399 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/server/IHttpServer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/server/IHttpServer.d.ts @@ -1,4 +1,5 @@ /// +/// import http, { ServerResponse } from "http"; import { INotification } from "../../eft/notifier/INotifier"; export interface IHttpServer { diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/server/ILocaleBase.d.ts index a20084d..8887c06 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/server/ILocaleBase.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/server/ILocaleBase.d.ts @@ -1,5 +1,5 @@ export interface ILocaleBase { - global: ILocaleGlobalBase; + global: Record; menu: Record; languages: ILanguageBase[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Live/CWX_MasterKey/server/dist/types/models/spt/utils/ILogger.d.ts b/Live/CWX_MasterKey/server/dist/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Live/CWX_MasterKey/server/dist/types/models/spt/utils/ILogger.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/HttpRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/HttpRouter.d.ts index 44edc0b..f75a47d 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/HttpRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/HttpRouter.d.ts @@ -1,11 +1,16 @@ /// import { IncomingMessage } from "http"; -import { DynamicRouter, StaticRouter } from "../di/Router"; +import { DynamicRouter, Router, StaticRouter } from "../di/Router"; export declare class HttpRouter { - private staticRouters; - private dynamicRoutes; + protected staticRouters: StaticRouter[]; + protected dynamicRoutes: DynamicRouter[]; constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); - private groupBy; + protected groupBy(list: T[], keyGetter: (t: T) => string): Map; getResponse(req: IncomingMessage, info: any, sessionID: string): string; - private handleRoute; + protected handleRoute(url: string, info: any, sessionID: string, wrapper: ResponseWrapper, routers: Router[], dynamic: boolean): boolean; } +declare class ResponseWrapper { + output: string; + constructor(output: string); +} +export {}; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/ImageRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/ImageRouter.d.ts index 97e580d..ab03977 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/ImageRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/ImageRouter.d.ts @@ -4,8 +4,8 @@ import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ImageRouteService } from "../services/mod/image/ImageRouteService"; import { VFS } from "../utils/VFS"; export declare class ImageRouter { - private vfs; - private imageRouteService; + protected vfs: VFS; + protected imageRouteService: ImageRouteService; constructor(vfs: VFS, imageRouteService: ImageRouteService); addRoute(key: string, valueToAdd: string): void; sendImage(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any, httpServer: IHttpServer): void; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/ItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/ItemEventRouter.d.ts index bb20152..b1ac5d9 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/ItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/ItemEventRouter.d.ts @@ -5,13 +5,13 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { - private logger; - private jsonUtil; - private profileHelper; - private itemEventRouters; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected itemEventRouters: ItemEventRouterDefinition[]; constructor(logger: ILogger, jsonUtil: JsonUtil, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[]); - private output; + protected output: IItemEventRouterResponse; handleEvents(info: IItemEventRouterRequest, sessionID: string): IItemEventRouterResponse; getOutput(sessionID: string): IItemEventRouterResponse; - private resetOutput; + protected resetOutput(sessionID: string): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts index dd2f68a..6d0ab4b 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts index be27008..a765410 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts index 03a5967..2db7cc5 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts index c30501a..836ed8d 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts index b2933e9..a152b4d 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts index ea4a9ae..7c0561f 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts index 30741db..b8e5cdf 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts index 4786817..83c60c5 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts index a100b4c..5b7cc1b 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts index 3025e2c..e78445e 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts index bad9af2..99847c6 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HealthItemEventRouter extends ItemEventRouterDefinition { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts index 2cec18b..e1e98af 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HideoutItemEventRouter extends ItemEventRouterDefinition { - private hideoutCallbacks; + protected hideoutCallbacks: HideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts index 8efc2c2..a922cc0 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts index 1d93e7b..2619bb9 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { - private inventoryCallbacks; + protected inventoryCallbacks: InventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts index 12af594..59bf598 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class NoteItemEventRouter extends ItemEventRouterDefinition { - private noteCallbacks; + protected noteCallbacks: NoteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7298c52..277db44 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { - private presetBuildCallbacks; + protected presetBuildCallbacks: PresetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts index 9944ae9..a092aa6 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { - private questCallbacks; - constructor(questCallbacks: QuestCallbacks); + protected logger: ILogger; + protected questCallbacks: QuestCallbacks; + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts index 88e52ba..9216cc5 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts index b292ded..5196ba9 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RepairItemEventRouter extends ItemEventRouterDefinition { - private repairCallbacks; + protected repairCallbacks: RepairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts index 1bca2b8..a43bb0a 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class TradeItemEventRouter extends ItemEventRouterDefinition { - private tradeCallbacks; + protected tradeCallbacks: TradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts index 38831f6..38497fb 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { - private wishlistCallbacks; + protected wishlistCallbacks: WishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/serializers/BundleSerializer.d.ts index 7952e9c..912db83 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/serializers/BundleSerializer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/serializers/BundleSerializer.d.ts @@ -3,8 +3,8 @@ import { BundleLoader } from "../../loaders/BundleLoader"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { ILogger } from "../../models/spt/utils/ILogger"; export declare class BundleSerializer extends Serializer { - private logger; - private bundleLoader; + protected logger: ILogger; + protected bundleLoader: BundleLoader; constructor(logger: ILogger, bundleLoader: BundleLoader); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/serializers/ImageSerializer.d.ts index 29340d0..0e040d4 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/serializers/ImageSerializer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/serializers/ImageSerializer.d.ts @@ -2,7 +2,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_MasterKey/server/dist/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/serializers/NotifySerializer.d.ts index 8be8ac2..1779ac9 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/serializers/NotifySerializer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/serializers/NotifySerializer.d.ts @@ -3,9 +3,9 @@ import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { - private notifierController; - private httpServerHelper; + protected notifierController: NotifierController; + protected httpServerHelper: HttpServerHelper; constructor(notifierController: NotifierController, httpServerHelper: HttpServerHelper); - serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; + serialize(_sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/BotStaticRouter.d.ts index d8b0bf4..aeea220 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/BotStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/BotStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/BundleStaticRouter.d.ts index 3905b82..fb682fc 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/BundleStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/BundleStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/CustomizationStaticRouter.d.ts index 46c71b8..21bc4bb 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/CustomizationStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/DataStaticRouter.d.ts index a493d3a..84ba7fd 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/DataStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/DataStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/DialogStaticRouter.d.ts index a59fb14..546cdf1 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/DialogStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/DialogStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { - private dialogueCallbacks; + protected dialogueCallbacks: DialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/GameStaticRouter.d.ts index 988b673..a9a7496 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/GameStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/GameStaticRouter.d.ts @@ -1,6 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { - private gameCallbacks; + protected gameCallbacks: GameCallbacks; constructor(gameCallbacks: GameCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/HealthStaticRouter.d.ts index e644861..863fd5e 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/HealthStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/HealthStaticRouter.d.ts @@ -1,6 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/InraidStaticRouter.d.ts index 66ed860..b29ad23 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/InraidStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/InraidStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/InsuranceStaticRouter.d.ts index 8da26b3..5676499 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/InsuranceStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/ItemEventStaticRouter.d.ts index 08ba6bb..c30a7fc 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/ItemEventStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { - private itemEventCallbacks; + protected itemEventCallbacks: ItemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/LauncherStaticRouter.d.ts index 9d07f78..0040cbd 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/LauncherStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/LauncherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { - private launcherCallbacks; + protected launcherCallbacks: LauncherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/LocationStaticRouter.d.ts index 9c5c52e..b6de956 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/LocationStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/LocationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/MatchStaticRouter.d.ts index d746381..9920a92 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/MatchStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/MatchStaticRouter.d.ts @@ -1,6 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { - private matchCallbacks; + protected matchCallbacks: MatchCallbacks; constructor(matchCallbacks: MatchCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/NotifierStaticRouter.d.ts index 1c8566d..8f1f5cc 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/NotifierStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/NotifierStaticRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/PresetStaticRouter.d.ts index 2272f82..a9e7458 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/PresetStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/PresetStaticRouter.d.ts @@ -1,6 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { - private presetCallbacks; + protected presetCallbacks: PresetBuildCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/ProfileStaticRouter.d.ts index fd787f1..83403f2 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/ProfileStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/ProfileStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { - private profileCallbacks; + protected profileCallbacks: ProfileCallbacks; constructor(profileCallbacks: ProfileCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/QuestStaticRouter.d.ts index fda3c23..8f7ca0a 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/QuestStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/QuestStaticRouter.d.ts @@ -1,6 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { - private questCallbacks; + protected questCallbacks: QuestCallbacks; constructor(questCallbacks: QuestCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/RagfairStaticRouter.d.ts index 618374f..6c41467 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/RagfairStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/RagfairStaticRouter.d.ts @@ -1,6 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/TraderStaticRouter.d.ts index 18f0629..41728a1 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/TraderStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/TraderStaticRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_MasterKey/server/dist/types/routers/static/WeatherStaticRouter.d.ts index 61b904d..72ed851 100644 --- a/Live/CWX_MasterKey/server/dist/types/routers/static/WeatherStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/routers/static/WeatherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { - private weatherCallbacks; + protected weatherCallbacks: WeatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); } diff --git a/Live/CWX_MasterKey/server/dist/types/servers/ConfigServer.d.ts b/Live/CWX_MasterKey/server/dist/types/servers/ConfigServer.d.ts index 83af38d..a079be8 100644 --- a/Live/CWX_MasterKey/server/dist/types/servers/ConfigServer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/servers/ConfigServer.d.ts @@ -3,10 +3,10 @@ import { VFS } from "../utils/VFS"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigTypes } from "../models/enums/ConfigTypes"; export declare class ConfigServer { - private logger; - private vfs; - private jsonUtil; - private configs; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected configs: Record; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil); getConfig(configType: ConfigTypes): T; getConfigByString(configType: string): T; diff --git a/Live/CWX_MasterKey/server/dist/types/servers/DatabaseServer.d.ts b/Live/CWX_MasterKey/server/dist/types/servers/DatabaseServer.d.ts index 521bcf9..aa152d0 100644 --- a/Live/CWX_MasterKey/server/dist/types/servers/DatabaseServer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/servers/DatabaseServer.d.ts @@ -1,6 +1,6 @@ import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { - private tableData; + protected tableData: IDatabaseTables; getTables(): IDatabaseTables; setTables(any: any): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/servers/HttpServer.d.ts b/Live/CWX_MasterKey/server/dist/types/servers/HttpServer.d.ts index d0db7e4..44d802b 100644 --- a/Live/CWX_MasterKey/server/dist/types/servers/HttpServer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/servers/HttpServer.d.ts @@ -1,9 +1,12 @@ /// +/// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; @@ -13,24 +16,25 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { - private httpRouter; - private logger; - private randomUtil; - private jsonUtil; - private httpResponse; - private databaseServer; - private notifierHelper; - private httpServerHelper; - private serializers; - private configServer; + protected httpRouter: HttpRouter; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected serializers: Serializer[]; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); - private buffers; - private onReceive; - private onRespond; - private httpConfig; - private webSockets; - private websocketPingHandler; + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); + protected buffers: {}; + protected onReceive: {}; + protected onRespond: {}; + protected httpConfig: IHttpConfig; + protected webSockets: {}; + protected websocketPingHandler: any; getCookies(req: http.IncomingMessage): any; resetBuffer(sessionID: string): void; putInBuffer(sessionID: any, data: any, bufLength: number): boolean; @@ -42,6 +46,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; - private getRandomisedMessage; + protected getRandomisedMessage(): string; wsOnConnection(ws: any, req: any): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/servers/RagfairServer.d.ts b/Live/CWX_MasterKey/server/dist/types/servers/RagfairServer.d.ts index cf56d64..bc86cdb 100644 --- a/Live/CWX_MasterKey/server/dist/types/servers/RagfairServer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/servers/RagfairServer.d.ts @@ -1,22 +1,24 @@ import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; import { ConfigServer } from "./ConfigServer"; export declare class RagfairServer { - private logger; - private ragfairOfferGenerator; - private ragfairOfferService; - private ragfairCategoriesService; - private ragfairRequiredItemsService; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Live/CWX_MasterKey/server/dist/types/servers/SaveServer.d.ts b/Live/CWX_MasterKey/server/dist/types/servers/SaveServer.d.ts index fdf92e4..cb28f49 100644 --- a/Live/CWX_MasterKey/server/dist/types/servers/SaveServer.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/servers/SaveServer.d.ts @@ -5,15 +5,15 @@ import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { - private vfs; - private saveLoadRouters; - private jsonUtil; - private hashUtil; - private logger; - private profileFilepath; - private profiles; - private onSave; - private saveMd5; + protected vfs: VFS; + protected saveLoadRouters: SaveLoadRouter[]; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected profileFilepath: string; + protected profiles: {}; + protected onSave: {}; + protected saveMd5: {}; constructor(vfs: VFS, saveLoadRouters: SaveLoadRouter[], jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger); load(): void; save(): void; diff --git a/Live/CWX_MasterKey/server/dist/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/services/BotLootCacheService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..cc71eee --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/services/BotLootCacheService.d.ts @@ -0,0 +1,82 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole bots role (assault / pmcBot etc) + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc Is the bot a PMC (alteres what loot is cached) + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Live/CWX_MasterKey/server/dist/types/services/FenceService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/FenceService.d.ts index 27d14ef..79058c6 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/FenceService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/FenceService.d.ts @@ -4,6 +4,7 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +12,25 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class FenceService { - private logger; - private hashUtil; - private jsonUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private itemHelper; - private presetHelper; - private configServer; - private fenceAssort; - private traderConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected fenceAssort: ITraderAssort; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, configServer: ConfigServer); - private setFenceAssort; + protected setFenceAssort(fenceAssort: ITraderAssort): void; getFenceAssorts(): ITraderAssort; hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Live/CWX_MasterKey/server/dist/types/services/HashCacheService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/HashCacheService.d.ts index c9b0170..5320f28 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/HashCacheService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/HashCacheService.d.ts @@ -3,13 +3,13 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; export declare class HashCacheService { - private vfs; - private hashUtil; - private jsonUtil; - private logger; - private jsonHashes; - private modHashes; - private readonly modCachePath; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected jsonHashes: any; + protected modHashes: any; + protected readonly modCachePath = "./user/cache/modCache.json"; constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); getStoredModHash(modName: string): string; modContentMatchesStoredHash(modName: string, modContent: string): boolean; diff --git a/Live/CWX_MasterKey/server/dist/types/services/InsuranceService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/InsuranceService.d.ts index 160faba..171bf10 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/InsuranceService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/InsuranceService.d.ts @@ -4,6 +4,7 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,18 +12,17 @@ import { SaveServer } from "../servers/SaveServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { - private logger; - private databaseServer; - private secureContainerHelper; - private randomUtil; - private timeUtil; - private saveServer; - private traderHelper; - private dialogueHelper; - private configServer; - private insured; - private templatesById; - private insuranceConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected secureContainerHelper: SecureContainerHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected traderHelper: TraderHelper; + protected dialogueHelper: DialogueHelper; + protected configServer: ConfigServer; + protected insured: Record>; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; @@ -31,11 +31,21 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - private addGearToSend; + protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/LocaleService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Live/CWX_MasterKey/server/dist/types/services/MatchLocationService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/MatchLocationService.d.ts index f7b7d3b..c027bec 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/MatchLocationService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/MatchLocationService.d.ts @@ -1,8 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { TimeUtil } from "../utils/TimeUtil"; export declare class MatchLocationService { - private timeUtil; - private locations; + protected timeUtil: TimeUtil; + protected locations: {}; constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/ModCompilerService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/ModCompilerService.d.ts index cf7cc21..26cb4ac 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/ModCompilerService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/ModCompilerService.d.ts @@ -1,15 +1,20 @@ +import * as ts from "typescript"; import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { - private logger; - private hashCacheService; - private vfs; + protected logger: ILogger; + protected hashCacheService: HashCacheService; + protected vfs: VFS; constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; - private compile; - private buildDepth; - private calculateDepth; - private areFilesReady; - private delay; + protected compile(fileNames: string[], options: ts.CompilerOptions): Promise; + protected buildDepth(depth: number): string; + protected getNodesModulesPath(depth: number): string; + protected getAkiPath(depth: number): string; + protected getAkiFolder(): string; + protected getNodesModulesFolder(): string; + protected calculateDepth(file: string): number; + protected areFilesReady(fileNames: string[]): boolean; + protected delay(ms: number): Promise; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/NotificationService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/NotificationService.d.ts index 9c6c143..65a84dd 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/NotificationService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - private messageQueue; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/PaymentService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/PaymentService.d.ts index 0a6c4d6..a5e538f 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/PaymentService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/PaymentService.d.ts @@ -4,6 +4,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -11,14 +12,14 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { - private logger; - private httpResponse; - private databaseServer; - private handbookHelper; - private traderHelper; - private itemHelper; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request @@ -43,6 +44,23 @@ export declare class PaymentService { * inside the stash, that is it has the stash as * ancestor with slotId=hideout */ - private isItemInStash; + protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/PlayerService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/PlayerService.d.ts index 99e5986..519b7e5 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/PlayerService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/PlayerService.d.ts @@ -3,8 +3,8 @@ import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPla import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PlayerService { - private logger; - private databaseServer; + protected logger: ILogger; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, databaseServer: DatabaseServer); /** * increases the profile skill and updates any output diff --git a/Live/CWX_MasterKey/server/dist/types/services/ProfileFixerService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..ed1dec7 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/services/ProfileFixerService.d.ts @@ -0,0 +1,61 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/services/RagfairCategoriesService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/RagfairCategoriesService.d.ts index fb9efa2..83910e5 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/RagfairCategoriesService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/RagfairCategoriesService.d.ts @@ -1,10 +1,40 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - private categories; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/RagfairLinkedItemService.d.ts index 3dbcf6f..6c34ee0 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/RagfairLinkedItemService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/RagfairLinkedItemService.d.ts @@ -1,9 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; export declare class RagfairLinkedItemService { - private databaseServer; - private linkedItemsCache; + protected databaseServer: DatabaseServer; + protected linkedItemsCache: Record>; constructor(databaseServer: DatabaseServer); getLinkedItems(linkedSearchId: string): Iterable; - private buildLinkedItemTable; - private getFilters; + protected buildLinkedItemTable(): void; + protected getFilters(item: ITemplateItem, slot: string): string[]; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/RagfairOfferService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/RagfairOfferService.d.ts index 9b1bf8d..7398a8f 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/RagfairOfferService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/RagfairOfferService.d.ts @@ -1,7 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -9,27 +11,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { - private logger; - private timeUtil; - private databaseServer; - private saveServer; - private ragfairServerHelper; - private profileHelper; - private itemEventRouter; - private httpResponse; - private configServer; - private playerOffersLoaded; - private toUpdate; - private expiredOffers; - private offers; - private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; + protected profileHelper: ProfileHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected playerOffersLoaded: boolean; + protected toUpdate: Record; + protected expiredOffers: Item[]; + protected offers: IRagfairOffer[]; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; @@ -57,8 +65,8 @@ export declare class RagfairOfferService { * Get an array of stale offers that are still shown to player * @returns IRagfairOffer array */ - private getStaleOffers; - private isStale; - private processStaleOffer; - private returnPlayerOffer; + protected getStaleOffers(): IRagfairOffer[]; + protected isStale(offer: IRagfairOffer, time: number): boolean; + protected processStaleOffer(staleOffer: IRagfairOffer): void; + protected returnPlayerOffer(offer: IRagfairOffer): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/RagfairPriceService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/RagfairPriceService.d.ts index 7cdf854..679fe1d 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/RagfairPriceService.d.ts @@ -1,22 +1,25 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "../models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RagfairPriceService { - private handbookHelper; - private databaseServer; - private logger; - private itemHelper; - private presetHelper; - private randomUtil; - private configServer; - private ragfairConfig; - private prices; + protected handbookHelper: HandbookHelper; + protected databaseServer: DatabaseServer; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected prices: IRagfairServerPrices; constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); generateStaticPrices(): void; generateDynamicPrices(): void; @@ -24,7 +27,29 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/RagfairRequiredItemsService.d.ts index e4582d0..b05fc65 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/RagfairRequiredItemsService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/RagfairRequiredItemsService.d.ts @@ -2,10 +2,10 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { - private logger; - private paymentHelper; - private ragfairOfferService; - private requiredItemsCache; + protected logger: ILogger; + protected paymentHelper: PaymentHelper; + protected ragfairOfferService: RagfairOfferService; + protected requiredItemsCache: {}; constructor(logger: ILogger, paymentHelper: PaymentHelper, ragfairOfferService: RagfairOfferService); getRequiredItems(searchId: string): any; buildRequiredItemTable(): void; diff --git a/Live/CWX_MasterKey/server/dist/types/services/TraderAssortService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/TraderAssortService.d.ts index ccb9e45..5ba2d05 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/TraderAssortService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/TraderAssortService.d.ts @@ -1,6 +1,6 @@ import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { - private pristineTraderAssorts; + protected pristineTraderAssorts: Record; getPristineTraderAssort(traderId: string): ITraderAssort; setPristineTraderAssort(traderId: string, assort: ITraderAssort): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/mod/CustomItemService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_MasterKey/server/dist/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/mod/image/imageRouteService.d.ts index 854083c..29569b2 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/mod/image/imageRouteService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/mod/image/imageRouteService.d.ts @@ -1,5 +1,5 @@ export declare class ImageRouteService { - private routes; + protected routes: Record; addRoute(urlKey: string, route: string): void; getByKey(urlKey: string): string; existsByKey(urlKey: string): boolean; diff --git a/Live/CWX_MasterKey/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts index 89bad14..f402103 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnLoadModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts index 32419f4..05d735b 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnUpdateModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_MasterKey/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts index d4c42aa..f28fd45 100644 --- a/Live/CWX_MasterKey/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,7 +1,7 @@ import { DependencyContainer } from "tsyringe"; import { RouteAction } from "../../../di/Router"; export declare class StaticRouterModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/utils/App.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/App.d.ts index a11f576..dcc2669 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/App.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/App.d.ts @@ -3,12 +3,13 @@ import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { - private logger; - private timeUtil; - private onLoadComponents; - private onUpdateComponents; - private onUpdateLastRun; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected onLoadComponents: OnLoad[]; + protected onUpdateComponents: OnUpdate[]; + protected onUpdateLastRun: {}; constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; - private update; + protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/utils/AyncQueue.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/AyncQueue.d.ts index a99aa37..da6ab18 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/AyncQueue.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - private commandsQueue; + protected commandsQueue: ICommand[]; constructor(); waitFor(command: ICommand): Promise; } diff --git a/Live/CWX_MasterKey/server/dist/types/utils/DatabaseImporter.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/DatabaseImporter.d.ts index 97dda30..483e135 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/DatabaseImporter.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/DatabaseImporter.d.ts @@ -1,18 +1,24 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { - private logger; - private vfs; - private jsonUtil; - private databaseServer; - private imageRouter; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Live/CWX_MasterKey/server/dist/types/utils/HashUtil.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/HashUtil.d.ts index cf92b47..bacbf2a 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/HashUtil.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/HashUtil.d.ts @@ -2,7 +2,7 @@ import crypto from "crypto"; import { TimeUtil } from "./TimeUtil"; export declare class HashUtil { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); generate(): string; generateMd5ForData(data: string): string; diff --git a/Live/CWX_MasterKey/server/dist/types/utils/HttpResponseUtil.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/HttpResponseUtil.d.ts index 85c28bd..29502be 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/HttpResponseUtil.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/HttpResponseUtil.d.ts @@ -3,9 +3,9 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HttpResponseUtil { - private jsonUtil; + protected jsonUtil: JsonUtil; constructor(jsonUtil: JsonUtil); - private clearString; + protected clearString(s: string): any; noBody(data: any): any; getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; getUnclearedBody(data: any, err?: number, errmsg?: any): string; diff --git a/Live/CWX_MasterKey/server/dist/types/utils/JsonUtil.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/JsonUtil.d.ts index 20b7448..71e95f6 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/JsonUtil.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/JsonUtil.d.ts @@ -2,10 +2,10 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { - private vfs; - private hashUtil; - private logger; - private fileHashes; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected fileHashes: any; constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string diff --git a/Live/CWX_MasterKey/server/dist/types/utils/Logger.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/Logger.d.ts index 9d5b32a..3d9013f 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/Logger.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/Logger.d.ts @@ -1,25 +1,58 @@ /// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class WinstonLogger implements ILogger { - private asyncQueue; - private uuidGenerator; - private showDebugInConsole; - private folderPath; - private file; - private filePath; - private logLevels; - private logger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + protected showDebugInConsole: boolean; + protected folderPath: string; + protected file: string; + protected filePath: string; + protected logLevels: { + levels: { + error: number; + warn: number; + succ: number; + info: number; + custom: number; + debug: number; + }; + colors: { + error: string; + warn: string; + succ: string; + info: string; + custom: string; + debug: string; + }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; + }; + protected logger: winston.Logger & SptLogger; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; warning(data: string | Record): Promise; success(data: string | Record): Promise; info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; debug(data: string | Record, onlyShowInConsole?: boolean): Promise; } diff --git a/Live/CWX_MasterKey/server/dist/types/utils/ObjectId.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/ObjectId.d.ts index b100572..03aae56 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/ObjectId.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/ObjectId.d.ts @@ -1,13 +1,13 @@ /// import { TimeUtil } from "./TimeUtil"; export declare class ObjectId { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); - private randomBytes; - private constglobalCounter; - private consttime; - private globalCounter; - private time; + protected randomBytes: Buffer; + protected constglobalCounter: number; + protected consttime: number; + protected globalCounter: number; + protected time: number; incGlobalCounter(): number; toHexString(byteArray: string | any[] | Buffer): string; generate(): string; diff --git a/Live/CWX_MasterKey/server/dist/types/utils/RandomUtil.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/RandomUtil.d.ts index 3a3ecb6..c24dd60 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/RandomUtil.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/RandomUtil.d.ts @@ -103,8 +103,8 @@ export declare class ProbabilityObject { constructor(key: K, relativeProbability: number, data?: V); } export declare class RandomUtil { - private jsonUtil; - private logger; + protected jsonUtil: JsonUtil; + protected logger: ILogger; constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; diff --git a/Live/CWX_MasterKey/server/dist/types/utils/TimeUtil.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/TimeUtil.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_MasterKey/server/dist/types/utils/VFS.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/VFS.d.ts index d567615..e5eaf02 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/VFS.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/VFS.d.ts @@ -1,11 +1,12 @@ /// +/// import "reflect-metadata"; import fs from "fs"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { - private asyncQueue; - private uuidGenerator; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; accessFilePromisify: (path: fs.PathLike, mode?: number) => Promise; copyFilePromisify: (src: fs.PathLike, dst: fs.PathLike, flags?: number) => Promise; mkdirPromisify: (path: fs.PathLike, options: fs.MakeDirectoryOptions & { diff --git a/Live/CWX_MasterKey/server/dist/types/utils/Watermark.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/Watermark.d.ts index 3a8cb3a..c6dc120 100644 --- a/Live/CWX_MasterKey/server/dist/types/utils/Watermark.d.ts +++ b/Live/CWX_MasterKey/server/dist/types/utils/Watermark.d.ts @@ -1,22 +1,39 @@ +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WatermarkLocale { - private locales; + protected locales: { + "en-US": { + description: string[]; + warning: string[]; + modding: string[]; + }; + "zh-CN": { + description: string[]; + warning: string[]; + modding: string[]; + }; + }; getLocale(): string; getDescription(): string[]; getWarning(): string[]; getModding(): string[]; } export declare class Watermark { - private logger; - private configServer; - private watermarkLocale?; - private akiConfig; + protected logger: ILogger; + protected configServer: ConfigServer; + protected watermarkLocale?: WatermarkLocale; + protected akiConfig: ICoreConfig; constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); - private text; - private versionLabel; + protected text: string[]; + protected versionLabel: string; initialize(): void; - getVersionTag(): string; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; getVersionLabel(): string; /** Set window title */ setTitle(): void; @@ -25,5 +42,5 @@ export declare class Watermark { /** Draw the watermark */ draw(): void; /** Caculate text length */ - private textLength; + protected textLength(s: string): number; } diff --git a/Live/CWX_MasterKey/server/dist/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_MasterKey/server/dist/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_MasterKey/server/dist/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_MasterKey/server/package.json b/Live/CWX_MasterKey/server/package.json index 0151e10..7669d0e 100644 --- a/Live/CWX_MasterKey/server/package.json +++ b/Live/CWX_MasterKey/server/package.json @@ -1,10 +1,10 @@ { "name": "MasterKey", "author": "CWX", - "version": "1.2.0", + "version": "1.3.2", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.0.0", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_MasterKey/server/src/mod.ts b/Live/CWX_MasterKey/server/src/mod.ts index 8a3bdce..4ab8fbd 100644 --- a/Live/CWX_MasterKey/server/src/mod.ts +++ b/Live/CWX_MasterKey/server/src/mod.ts @@ -1,21 +1,14 @@ import { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -class CWX_MasterKey implements IMod +class CWX_MasterKey implements IPreAkiLoadMod { private pkg; - public load(container: DependencyContainer): void + public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } - - public delayedLoad(container: DependencyContainer): void - { return } } module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file diff --git a/Live/CWX_MasterKey/server/types/Utils.d.ts b/Live/CWX_MasterKey/server/types/Utils.d.ts deleted file mode 100644 index e69de29..0000000 diff --git a/Live/CWX_MasterKey/server/types/callbacks/BotCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/BotCallbacks.d.ts index 9602975..2db60dc 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/BotCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/BotCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { - private botController; - private httpResponse; + protected botController: BotController; + protected httpResponse: HttpResponseUtil; constructor(botController: BotController, httpResponse: HttpResponseUtil); getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string; getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/BundleCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/BundleCallbacks.d.ts index b007ab8..b28abe1 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/BundleCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/BundleCallbacks.d.ts @@ -1,15 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BundleCallbacks { - private logger; - private httpResponse; - private httpServer; - private bundleLoader; - private configServer; - private httpConfig; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); sendBundle(sessionID: string, req: any, resp: any, body: any): any; getBundles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/CustomizationCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/CustomizationCallbacks.d.ts index 918b8b6..3bab8c0 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/CustomizationCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/CustomizationCallbacks.d.ts @@ -9,9 +9,9 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { - private customizationController; - private saveServer; - private httpResponse; + protected customizationController: CustomizationController; + protected saveServer: SaveServer; + protected httpResponse: HttpResponseUtil; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts index 018420e..cfb1c16 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/DataCallbacks.d.ts @@ -12,8 +12,8 @@ import { ISettingsBase } from "../models/spt/server/ISettingsBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { - private httpResponse; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts index 3b6fbd1..634f90b 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/DialogueCallbacks.d.ts @@ -21,10 +21,10 @@ import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { - private hashUtil; - private timeUtil; - private httpResponse; - private dialogueController; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected dialogueController: DialogueController; constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/server/types/callbacks/GameCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/GameCallbacks.d.ts index 44a30ea..06da1b5 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/GameCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/GameCallbacks.d.ts @@ -2,15 +2,16 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { - private httpResponse; - private watermark; - private gameController; + protected httpResponse: HttpResponseUtil; + protected watermark: Watermark; + protected gameController: GameController; constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts index 0db5fec..891e375 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HandbookCallbacks.d.ts @@ -1,7 +1,7 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; export declare class HandbookCallbacks extends OnLoad { - private handbookController; + protected handbookController: HandbookController; constructor(handbookController: HandbookController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts index a50dd42..8672be7 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HealthCallbacks.d.ts @@ -9,10 +9,17 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { - private httpResponse; - private profileHelper; - private healthController; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts index 3698176..99ab4c9 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HideoutCallbacks.d.ts @@ -11,11 +11,12 @@ import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutTog import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HideoutCallbacks extends OnUpdate { - private hideoutController; - private configServer; - private hideoutConfig; + protected hideoutController: HideoutController; + protected configServer: ConfigServer; + protected hideoutConfig: IHideoutConfig; constructor(hideoutController: HideoutController, // TODO: delay needed configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts index 9fe387d..94c97bd 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/HttpCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoad } from "../di/OnLoad"; import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { - private httpServer; + protected httpServer: IHttpServer; constructor(httpServer: IHttpServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/InraidCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/InraidCallbacks.d.ts index 2d53227..05bcce4 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/InraidCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/InraidCallbacks.d.ts @@ -3,14 +3,16 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { - private inraidController; - private httpResponse; - private configServer; - private airdropConfig; - private inraidConfig; + protected inraidController: InraidController; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected airdropConfig: IAirdropConfig; + protected inraidConfig: IInRaidConfig; constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts index 79feb67..6819960 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/InsuranceCallbacks.d.ts @@ -3,20 +3,22 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { InsuranceService } from "../services/InsuranceService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { - private insuranceController; - private insuranceService; - private httpResponse; - private configServer; - private insuranceConfig; + protected insuranceController: InsuranceController; + protected insuranceService: InsuranceService; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/InventoryCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/InventoryCallbacks.d.ts index 9795aa0..9ab1486 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/InventoryCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/InventoryCallbacks.d.ts @@ -18,7 +18,7 @@ import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryT import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { - private inventoryController; + protected inventoryController: InventoryController; constructor(inventoryController: InventoryController); moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/callbacks/ItemEventCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/ItemEventCallbacks.d.ts index 74e79c4..f4f04f9 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/ItemEventCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/ItemEventCallbacks.d.ts @@ -4,8 +4,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { - private httpResponse; - private itemEventRouter; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/LauncherCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/LauncherCallbacks.d.ts index 4bd5e2c..c022325 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/LauncherCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/LauncherCallbacks.d.ts @@ -8,10 +8,10 @@ import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { - private httpResponse; - private launcherController; - private saveServer; - private watermark; + protected httpResponse: HttpResponseUtil; + protected launcherController: LauncherController; + protected saveServer: SaveServer; + protected watermark: Watermark; constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/LocationCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/LocationCallbacks.d.ts index 5ecab74..cc69369 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/LocationCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/LocationCallbacks.d.ts @@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { - private httpResponse; - private locationController; + protected httpResponse: HttpResponseUtil; + protected locationController: LocationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts index 63d38d9..2a92ef5 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/MatchCallbacks.d.ts @@ -1,34 +1,41 @@ import { MatchController } from "../controllers/MatchController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { - private httpResponse; - private jsonUtil; - private matchController; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected jsonUtil: JsonUtil; + protected matchController: MatchController; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; deleteGroup(url: string, info: any, sessionID: string): INullResponseData; startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts index 2011f0e..58342dc 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/ModCallbacks.d.ts @@ -1,17 +1,18 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { - private logger; - private httpResponse; - private httpServer; - private modLoader; - private configServer; - private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected postAkiModLoader: PostAkiModLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Live/CWX_MasterKey/server/types/callbacks/NoteCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/NoteCallbacks.d.ts index fd7c5ca..d39d400 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/NoteCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/NoteCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { - private noteController; + protected noteController: NoteController; constructor(noteController: NoteController); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/NotifierCallbacks.d.ts index 416e6a3..c42058f 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/NotifierCallbacks.d.ts @@ -6,9 +6,9 @@ import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { - private httpServerHelper; - private httpResponse; - private notifierController; + protected httpServerHelper: HttpServerHelper; + protected httpResponse: HttpResponseUtil; + protected notifierController: NotifierController; constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back diff --git a/Live/CWX_MasterKey/server/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/PresetBuildCallbacks.d.ts index 639c33f..541715a 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; @@ -6,10 +7,10 @@ import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPreset import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { - private httpResponse; - private presetBuildController; + protected httpResponse: HttpResponseUtil; + protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts index f62afd6..4553f8f 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/PresetCallbacks.d.ts @@ -1,7 +1,7 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; export declare class PresetCallbacks extends OnLoad { - private presetController; + protected presetController: PresetController; constructor(presetController: PresetController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/ProfileCallbacks.d.ts index efce47d..6a86fc0 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/ProfileCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -12,9 +13,9 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { - private httpResponse; - private timeUtil; - private profileController; + protected httpResponse: HttpResponseUtil; + protected timeUtil: TimeUtil; + protected profileController: ProfileController; constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/QuestCallbacks.d.ts index f742096..559c29e 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/QuestCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/QuestCallbacks.d.ts @@ -13,9 +13,9 @@ import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestD import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { - private httpResponse; - private questController; - private repeatableQuestController; + protected httpResponse: HttpResponseUtil; + protected questController: QuestController; + protected repeatableQuestController: RepeatableQuestController; constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts index 152475f..3a405c9 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/RagfairCallbacks.d.ts @@ -3,34 +3,39 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairCallbacks extends OnLoadOnUpdate { - private httpResponse; - private logger; - private jsonUtil; - private ragfairServer; - private ragfairController; - private configServer; - private ragfairConfig; + protected httpResponse: HttpResponseUtil; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected ragfairServer: RagfairServer; + protected ragfairController: RagfairController; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/RepairCallbacks.d.ts index f63ec18..63733fa 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/RepairCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/RepairCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; export declare class RepairCallbacks { - private repairController; + protected repairController: RepairController; constructor(repairController: RepairController); traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts index b7219a0..bbb6e53 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/SaveCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { - private saveServer; + protected saveServer: SaveServer; constructor(saveServer: SaveServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts index 9928951..272ae46 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/TradeCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { - private tradeController; + protected tradeController: TradeController; constructor(tradeController: TradeController); processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts index 2a8af7f..128d9b2 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/TraderCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { - private httpResponse; - private traderController; + protected httpResponse: HttpResponseUtil; + protected traderController: TraderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/server/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/WeatherCallbacks.d.ts index e40ab3e..ae784c8 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/WeatherCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/WeatherCallbacks.d.ts @@ -3,8 +3,8 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { - private httpResponse; - private weatherController; + protected httpResponse: HttpResponseUtil; + protected weatherController: WeatherController; constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_MasterKey/server/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_MasterKey/server/types/callbacks/WishlistCallbacks.d.ts index e0249fd..c2cc2a8 100644 --- a/Live/CWX_MasterKey/server/types/callbacks/WishlistCallbacks.d.ts +++ b/Live/CWX_MasterKey/server/types/callbacks/WishlistCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; export declare class WishlistCallbacks { - private wishlistController; + protected wishlistController: WishlistController; constructor(wishlistController: WishlistController); addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts b/Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_MasterKey/server/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_MasterKey/server/types/context/ContextVariable.d.ts b/Live/CWX_MasterKey/server/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts b/Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts b/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts index 8ecb97f..5e6f05d 100644 --- a/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/BotController.d.ts @@ -4,17 +4,32 @@ import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequest import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class BotController { - private databaseServer; - private botGenerator; - private botHelper; - private configServer; - private botConfig; + protected databaseServer: DatabaseServer; + protected botGenerator: BotGenerator; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); - getBotLimit(type: string): number; - getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + /** + * Return the number of bot loadout varieties to be generated + * @param type bot Type we want the loadout gen count for + * @returns + */ + getBotPresetGenerationLimit(type: string): number; + getBotCoreDifficulty(): IBotCore; + /** + * Get bot difficulty settings + * adjust PMC settings to ensure they engage the correct bot types + * @param type what bot the server is requesting settings for + * @param difficulty difficulty level server requested settings for + * @returns Difficulty object + */ + getBotDifficulty(type: string, difficulty: string): Difficulty; + protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_MasterKey/server/types/controllers/CustomizationController.d.ts b/Live/CWX_MasterKey/server/types/controllers/CustomizationController.d.ts index 698e6be..a6c4730 100644 --- a/Live/CWX_MasterKey/server/types/controllers/CustomizationController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/CustomizationController.d.ts @@ -9,14 +9,14 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; export declare class CustomizationController { - private logger; - private itemEventRouter; - private databaseServer; - private saveServer; - private profileHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper); getTraderSuits(traderID: string, sessionID: string): ISuit[]; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; - private getAllTraderSuits; + protected getAllTraderSuits(sessionID: string): ISuit[]; } diff --git a/Live/CWX_MasterKey/server/types/controllers/DialogueController.d.ts b/Live/CWX_MasterKey/server/types/controllers/DialogueController.d.ts index 235594f..b15c4b6 100644 --- a/Live/CWX_MasterKey/server/types/controllers/DialogueController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/DialogueController.d.ts @@ -3,13 +3,13 @@ import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachme import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { - private httpResponse; - private saveServer; - private dialogueHelper; + protected httpResponse: HttpResponseUtil; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; @@ -19,7 +19,7 @@ export declare class DialogueController { setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void; setRead(dialogueIDs: string[], sessionID: string): void; getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse; - private messagesHaveUncollectedRewards; - private removeExpiredItems; + protected messagesHaveUncollectedRewards(messages: Message[]): boolean; + protected removeExpiredItems(sessionID: string): void; update(): void; } diff --git a/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts b/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts index bb2a55a..85ec418 100644 --- a/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/GameController.d.ts @@ -2,27 +2,27 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { Watermark } from "../utils/Watermark"; export declare class GameController { - private logger; - private watermark; - private httpServerHelper; - private profileHelper; - private configServer; - private httpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + protected logger: ILogger; + protected watermark: Watermark; + protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - private addMissingBonusesProperty; - private addMissingRepeatableQuestsProperty; - private addMissingWeaponRepairSkill; - private addMissingAkiVersionTagToProfile; - private addMissingArmorRepairSkill; - private fixNullTraderSalesSums; - private removeDanglingConditionCounters; - private removeDanglingBackendCounters; + protected logProfileDetails(fullProfile: IAkiProfile): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; - private getActiveRepeatableQuests; } diff --git a/Live/CWX_MasterKey/server/types/controllers/HandbookController.d.ts b/Live/CWX_MasterKey/server/types/controllers/HandbookController.d.ts index f473437..52d2dd8 100644 --- a/Live/CWX_MasterKey/server/types/controllers/HandbookController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/HandbookController.d.ts @@ -1,8 +1,8 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class HandbookController { - private databaseServer; - private handbookHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper); load(): void; } diff --git a/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts b/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts index ca049f6..cc13603 100644 --- a/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/HealthController.d.ts @@ -11,15 +11,36 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { - private logger; - private itemEventRouter; - private itemHelper; - private paymentService; - private inventoryHelper; - private healthHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected inventoryHelper: InventoryHelper; + protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts b/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts index f35c23b..3eefe1a 100644 --- a/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/HideoutController.d.ts @@ -1,11 +1,14 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -14,6 +17,7 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -25,32 +29,74 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HideoutController { - private logger; - private hashUtil; - private timeUtil; - private databaseServer; - private randomUtil; - private inventoryHelper; - private saveServer; - private playerService; - private presetHelper; - private paymentHelper; - private itemEventRouter; - private httpResponse; - private profileHelper; - private hideoutHelper; - private configServer; - private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected inventoryHelper: InventoryHelper; + protected saveServer: SaveServer; + protected playerService: PlayerService; + protected presetHelper: PresetHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; + protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; + protected hideoutConfig: IHideoutConfig; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts b/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts index c1cd6f5..b899e7d 100644 --- a/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/InraidController.d.ts @@ -1,30 +1,44 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { - private saveServer; - private jsonUtil; - private databaseServer; - private questHelper; - private itemHelper; - private extendedProfileHelper; - private healthHelper; - private traderHelper; - private insuranceService; - private inRaidHelper; - private configServer; - private inraidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; + protected healthHelper: HealthHelper; + protected traderHelper: TraderHelper; + protected insuranceService: InsuranceService; + protected inRaidHelper: InRaidHelper; + protected configServer: ConfigServer; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts b/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts index b175a06..6895383 100644 --- a/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/InsuranceController.d.ts @@ -3,8 +3,10 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,23 +17,28 @@ import { PaymentService } from "../services/PaymentService"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceController { - private logger; - private randomUtil; - private itemEventRouter; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private profileHelper; - private dialogueHelper; - private paymentService; - private insuranceService; - private configServer; - private insuranceConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected itemEventRouter: ItemEventRouter; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected dialogueHelper: DialogueHelper; + protected paymentService: PaymentService; + protected insuranceService: InsuranceService; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; - doAbsolutelyNothing(): void; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; } diff --git a/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts b/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts index 8235082..f57f731 100644 --- a/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/InventoryController.d.ts @@ -24,19 +24,23 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; - private presetHelper; - private inventoryHelper; - private profileHelper; - private paymentHelper; - private itemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected fenceService: FenceService; + protected presetHelper: PresetHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Live/CWX_MasterKey/server/types/controllers/LauncherController.d.ts b/Live/CWX_MasterKey/server/types/controllers/LauncherController.d.ts index 2a30713..1af1f56 100644 --- a/Live/CWX_MasterKey/server/types/controllers/LauncherController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/LauncherController.d.ts @@ -3,23 +3,24 @@ import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { Info } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class LauncherController { - private hashUtil; - private saveServer; - private httpServerHelper; - private databaseServer; - private configServer; - private coreConfig; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected httpServerHelper: HttpServerHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected coreConfig: ICoreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; login(info: ILoginRequestData): string; register(info: IRegisterData): string; - private createAccount; + protected createAccount(info: IRegisterData): string; changeUsername(info: IChangeRequestData): string; changePassword(info: IChangeRequestData): string; wipe(info: IRegisterData): string; diff --git a/Live/CWX_MasterKey/server/types/controllers/LocationController.d.ts b/Live/CWX_MasterKey/server/types/controllers/LocationController.d.ts index 41a8719..90b6d7a 100644 --- a/Live/CWX_MasterKey/server/types/controllers/LocationController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/LocationController.d.ts @@ -6,11 +6,11 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class LocationController { - private jsonUtil; - private logger; - private locationGenerator; - private databaseServer; - private timeUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected locationGenerator: LocationGenerator; + protected databaseServer: DatabaseServer; + protected timeUtil: TimeUtil; constructor(jsonUtil: JsonUtil, logger: ILogger, locationGenerator: LocationGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil); get(location: string): ILocationBase; generate(name: string): ILocationBase; diff --git a/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts b/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts index 84abbe3..71cb7d3 100644 --- a/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/MatchController.d.ts @@ -1,28 +1,38 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "../models/spt/config/IMatchConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { - private saveServer; - private profileHelper; - private matchLocationService; - private traderHelper; - private configServer; - private matchConfig; - private inraidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected matchLocationService: MatchLocationService; + protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; + protected matchConfig: IMatchConfig; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; - private getMatch; - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Live/CWX_MasterKey/server/types/controllers/NoteController.d.ts b/Live/CWX_MasterKey/server/types/controllers/NoteController.d.ts index 4d3420e..ee70541 100644 --- a/Live/CWX_MasterKey/server/types/controllers/NoteController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { - private itemEventRouter; +export declare class NoteController { + protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_MasterKey/server/types/controllers/NotifierController.d.ts b/Live/CWX_MasterKey/server/types/controllers/NotifierController.d.ts index 36fef66..31d7bfe 100644 --- a/Live/CWX_MasterKey/server/types/controllers/NotifierController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/NotifierController.d.ts @@ -3,11 +3,11 @@ import { NotificationService } from "../services/NotificationService"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { - private notifierHelper; - private httpServerHelper; - private notificationService; - private pollInterval; - private timeout; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected notificationService: NotificationService; + protected pollInterval: number; + protected timeout: number; constructor(notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, notificationService: NotificationService); /** * Resolve an array of session notifications. diff --git a/Live/CWX_MasterKey/server/types/controllers/PresetBuildController.d.ts b/Live/CWX_MasterKey/server/types/controllers/PresetBuildController.d.ts index 11c5c3e..adf4084 100644 --- a/Live/CWX_MasterKey/server/types/controllers/PresetBuildController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/PresetBuildController.d.ts @@ -7,10 +7,10 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class PresetBuildController { - private hashUtil; - private itemEventRouter; - private itemHelper; - private saveServer; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer); getUserBuilds(sessionID: string): WeaponBuild[]; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/controllers/PresetController.d.ts b/Live/CWX_MasterKey/server/types/controllers/PresetController.d.ts index 6ec8c55..ca1af1a 100644 --- a/Live/CWX_MasterKey/server/types/controllers/PresetController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/PresetController.d.ts @@ -1,8 +1,8 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetController { - private presetHelper; - private databaseServer; + protected presetHelper: PresetHelper; + protected databaseServer: DatabaseServer; constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer); initialize(): void; } diff --git a/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts b/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts index c8bd5f1..8c89a02 100644 --- a/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -11,21 +12,30 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { - private hashUtil; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private traderHelper; - private extendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; + protected traderHelper: TraderHelper; + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts b/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts index d8caee5..2cbccfb 100644 --- a/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/QuestController.d.ts @@ -4,34 +4,73 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { PlayerService } from "../services/PlayerService"; import { TimeUtil } from "../utils/TimeUtil"; export declare class QuestController { - private logger; - private timeUtil; - private itemEventRouter; - private databaseServer; - private itemHelper; - private dialogueHelper; - private profileHelper; - private questHelper; - private questConditionHelper; - private playerService; - private configServer; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected questHelper: QuestHelper; + protected questConditionHelper: QuestConditionHelper; + protected playerService: PlayerService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ getClientQuests(sessionID: string): IQuest[]; acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void; + /** + * Returns a list of quests that should be failed when a quest is completed + * @param completedQuestId quest completed id + * @returns array of quests + */ + protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[]; + /** + * Fail the quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts b/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts index 5b94a95..c4ffc15 100644 --- a/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/RagfairController.d.ts @@ -20,6 +20,7 @@ import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPric import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -33,32 +34,34 @@ import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsSer import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { - private logger; - private timeUtil; - private httpResponse; - private itemEventRouter; - private ragfairServer; - private ragfairPriceService; - private databaseServer; - private itemHelper; - private saveServer; - private ragfairSellHelper; - private ragfairTaxHelper; - private ragfairSortHelper; - private ragfairOfferHelper; - private profileHelper; - private paymentService; - private handbookHelper; - private paymentHelper; - private inventoryHelper; - private ragfairHelper; - private ragfairOfferService; - private ragfairRequiredItemsService; - private ragfairOfferGenerator; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; + protected ragfairServer: RagfairServer; + protected ragfairPriceService: RagfairPriceService; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; + protected ragfairSellHelper: RagfairSellHelper; + protected ragfairTaxHelper: RagfairTaxHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairOfferHelper: RagfairOfferHelper; + protected profileHelper: ProfileHelper; + protected paymentService: PaymentService; + protected handbookHelper: HandbookHelper; + protected paymentHelper: PaymentHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/controllers/RepairController.d.ts b/Live/CWX_MasterKey/server/types/controllers/RepairController.d.ts index 77dd47a..0e78ef6 100644 --- a/Live/CWX_MasterKey/server/types/controllers/RepairController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/RepairController.d.ts @@ -5,21 +5,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; export declare class RepairController { - private logger; - private itemEventRouter; - private databaseServer; - private questHelper; - private traderHelper; - private paymentService; - private repairHelper; - private configServer; - private repairConfig; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected traderHelper: TraderHelper; + protected paymentService: PaymentService; + protected repairHelper: RepairHelper; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -36,5 +37,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts index 2dedc7e..98d05dd 100644 --- a/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/RepeatableQuestController.d.ts @@ -4,17 +4,19 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { ELocationName } from "../models/enums/ELocationName"; -import { IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -48,22 +50,23 @@ export interface ITargetLocation { locations: string[]; } export declare class RepeatableQuestController { - private timeUtil; - private logger; - private randomUtil; - private mathUtil; - private jsonUtil; - private databaseServer; - private itemHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private itemEventRouter; - private paymentService; - private objectId; - private configServer; - private questConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + protected timeUtil: TimeUtil; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected mathUtil: MathUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected ragfairServerHelper: RagfairServerHelper; + protected itemEventRouter: ItemEventRouter; + protected paymentService: PaymentService; + protected objectId: ObjectId; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts b/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts index f0a177b..c86745c 100644 --- a/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/TradeController.d.ts @@ -9,11 +9,11 @@ import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTr import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { - private logger; - private itemEventRouter; - private tradeHelper; - private profileHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected tradeHelper: TradeHelper; + protected profileHelper: ProfileHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer); confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse; confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/controllers/TraderController.d.ts b/Live/CWX_MasterKey/server/types/controllers/TraderController.d.ts index 36eac75..7bab158 100644 --- a/Live/CWX_MasterKey/server/types/controllers/TraderController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/TraderController.d.ts @@ -8,14 +8,14 @@ import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { - private logger; - private databaseServer; - private traderAssortHelper; - private profileHelper; - private traderHelper; - private timeUtil; - private traderAssortService; - private jsonUtil; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected traderAssortHelper: TraderAssortHelper; + protected profileHelper: ProfileHelper; + protected traderHelper: TraderHelper; + protected timeUtil: TimeUtil; + protected traderAssortService: TraderAssortService; + protected jsonUtil: JsonUtil; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/Live/CWX_MasterKey/server/types/controllers/WeatherController.d.ts b/Live/CWX_MasterKey/server/types/controllers/WeatherController.d.ts index 312c3a3..ca7f5eb 100644 --- a/Live/CWX_MasterKey/server/types/controllers/WeatherController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/WeatherController.d.ts @@ -1,10 +1,11 @@ import { WeatherGenerator } from "../generators/WeatherGenerator"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WeatherController { - private weatherGenerator; - private configServer; - private weatherConfig; + protected weatherGenerator: WeatherGenerator; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts b/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts index 5ef8df3..a96c522 100644 --- a/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts +++ b/Live/CWX_MasterKey/server/types/controllers/WishlistController.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class WishlistController { - private itemEvenRouter; + protected itemEvenRouter: ItemEventRouter; constructor(itemEvenRouter: ItemEventRouter); addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts index e2565b7..a5fc0ad 100644 --- a/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/BotGenerator.d.ts @@ -1,36 +1,96 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; -export declare class BotGenerator { - private logger; - private hashUtil; - private randomUtil; - private jsonUtil; - private databaseServer; - private botInventoryGenerator; - private botHelper; - private gameEventHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - private generateBot; - private generateRandomLevel; - /** Converts health object to the required format */ - private generateHealth; - private generateSkills; - private getPmcRole; - private removeChristmasItemsFromBotInventory; - private generateId; - private generateInventoryID; - private getPMCDifficulty; - private generateDogtag; +declare namespace BotGenerator { + interface IRandomisedBotLevelResult { + level: number; + exp: number; + } } +export declare class BotGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected databaseServer: DatabaseServer; + protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; + protected botHelper: BotHelper; + protected gameEventHelper: GameEventHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); + /** + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns + */ + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; + protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ + protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; + protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ + protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ + protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; + protected generateId(bot: IBotBase): IBotBase; + protected generateInventoryID(profile: IBotBase): IBotBase; + protected getPMCDifficulty(requestedDifficulty: string): string; + /** + * Add a side-specific (usec/bear) dogtag item to a bots inventory + * @param bot bot to add dogtag to + * @returns Bot with dogtag added + */ + protected generateDogtag(bot: IBotBase): IBotBase; +} +export {}; diff --git a/Live/CWX_MasterKey/server/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/BotInventoryGenerator.d.ts index 0cdbacb..35d1ee8 100644 --- a/Live/CWX_MasterKey/server/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/BotInventoryGenerator.d.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; @@ -9,16 +9,16 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botWeaponGenerator; - private botLootGenerator; - private botGeneratorHelper; - private weightedRandomHelper; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootGenerator: BotLootGenerator; + protected botGeneratorHelper: BotGeneratorHelper; + protected weightedRandomHelper: WeightedRandomHelper; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; - private generateEquipment; - private generateInventoryBase; + protected generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + protected generateInventoryBase(): PmcInventory; } diff --git a/Live/CWX_MasterKey/server/types/generators/BotLootGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/BotLootGenerator.d.ts index 1d8c8e1..c6a3f29 100644 --- a/Live/CWX_MasterKey/server/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/BotLootGenerator.d.ts @@ -1,27 +1,124 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private botGeneratorHelper; - private pmcLootGenerator; - private configServer; - private botConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; - private getRandomisedCount; - private addLootFromPool; - /** Compares two item templates by their price to spawn chance ratio */ - private compareByValue; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts index e8f91cb..9215214 100644 --- a/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/BotWeaponGenerator.d.ts @@ -1,44 +1,173 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { - private logger; - private hashUtil; - private databaseServer; - private itemHelper; - private weightedRandomHelper; - private botGeneratorHelper; - private randomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - private isWeaponValid; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - private generateExtraMagazines; - private addBullets; + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values * @returns */ - private getCompatibleAmmo; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - private fillExistingMagazines; + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; } diff --git a/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts index 4b96792..bd368b5 100644 --- a/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/LocationGenerator.d.ts @@ -6,6 +6,8 @@ import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; import { Item } from "../models/eft/common/tables/IItem"; import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILocationConfig } from "../models/spt/config/ILocationConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; @@ -18,27 +20,27 @@ export interface IContainerItem { height: number; } export declare class LocationGenerator { - private logger; - private jsonUtil; - private objectId; - private randomUtil; - private ragfairServerHelper; - private itemHelper; - private mathUtil; - private gameEventHelper; - private containerHelper; - private presetHelper; - private configServer; - private locationConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected objectId: ObjectId; + protected randomUtil: RandomUtil; + protected ragfairServerHelper: RagfairServerHelper; + protected itemHelper: ItemHelper; + protected mathUtil: MathUtil; + protected gameEventHelper: GameEventHelper; + protected containerHelper: ContainerHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected locationConfig: ILocationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; - private getLooseLootMultiplerForLocation; - private getStaticLootMultiplerForLocation; + protected getLooseLootMultiplerForLocation(location: string): number; + protected getStaticLootMultiplerForLocation(location: string): number; generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record, locationName: string): SpawnpointTemplate[]; - private createItem; - private getRandomCompatibleCaliberTemplateId; - private getRandomValidCaliber; - private drawAmmoTpl; - private createRandomMagCartridges; - private createCartidges; + protected createItem(tpl: string, staticAmmoDist: Record, parentId?: string): IContainerItem; + protected getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string; + protected getRandomValidCaliber(magTemplate: ITemplateItem): string; + protected drawAmmoTpl(caliber: string, staticAmmoDist: Record): string; + protected createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record, caliber?: string): Item; + protected createCartidges(parentId: string, ammoTpl: string, stackCount: number): Item; } diff --git a/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts index 601431b..64e6f7f 100644 --- a/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/PMCLootGenerator.d.ts @@ -1,13 +1,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; export declare class PMCLootGenerator { - private itemHelper; - private databaseServer; - private configServer; - private pocketLootPool; - private backpackLootPool; - private botConfig; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected pocketLootPool: string[]; + protected backpackLootPool: string[]; + protected botConfig: IBotConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts index 06d3250..cbdd7f2 100644 --- a/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/RagfairAssortGenerator.d.ts @@ -4,22 +4,22 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairAssortGenerator { - private jsonUtil; - private hashUtil; - private itemHelper; - private databaseServer; - private generatedAssortItems; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected generatedAssortItems: Item[]; constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer); /** * Get an array of unique items that can be sold on the flea * @returns array of unique items */ getAssortItems(): Item[]; - private assortsAreGenerated; + protected assortsAreGenerated(): boolean; /** * Generate an array of items the flea can sell * @returns array of unique items */ - private generateRagfairAssortItems; - private createRagfairAssortItem; + protected generateRagfairAssortItems(): Item[]; + protected createRagfairAssortItem(tplId: string, id?: string): Item; } diff --git a/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts index e3fbe4a..3e7f4cc 100644 --- a/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/RagfairOfferGenerator.d.ts @@ -2,13 +2,16 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -17,37 +20,41 @@ import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairAssortGenerator } from "./RagfairAssortGenerator"; export declare class RagfairOfferGenerator { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private timeUtil; - private databaseServer; - private ragfairServerHelper; - private saveServer; - private presetHelper; - private ragfairAssortGenerator; - private ragfairOfferService; - private ragfairPriceService; - private fenceService; - private itemHelper; - private configServer; - private ragfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected ragfairServerHelper: RagfairServerHelper; + protected saveServer: SaveServer; + protected presetHelper: PresetHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected fenceService: FenceService; + protected itemHelper: ItemHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; - private getTraderId; - private getRating; - private getRatingGrowing; - private getOfferEndTime; + protected getTraderId(userID: string): string; + protected getRating(userID: string): number; + protected getRatingGrowing(userID: string): boolean; + protected getOfferEndTime(userID: string, time: number): number; /** * Create multiple offers for items by using a unique list of items we've generated previously * @param expiredOffers */ generateDynamicOffers(expiredOffers?: Item[]): void; generateTraderOffers(traderID: string): void; - private getItemCondition; - private addMissingCondition; - private getOfferRequirements; + protected getItemCondition(userID: string, items: Item[], itemDetails: ITemplateItem): Item[]; + protected addMissingCondition(item: Item): Item; + protected getOfferRequirements(items: Item[]): { + count: number; + _tpl: string; + }[]; /** * Create a flea offer and store it in the Ragfair server offers array */ diff --git a/Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_MasterKey/server/types/generators/WeatherGenerator.d.ts b/Live/CWX_MasterKey/server/types/generators/WeatherGenerator.d.ts index b9faa3a..44cecbb 100644 --- a/Live/CWX_MasterKey/server/types/generators/WeatherGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/generators/WeatherGenerator.d.ts @@ -1,19 +1,33 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { - private weightedRandomHelper; - private randomUtil; - private timeUtil; - private configServer; - private weatherConfig; + protected weightedRandomHelper: WeightedRandomHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; generateWeather(data: IWeatherData): IWeatherData; - private getWeightedFog; - private getWeightedRain; - private getRandomFloat; - private getRandomInt; + protected getWeightedFog(): string; + protected getWeightedRain(): number; + protected getRandomFloat(node: string): number; + protected getRandomInt(node: string): number; } diff --git a/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts index 33cb5c6..15586b9 100644 --- a/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/AssortHelper.d.ts @@ -5,12 +5,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; export declare class AssortHelper { - private logger; - private itemHelper; - private databaseServer; - private questHelper; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort assort items from a trader + * @returns assort items minus locked quest assorts + */ + stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort traders assorts + * @returns traders assorts minus locked loyality assorts + */ + stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove an item from an assort + * @param assort assort to modify + * @param itemID item id to remove from asort + * @returns Modified assort + */ removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; - stripQuestAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; - stripLoyaltyAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; } diff --git a/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts index 141f71d..3cd7256 100644 --- a/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/BotGeneratorHelper.d.ts @@ -1,8 +1,9 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; +import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,20 +13,50 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ContainerHelper } from "./ContainerHelper"; import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; export declare class BotGeneratorHelper { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private durabilityLimitsHelper; - private itemHelper; - private inventoryHelper; - private containerHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; + protected databaseServer: DatabaseServer; + protected durabilityLimitsHelper: DurabilityLimitsHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected containerHelper: ContainerHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot + * never return true for an item that has 0% spawn chance + * @param itemSlot slot the item sits in + * @param modSlot slot the mod sits in + * @param modSpawnChances Chances for various mod spawns + * @returns boolean true if it should spawn + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * e.g. mod_magazine + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; /** * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. @@ -37,16 +68,56 @@ export declare class BotGeneratorHelper { * @param {string} parentId The CylinderMagazine's UID * @param {object} parentTemplate The CylinderMagazine's template */ - private fillCamora; + protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void; + /** + * Take a record of camoras and merge the compatable shells into one array + * @param camorasWithShells camoras we want to merge into one array + * @returns string array of shells fro luitple camora sources + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { - "upd"?: Upd; + upd?: Upd; }; - private getModTplFromItemDb; + /** + * Create a repairable object for a weapon that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateWeaponRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + /** + * Create a repairable object for an armor that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string; + /** + * Sort by spawn chance, highest to lowest, higher is more common + * @param unsortedModArray String array to sort + * @returns Sorted string array + */ + protected sortModArray(unsortedModArray: string[]): string[]; + /** + * Can an item be added to an item without issue + * @param items + * @param tplToCheck + * @param equipmentSlot + * @returns true if possible + */ isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. - * Returns a `boolean` indicating success. */ + /** + * Adds an item with all its childern into specified equipmentSlots, wherever it fits. + * @param equipmentSlots + * @param parentId + * @param parentTpl + * @param itemWithChildren + * @param inventory + * @returns a `boolean` indicating item was added + */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; - private itemAllowedInContainer; + protected itemAllowedInContainer(slot: Grid, itemTpl: string): boolean; } export declare class ExhaustableArray { private itemPool; diff --git a/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts index d901362..9b89481 100644 --- a/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/BotHelper.d.ts @@ -1,22 +1,45 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotHelper { - private logger; - private jsonUtil; - private databaseServer; - private randomUtil; - private configServer; - private botConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; + /** + * Randomise the chance the PMC will attack their own side + * @param difficultySettings pmc difficulty settings + */ randomisePmcHostility(difficultySettings: Difficulty): void; isBotPmc(botRole: string): boolean; isBotBoss(botRole: string): boolean; isBotFollower(botRole: string): boolean; + /** + * Add a bot to the FRIENDLY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typeToAdd bot type to add to friendly list + */ addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; + /** + * Add a bot to the ENEMY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to enemy list + */ + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; + /** + * Add a bot to the REVENGE_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to revenge list + */ + addBotToRevengeList(difficultySettings: Difficulty, typesToAdd: string[]): void; } diff --git a/Live/CWX_MasterKey/server/types/helpers/ContainerHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/ContainerHelper.d.ts index 34cd1e4..3c2ee93 100644 --- a/Live/CWX_MasterKey/server/types/helpers/ContainerHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/ContainerHelper.d.ts @@ -6,7 +6,7 @@ export declare class FindSlotResult { constructor(success?: boolean, x?: any, y?: any, rotation?: boolean); } export declare class ContainerHelper { - private locateSlot; + protected locateSlot(container2D: number[][], containerX: number, containerY: number, x: number, y: number, itemW: number, itemH: number): boolean; findSlotForItem(container2D: number[][], itemWidth: number, itemHeight: number): FindSlotResult; fillContainerMapWithItem(container2D: number[][], x: number, y: number, itemW: number, itemH: number, rotate: boolean): any; } diff --git a/Live/CWX_MasterKey/server/types/helpers/DialogueHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/DialogueHelper.d.ts index ae1f581..e3e2bda 100644 --- a/Live/CWX_MasterKey/server/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -7,15 +8,33 @@ import { ItemHelper } from "./ItemHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; import { NotifierHelper } from "./NotifierHelper"; export declare class DialogueHelper { - private hashUtil; - private saveServer; - private databaseServer; - private notifierHelper; - private notificationSendHelper; - private itemHelper; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected notificationSendHelper: NotificationSendHelper; + protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts index 609bc7d..07a5db1 100644 --- a/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,25 +1,26 @@ import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { - private randomUtil; - private botHelper; - private configServer; - private botConfig; + protected randomUtil: RandomUtil; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - private generateMaxWeaponDurability; - private generateMaxPmcArmorDurability; - private getLowestMaxWeaponFromConfig; - private getHighestMaxWeaponDurabilityFromConfig; - private generateWeaponDurability; - private generateArmorDurability; - private getMinWeaponDeltaFromConfig; - private getMaxWeaponDeltaFromConfig; - private getMinArmorDeltaFromConfig; - private getMaxArmorDeltaFromConfig; + protected generateMaxWeaponDurability(botRole: string): number; + protected generateMaxPmcArmorDurability(itemMaxDurability: number): number; + protected getLowestMaxWeaponFromConfig(botRole: string): number; + protected getHighestMaxWeaponDurabilityFromConfig(botRole: string): number; + protected generateWeaponDurability(botRole: string, maxDurability: number): number; + protected generateArmorDurability(botRole: string, maxDurability: number): number; + protected getMinWeaponDeltaFromConfig(botRole: string): number; + protected getMaxWeaponDeltaFromConfig(botRole: string): number; + protected getMinArmorDeltaFromConfig(botRole: string): number; + protected getMaxArmorDeltaFromConfig(botRole: string): number; } diff --git a/Live/CWX_MasterKey/server/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/ExtendedProfileHelper.d.ts deleted file mode 100644 index 4dd7d3a..0000000 --- a/Live/CWX_MasterKey/server/types/helpers/ExtendedProfileHelper.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { BotGenerator } from "../generators/BotGenerator"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { Watermark } from "../utils/Watermark"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class ExtendedProfileHelper extends ProfileHelper { - private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); - generatePlayerScav(sessionID: string): IPmcData; - private getScavSkills; - private removeSecureContainer; - private getDefaultScavSkills; - private getScavStats; - private getScavLevel; - private getScavExperience; - private setScavCooldownTimer; -} diff --git a/Live/CWX_MasterKey/server/types/helpers/GameEventHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/GameEventHelper.d.ts index 8131d31..7613053 100644 --- a/Live/CWX_MasterKey/server/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/GameEventHelper.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { - private databaseServer; + protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_MasterKey/server/types/helpers/HandbookHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/HandbookHelper.d.ts index aed6984..b47d466 100644 --- a/Live/CWX_MasterKey/server/types/helpers/HandbookHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/HandbookHelper.d.ts @@ -9,7 +9,7 @@ export declare class LookupCollection { constructor(); } export declare class HandbookHelper { - private lookup; + protected lookup: LookupCollection; hydrateLookup(lookup: LookupCollection): void; getTemplatePrice(x: string): number; templatesWithParent(x: string): string[]; diff --git a/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts index bb160a3..3116c9c 100644 --- a/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/HealthHelper.d.ts @@ -1,23 +1,51 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HealthHelper { - private jsonUtil; - private logger; - private timeUtil; - private saveServer; - private configServer; - private healthConfig; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - private saveHealth; - private saveEffects; - private addEffect; - private isEmpty; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; } diff --git a/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts index d6a4414..36e4009 100644 --- a/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/HideoutHelper.d.ts @@ -1,10 +1,12 @@ -import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; +import { Upd } from "../models/eft/common/tables/IItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -17,26 +19,22 @@ import { TimeUtil } from "../utils/TimeUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class HideoutHelper { - private logger; - private hashUtil; - private timeUtil; - private randomUtil; - private databaseServer; - private itemEventRouter; - private httpResponse; - private profileHelper; - private inventoryHelper; - private playerService; - private configServer; - static BITCOIN_FARM: string; - private WATER_COLLECTOR; - private BITCOIN; - private EXPEDITIONARY_FUEL_TANK; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; - private hideoutConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected inventoryHelper: InventoryHelper; + protected playerService: PlayerService; + protected configServer: ConfigServer; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; + protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** @@ -46,21 +44,20 @@ export declare class HideoutHelper { initProduction(recipeId: string, productionTime: number): Production; isProductionType(productive: Productive): productive is Production; applyPlayerUpgradesBonuses(pmcData: IPmcData, bonus: StageBonus): void; - private applySkillXPBoost; + protected applySkillXPBoost(pmcData: IPmcData, bonus: StageBonus): void; updatePlayerHideout(sessionID: string): void; - private updateWaterCollector; - private doesWaterCollectorHaveFilter; - private updateFuel; - private updateWaterFilters; - private getAreaUpdObject; - private updateAirFilters; - private updateBitcoinFarm; - private getBTCSlots; - private getManagementSkillsSlots; - private hasManagementSkillSlots; - private getHideoutManagementSkill; - private getHideoutManagementConsumptionBonus; + protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void; + protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean; + protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateWaterFilters(waterFilterArea: HideoutArea, pwProd: Production, isGeneratorOn: boolean, pmcData: IPmcData): HideoutArea; + protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd; + protected updateAirFilters(airFilterArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production; + protected getBTCSlots(pmcData: IPmcData): number; + protected getManagementSkillsSlots(): number; + protected hasManagementSkillSlots(pmcData: IPmcData): boolean; + protected getHideoutManagementSkill(pmcData: IPmcData): Common; + protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_MasterKey/server/types/helpers/HttpServerHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/HttpServerHelper.d.ts index 2e40814..c6e5296 100644 --- a/Live/CWX_MasterKey/server/types/helpers/HttpServerHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/HttpServerHelper.d.ts @@ -1,8 +1,19 @@ +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HttpServerHelper { - private configServer; - private httpConfig; - private mime; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected mime: { + css: string; + bin: string; + html: string; + jpg: string; + js: string; + json: string; + png: string; + svg: string; + txt: string; + }; constructor(configServer: ConfigServer); getMimeText(key: string): string; buildUrl(): string; diff --git a/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts index e79d384..c3cbfbb 100644 --- a/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -8,26 +9,89 @@ import { JsonUtil } from "../utils/JsonUtil"; import { InventoryHelper } from "./InventoryHelper"; import { PaymentHelper } from "./PaymentHelper"; export declare class InRaidHelper { - private logger; - private saveServer; - private jsonUtil; - private databaseServer; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - private removePlayer; - private removeMapAccessKey; + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; getPlayerGear(items: Item[]): Item[]; } diff --git a/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts index 00e95d3..dc7cbca 100644 --- a/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/InventoryHelper.d.ts @@ -5,6 +5,7 @@ import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMe import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInventoryConfig } from "../models/spt/config/IInventoryConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -25,26 +26,26 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class InventoryHelper { - private logger; - private jsonUtil; - private hashUtil; - private httpResponse; - private fenceService; - private databaseServer; - private paymentHelper; - private traderAssortHelper; - private dialogueHelper; - private itemHelper; - private containerHelper; - private profileHelper; - private configServer; - private inventoryConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected httpResponse: HttpResponseUtil; + protected fenceService: FenceService; + protected databaseServer: DatabaseServer; + protected paymentHelper: PaymentHelper; + protected traderAssortHelper: TraderAssortHelper; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected containerHelper: ContainerHelper; + protected profileHelper: ProfileHelper; + protected configServer: ConfigServer; + protected inventoryConfig: IInventoryConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; - private getSizeByInventoryItemHash; - private getInventoryItemHash; + protected getSizeByInventoryItemHash(itemTpl: string, itemID: string, inventoryItemHash: InventoryHelper.InventoryItemHash): Record; + protected getInventoryItemHash(inventoryItem: Item[]): InventoryHelper.InventoryItemHash; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. @@ -56,9 +57,9 @@ export declare class InventoryHelper { * @param {string} sessionID * @returns Array */ - private getStashSlotMap; - private getStashType; - private getPlayerStashSize; + protected getStashSlotMap(pmcData: IPmcData, sessionID: string): number[][]; + protected getStashType(sessionID: string): string; + protected getPlayerStashSize(sessionID: string): Record; /** * Internal helper function to transfer an item from one profile to another. * fromProfileData: Profile of the source. @@ -73,5 +74,12 @@ export declare class InventoryHelper { /** * Internal helper function to handle cartridges in inventory if any of them exist. */ - private handleCartridges; + protected handleCartridges(items: Item[], body: IInventoryMoveRequestData): void; } +declare namespace InventoryHelper { + interface InventoryItemHash { + byItemId: Record; + byParentId: Record; + } +} +export {}; diff --git a/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts index 5ff64b6..1701c62 100644 --- a/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/ItemHelper.d.ts @@ -1,15 +1,16 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; declare class ItemHelper { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); /** * Checks if a id is a valid item. Valid meaning that it's an item that be stored in stash @@ -18,7 +19,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward * or content of bot loot. Items that are tested as valid may be in a player backpack or stash. * @param {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 @@ -82,27 +83,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +163,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +189,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts index b9298da..34e62d9 100644 --- a/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/NotificationSendHelper.d.ts @@ -2,8 +2,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { - private httpServer; - private notificationService; + protected httpServer: IHttpServer; + protected notificationService: NotificationService; constructor(httpServer: IHttpServer, notificationService: NotificationService); /** * Send notification message to the appropiate channel diff --git a/Live/CWX_MasterKey/server/types/helpers/NotifierHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/NotifierHelper.d.ts index 0d524e9..738b69a 100644 --- a/Live/CWX_MasterKey/server/types/helpers/NotifierHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/NotifierHelper.d.ts @@ -2,11 +2,11 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { - private httpServerHelper; + protected httpServerHelper: HttpServerHelper; /** * The default notification sent when waiting times out. */ - private defaultNotification; + protected defaultNotification: INotification; constructor(httpServerHelper: HttpServerHelper); getDefaultNotification(): INotification; /** Creates a new notification that displays the "Your offer was sold!" prompt and removes sold offer from "My Offers" on clientside */ diff --git a/Live/CWX_MasterKey/server/types/helpers/PresetHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/PresetHelper.d.ts index 0a24128..a469582 100644 --- a/Live/CWX_MasterKey/server/types/helpers/PresetHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { - private databaseServer; - private lookup; - constructor(databaseServer: DatabaseServer); + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected lookup: Record; + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Live/CWX_MasterKey/server/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Live/CWX_MasterKey/server/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts index 508443c..6c150c8 100644 --- a/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -20,6 +21,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; @@ -28,6 +35,12 @@ export declare class ProfileHelper { getPmcProfile(sessionID: string): IPmcData; getScavProfile(sessionID: string): IPmcData; getDefaultCounters(): Stats; - private isWiped; - private getServerVersion; + protected isWiped(sessionID: string): boolean; + protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_MasterKey/server/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/QuestConditionHelper.d.ts index 2a0ee94..90ee560 100644 --- a/Live/CWX_MasterKey/server/types/helpers/QuestConditionHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/QuestConditionHelper.d.ts @@ -3,5 +3,5 @@ export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLoyaltyConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; - private filterConditions; + protected filterConditions(q: AvailableForConditions[], questType: string, furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; } diff --git a/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts index 9e2dd5e..0f68cd5 100644 --- a/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/QuestHelper.d.ts @@ -1,12 +1,15 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -17,23 +20,23 @@ import { ProfileHelper } from "./ProfileHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { - private logger; - private jsonUtil; - private timeUtil; - private hashUtil; - private itemHelper; - private itemEventRouter; - private databaseServer; - private ragfairServerHelper; - private dialogueHelper; - private profileHelper; - private paymentHelper; - private traderHelper; - private configServer; - private questConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + protected ragfairServerHelper: RagfairServerHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected traderHelper: TraderHelper; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -45,24 +48,68 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; - private processReward; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + protected processReward(reward: Reward): any[]; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; /** * Get List of All Quests as an array + * @returns Array of IQuest objects */ questValues(): IQuest[]; - private cleanQuestList; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ + protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ cleanQuestConditions(quest: IQuest): IQuest; failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; getFindItemIdForQuestItem(itemTpl: string): string; } diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairHelper.d.ts index 8e70bcd..2c8dbb5 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairHelper.d.ts @@ -2,6 +2,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,16 +13,16 @@ import { ItemHelper } from "./ItemHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { - private logger; - private jsonUtil; - private traderAssortHelper; - private databaseServer; - private handbookHelper; - private itemHelper; - private ragfairLinkedItemService; - private utilityHelper; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected traderAssortHelper: TraderAssortHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected ragfairLinkedItemService: RagfairLinkedItemService; + protected utilityHelper: UtilityHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, traderAssortHelper: TraderAssortHelper, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, ragfairLinkedItemService: RagfairLinkedItemService, utilityHelper: UtilityHelper, configServer: ConfigServer); /** * Gets currency TAG from TPL @@ -31,7 +32,7 @@ export declare class RagfairHelper { getCurrencyTag(currency: string): string; filterCategories(sessionID: string, info: ISearchRequestData): string[]; getDisplayableAssorts(sessionID: string): Record; - private getCategoryList; + protected getCategoryList(handbookId: string): string[]; countCategories(result: IGetOffersResult): void; /** * Merges Root Items @@ -39,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts index 3bf8add..8d03bee 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairOfferHelper.d.ts @@ -1,12 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -19,31 +23,32 @@ import { RagfairHelper } from "./RagfairHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { - private logger; - private timeUtil; - private hashUtil; - private itemEventRouter; - private databaseServer; - private saveServer; - private dialogueHelper; - private itemHelper; - private paymentHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private ragfairSortHelper; - private ragfairHelper; - private ragfairOfferService; - private configServer; - private static TPL_GOODS_SOLD; - private ragfairConfig; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected paymentHelper: PaymentHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected static goodSoldTemplate: string; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; - private getProfileOffers; - private deleteOfferByOfferId; - private completeOffer; + protected getProfileOffers(sessionID: string): IRagfairOffer[]; + protected deleteOfferByOfferId(sessionID: string, offerId: string): void; + protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, offer: IRagfairOffer, pmcProfile: IPmcData): boolean; } diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts index 929d112..6ec004a 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairSellHelper.d.ts @@ -1,14 +1,15 @@ import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairSellHelper { - private logger; - private randomUtil; - private timeUtil; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairServerHelper.d.ts index d29ba42..e4939d1 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairServerHelper.d.ts @@ -1,9 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -11,26 +14,27 @@ import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { - private randomUtil; - private hashUtil; - private saveServer; - private databaseServer; - private profileHelper; - private itemHelper; - private dialogueHelper; - private jsonUtil; - private configServer; - private ragfairConfig; - private questConfig; - private static TPL_GOODS_RETURNED; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected itemHelper: ItemHelper; + protected localeService: LocaleService; + protected dialogueHelper: DialogueHelper; + protected jsonUtil: JsonUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + protected static goodsReturnedTemplate: string; + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails * @returns boolean */ isItemValidRagfairItem(itemDetails: [boolean, ITemplateItem]): boolean; - private isItemBlacklisted; + protected isItemBlacklisted(itemTemplateId: string): boolean; isTrader(userID: string): boolean; isPlayer(userID: string): boolean; returnItems(sessionID: string, items: any[]): void; diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts index e9d8069..d20e10c 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairSortHelper.d.ts @@ -1,12 +1,14 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; export declare class RagfairSortHelper { - private databaseServer; - constructor(databaseServer: DatabaseServer); + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; - private sortOffersByID; - private sortOffersByRating; - private sortOffersByName; - private sortOffersByPrice; - private sortOffersByExpiry; + protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByName(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByPrice(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByExpiry(a: IRagfairOffer, b: IRagfairOffer): number; } diff --git a/Live/CWX_MasterKey/server/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RagfairTaxHelper.d.ts index e87334f..820facb 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RagfairTaxHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RagfairTaxHelper.d.ts @@ -1,15 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { - private logger; - private databaseServer; - private ragfairPriceService; - private itemHelper; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected itemHelper: ItemHelper; constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); calculateTax(item: Item, pmcData: IPmcData, requirementsValue: number, offerItemCount: number, sellInOnePiece: boolean): number; - private calculateItemWorth; + protected calculateItemWorth(item: Item, itemTemplate: ITemplateItem, itemCount: number, pmcData: IPmcData, isRootItem?: boolean): number; } diff --git a/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts index 47123e1..9a3ab29 100644 --- a/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/RepairHelper.d.ts @@ -1,20 +1,21 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RepairHelper { - private logger; - private jsonUtil; - private randomUtil; - private databaseServer; - private configServer; - private repairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; - private getRandomisedArmorRepairDegredationValue; - private getRandomisedWeaponRepairDegredationValue; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; + protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; + protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; } diff --git a/Live/CWX_MasterKey/server/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/SecureContainerHelper.d.ts index 8f246b6..9e2bc32 100644 --- a/Live/CWX_MasterKey/server/types/helpers/SecureContainerHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/SecureContainerHelper.d.ts @@ -7,7 +7,7 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class SecureContainerHelper { - private itemHelper; + protected itemHelper: ItemHelper; constructor(itemHelper: ItemHelper); getSecureContainerItems(items: Item[]): string[]; } diff --git a/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts index 475390b..975062b 100644 --- a/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/TradeHelper.d.ts @@ -2,7 +2,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { Upd } from "../models/eft/common/tables/IItem"; +import { Item, Upd } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -12,14 +12,14 @@ import { RagfairServer } from "../servers/RagfairServer"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { - private logger; - private itemEventRouter; - private traderHelper; - private itemHelper; - private paymentService; - private fenceService; - private inventoryHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected fenceService: FenceService; + protected inventoryHelper: InventoryHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer); /** * Buy item from flea or trader @@ -39,6 +39,6 @@ export declare class TradeHelper { * @returns */ sellItem(pmcData: IPmcData, body: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; - private incrementAssortBuyCount; - private checkPurchaseIsWithinTraderItemLimit; + protected incrementAssortBuyCount(assortBeingPurchased: Item, itemsPurchasedCount: number): void; + protected checkPurchaseIsWithinTraderItemLimit(assortBeingPurchased: Item, assortId: string, count: number): void; } diff --git a/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts index d95879c..91ba6b9 100644 --- a/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/TraderAssortHelper.d.ts @@ -1,23 +1,55 @@ -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderAssortHelper { - private logger; - private jsonUtil; - private databaseServer; - private profileHelper; - private assortHelper; - private ragfairAssortGenerator; - private ragfairOfferGenerator; - private traderAssortService; - private fenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected traderAssortService: TraderAssortService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); + /** + * Get a traders assorts + * Can be used for returning ragfair / fence assorts + * @param sessionId session id + * @param traderId trader id + * @returns a traders assorts + */ getAssort(sessionId: string, traderId: string): ITraderAssort; + /** + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) + * @param traderId trader id + * @returns array of Items + */ + protected getPristineTraderAssorts(traderId: string): Item[]; + /** + * Returns generated ragfair offers in a trader assort format + * @returns Trader assort object + */ + protected getRagfairDataAsTraderAssort(): ITraderAssort; } diff --git a/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts b/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts index ec64d59..b2e9d38 100644 --- a/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts +++ b/Live/CWX_MasterKey/server/types/helpers/TraderHelper.d.ts @@ -1,5 +1,8 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +14,96 @@ import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderHelper { - private logger; - private databaseServer; - private saveServer; - private profileHelper; - private paymentHelper; - private itemHelper; - private handbookHelper; - private playerService; - private fenceService; - private configServer; - private traderConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); getTrader(traderID: string, sessionID: string): ITraderBase; getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ lvlUp(traderID: string, sessionID: string): void; getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ traderFilter(traderFilters: string[], tplToCheck: string): boolean; getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; } diff --git a/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts index 4f7664c..06ad698 100644 --- a/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/loaders/BundleLoader.d.ts @@ -10,10 +10,10 @@ declare class BundleInfo { constructor(modpath: string, bundle: any, bundlePath: string, bundleFilepath: string); } export declare class BundleLoader { - private httpServerHelper; - private vfs; - private jsonUtil; - private bundles; + protected httpServerHelper: HttpServerHelper; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected bundles: Record; constructor(httpServerHelper: HttpServerHelper, vfs: VFS, jsonUtil: JsonUtil); getBundles(local: boolean): BundleInfo[]; getBundle(key: string, local: boolean): BundleInfo; diff --git a/Live/CWX_MasterKey/server/types/loaders/InitialModLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/InitialModLoader.d.ts deleted file mode 100644 index 5957d35..0000000 --- a/Live/CWX_MasterKey/server/types/loaders/InitialModLoader.d.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { DependencyContainer } from "tsyringe"; -import { IModLoader } from "../models/spt/mod/IModLoader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ModCompilerService } from "../services/ModCompilerService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; -import { BundleLoader } from "./BundleLoader"; -export declare class InitialModLoader implements IModLoader { - private logger; - private vfs; - private jsonUtil; - private modCompilerService; - private bundleLoader; - private configServer; - private static container; - private readonly basepath; - private imported; - private onLoad; - private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); - load(container: DependencyContainer): Promise; - getBundles(local: boolean): string; - getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; - getModPath(mod: string): string; - private importClass; - private importMods; - /** - * - * @param mods Get an array of broken/invalid mods by name - * @returns Mod names array - */ - private getBrokenMods; - /** - * Get packageJson data for mods - * @param mods mods to get packageJson for - * @returns dictionary - */ - private getModsPackageData; - /** - * Does mod have "delayedLoad(" string in its entry class - * @param modFolderName folder name - * @param modToValidate package.json details - * @returns boolean - */ - private isModSpt300Compatible; - private isModCombatibleWithAki; - private executeMods; - private sortModsLoadOrder; - private addMod; - private areModDependenciesFulfilled; - private isModCompatible; - private validMod; - private getLoadOrderRecursive; - private getLoadOrder; - getContainer(): DependencyContainer; -} diff --git a/Live/CWX_MasterKey/server/types/loaders/DelayedModLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/PostAkiModLoader.d.ts similarity index 51% rename from Live/CWX_MasterKey/server/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_MasterKey/server/types/loaders/PostAkiModLoader.d.ts index 7d0009f..edc6e5d 100644 --- a/Live/CWX_MasterKey/server/types/loaders/DelayedModLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/loaders/PostAkiModLoader.d.ts @@ -1,21 +1,21 @@ +import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; -import { InitialModLoader } from "./InitialModLoader"; -export declare class DelayedModLoader implements IModLoader { - private bundleLoader; - private handbookController; - private vfs; - private modCompilerService; - private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; load(): void; - private executeMods; - private addBundles; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; } diff --git a/Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Live/CWX_MasterKey/server/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Live/CWX_MasterKey/server/types/models/common/MinMax.d.ts b/Live/CWX_MasterKey/server/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/IPmcData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/IPmcData.d.ts index adc2aa5..5703e4b 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/IPmcData.d.ts @@ -1,341 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/MemberCategory.d.ts deleted file mode 100644 index 3bd9a21..0000000 --- a/Live/CWX_MasterKey/server/types/models/eft/common/MemberCategory.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -export declare enum MemberCategory { - Default = 0, - Developer = 1, - UniqueId = 2, - Trader = 4, - Group = 8, - System = 16, - ChatModerator = 32, - ChatModeratorWithPermanentBan = 64, - UnitTest = 128, - Sherpa = 256, - Emissary = 512 -} diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts index c2ba762..23a1a14 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/common/tables/ITemplateItem.d.ts @@ -7,284 +7,362 @@ export interface ITemplateItem { _proto: string; } export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; Rarity?: string; SpawnChance?: number; CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; foodUseTime?: number; foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; } export interface Prefab { path: string; @@ -315,27 +393,18 @@ export interface Slot { _id: string; _parent: string; _props: SlotProps; + _max_count?: number; _required: boolean; _mergeSlotWithChildren: boolean; _proto: string; } export interface SlotProps { - filters: Filter[]; + filters: SlotFilter[]; } -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { +export interface SlotFilter { + Shift?: number; Filter: string[]; + AnimationIndex?: number; } export interface Xyz { x: number; @@ -345,53 +414,38 @@ export interface Xyz { export interface StackSlot { _name?: string; _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; + _parent: string; _max_count: number; - _props?: StackSlotProps; - _proto?: string; + _props: StackSlotProps; + _proto: string; upd: any; } export interface StackSlotProps { - filters: Filter[]; + filters: SlotFilter[]; } export interface EffectsHealth { - Hydration: Hydration; + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; } -export interface Hydration { +export interface EffectsHealthProps { value: number; } export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; } -export interface Pain { +export interface EffectDamageProps { delay: number; duration: number; fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; } export interface Color { r: number; diff --git a/Live/CWX_MasterKey/server/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts b/Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/HideoutAreasEnum.d.ts deleted file mode 100644 index 10f851b..0000000 --- a/Live/CWX_MasterKey/server/types/models/eft/hideout/HideoutAreasEnum.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export declare enum HideoutAreasEnum { - NOTSET = -1, - VENTS = 0, - SECURITY = 1, - LAVATORY = 2, - STASH = 3, - GENERATOR = 4, - HEATING = 5, - WATER_COLLECTOR = 6, - MEDSTATION = 7, - NUTRITION_UNIT = 8, - REST_SPACE = 9, - WORKBENCH = 10, - INTEL_CENTER = 11, - SHOOTING_RANGE = 12, - LIBRARY = 13, - SCAV_CASE = 14, - ILLUMINATION = 15, - PLACE_OF_FAME = 16, - AIR_FILTERING = 17, - SOLAR_POWER = 18, - BOOZE_GENERATOR = 19, - BITCOIN_FARM = 20, - CHRISTMAS_TREE = 21 -} diff --git a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_MasterKey/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_MasterKey/server/types/models/eft/profile/IAkiProfile.d.ts index 80dd02d..eaa66c1 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -126,12 +126,16 @@ export interface Chest { export interface Stomach { } export interface LeftArm { + Fracture?: number; } export interface RightArm { + Fracture?: number; } export interface LeftLeg { + Fracture?: number; } export interface RightLeg { + Fracture?: number; } export interface Inraid { location: string; @@ -149,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_MasterKey/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Live/CWX_MasterKey/server/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_MasterKey/server/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Live/CWX_MasterKey/server/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Live/CWX_MasterKey/server/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Live/CWX_MasterKey/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_MasterKey/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/AmmoTypes.d.ts b/Live/CWX_MasterKey/server/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/BotAmount.d.ts b/Live/CWX_MasterKey/server/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/BotDifficulty.d.ts b/Live/CWX_MasterKey/server/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/ConfigTypes.d.ts b/Live/CWX_MasterKey/server/types/models/enums/ConfigTypes.d.ts index 6bd31e8..61d6f99 100644 --- a/Live/CWX_MasterKey/server/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_MasterKey/server/types/models/enums/ConfigTypes.d.ts @@ -8,11 +8,14 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_MasterKey/server/types/models/enums/ContainerTypes.d.ts b/Live/CWX_MasterKey/server/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts b/Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts b/Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..ba65933 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,11 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7, + Expired = 8 +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/RaidMode.d.ts b/Live/CWX_MasterKey/server/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/SkillTypes.d.ts b/Live/CWX_MasterKey/server/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_MasterKey/server/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_MasterKey/server/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_MasterKey/server/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_MasterKey/server/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_MasterKey/server/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_MasterKey/server/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_MasterKey/server/types/models/external/mod.d.ts b/Live/CWX_MasterKey/server/types/models/external/mod.d.ts deleted file mode 100644 index ecef460..0000000 --- a/Live/CWX_MasterKey/server/types/models/external/mod.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { DependencyContainer } from "./tsyringe"; -export interface IMod { - load: (container: DependencyContainer) => void; - delayedLoad: (container: DependencyContainer) => void; -} diff --git a/Live/CWX_MasterKey/server/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_MasterKey/server/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts index f8ea940..e171087 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -5,9 +6,13 @@ export interface IBotConfig extends IBaseConfig { bosses: string[]; durability: Durability; lootNValue: LootNvalue; + revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -17,6 +22,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -27,6 +33,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; @@ -86,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -96,17 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; + enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IInRaidConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..c24e617 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -30,6 +31,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; @@ -39,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_MasterKey/server/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_MasterKey/server/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_MasterKey/server/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_MasterKey/server/types/models/spt/helpers/Traders.d.ts b/Live/CWX_MasterKey/server/types/models/spt/helpers/Traders.d.ts deleted file mode 100644 index e935d29..0000000 --- a/Live/CWX_MasterKey/server/types/models/spt/helpers/Traders.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export declare const enum Traders { - PRAPOR = "54cb50c76803fa8b248b4571", - THERAPIST = "54cb57776803fa99248b456e", - FENCE = "579dc571d53a0658a154fbec", - SKIER = "58330581ace78e27b8b10cee", - PEACEKEEPER = "5935c25fb3acc3127c3d8cd9", - MECHANIC = "5a7c2eca46aef81a7ca2145d", - RAGMAN = "5ac3b934156ae10c4430e83c", - JAEGER = "5c0647fdd443bc2504c2d371" -} diff --git a/Live/CWX_MasterKey/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_MasterKey/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_MasterKey/server/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_MasterKey/server/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_MasterKey/server/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts index 5398c9b..40a5e19 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/mod/IModLoader.d.ts @@ -3,6 +3,5 @@ export interface IModLoader { load(container: DependencyContainer): void; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Live/CWX_MasterKey/server/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_MasterKey/server/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_MasterKey/server/types/models/spt/server/IHttpServer.d.ts index 50e5c91..c828399 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/server/IHttpServer.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/server/IHttpServer.d.ts @@ -1,4 +1,5 @@ /// +/// import http, { ServerResponse } from "http"; import { INotification } from "../../eft/notifier/INotifier"; export interface IHttpServer { diff --git a/Live/CWX_MasterKey/server/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_MasterKey/server/types/models/spt/server/ILocaleBase.d.ts index a20084d..8887c06 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/server/ILocaleBase.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/server/ILocaleBase.d.ts @@ -1,5 +1,5 @@ export interface ILocaleBase { - global: ILocaleGlobalBase; + global: Record; menu: Record; languages: ILanguageBase[]; } diff --git a/Live/CWX_MasterKey/server/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_MasterKey/server/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_MasterKey/server/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Live/CWX_MasterKey/server/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Live/CWX_MasterKey/server/types/models/spt/utils/ILogger.d.ts b/Live/CWX_MasterKey/server/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Live/CWX_MasterKey/server/types/models/spt/utils/ILogger.d.ts +++ b/Live/CWX_MasterKey/server/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Live/CWX_MasterKey/server/types/routers/HttpRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/HttpRouter.d.ts index 44edc0b..f75a47d 100644 --- a/Live/CWX_MasterKey/server/types/routers/HttpRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/HttpRouter.d.ts @@ -1,11 +1,16 @@ /// import { IncomingMessage } from "http"; -import { DynamicRouter, StaticRouter } from "../di/Router"; +import { DynamicRouter, Router, StaticRouter } from "../di/Router"; export declare class HttpRouter { - private staticRouters; - private dynamicRoutes; + protected staticRouters: StaticRouter[]; + protected dynamicRoutes: DynamicRouter[]; constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); - private groupBy; + protected groupBy(list: T[], keyGetter: (t: T) => string): Map; getResponse(req: IncomingMessage, info: any, sessionID: string): string; - private handleRoute; + protected handleRoute(url: string, info: any, sessionID: string, wrapper: ResponseWrapper, routers: Router[], dynamic: boolean): boolean; } +declare class ResponseWrapper { + output: string; + constructor(output: string); +} +export {}; diff --git a/Live/CWX_MasterKey/server/types/routers/ImageRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/ImageRouter.d.ts index 97e580d..ab03977 100644 --- a/Live/CWX_MasterKey/server/types/routers/ImageRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/ImageRouter.d.ts @@ -4,8 +4,8 @@ import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ImageRouteService } from "../services/mod/image/ImageRouteService"; import { VFS } from "../utils/VFS"; export declare class ImageRouter { - private vfs; - private imageRouteService; + protected vfs: VFS; + protected imageRouteService: ImageRouteService; constructor(vfs: VFS, imageRouteService: ImageRouteService); addRoute(key: string, valueToAdd: string): void; sendImage(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any, httpServer: IHttpServer): void; diff --git a/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts index bb20152..b1ac5d9 100644 --- a/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/ItemEventRouter.d.ts @@ -5,13 +5,13 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { - private logger; - private jsonUtil; - private profileHelper; - private itemEventRouters; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected itemEventRouters: ItemEventRouterDefinition[]; constructor(logger: ILogger, jsonUtil: JsonUtil, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[]); - private output; + protected output: IItemEventRouterResponse; handleEvents(info: IItemEventRouterRequest, sessionID: string): IItemEventRouterResponse; getOutput(sessionID: string): IItemEventRouterResponse; - private resetOutput; + protected resetOutput(sessionID: string): void; } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/BotDynamicRouter.d.ts index dd2f68a..6d0ab4b 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/BundleDynamicRouter.d.ts index be27008..a765410 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts index 03a5967..2db7cc5 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/DataDynamicRouter.d.ts index c30501a..836ed8d 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/HttpDynamicRouter.d.ts index b2933e9..a152b4d 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/InraidDynamicRouter.d.ts index ea4a9ae..7c0561f 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/LocationDynamicRouter.d.ts index 30741db..b8e5cdf 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/NotifierDynamicRouter.d.ts index 4786817..83c60c5 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/dynamic/TraderDynamicRouter.d.ts index a100b4c..5b7cc1b 100644 --- a/Live/CWX_MasterKey/server/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts index 3025e2c..e78445e 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts index bad9af2..99847c6 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/HealthItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HealthItemEventRouter extends ItemEventRouterDefinition { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/HideoutItemEventRouter.d.ts index 2cec18b..e1e98af 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HideoutItemEventRouter extends ItemEventRouterDefinition { - private hideoutCallbacks; + protected hideoutCallbacks: HideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts index 8efc2c2..a922cc0 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts index 1d93e7b..2619bb9 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { - private inventoryCallbacks; + protected inventoryCallbacks: InventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts index 12af594..59bf598 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/NoteItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class NoteItemEventRouter extends ItemEventRouterDefinition { - private noteCallbacks; + protected noteCallbacks: NoteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7298c52..277db44 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { - private presetBuildCallbacks; + protected presetBuildCallbacks: PresetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/QuestItemEventRouter.d.ts index 9944ae9..a092aa6 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { - private questCallbacks; - constructor(questCallbacks: QuestCallbacks); + protected logger: ILogger; + protected questCallbacks: QuestCallbacks; + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts index 88e52ba..9216cc5 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts index b292ded..5196ba9 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/RepairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RepairItemEventRouter extends ItemEventRouterDefinition { - private repairCallbacks; + protected repairCallbacks: RepairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts index 1bca2b8..a43bb0a 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/TradeItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class TradeItemEventRouter extends ItemEventRouterDefinition { - private tradeCallbacks; + protected tradeCallbacks: TradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts index 38831f6..38497fb 100644 --- a/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { - private wishlistCallbacks; + protected wishlistCallbacks: WishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/server/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_MasterKey/server/types/routers/serializers/BundleSerializer.d.ts index 7952e9c..912db83 100644 --- a/Live/CWX_MasterKey/server/types/routers/serializers/BundleSerializer.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/serializers/BundleSerializer.d.ts @@ -3,8 +3,8 @@ import { BundleLoader } from "../../loaders/BundleLoader"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { ILogger } from "../../models/spt/utils/ILogger"; export declare class BundleSerializer extends Serializer { - private logger; - private bundleLoader; + protected logger: ILogger; + protected bundleLoader: BundleLoader; constructor(logger: ILogger, bundleLoader: BundleLoader); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts index 29340d0..0e040d4 100644 --- a/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/serializers/ImageSerializer.d.ts @@ -2,7 +2,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_MasterKey/server/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_MasterKey/server/types/routers/serializers/NotifySerializer.d.ts index 8be8ac2..1779ac9 100644 --- a/Live/CWX_MasterKey/server/types/routers/serializers/NotifySerializer.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/serializers/NotifySerializer.d.ts @@ -3,9 +3,9 @@ import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { - private notifierController; - private httpServerHelper; + protected notifierController: NotifierController; + protected httpServerHelper: HttpServerHelper; constructor(notifierController: NotifierController, httpServerHelper: HttpServerHelper); - serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; + serialize(_sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; } diff --git a/Live/CWX_MasterKey/server/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/BotStaticRouter.d.ts index d8b0bf4..aeea220 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/BotStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/BotStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/BundleStaticRouter.d.ts index 3905b82..fb682fc 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/BundleStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/BundleStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/CustomizationStaticRouter.d.ts index 46c71b8..21bc4bb 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/CustomizationStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/DataStaticRouter.d.ts index a493d3a..84ba7fd 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/DataStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/DataStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/DialogStaticRouter.d.ts index a59fb14..546cdf1 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/DialogStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/DialogStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { - private dialogueCallbacks; + protected dialogueCallbacks: DialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/GameStaticRouter.d.ts index 988b673..a9a7496 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/GameStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/GameStaticRouter.d.ts @@ -1,6 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { - private gameCallbacks; + protected gameCallbacks: GameCallbacks; constructor(gameCallbacks: GameCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/HealthStaticRouter.d.ts index e644861..863fd5e 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/HealthStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/HealthStaticRouter.d.ts @@ -1,6 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/InraidStaticRouter.d.ts index 66ed860..b29ad23 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/InraidStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/InraidStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/InsuranceStaticRouter.d.ts index 8da26b3..5676499 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/InsuranceStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/ItemEventStaticRouter.d.ts index 08ba6bb..c30a7fc 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/ItemEventStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { - private itemEventCallbacks; + protected itemEventCallbacks: ItemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/LauncherStaticRouter.d.ts index 9d07f78..0040cbd 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/LauncherStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/LauncherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { - private launcherCallbacks; + protected launcherCallbacks: LauncherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/LocationStaticRouter.d.ts index 9c5c52e..b6de956 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/LocationStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/LocationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/MatchStaticRouter.d.ts index d746381..9920a92 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/MatchStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/MatchStaticRouter.d.ts @@ -1,6 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { - private matchCallbacks; + protected matchCallbacks: MatchCallbacks; constructor(matchCallbacks: MatchCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/NotifierStaticRouter.d.ts index 1c8566d..8f1f5cc 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/NotifierStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/NotifierStaticRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/PresetStaticRouter.d.ts index 2272f82..a9e7458 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/PresetStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/PresetStaticRouter.d.ts @@ -1,6 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { - private presetCallbacks; + protected presetCallbacks: PresetBuildCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/ProfileStaticRouter.d.ts index fd787f1..83403f2 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/ProfileStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/ProfileStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { - private profileCallbacks; + protected profileCallbacks: ProfileCallbacks; constructor(profileCallbacks: ProfileCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/QuestStaticRouter.d.ts index fda3c23..8f7ca0a 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/QuestStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/QuestStaticRouter.d.ts @@ -1,6 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { - private questCallbacks; + protected questCallbacks: QuestCallbacks; constructor(questCallbacks: QuestCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/RagfairStaticRouter.d.ts index 618374f..6c41467 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/RagfairStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/RagfairStaticRouter.d.ts @@ -1,6 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/TraderStaticRouter.d.ts index 18f0629..41728a1 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/TraderStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/TraderStaticRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_MasterKey/server/types/routers/static/WeatherStaticRouter.d.ts index 61b904d..72ed851 100644 --- a/Live/CWX_MasterKey/server/types/routers/static/WeatherStaticRouter.d.ts +++ b/Live/CWX_MasterKey/server/types/routers/static/WeatherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { - private weatherCallbacks; + protected weatherCallbacks: WeatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); } diff --git a/Live/CWX_MasterKey/server/types/servers/ConfigServer.d.ts b/Live/CWX_MasterKey/server/types/servers/ConfigServer.d.ts index 83af38d..a079be8 100644 --- a/Live/CWX_MasterKey/server/types/servers/ConfigServer.d.ts +++ b/Live/CWX_MasterKey/server/types/servers/ConfigServer.d.ts @@ -3,10 +3,10 @@ import { VFS } from "../utils/VFS"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigTypes } from "../models/enums/ConfigTypes"; export declare class ConfigServer { - private logger; - private vfs; - private jsonUtil; - private configs; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected configs: Record; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil); getConfig(configType: ConfigTypes): T; getConfigByString(configType: string): T; diff --git a/Live/CWX_MasterKey/server/types/servers/DatabaseServer.d.ts b/Live/CWX_MasterKey/server/types/servers/DatabaseServer.d.ts index 521bcf9..aa152d0 100644 --- a/Live/CWX_MasterKey/server/types/servers/DatabaseServer.d.ts +++ b/Live/CWX_MasterKey/server/types/servers/DatabaseServer.d.ts @@ -1,6 +1,6 @@ import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { - private tableData; + protected tableData: IDatabaseTables; getTables(): IDatabaseTables; setTables(any: any): void; } diff --git a/Live/CWX_MasterKey/server/types/servers/HttpServer.d.ts b/Live/CWX_MasterKey/server/types/servers/HttpServer.d.ts index d0db7e4..44d802b 100644 --- a/Live/CWX_MasterKey/server/types/servers/HttpServer.d.ts +++ b/Live/CWX_MasterKey/server/types/servers/HttpServer.d.ts @@ -1,9 +1,12 @@ /// +/// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; @@ -13,24 +16,25 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { - private httpRouter; - private logger; - private randomUtil; - private jsonUtil; - private httpResponse; - private databaseServer; - private notifierHelper; - private httpServerHelper; - private serializers; - private configServer; + protected httpRouter: HttpRouter; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected serializers: Serializer[]; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); - private buffers; - private onReceive; - private onRespond; - private httpConfig; - private webSockets; - private websocketPingHandler; + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); + protected buffers: {}; + protected onReceive: {}; + protected onRespond: {}; + protected httpConfig: IHttpConfig; + protected webSockets: {}; + protected websocketPingHandler: any; getCookies(req: http.IncomingMessage): any; resetBuffer(sessionID: string): void; putInBuffer(sessionID: any, data: any, bufLength: number): boolean; @@ -42,6 +46,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; - private getRandomisedMessage; + protected getRandomisedMessage(): string; wsOnConnection(ws: any, req: any): void; } diff --git a/Live/CWX_MasterKey/server/types/servers/RagfairServer.d.ts b/Live/CWX_MasterKey/server/types/servers/RagfairServer.d.ts index cf56d64..bc86cdb 100644 --- a/Live/CWX_MasterKey/server/types/servers/RagfairServer.d.ts +++ b/Live/CWX_MasterKey/server/types/servers/RagfairServer.d.ts @@ -1,22 +1,24 @@ import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; import { ConfigServer } from "./ConfigServer"; export declare class RagfairServer { - private logger; - private ragfairOfferGenerator; - private ragfairOfferService; - private ragfairCategoriesService; - private ragfairRequiredItemsService; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts b/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts index fdf92e4..cb28f49 100644 --- a/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts +++ b/Live/CWX_MasterKey/server/types/servers/SaveServer.d.ts @@ -5,15 +5,15 @@ import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { - private vfs; - private saveLoadRouters; - private jsonUtil; - private hashUtil; - private logger; - private profileFilepath; - private profiles; - private onSave; - private saveMd5; + protected vfs: VFS; + protected saveLoadRouters: SaveLoadRouter[]; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected profileFilepath: string; + protected profiles: {}; + protected onSave: {}; + protected saveMd5: {}; constructor(vfs: VFS, saveLoadRouters: SaveLoadRouter[], jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger); load(): void; save(): void; diff --git a/Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_MasterKey/server/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_MasterKey/server/types/services/BotLootCacheService.d.ts b/Live/CWX_MasterKey/server/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..cc71eee --- /dev/null +++ b/Live/CWX_MasterKey/server/types/services/BotLootCacheService.d.ts @@ -0,0 +1,82 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole bots role (assault / pmcBot etc) + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc Is the bot a PMC (alteres what loot is cached) + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Live/CWX_MasterKey/server/types/services/FenceService.d.ts b/Live/CWX_MasterKey/server/types/services/FenceService.d.ts index 27d14ef..79058c6 100644 --- a/Live/CWX_MasterKey/server/types/services/FenceService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/FenceService.d.ts @@ -4,6 +4,7 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +12,25 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class FenceService { - private logger; - private hashUtil; - private jsonUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private itemHelper; - private presetHelper; - private configServer; - private fenceAssort; - private traderConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected fenceAssort: ITraderAssort; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, configServer: ConfigServer); - private setFenceAssort; + protected setFenceAssort(fenceAssort: ITraderAssort): void; getFenceAssorts(): ITraderAssort; hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Live/CWX_MasterKey/server/types/services/HashCacheService.d.ts b/Live/CWX_MasterKey/server/types/services/HashCacheService.d.ts index c9b0170..5320f28 100644 --- a/Live/CWX_MasterKey/server/types/services/HashCacheService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/HashCacheService.d.ts @@ -3,13 +3,13 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; export declare class HashCacheService { - private vfs; - private hashUtil; - private jsonUtil; - private logger; - private jsonHashes; - private modHashes; - private readonly modCachePath; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected jsonHashes: any; + protected modHashes: any; + protected readonly modCachePath = "./user/cache/modCache.json"; constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); getStoredModHash(modName: string): string; modContentMatchesStoredHash(modName: string, modContent: string): boolean; diff --git a/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts b/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts index 160faba..171bf10 100644 --- a/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/InsuranceService.d.ts @@ -4,6 +4,7 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,18 +12,17 @@ import { SaveServer } from "../servers/SaveServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { - private logger; - private databaseServer; - private secureContainerHelper; - private randomUtil; - private timeUtil; - private saveServer; - private traderHelper; - private dialogueHelper; - private configServer; - private insured; - private templatesById; - private insuranceConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected secureContainerHelper: SecureContainerHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected traderHelper: TraderHelper; + protected dialogueHelper: DialogueHelper; + protected configServer: ConfigServer; + protected insured: Record>; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; @@ -31,11 +31,21 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - private addGearToSend; + protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; } diff --git a/Live/CWX_MasterKey/server/types/services/LocaleService.d.ts b/Live/CWX_MasterKey/server/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Live/CWX_MasterKey/server/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Live/CWX_MasterKey/server/types/services/MatchLocationService.d.ts b/Live/CWX_MasterKey/server/types/services/MatchLocationService.d.ts index f7b7d3b..c027bec 100644 --- a/Live/CWX_MasterKey/server/types/services/MatchLocationService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/MatchLocationService.d.ts @@ -1,8 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { TimeUtil } from "../utils/TimeUtil"; export declare class MatchLocationService { - private timeUtil; - private locations; + protected timeUtil: TimeUtil; + protected locations: {}; constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; } diff --git a/Live/CWX_MasterKey/server/types/services/ModCompilerService.d.ts b/Live/CWX_MasterKey/server/types/services/ModCompilerService.d.ts index cf7cc21..26cb4ac 100644 --- a/Live/CWX_MasterKey/server/types/services/ModCompilerService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/ModCompilerService.d.ts @@ -1,15 +1,20 @@ +import * as ts from "typescript"; import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { - private logger; - private hashCacheService; - private vfs; + protected logger: ILogger; + protected hashCacheService: HashCacheService; + protected vfs: VFS; constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; - private compile; - private buildDepth; - private calculateDepth; - private areFilesReady; - private delay; + protected compile(fileNames: string[], options: ts.CompilerOptions): Promise; + protected buildDepth(depth: number): string; + protected getNodesModulesPath(depth: number): string; + protected getAkiPath(depth: number): string; + protected getAkiFolder(): string; + protected getNodesModulesFolder(): string; + protected calculateDepth(file: string): number; + protected areFilesReady(fileNames: string[]): boolean; + protected delay(ms: number): Promise; } diff --git a/Live/CWX_MasterKey/server/types/services/NotificationService.d.ts b/Live/CWX_MasterKey/server/types/services/NotificationService.d.ts index 9c6c143..65a84dd 100644 --- a/Live/CWX_MasterKey/server/types/services/NotificationService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - private messageQueue; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts b/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts index 0a6c4d6..a5e538f 100644 --- a/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/PaymentService.d.ts @@ -4,6 +4,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -11,14 +12,14 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { - private logger; - private httpResponse; - private databaseServer; - private handbookHelper; - private traderHelper; - private itemHelper; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request @@ -43,6 +44,23 @@ export declare class PaymentService { * inside the stash, that is it has the stash as * ancestor with slotId=hideout */ - private isItemInStash; + protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts b/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts index 99e5986..519b7e5 100644 --- a/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/PlayerService.d.ts @@ -3,8 +3,8 @@ import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPla import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PlayerService { - private logger; - private databaseServer; + protected logger: ILogger; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, databaseServer: DatabaseServer); /** * increases the profile skill and updates any output diff --git a/Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts b/Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..ed1dec7 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/services/ProfileFixerService.d.ts @@ -0,0 +1,61 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Live/CWX_MasterKey/server/types/services/RagfairCategoriesService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairCategoriesService.d.ts index fb9efa2..83910e5 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairCategoriesService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairCategoriesService.d.ts @@ -1,10 +1,40 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - private categories; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; } diff --git a/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts index 3dbcf6f..6c34ee0 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairLinkedItemService.d.ts @@ -1,9 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; export declare class RagfairLinkedItemService { - private databaseServer; - private linkedItemsCache; + protected databaseServer: DatabaseServer; + protected linkedItemsCache: Record>; constructor(databaseServer: DatabaseServer); getLinkedItems(linkedSearchId: string): Iterable; - private buildLinkedItemTable; - private getFilters; + protected buildLinkedItemTable(): void; + protected getFilters(item: ITemplateItem, slot: string): string[]; } diff --git a/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts index 9b1bf8d..7398a8f 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairOfferService.d.ts @@ -1,7 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -9,27 +11,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { - private logger; - private timeUtil; - private databaseServer; - private saveServer; - private ragfairServerHelper; - private profileHelper; - private itemEventRouter; - private httpResponse; - private configServer; - private playerOffersLoaded; - private toUpdate; - private expiredOffers; - private offers; - private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; + protected profileHelper: ProfileHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected playerOffersLoaded: boolean; + protected toUpdate: Record; + protected expiredOffers: Item[]; + protected offers: IRagfairOffer[]; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; @@ -57,8 +65,8 @@ export declare class RagfairOfferService { * Get an array of stale offers that are still shown to player * @returns IRagfairOffer array */ - private getStaleOffers; - private isStale; - private processStaleOffer; - private returnPlayerOffer; + protected getStaleOffers(): IRagfairOffer[]; + protected isStale(offer: IRagfairOffer, time: number): boolean; + protected processStaleOffer(staleOffer: IRagfairOffer): void; + protected returnPlayerOffer(offer: IRagfairOffer): IItemEventRouterResponse; } diff --git a/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts index 7cdf854..679fe1d 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairPriceService.d.ts @@ -1,22 +1,25 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "../models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RagfairPriceService { - private handbookHelper; - private databaseServer; - private logger; - private itemHelper; - private presetHelper; - private randomUtil; - private configServer; - private ragfairConfig; - private prices; + protected handbookHelper: HandbookHelper; + protected databaseServer: DatabaseServer; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected prices: IRagfairServerPrices; constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); generateStaticPrices(): void; generateDynamicPrices(): void; @@ -24,7 +27,29 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; } diff --git a/Live/CWX_MasterKey/server/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_MasterKey/server/types/services/RagfairRequiredItemsService.d.ts index e4582d0..b05fc65 100644 --- a/Live/CWX_MasterKey/server/types/services/RagfairRequiredItemsService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/RagfairRequiredItemsService.d.ts @@ -2,10 +2,10 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { - private logger; - private paymentHelper; - private ragfairOfferService; - private requiredItemsCache; + protected logger: ILogger; + protected paymentHelper: PaymentHelper; + protected ragfairOfferService: RagfairOfferService; + protected requiredItemsCache: {}; constructor(logger: ILogger, paymentHelper: PaymentHelper, ragfairOfferService: RagfairOfferService); getRequiredItems(searchId: string): any; buildRequiredItemTable(): void; diff --git a/Live/CWX_MasterKey/server/types/services/TraderAssortService.d.ts b/Live/CWX_MasterKey/server/types/services/TraderAssortService.d.ts index ccb9e45..5ba2d05 100644 --- a/Live/CWX_MasterKey/server/types/services/TraderAssortService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/TraderAssortService.d.ts @@ -1,6 +1,6 @@ import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { - private pristineTraderAssorts; + protected pristineTraderAssorts: Record; getPristineTraderAssort(traderId: string): ITraderAssort; setPristineTraderAssort(traderId: string, assort: ITraderAssort): void; } diff --git a/Live/CWX_MasterKey/server/types/services/mod/CustomItemService.d.ts b/Live/CWX_MasterKey/server/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_MasterKey/server/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_MasterKey/server/types/services/mod/image/imageRouteService.d.ts index 854083c..29569b2 100644 --- a/Live/CWX_MasterKey/server/types/services/mod/image/imageRouteService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/mod/image/imageRouteService.d.ts @@ -1,5 +1,5 @@ export declare class ImageRouteService { - private routes; + protected routes: Record; addRoute(urlKey: string, route: string): void; getByKey(urlKey: string): string; existsByKey(urlKey: string): boolean; diff --git a/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadModService.d.ts index 89bad14..f402103 100644 --- a/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadModService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/mod/onLoad/OnLoadModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnLoadModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; } diff --git a/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateModService.d.ts index 32419f4..05d735b 100644 --- a/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateModService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnUpdateModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; } diff --git a/Live/CWX_MasterKey/server/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_MasterKey/server/types/services/mod/staticRouter/StaticRouterModService.d.ts index d4c42aa..f28fd45 100644 --- a/Live/CWX_MasterKey/server/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/Live/CWX_MasterKey/server/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,7 +1,7 @@ import { DependencyContainer } from "tsyringe"; import { RouteAction } from "../../../di/Router"; export declare class StaticRouterModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; } diff --git a/Live/CWX_MasterKey/server/types/utils/App.d.ts b/Live/CWX_MasterKey/server/types/utils/App.d.ts index a11f576..dcc2669 100644 --- a/Live/CWX_MasterKey/server/types/utils/App.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/App.d.ts @@ -3,12 +3,13 @@ import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { - private logger; - private timeUtil; - private onLoadComponents; - private onUpdateComponents; - private onUpdateLastRun; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected onLoadComponents: OnLoad[]; + protected onUpdateComponents: OnUpdate[]; + protected onUpdateLastRun: {}; constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; - private update; + protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_MasterKey/server/types/utils/AyncQueue.d.ts b/Live/CWX_MasterKey/server/types/utils/AyncQueue.d.ts index a99aa37..da6ab18 100644 --- a/Live/CWX_MasterKey/server/types/utils/AyncQueue.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - private commandsQueue; + protected commandsQueue: ICommand[]; constructor(); waitFor(command: ICommand): Promise; } diff --git a/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts b/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts index 97dda30..483e135 100644 --- a/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/DatabaseImporter.d.ts @@ -1,18 +1,24 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { - private logger; - private vfs; - private jsonUtil; - private databaseServer; - private imageRouter; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Live/CWX_MasterKey/server/types/utils/HashUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/HashUtil.d.ts index cf92b47..bacbf2a 100644 --- a/Live/CWX_MasterKey/server/types/utils/HashUtil.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/HashUtil.d.ts @@ -2,7 +2,7 @@ import crypto from "crypto"; import { TimeUtil } from "./TimeUtil"; export declare class HashUtil { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); generate(): string; generateMd5ForData(data: string): string; diff --git a/Live/CWX_MasterKey/server/types/utils/HttpResponseUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/HttpResponseUtil.d.ts index 85c28bd..29502be 100644 --- a/Live/CWX_MasterKey/server/types/utils/HttpResponseUtil.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/HttpResponseUtil.d.ts @@ -3,9 +3,9 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HttpResponseUtil { - private jsonUtil; + protected jsonUtil: JsonUtil; constructor(jsonUtil: JsonUtil); - private clearString; + protected clearString(s: string): any; noBody(data: any): any; getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; getUnclearedBody(data: any, err?: number, errmsg?: any): string; diff --git a/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts index 20b7448..71e95f6 100644 --- a/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/JsonUtil.d.ts @@ -2,10 +2,10 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { - private vfs; - private hashUtil; - private logger; - private fileHashes; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected fileHashes: any; constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string diff --git a/Live/CWX_MasterKey/server/types/utils/Logger.d.ts b/Live/CWX_MasterKey/server/types/utils/Logger.d.ts index 9d5b32a..3d9013f 100644 --- a/Live/CWX_MasterKey/server/types/utils/Logger.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/Logger.d.ts @@ -1,25 +1,58 @@ /// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class WinstonLogger implements ILogger { - private asyncQueue; - private uuidGenerator; - private showDebugInConsole; - private folderPath; - private file; - private filePath; - private logLevels; - private logger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + protected showDebugInConsole: boolean; + protected folderPath: string; + protected file: string; + protected filePath: string; + protected logLevels: { + levels: { + error: number; + warn: number; + succ: number; + info: number; + custom: number; + debug: number; + }; + colors: { + error: string; + warn: string; + succ: string; + info: string; + custom: string; + debug: string; + }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; + }; + protected logger: winston.Logger & SptLogger; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; warning(data: string | Record): Promise; success(data: string | Record): Promise; info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; debug(data: string | Record, onlyShowInConsole?: boolean): Promise; } diff --git a/Live/CWX_MasterKey/server/types/utils/ObjectId.d.ts b/Live/CWX_MasterKey/server/types/utils/ObjectId.d.ts index b100572..03aae56 100644 --- a/Live/CWX_MasterKey/server/types/utils/ObjectId.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/ObjectId.d.ts @@ -1,13 +1,13 @@ /// import { TimeUtil } from "./TimeUtil"; export declare class ObjectId { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); - private randomBytes; - private constglobalCounter; - private consttime; - private globalCounter; - private time; + protected randomBytes: Buffer; + protected constglobalCounter: number; + protected consttime: number; + protected globalCounter: number; + protected time: number; incGlobalCounter(): number; toHexString(byteArray: string | any[] | Buffer): string; generate(): string; diff --git a/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts index 3a3ecb6..c24dd60 100644 --- a/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/RandomUtil.d.ts @@ -103,8 +103,8 @@ export declare class ProbabilityObject { constructor(key: K, relativeProbability: number, data?: V); } export declare class RandomUtil { - private jsonUtil; - private logger; + protected jsonUtil: JsonUtil; + protected logger: ILogger; constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; diff --git a/Live/CWX_MasterKey/server/types/utils/TimeUtil.d.ts b/Live/CWX_MasterKey/server/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_MasterKey/server/types/utils/TimeUtil.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_MasterKey/server/types/utils/VFS.d.ts b/Live/CWX_MasterKey/server/types/utils/VFS.d.ts index d567615..e5eaf02 100644 --- a/Live/CWX_MasterKey/server/types/utils/VFS.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/VFS.d.ts @@ -1,11 +1,12 @@ /// +/// import "reflect-metadata"; import fs from "fs"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { - private asyncQueue; - private uuidGenerator; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; accessFilePromisify: (path: fs.PathLike, mode?: number) => Promise; copyFilePromisify: (src: fs.PathLike, dst: fs.PathLike, flags?: number) => Promise; mkdirPromisify: (path: fs.PathLike, options: fs.MakeDirectoryOptions & { diff --git a/Live/CWX_MasterKey/server/types/utils/Watermark.d.ts b/Live/CWX_MasterKey/server/types/utils/Watermark.d.ts index 3a8cb3a..c6dc120 100644 --- a/Live/CWX_MasterKey/server/types/utils/Watermark.d.ts +++ b/Live/CWX_MasterKey/server/types/utils/Watermark.d.ts @@ -1,22 +1,39 @@ +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WatermarkLocale { - private locales; + protected locales: { + "en-US": { + description: string[]; + warning: string[]; + modding: string[]; + }; + "zh-CN": { + description: string[]; + warning: string[]; + modding: string[]; + }; + }; getLocale(): string; getDescription(): string[]; getWarning(): string[]; getModding(): string[]; } export declare class Watermark { - private logger; - private configServer; - private watermarkLocale?; - private akiConfig; + protected logger: ILogger; + protected configServer: ConfigServer; + protected watermarkLocale?: WatermarkLocale; + protected akiConfig: ICoreConfig; constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); - private text; - private versionLabel; + protected text: string[]; + protected versionLabel: string; initialize(): void; - getVersionTag(): string; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; getVersionLabel(): string; /** Set window title */ setTitle(): void; @@ -25,5 +42,5 @@ export declare class Watermark { /** Draw the watermark */ draw(): void; /** Caculate text length */ - private textLength; + protected textLength(s: string): number; } diff --git a/Live/CWX_MasterKey/server/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_MasterKey/server/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_MasterKey/server/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatch.csproj b/Live/CWX_WeatherPatcher/CWX_WeatherPatch.csproj index 1c0c0aa..018490e 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatch.csproj +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatch.csproj @@ -14,7 +14,7 @@ ..\Shared\AKI\Aki.Reflection.dll - ..\Shared\EFT\Assembly-CSharp.dll + ..\..\..\ALT-Mods\Shared\EFT\Assembly-CSharp.dll ..\Shared\BepInEx\BepInEx.dll diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/BepInEx/plugins/CWX-WeatherPatcher.dll b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/BepInEx/plugins/CWX-WeatherPatcher.dll deleted file mode 100644 index 2b7d51fd82e4b8ec9b828756cb2d0a28c57a437c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7680 zcmeHLZ*WxA6+ds^+fA~B1wsHR3JU>=3Tq${L{XFMCLx%RkX;DXwBcplUc9}>NQCzo~!KORh@IkMtM5jtIW zVdV=---VT_3B!pNY%6Q)xoBF?=PfrnCZcvRA2ssP#6U8dvoaz!cW!vKuX?bHs83Pp zp}T%^rZn0`S{0q6v=A)@C**P8xCzfFYC9^?e2E7tpNmR+kFqHLD^H(f z7Rn>gJHSXgy0Rl?m%T*w;C-o$C^ft7gaov5>ll;}(BR}{7_KtVdv z1iKdyDU$o&gXMvP=&D`6Dxe;c2pBNMV@L!HwZxDJ7?_kNArUZwC5DeQ&m#)c^+XF> zR5>l^UO+D|gQ3lcZrBE0Skc%F%fsOtD0KZQYF^5#0){j>%R^%7Geb>${J_d0x{o~N!Hg~(YLTAK>3m@rRwRI4ql#;I;I3?7)5=?Rsni7gRmr$5pLL+5V#yLP!(2FIrfbNG&!r@S3 zGZtrfPR+V;3LRVxbg{LDRfi5ka|&{Wp8OGS``ThHvDTK> z4O`gQAen#}B)F#giC)I@G~-FvHu71AC63HR-o^%K+LffO*eIOtntFEiCh+V7eU{rg zO>2yWQ39}jc+t0&Iwsy%S~>SXgy2${v#{p~^CE7C<&uv+Qij{YRXEYL8uvx)=&3+9 z7$QYw__~q`&ZCDQ9-`%eyVVfA9XPCo=zxTqB}_?pM#35iKM39inHLq-a1t6q^e$kS zPOEWf_=a*=3)8ECxEi4&NF5PrQG~vOQ5tBswl>s2V}KFb7*vB1I<7J-O38Dy2$npl zu>JuFpV!!)CxeHz23o4Ls*CA^;1`t$H9^~A+Ai^VJY5u-RWTa>=F@Y*chn7K>KXMN zwFA0YWl~Qfa8<^yhY-J z5CF$*l z6)NwLkAe|}TN|-+74q;1_Fp2XAic5wmI8+9I>7m~LBcH(c1YMO;Z6xZE1>}xLWWEP z7r}RoKL@ysbcw%7y0Vtuq~BAF4ol8cbWLaz@K?1hq$rz}JLm*m2yOy=R!acBhP8Eq zc4`dYll*DOpP;Wvr~y7pPpCbB|Agcj=-Cc!+u*~WQc&4LbxLn&1b9<$9J?t-lfdT% z3xLPfBAusI;G8E1dd|~hDnlOYJPk|Ebqed`S-e6g!Fh$&Kqg9e(>`UT57TrIdgstt z%xNM00&p3<1=vJ?1H6H5MQbZ10dJ+x1IB3*@J`830=7#%9X@1jdnK;>kU7&5KkP&1 zJT37PK4i{0iC>iPkL1u1Bn7rJDq*{XPb-t)P=MiH3C~G5tukj74Pr-PK_CLB0iV_Q z*8LhWzEflP9{4Pwq6PrD27zmUd`qhV9s&%Y)&Z{t44}>d9tPB=Im=@~mdhVB+^EVF zVdX596kAa#cD0Dl{+Z+j(HplRzpTYNo?V=Zs-C#1JI;npTei^Fek)Tn#qHG9ouZtR zwrtZFBS*NSU3q=X6d8#NAKyA`D1*vZ34BPG%!+Z3{#(q7UH{4=I5cvHtSI-LSxKE!HRNTss8`&c4pP|H?n`90NQ{OK! z=h8t2Z7kZfTWJ{7-Sotu<+$U<{tCA=K~}5hrz#D8#3bJ}#taj|skH9X&7z=f!pKgz z-MVR7++vpPX`Bk&F2Q#C!*EOKKo7noR4i zEBIbW@uK5exgK2lbhF#a5>_V-3*DU%whSYc7rE3;-h%P)nW{YAEPXz6c+aS>)MNCC zeZou%*M$j=$MSN4hqDK}js4}$>#I8pJC-p`e};1B@ivt^Pa@JqgJu!_Azr|8ZTs|0 zca^aPok%tyx=kH#4Ko5o+mi!3WXhHkEhkRtqYA~zaAxK#2d9!uX<+OgELtkB zJa3)T=%_86qUln1F`q`JvE9;|C%GK_rBNZU)5t1}_U6UC$eGwc6+fmXiusJNu}jBv zZ*!5fG9mH~3-UG)Hg5y0{1UTl&`d^&qGbbkNAJP?DMx~mlDZr4P?eNcB-SupU~8S4l^X;nD#*6=cMB|t(=hF!^?(8`JSPFa4N5%iQ&F@>p|utFv=&*F zo=>ua{l_y(VuTK9M;8tGwnQtwr1RP7dC_~mKX6i~M<1=vt|Kj~D79*olpv4=3z&>Z zbW13zDv?M;t5F)d@S56i?}B1YG|(^=S#T&2s^@pe>BB63bs$t52nB*sX4KTE4SJwK zsG$ZOcdS6e^ilk^P{Z`YEE{0#aWsnB=MRkRUfOo?VT@hRP4z%(H7M!g7Xu8a%x~!T z9y`6qF7IKe%~X$CTgw+YF3b5nGZk1oZ0m&`7S4sVDDX*^n&7iqfn1Hka{UTj9ox~B zDj%ln`~%@Od_ve9+Xy9*#&RRBCIwTU+JS?&k$XkUEm0}GM4^VuWH$;c6!gvvs>jG1 zW3Bi+!Cy4MmjrH>Y!1xwN}EE9(^f79Wu+u2_qebxqd(|t^ZPdb@SU@y^bZC=A3?p? zhRWZ8{la7LJro~!D1&d88GK8sF8uAIx(p=~$;pR%*Z;En%$-M1{q@m*{pOALSV#Pp zkzEch86#<1H?kv+ypWC9qF^~AushMUn;+|uI-QX|W1nDZR+1mF#_k!Bjv2`dw{7!A z*<;p`R>+J|a$Cp7n>LYe#@#{R3`}*adwkx8Q$gp;N8PhcKfrWKxXNgWVTCYYMVjv*A4l3d3pvLtC4+%m|wzYIsSIMrybvk zs$Mu&s|XzSd=h(@^T`mfUhL@|pgE&(Hstc6_V<7DJ2AiGa49|Skd*h%;;sIs5Pjp&mqVWAF{Ush@8n?pSCSK1Zim!U8aIJiIFy$56lBgW*?Xn>T97`J zvPX8yOzc$6dn0mhB?t5POCZml<8#i&Q-`lAGr5v+V>k^={J1nDh6+v&fwP7+v4;xq z4SP6?v%rN+6m_>8cfjYf_gT8+2d4N8zA`^nkMG505PJDsEy9;>)oiXzABIJYk(hCY zRqL7U&5AFHZkB%UK=d5gox>{OvzJdi_G%>pl|Fn9eo6`q;V+jLtCG*B#IpaJ@jvju Fe*oWdP^SO@ diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/src/mod.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/src/mod.ts deleted file mode 100644 index 8a3bdce..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/src/mod.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; - -class CWX_MasterKey implements IMod -{ - private pkg; - - public load(container: DependencyContainer): void - { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); - this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); - } - - public delayedLoad(container: DependencyContainer): void - { return } -} - -module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/Utils.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/Utils.d.ts deleted file mode 100644 index e69de29..0000000 diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/MatchCallbacks.d.ts deleted file mode 100644 index 63d38d9..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/MatchCallbacks.d.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { MatchController } from "../controllers/MatchController"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HttpResponseUtil } from "../utils/HttpResponseUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -export declare class MatchCallbacks { - private httpResponse; - private jsonUtil; - private matchController; - private databaseServer; - constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; - getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; - getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; - deleteGroup(url: string, info: any, sessionID: string): INullResponseData; - startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; - endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/BotController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/BotController.d.ts deleted file mode 100644 index 8ecb97f..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/BotController.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { BotGenerator } from "../generators/BotGenerator"; -import { BotHelper } from "../helpers/BotHelper"; -import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { IBotCore } from "../models/eft/common/tables/IBotCore"; -import { Difficulty } from "../models/eft/common/tables/IBotType"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class BotController { - private databaseServer; - private botGenerator; - private botHelper; - private configServer; - private botConfig; - constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); - getBotLimit(type: string): number; - getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - getBotCap(): number; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/GameController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/GameController.d.ts deleted file mode 100644 index bb2a55a..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/GameController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { HttpServerHelper } from "../helpers/HttpServerHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; -import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { Watermark } from "../utils/Watermark"; -export declare class GameController { - private logger; - private watermark; - private httpServerHelper; - private profileHelper; - private configServer; - private httpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); - gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - private addMissingBonusesProperty; - private addMissingRepeatableQuestsProperty; - private addMissingWeaponRepairSkill; - private addMissingAkiVersionTagToProfile; - private addMissingArmorRepairSkill; - private fixNullTraderSalesSums; - private removeDanglingConditionCounters; - private removeDanglingBackendCounters; - getGameConfig(sessionID: string): IGameConfigResponse; - getServer(): any[]; - private getActiveRepeatableQuests; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InraidController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InraidController.d.ts deleted file mode 100644 index c1cd6f5..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InraidController.d.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; -import { HealthHelper } from "../helpers/HealthHelper"; -import { InRaidHelper } from "../helpers/InRaidHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { InsuranceService } from "../services/InsuranceService"; -import { JsonUtil } from "../utils/JsonUtil"; -export declare class InraidController { - private saveServer; - private jsonUtil; - private databaseServer; - private questHelper; - private itemHelper; - private extendedProfileHelper; - private healthHelper; - private traderHelper; - private insuranceService; - private inRaidHelper; - private configServer; - private inraidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); - addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; - saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/MatchController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/MatchController.d.ts deleted file mode 100644 index 84abbe3..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/MatchController.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { TraderHelper } from "../helpers/TraderHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; -import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; -import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { MatchLocationService } from "../services/MatchLocationService"; -export declare class MatchController { - private saveServer; - private profileHelper; - private matchLocationService; - private traderHelper; - private configServer; - private matchConfig; - private inraidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); - getEnabled(): boolean; - getProfile(info: IGetProfileRequestData): IPmcData[]; - private getMatch; - createGroup(sessionID: string, info: any): any; - deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; - startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; - endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/QuestController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/QuestController.d.ts deleted file mode 100644 index d8caee5..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/QuestController.d.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { DialogueHelper } from "../helpers/DialogueHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { ProfileHelper } from "../helpers/ProfileHelper"; -import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; -import { QuestHelper } from "../helpers/QuestHelper"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { PlayerService } from "../services/PlayerService"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class QuestController { - private logger; - private timeUtil; - private itemEventRouter; - private databaseServer; - private itemHelper; - private dialogueHelper; - private profileHelper; - private questHelper; - private questConditionHelper; - private playerService; - private configServer; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); - getClientQuests(sessionID: string): IQuest[]; - acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; - acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; - completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; - handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotGenerator.d.ts deleted file mode 100644 index e2565b7..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotGenerator.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { BotHelper } from "../helpers/BotHelper"; -import { GameEventHelper } from "../helpers/GameEventHelper"; -import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotInventoryGenerator } from "./BotInventoryGenerator"; -export declare class BotGenerator { - private logger; - private hashUtil; - private randomUtil; - private jsonUtil; - private databaseServer; - private botInventoryGenerator; - private botHelper; - private gameEventHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - private generateBot; - private generateRandomLevel; - /** Converts health object to the required format */ - private generateHealth; - private generateSkills; - private getPmcRole; - private removeChristmasItemsFromBotInventory; - private generateId; - private generateInventoryID; - private getPMCDifficulty; - private generateDogtag; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotLootGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotLootGenerator.d.ts deleted file mode 100644 index 1d8c8e1..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotLootGenerator.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotLootGenerator { - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private botGeneratorHelper; - private pmcLootGenerator; - private configServer; - private botConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; - private getRandomisedCount; - private addLootFromPool; - /** Compares two item templates by their price to spawn chance ratio */ - private compareByValue; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotWeaponGenerator.d.ts deleted file mode 100644 index e8f91cb..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotWeaponGenerator.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotWeaponGenerator { - private logger; - private hashUtil; - private databaseServer; - private itemHelper; - private weightedRandomHelper; - private botGeneratorHelper; - private randomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - private isWeaponValid; - /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - private generateExtraMagazines; - private addBullets; - /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @returns - */ - private getCompatibleAmmo; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - private fillExistingMagazines; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/WeatherGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/WeatherGenerator.d.ts deleted file mode 100644 index b9faa3a..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/WeatherGenerator.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { ConfigServer } from "../servers/ConfigServer"; -import { IWeatherData } from "../models/eft/weather/IWeatherData"; -import { RandomUtil } from "../utils/RandomUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class WeatherGenerator { - private weightedRandomHelper; - private randomUtil; - private timeUtil; - private configServer; - private weatherConfig; - constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); - calculateTime(data: IWeatherData): IWeatherData; - generateWeather(data: IWeatherData): IWeatherData; - private getWeightedFog; - private getWeightedRain; - private getRandomFloat; - private getRandomInt; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/AssortHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/AssortHelper.d.ts deleted file mode 100644 index 33cb5c6..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/AssortHelper.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ItemHelper } from "./ItemHelper"; -import { QuestHelper } from "./QuestHelper"; -export declare class AssortHelper { - private logger; - private itemHelper; - private databaseServer; - private questHelper; - constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); - removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; - stripQuestAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; - stripLoyaltyAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotGeneratorHelper.d.ts deleted file mode 100644 index 141f71d..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotGeneratorHelper.d.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -import { ContainerHelper } from "./ContainerHelper"; -import { InventoryHelper } from "./InventoryHelper"; -import { ItemHelper } from "./ItemHelper"; -export declare class BotGeneratorHelper { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private durabilityLimitsHelper; - private itemHelper; - private inventoryHelper; - private containerHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; - /** - * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. - * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. - * Ammo is not put into the magazine directly but assigned to the magazine's slots: The "camora_xxx" slots. - * This function is a helper called by generateModsForItem for mods with parent type "CylinderMagazine" - * - * @param {object} items The items where the CylinderMagazine's camora are appended to - * @param {object} modPool modPool which should include available cartrigdes - * @param {string} parentId The CylinderMagazine's UID - * @param {object} parentTemplate The CylinderMagazine's template - */ - private fillCamora; - generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { - "upd"?: Upd; - }; - private getModTplFromItemDb; - isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. - * Returns a `boolean` indicating success. */ - addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; - private itemAllowedInContainer; -} -export declare class ExhaustableArray { - private itemPool; - private randomUtil; - private jsonUtil; - private pool; - constructor(itemPool: T[], randomUtil: RandomUtil, jsonUtil: JsonUtil); - getRandomValue(): T; - getFirstValue(): T; - hasValues(): boolean; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotHelper.d.ts deleted file mode 100644 index d901362..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/BotHelper.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class BotHelper { - private logger; - private jsonUtil; - private databaseServer; - private randomUtil; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); - getBotDifficultySettings(type: string, difficulty: string): Difficulty; - getPmcDifficultySettings(type: string, difficulty: string): Difficulty; - randomisePmcHostility(difficultySettings: Difficulty): void; - isBotPmc(botRole: string): boolean; - isBotBoss(botRole: string): boolean; - isBotFollower(botRole: string): boolean; - addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/DurabilityLimitsHelper.d.ts deleted file mode 100644 index 609bc7d..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/DurabilityLimitsHelper.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; -import { ConfigServer } from "../servers/ConfigServer"; -import { RandomUtil } from "../utils/RandomUtil"; -import { BotHelper } from "./BotHelper"; -export declare class DurabilityLimitsHelper { - private randomUtil; - private botHelper; - private configServer; - private botConfig; - constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); - getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; - getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; - getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - private generateMaxWeaponDurability; - private generateMaxPmcArmorDurability; - private getLowestMaxWeaponFromConfig; - private getHighestMaxWeaponDurabilityFromConfig; - private generateWeaponDurability; - private generateArmorDurability; - private getMinWeaponDeltaFromConfig; - private getMaxWeaponDeltaFromConfig; - private getMinArmorDeltaFromConfig; - private getMaxArmorDeltaFromConfig; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ExtendedProfileHelper.d.ts deleted file mode 100644 index 4dd7d3a..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ExtendedProfileHelper.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { BotGenerator } from "../generators/BotGenerator"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { Watermark } from "../utils/Watermark"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class ExtendedProfileHelper extends ProfileHelper { - private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); - generatePlayerScav(sessionID: string): IPmcData; - private getScavSkills; - private removeSecureContainer; - private getDefaultScavSkills; - private getScavStats; - private getScavLevel; - private getScavExperience; - private setScavCooldownTimer; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HealthHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HealthHelper.d.ts deleted file mode 100644 index bb160a3..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HealthHelper.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; -import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -export declare class HealthHelper { - private jsonUtil; - private logger; - private timeUtil; - private saveServer; - private configServer; - private healthConfig; - constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); - resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - private saveHealth; - private saveEffects; - private addEffect; - private isEmpty; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HttpServerHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HttpServerHelper.d.ts deleted file mode 100644 index 2e40814..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HttpServerHelper.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { ConfigServer } from "../servers/ConfigServer"; -export declare class HttpServerHelper { - private configServer; - private httpConfig; - private mime; - constructor(configServer: ConfigServer); - getMimeText(key: string): string; - buildUrl(): string; - getBackendUrl(): string; - getWebsocketUrl(): string; - sendTextJson(resp: any, output: any): void; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/InRaidHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/InRaidHelper.d.ts deleted file mode 100644 index e79d384..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/InRaidHelper.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { InventoryHelper } from "./InventoryHelper"; -import { PaymentHelper } from "./PaymentHelper"; -export declare class InRaidHelper { - private logger; - private saveServer; - private jsonUtil; - private databaseServer; - private inventoryHelper; - private paymentHelper; - constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - private removePlayer; - private removeMapAccessKey; - addUpdToMoneyFromRaid(items: Item[]): void; - /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims - */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; - deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; - getPlayerGear(items: Item[]): Item[]; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/QuestHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/QuestHelper.d.ts deleted file mode 100644 index 9e2dd5e..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/QuestHelper.d.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; -import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; -import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; -import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; -import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ItemEventRouter } from "../routers/ItemEventRouter"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { DialogueHelper } from "./DialogueHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -import { RagfairServerHelper } from "./RagfairServerHelper"; -import { TraderHelper } from "./TraderHelper"; -export declare class QuestHelper { - private logger; - private jsonUtil; - private timeUtil; - private hashUtil; - private itemHelper; - private itemEventRouter; - private databaseServer; - private ragfairServerHelper; - private dialogueHelper; - private profileHelper; - private paymentHelper; - private traderHelper; - private configServer; - private questConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; - /** - * returns true is the condition is satisfied - */ - evaluateLevel(pmcProfile: IPmcData, cond: AvailableForConditions): boolean; - getDeltaQuests(before: IQuest[], after: IQuest[]): IQuest[]; - rewardSkillPoints(sessionID: string, pmcData: IPmcData, output: IItemEventRouterResponse, skillName: string, progress: number): void; - getQuestLocale(questId: string): any; - /** - * Debug Routine for showing some information on the - * quest list in question. - */ - dumpQuests(quests: any, label?: any): void; - loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; - private processReward; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; - acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; - failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; - applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; - changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; - /** - * Get List of All Quests as an array - */ - questValues(): IQuest[]; - private cleanQuestList; - cleanQuestConditions(quest: IQuest): IQuest; - failQuest(pmcData: IPmcData, body: any, sessionID: string): any; - getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; - getFindItemIdForQuestItem(itemTpl: string): string; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairSortHelper.d.ts deleted file mode 100644 index e9d8069..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairSortHelper.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class RagfairSortHelper { - private databaseServer; - constructor(databaseServer: DatabaseServer); - sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; - private sortOffersByID; - private sortOffersByRating; - private sortOffersByName; - private sortOffersByPrice; - private sortOffersByExpiry; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RepairHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RepairHelper.d.ts deleted file mode 100644 index 47123e1..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RepairHelper.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { JsonUtil } from "../utils/JsonUtil"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class RepairHelper { - private logger; - private jsonUtil; - private randomUtil; - private databaseServer; - private configServer; - private repairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; - private getRandomisedArmorRepairDegredationValue; - private getRandomisedWeaponRepairDegredationValue; - isWeaponTemplate(tpl: string): boolean; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderAssortHelper.d.ts deleted file mode 100644 index d95879c..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderAssortHelper.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; -import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { FenceService } from "../services/FenceService"; -import { TraderAssortService } from "../services/TraderAssortService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { AssortHelper } from "./AssortHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderAssortHelper { - private logger; - private jsonUtil; - private databaseServer; - private profileHelper; - private assortHelper; - private ragfairAssortGenerator; - private ragfairOfferGenerator; - private traderAssortService; - private fenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); - getAssort(sessionId: string, traderId: string): ITraderAssort; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderHelper.d.ts deleted file mode 100644 index ec64d59..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TraderHelper.d.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; -import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { PlayerService } from "../services/PlayerService"; -import { HandbookHelper } from "./HandbookHelper"; -import { ItemHelper } from "./ItemHelper"; -import { PaymentHelper } from "./PaymentHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class TraderHelper { - private logger; - private databaseServer; - private saveServer; - private profileHelper; - private paymentHelper; - private itemHelper; - private handbookHelper; - private playerService; - private fenceService; - private configServer; - private traderConfig; - constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); - getTrader(traderID: string, sessionID: string): ITraderBase; - getTraderAssortsById(traderId: string): ITraderAssort; - resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; - getPurchasesData(traderID: string, sessionID: string): Record; - lvlUp(traderID: string, sessionID: string): void; - getTraderUpdateSeconds(traderId: string): number; - traderFilter(traderFilters: string[], tplToCheck: string): boolean; - getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/InitialModLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/InitialModLoader.d.ts deleted file mode 100644 index 5957d35..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/InitialModLoader.d.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { DependencyContainer } from "tsyringe"; -import { IModLoader } from "../models/spt/mod/IModLoader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ModCompilerService } from "../services/ModCompilerService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; -import { BundleLoader } from "./BundleLoader"; -export declare class InitialModLoader implements IModLoader { - private logger; - private vfs; - private jsonUtil; - private modCompilerService; - private bundleLoader; - private configServer; - private static container; - private readonly basepath; - private imported; - private onLoad; - private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); - load(container: DependencyContainer): Promise; - getBundles(local: boolean): string; - getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; - getModPath(mod: string): string; - private importClass; - private importMods; - /** - * - * @param mods Get an array of broken/invalid mods by name - * @returns Mod names array - */ - private getBrokenMods; - /** - * Get packageJson data for mods - * @param mods mods to get packageJson for - * @returns dictionary - */ - private getModsPackageData; - /** - * Does mod have "delayedLoad(" string in its entry class - * @param modFolderName folder name - * @param modToValidate package.json details - * @returns boolean - */ - private isModSpt300Compatible; - private isModCombatibleWithAki; - private executeMods; - private sortModsLoadOrder; - private addMod; - private areModDependenciesFulfilled; - private isModCompatible; - private validMod; - private getLoadOrderRecursive; - private getLoadOrder; - getContainer(): DependencyContainer; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/MemberCategory.d.ts deleted file mode 100644 index 3bd9a21..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/MemberCategory.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -export declare enum MemberCategory { - Default = 0, - Developer = 1, - UniqueId = 2, - Trader = 4, - Group = 8, - System = 16, - ChatModerator = 32, - ChatModeratorWithPermanentBan = 64, - UnitTest = 128, - Sherpa = 256, - Emissary = 512 -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotBase.d.ts deleted file mode 100644 index 677fd49..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotBase.d.ts +++ /dev/null @@ -1,101 +0,0 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; -export interface IBotBase { - _id: string; - aid: string; - savage: any; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: any; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: any[]; - Hideout: Hideout; - Bonuses: Bonus[]; -} -export interface Info { - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: number; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - NeedWipeOptions: any[]; - lastCompletedWipe: any; - BannedState: boolean; - BannedUntil: number; - IsStreamerModeAvailable: boolean; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: any[]; - Mastering: any[]; - Points: number; -} -export interface Stats { - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; -} -export interface SessionCounters { - Items: any[]; -} -export interface OverallCounters { - Items: any[]; -} -export interface ConditionCounters { - Counters: any[]; -} -export interface Hideout { - Production: Production; - Areas: Area[]; -} -export interface Production { -} -export interface Area { - type: number; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: any[]; - lastRecipe: any; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ITemplateItem.d.ts deleted file mode 100644 index c2ba762..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ITemplateItem.d.ts +++ /dev/null @@ -1,401 +0,0 @@ -export interface ITemplateItem { - _id: string; - _name: string; - _parent: string; - _type: string; - _props: Props; - _proto: string; -} -export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; - Rarity?: string; - SpawnChance?: number; - CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; - Resource?: number; - CoolFactor?: number; - foodUseTime?: number; - foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; -} -export interface Prefab { - path: string; - rcid: string; -} -export interface Grid { - _name: string; - _id: string; - _parent: string; - _props: GridProps; - _proto: string; -} -export interface GridProps { - filters: GridFilter[]; - cellsH: number; - cellsV: number; - minCount: number; - maxCount: number; - maxWeight: number; - isSortingTable: boolean; -} -export interface GridFilter { - Filter: string[]; - ExcludedFilter: string[]; -} -export interface Slot { - _name: string; - _id: string; - _parent: string; - _props: SlotProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface SlotProps { - filters: Filter[]; -} -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { - Filter: string[]; -} -export interface Xyz { - x: number; - y: number; - z: number; -} -export interface StackSlot { - _name?: string; - _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; - _max_count: number; - _props?: StackSlotProps; - _proto?: string; - upd: any; -} -export interface StackSlotProps { - filters: Filter[]; -} -export interface EffectsHealth { - Hydration: Hydration; -} -export interface Hydration { - value: number; -} -export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; -} -export interface Pain { - delay: number; - duration: number; - fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; -} -export interface Color { - r: number; - g: number; - b: number; - a: number; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/HideoutAreasEnum.d.ts deleted file mode 100644 index 10f851b..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/HideoutAreasEnum.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export declare enum HideoutAreasEnum { - NOTSET = -1, - VENTS = 0, - SECURITY = 1, - LAVATORY = 2, - STASH = 3, - GENERATOR = 4, - HEATING = 5, - WATER_COLLECTOR = 6, - MEDSTATION = 7, - NUTRITION_UNIT = 8, - REST_SPACE = 9, - WORKBENCH = 10, - INTEL_CENTER = 11, - SHOOTING_RANGE = 12, - LIBRARY = 13, - SCAV_CASE = 14, - ILLUMINATION = 15, - PLACE_OF_FAME = 16, - AIR_FILTERING = 17, - SOLAR_POWER = 18, - BOOZE_GENERATOR = 19, - BITCOIN_FARM = 20, - CHRISTMAS_TREE = 21 -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/MemberCategory.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/MemberCategory.d.ts deleted file mode 100644 index 3bd9a21..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/MemberCategory.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -export declare enum MemberCategory { - Default = 0, - Developer = 1, - UniqueId = 2, - Trader = 4, - Group = 8, - System = 16, - ChatModerator = 32, - ChatModeratorWithPermanentBan = 64, - UnitTest = 128, - Sherpa = 256, - Emissary = 512 -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/external/mod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/external/mod.d.ts deleted file mode 100644 index ecef460..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/external/mod.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { DependencyContainer } from "./tsyringe"; -export interface IMod { - load: (container: DependencyContainer) => void; - delayedLoad: (container: DependencyContainer) => void; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHideoutConfig.d.ts deleted file mode 100644 index 4658fa6..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHideoutConfig.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { IBaseConfig } from "./IBaseConfig"; -export interface IHideoutConfig extends IBaseConfig { - kind: "aki-hideout"; - runIntervalSeconds: number; - scavCase: ScavCase; - fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/helpers/Traders.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/helpers/Traders.d.ts deleted file mode 100644 index e935d29..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/helpers/Traders.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export declare const enum Traders { - PRAPOR = "54cb50c76803fa8b248b4571", - THERAPIST = "54cb57776803fa99248b456e", - FENCE = "579dc571d53a0658a154fbec", - SKIER = "58330581ace78e27b8b10cee", - PEACEKEEPER = "5935c25fb3acc3127c3d8cd9", - MECHANIC = "5a7c2eca46aef81a7ca2145d", - RAGMAN = "5ac3b934156ae10c4430e83c", - JAEGER = "5c0647fdd443bc2504c2d371" -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/HttpRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/HttpRouter.d.ts deleted file mode 100644 index 44edc0b..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/HttpRouter.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -/// -import { IncomingMessage } from "http"; -import { DynamicRouter, StaticRouter } from "../di/Router"; -export declare class HttpRouter { - private staticRouters; - private dynamicRoutes; - constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); - private groupBy; - getResponse(req: IncomingMessage, info: any, sessionID: string): string; - private handleRoute; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/MatchLocationService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/MatchLocationService.d.ts deleted file mode 100644 index f7b7d3b..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/MatchLocationService.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { TimeUtil } from "../utils/TimeUtil"; -export declare class MatchLocationService { - private timeUtil; - private locations; - constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; - deleteGroup(info: any): void; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/ModCompilerService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/ModCompilerService.d.ts deleted file mode 100644 index cf7cc21..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/ModCompilerService.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ILogger } from "../models/spt/utils/ILogger"; -import { VFS } from "../utils/VFS"; -import { HashCacheService } from "./HashCacheService"; -export declare class ModCompilerService { - private logger; - private hashCacheService; - private vfs; - constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); - compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; - private compile; - private buildDepth; - private calculateDepth; - private areFilesReady; - private delay; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairCategoriesService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairCategoriesService.d.ts deleted file mode 100644 index fb9efa2..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairCategoriesService.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; -export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - private categories; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairLinkedItemService.d.ts deleted file mode 100644 index 3dbcf6f..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairLinkedItemService.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { DatabaseServer } from "../servers/DatabaseServer"; -export declare class RagfairLinkedItemService { - private databaseServer; - private linkedItemsCache; - constructor(databaseServer: DatabaseServer); - getLinkedItems(linkedSearchId: string): Iterable; - private buildLinkedItemTable; - private getFilters; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairPriceService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairPriceService.d.ts deleted file mode 100644 index 7cdf854..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairPriceService.d.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { HandbookHelper } from "../helpers/HandbookHelper"; -import { ItemHelper } from "../helpers/ItemHelper"; -import { PresetHelper } from "../helpers/PresetHelper"; -import { Item } from "../models/eft/common/tables/IItem"; -import { IBarterScheme } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { RandomUtil } from "../utils/RandomUtil"; -export declare class RagfairPriceService { - private handbookHelper; - private databaseServer; - private logger; - private itemHelper; - private presetHelper; - private randomUtil; - private configServer; - private ragfairConfig; - private prices; - constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); - generateStaticPrices(): void; - generateDynamicPrices(): void; - hasDynamicPrices(): boolean; - getDynamicPrice(itemTpl: string): number; - getAllFleaPrices(): Record; - getFleaPriceForItem(tplId: string): number; - getBarterPrice(barterScheme: IBarterScheme[]): number; - getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; - getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Logger.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Logger.d.ts deleted file mode 100644 index 9d5b32a..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Logger.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -/// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; -import fs from "fs"; -export declare class WinstonLogger implements ILogger { - private asyncQueue; - private uuidGenerator; - private showDebugInConsole; - private folderPath; - private file; - private filePath; - private logLevels; - private logger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; - constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); - writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; - error(data: string | Record): Promise; - warning(data: string | Record): Promise; - success(data: string | Record): Promise; - info(data: string | Record): Promise; - debug(data: string | Record, onlyShowInConsole?: boolean): Promise; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/TimeUtil.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/TimeUtil.d.ts deleted file mode 100644 index 9733be9..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/TimeUtil.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export declare class TimeUtil { - static readonly oneHourAsSeconds = 3600; - formatTime(date: Date): string; - formatDate(date: Date): string; - getDate(): string; - getTime(): string; - getTimestamp(): number; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Watermark.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Watermark.d.ts deleted file mode 100644 index 3a8cb3a..0000000 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/Watermark.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -export declare class WatermarkLocale { - private locales; - getLocale(): string; - getDescription(): string[]; - getWarning(): string[]; - getModding(): string[]; -} -export declare class Watermark { - private logger; - private configServer; - private watermarkLocale?; - private akiConfig; - constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); - private text; - private versionLabel; - initialize(): void; - getVersionTag(): string; - getVersionLabel(): string; - /** Set window title */ - setTitle(): void; - /** Reset console cursor to top */ - resetCursor(): void; - /** Draw the watermark */ - draw(): void; - /** Caculate text length */ - private textLength; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/BepInEx/plugins/CWX-WeatherPatcher.dll b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/BepInEx/plugins/CWX-WeatherPatcher.dll new file mode 100644 index 0000000000000000000000000000000000000000..02194002d2f0425f12ed28626862a170d2dcf55c GIT binary patch literal 7168 zcmeHLeQX@n5ud%?J71jSh@CHJDA~jTOh~Ry96|%3@yGcR6Mx~m#A#}<_wJtUP4;dt zyL%xHP2`9#wUnx~K!t=_D5+XnBtF|xqyj|84c-n@D9X6DVlz5c!5A(ePSa|AzS2gt1e}=9eX|`;9lZmcXpzJtzTM0S#E515@qL(eHN_~#p}l7pm)^KNlzT|K>vO*0LJ8A1G_=VrW1`P z9oNZ&lD2gK;Xo}zuWKE!KIsU{h9KKYWF$oB4EH2pCJ)2)Q}+&Ft90KLLy*9Lq>qK!lXu8OSHI6rAuKJ zbT`pkD}b~jx{VI#^2#NxO~4zkrr6rm)OrbL1q^9zKJQ#OKA8JOp1Y&#C zflOmf!|b(@oWcC7cz$bb{^GU>-4eP^s+xJ}2*evBLzf*{Dxbc3#1T9nUtWh_T!&*9 zRT;#yieu|_rp@sS771*-VUAz+VsFciz=Ksq*nOR%KamSdW388gOD^0QqOdPSF(X71 zRaC|%Letnc!rVkhS3*N$Y)Pw*=lq6s6BN5`70_ii_S*;oi53!4_O>-(EQl|+FX!<% zq~NtHfHR6%Tv~U=zic_l3KR! z>P_K!9Q03-z%5;todeA+0&7Q>{z#d}#3xESpLvK7ye8`k&IKV3#N)7(;5>QcS%$|N z(LairmN*(HOlW;WNtO=tY!~mpN@S-NqpXBY5+)`5o`h!<9z7Xt z0Q|nfdS;*@My~-j(ouCGG*lqdNKZr-stFpv@lMcT=uc1%u$gr2qi8d&15D80wO2Io zRfgN7IR83 zWvkDsozTiLTSPxlpVXK_H39X9fI@u$^=d#Zm0GURp44uJB#t7+z8Q?Iz}R8h4EQzL z0{A6~_el5v;E)b+x+{Kn^Z-Wp1k?l33MeC>Zq^PXQf5HengYrRsF&yfsdPA?PEZBZ z?E#h04xsqo6Hv>w3aI-7>M^VrrH2FRmsl@KKlZ7MRYWL8Pf6-kdWVjJdRtQW(LbZN zgE})y@~^Wbm#iYR`{;f3Zb-IB>Mp6Xf!0aN*V#bXKr$ZtHZ{e z)d!Hv4f1&VI_J?MNgbn0l^AlnPf`z(7P}qPsacZmO3Gh-9%+0qq@52#a;2nvo&HJq zM}+g_(;y!Yg-#cq1v<-Sr z(q5GzuX2)FBqyP4re8~|PLTu7DLNb3Ogb`ND60aPr+rG2=F`uygT?e5;0pR3U<+#rU^{gQJ0yHW*$)my7>-N$vV=1#b5_$foIivgzJCnR)qVo_Ix)UNWB3C2ETN)D z0J%qjYk+)XY5*PsjG)g09tVt|&j;QJsLgO?R-q|u52J1crAxA=2(M8zwxZUy){6w} zZ%JMhvvD&C+DFLRxvjsZYHPn;s954F)RWFq(aqbAW#-5g-dIn`$XTKwaS`BKN6b>; zEBnXBx{UmOyt~q-unM$w*f2}ya#=QIIwJ3x_IZZ8ExS@E3D-S$ChHqEN(H-k-tp~5 zQH;RQ0!_kBUPc-zk?q3k7v7XzAYfU;fkZ%0*poeMkn0(xyrAAvfQ*fqA<7#1jmeVf zRSJSSZ#DJ{^4&ngm6B%`MRvL@cEB=ANd2JFj$I5myD)LOr!;AnM6%mZdblg(Dj4!-u;^S~otD~A zr|XJh&YI4eUi}Q;GiiK>iCb-F|GDyMEWcYgE<$(iU~g%{c8Uha)v!KQs@pD2n3EOQ zKTCbAgeV>)3t#hVv_HfInzRL zYNH1Yt0HKJFej(Hv|(BH!~}KjHd~k?de{%^l8|yVA`EXzI5KQh&0MLQ`~>mw*{Xcr9DMg4tHlZBHkSXQt@d7Sv{$>SuEE>Z3+4OtcBG;zYp zTn^~j?y7pJ>cHyhtQLXlF|Bd@v%m>OVIc~K}j+4xLwnJTF$~b7+6(`(B%0wZ6>&(0xvcd!iPiICr2hF^2 zgENVB5m1m_C?g=!mVwLttmx2ZE-y86d~<7L^2_Q~QYr`s z=Q3yb$BCqsDN%A+kPm`z_#hznLuS>W*^H2)6@yg5oy4Fb3CfTM%mEZsAevvJX|XFM zJendKV`J2Y7jP$)@n_*CmB9=TeabNtgoj;pd^uxE0=AR}_SCqJ_ zlM)5e)Wl>$qFZ9Rsw5H#twCw-iILKLpsCWJN1CS-O-CZJ1(8@h5{oo6sLe*CS*WpQ z1F!H%^UN{)Yq92;J6ThNv3oHn;=ejPy8Dt%r@w)v7VyvlAaPBn<{rG}aScj~s%Mxv!=h{>scpv;?kKEJ_3Y-ydK_?fw9h;!n3_|HM(y0bQR$x1 zlJGWNyHU=VQ*FzI9A$QNZoFnQ1@=4`+JilhZ+v3+tG8sL*Y-cY>5s>;uduzyxE@lo zpW$zGK6eZ^kCbKga~YTSIU!_;=h3s5L&sd#%vSc96n`-jfAh}F7ULu(K9T3}S&n}@ z+|z;IAnGo;Yt&8P?#8(t1MHz;V7>UIbpUiPVA}uHm42iB?caR!<$E=^@VQM={yo_r z2^e^!&=qLqN|HuJuuvO%Q5PmqIk>Hnx9coM4RBqI8?tiPp#1ifb_bLyvK~1>O*vQ7 zxRhzbzWu*Vlw%)Y&Bd78jn#^%PQ1o6cH~z$*56Gdv#>8U0bkX2 zav|#`QL8Qdace~k73zboNvVlFREBSON0ZpM2N@lGw_JBH;B!UibwfWe#qWv>^JD$` zeq4s2m){^2_|mJ}&4ua1vhWY8HR4sTXRbGEzQk{P((j%8{Rz8^$P#{I>DVWGwHATe b9FD=~q`?sWZS1YOTJ$-w?Ehx`4?OT6kDBq> literal 0 HcmV?d00001 diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/LICENSE.txt b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/LICENSE.txt similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/LICENSE.txt rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/LICENSE.txt diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/package.json b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/package.json similarity index 95% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/package.json rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/package.json index bca8c16..56d3d94 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/package.json +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/package.json @@ -1,10 +1,10 @@ { "name": "WeatherPatcher", "author": "CWX", - "version": "2.3.0", + "version": "2.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.0.0", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/src/mod.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/src/mod.ts new file mode 100644 index 0000000..a4178fa --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/src/mod.ts @@ -0,0 +1,14 @@ +import { DependencyContainer } from "tsyringe"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; + +class CWX_WeatherPatcher implements IPreAkiLoadMod +{ + private pkg; + + public preAkiLoad(container: DependencyContainer): void + { + this.pkg = require("../package.json") + } +} + +module.exports = { mod: new CWX_WeatherPatcher() } \ No newline at end of file diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/Program.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/Program.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/Program.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/Program.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/TYPES.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/TYPES.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/TYPES.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/TYPES.d.ts diff --git a/Live/CWX_DeSharpener/server/types/Utils.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/Utils.d.ts similarity index 100% rename from Live/CWX_DeSharpener/server/types/Utils.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/Utils.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/BotCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/BotCallbacks.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/BotCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/BotCallbacks.d.ts index 9602975..2db60dc 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/BotCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/BotCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { - private botController; - private httpResponse; + protected botController: BotController; + protected httpResponse: HttpResponseUtil; constructor(botController: BotController, httpResponse: HttpResponseUtil); getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string; getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/BundleCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/BundleCallbacks.d.ts similarity index 69% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/BundleCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/BundleCallbacks.d.ts index b007ab8..b28abe1 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/BundleCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/BundleCallbacks.d.ts @@ -1,15 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BundleCallbacks { - private logger; - private httpResponse; - private httpServer; - private bundleLoader; - private configServer; - private httpConfig; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); sendBundle(sessionID: string, req: any, resp: any, body: any): any; getBundles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/CustomizationCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/CustomizationCallbacks.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/CustomizationCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/CustomizationCallbacks.d.ts index 918b8b6..3bab8c0 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/CustomizationCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/CustomizationCallbacks.d.ts @@ -9,9 +9,9 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { - private customizationController; - private saveServer; - private httpResponse; + protected customizationController: CustomizationController; + protected saveServer: SaveServer; + protected httpResponse: HttpResponseUtil; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/DataCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/DataCallbacks.d.ts similarity index 96% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/DataCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/DataCallbacks.d.ts index 018420e..cfb1c16 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/DataCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/DataCallbacks.d.ts @@ -12,8 +12,8 @@ import { ISettingsBase } from "../models/spt/server/ISettingsBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { - private httpResponse; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/DialogueCallbacks.d.ts similarity index 95% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/DialogueCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/DialogueCallbacks.d.ts index 3b6fbd1..634f90b 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/DialogueCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/DialogueCallbacks.d.ts @@ -21,10 +21,10 @@ import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { - private hashUtil; - private timeUtil; - private httpResponse; - private dialogueController; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected dialogueController: DialogueController; constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/GameCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/GameCallbacks.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/GameCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/GameCallbacks.d.ts index 44a30ea..06da1b5 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/GameCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/GameCallbacks.d.ts @@ -2,15 +2,16 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { - private httpResponse; - private watermark; - private gameController; + protected httpResponse: HttpResponseUtil; + protected watermark: Watermark; + protected gameController: GameController; constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HandbookCallbacks.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HandbookCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HandbookCallbacks.d.ts index 0db5fec..891e375 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HandbookCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HandbookCallbacks.d.ts @@ -1,7 +1,7 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; export declare class HandbookCallbacks extends OnLoad { - private handbookController; + protected handbookController: HandbookController; constructor(handbookController: HandbookController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HealthCallbacks.d.ts similarity index 77% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HealthCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HealthCallbacks.d.ts index a50dd42..8672be7 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HealthCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HealthCallbacks.d.ts @@ -9,10 +9,17 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { - private httpResponse; - private profileHelper; - private healthController; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HideoutCallbacks.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HideoutCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HideoutCallbacks.d.ts index 3698176..99ab4c9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/HideoutCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HideoutCallbacks.d.ts @@ -11,11 +11,12 @@ import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutTog import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HideoutCallbacks extends OnUpdate { - private hideoutController; - private configServer; - private hideoutConfig; + protected hideoutController: HideoutController; + protected configServer: ConfigServer; + protected hideoutConfig: IHideoutConfig; constructor(hideoutController: HideoutController, // TODO: delay needed configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HttpCallbacks.d.ts similarity index 87% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HttpCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HttpCallbacks.d.ts index 9fe387d..94c97bd 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/HttpCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/HttpCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoad } from "../di/OnLoad"; import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { - private httpServer; + protected httpServer: IHttpServer; constructor(httpServer: IHttpServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InraidCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InraidCallbacks.d.ts similarity index 76% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InraidCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InraidCallbacks.d.ts index 2d53227..05bcce4 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InraidCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InraidCallbacks.d.ts @@ -3,14 +3,16 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { - private inraidController; - private httpResponse; - private configServer; - private airdropConfig; - private inraidConfig; + protected inraidController: InraidController; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected airdropConfig: IAirdropConfig; + protected inraidConfig: IInRaidConfig; constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InsuranceCallbacks.d.ts similarity index 70% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InsuranceCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InsuranceCallbacks.d.ts index 79feb67..6819960 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/InsuranceCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InsuranceCallbacks.d.ts @@ -3,20 +3,22 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { InsuranceService } from "../services/InsuranceService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { - private insuranceController; - private insuranceService; - private httpResponse; - private configServer; - private insuranceConfig; + protected insuranceController: InsuranceController; + protected insuranceService: InsuranceService; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InventoryCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InventoryCallbacks.d.ts similarity index 98% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InventoryCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InventoryCallbacks.d.ts index 9795aa0..9ab1486 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/InventoryCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/InventoryCallbacks.d.ts @@ -18,7 +18,7 @@ import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryT import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { - private inventoryController; + protected inventoryController: InventoryController; constructor(inventoryController: InventoryController); moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ItemEventCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ItemEventCallbacks.d.ts similarity index 87% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ItemEventCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ItemEventCallbacks.d.ts index 74e79c4..f4f04f9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/ItemEventCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ItemEventCallbacks.d.ts @@ -4,8 +4,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { - private httpResponse; - private itemEventRouter; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/LauncherCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/LauncherCallbacks.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/LauncherCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/LauncherCallbacks.d.ts index 4bd5e2c..c022325 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/LauncherCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/LauncherCallbacks.d.ts @@ -8,10 +8,10 @@ import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { - private httpResponse; - private launcherController; - private saveServer; - private watermark; + protected httpResponse: HttpResponseUtil; + protected launcherController: LauncherController; + protected saveServer: SaveServer; + protected watermark: Watermark; constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/LocationCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/LocationCallbacks.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/LocationCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/LocationCallbacks.d.ts index 5ecab74..cc69369 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/LocationCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/LocationCallbacks.d.ts @@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { - private httpResponse; - private locationController; + protected httpResponse: HttpResponseUtil; + protected locationController: LocationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/MatchCallbacks.d.ts new file mode 100644 index 0000000..2a92ef5 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/MatchCallbacks.d.ts @@ -0,0 +1,42 @@ +import { MatchController } from "../controllers/MatchController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HttpResponseUtil } from "../utils/HttpResponseUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +export declare class MatchCallbacks { + protected httpResponse: HttpResponseUtil; + protected jsonUtil: JsonUtil; + protected matchController: MatchController; + protected databaseServer: DatabaseServer; + constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; + acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; + cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; + getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; + getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; + deleteGroup(url: string, info: any, sessionID: string): INullResponseData; + startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; + endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ModCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ModCallbacks.d.ts similarity index 58% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ModCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ModCallbacks.d.ts index 2011f0e..58342dc 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ModCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ModCallbacks.d.ts @@ -1,17 +1,18 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { - private logger; - private httpResponse; - private httpServer; - private modLoader; - private configServer; - private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected postAkiModLoader: PostAkiModLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/NoteCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/NoteCallbacks.d.ts similarity index 93% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/NoteCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/NoteCallbacks.d.ts index fd7c5ca..d39d400 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/NoteCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/NoteCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { - private noteController; + protected noteController: NoteController; constructor(noteController: NoteController); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/NotifierCallbacks.d.ts similarity index 90% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/NotifierCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/NotifierCallbacks.d.ts index 416e6a3..c42058f 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/NotifierCallbacks.d.ts @@ -6,9 +6,9 @@ import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { - private httpServerHelper; - private httpResponse; - private notifierController; + protected httpServerHelper: HttpServerHelper; + protected httpResponse: HttpResponseUtil; + protected notifierController: NotifierController; constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/PresetBuildCallbacks.d.ts similarity index 75% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/PresetBuildCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/PresetBuildCallbacks.d.ts index 639c33f..541715a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; @@ -6,10 +7,10 @@ import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPreset import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { - private httpResponse; - private presetBuildController; + protected httpResponse: HttpResponseUtil; + protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/PresetCallbacks.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/PresetCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/PresetCallbacks.d.ts index f62afd6..4553f8f 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/PresetCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/PresetCallbacks.d.ts @@ -1,7 +1,7 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; export declare class PresetCallbacks extends OnLoad { - private presetController; + protected presetController: PresetController; constructor(presetController: PresetController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ProfileCallbacks.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ProfileCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ProfileCallbacks.d.ts index efce47d..6a86fc0 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/ProfileCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -12,9 +13,9 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { - private httpResponse; - private timeUtil; - private profileController; + protected httpResponse: HttpResponseUtil; + protected timeUtil: TimeUtil; + protected profileController: ProfileController; constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/QuestCallbacks.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/QuestCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/QuestCallbacks.d.ts index f742096..559c29e 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/QuestCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/QuestCallbacks.d.ts @@ -13,9 +13,9 @@ import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestD import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { - private httpResponse; - private questController; - private repeatableQuestController; + protected httpResponse: HttpResponseUtil; + protected questController: QuestController; + protected repeatableQuestController: RepeatableQuestController; constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/RagfairCallbacks.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/RagfairCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/RagfairCallbacks.d.ts index 152475f..3a405c9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/RagfairCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/RagfairCallbacks.d.ts @@ -3,34 +3,39 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairCallbacks extends OnLoadOnUpdate { - private httpResponse; - private logger; - private jsonUtil; - private ragfairServer; - private ragfairController; - private configServer; - private ragfairConfig; + protected httpResponse: HttpResponseUtil; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected ragfairServer: RagfairServer; + protected ragfairController: RagfairController; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/RepairCallbacks.d.ts similarity index 93% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/RepairCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/RepairCallbacks.d.ts index f63ec18..63733fa 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/RepairCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/RepairCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; export declare class RepairCallbacks { - private repairController; + protected repairController: RepairController; constructor(repairController: RepairController); traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/SaveCallbacks.d.ts similarity index 88% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/SaveCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/SaveCallbacks.d.ts index b7219a0..bbb6e53 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/SaveCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/SaveCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { - private saveServer; + protected saveServer: SaveServer; constructor(saveServer: SaveServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/TradeCallbacks.d.ts similarity index 94% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/TradeCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/TradeCallbacks.d.ts index 9928951..272ae46 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/TradeCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/TradeCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { - private tradeController; + protected tradeController: TradeController; constructor(tradeController: TradeController); processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/TraderCallbacks.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/TraderCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/TraderCallbacks.d.ts index 2a8af7f..128d9b2 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/TraderCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/TraderCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { - private httpResponse; - private traderController; + protected httpResponse: HttpResponseUtil; + protected traderController: TraderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/WeatherCallbacks.d.ts similarity index 84% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/WeatherCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/WeatherCallbacks.d.ts index e40ab3e..ae784c8 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/callbacks/WeatherCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/WeatherCallbacks.d.ts @@ -3,8 +3,8 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { - private httpResponse; - private weatherController; + protected httpResponse: HttpResponseUtil; + protected weatherController: WeatherController; constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/WishlistCallbacks.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/WishlistCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/WishlistCallbacks.d.ts index e0249fd..c2cc2a8 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/callbacks/WishlistCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/callbacks/WishlistCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; export declare class WishlistCallbacks { - private wishlistController; + protected wishlistController: WishlistController; constructor(wishlistController: WishlistController); addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ApplicationContext.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariable.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariableType.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/BotController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/BotController.d.ts new file mode 100644 index 0000000..5e6f05d --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/BotController.d.ts @@ -0,0 +1,35 @@ +import { BotGenerator } from "../generators/BotGenerator"; +import { BotHelper } from "../helpers/BotHelper"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { IBotCore } from "../models/eft/common/tables/IBotCore"; +import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +export declare class BotController { + protected databaseServer: DatabaseServer; + protected botGenerator: BotGenerator; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); + /** + * Return the number of bot loadout varieties to be generated + * @param type bot Type we want the loadout gen count for + * @returns + */ + getBotPresetGenerationLimit(type: string): number; + getBotCoreDifficulty(): IBotCore; + /** + * Get bot difficulty settings + * adjust PMC settings to ensure they engage the correct bot types + * @param type what bot the server is requesting settings for + * @param difficulty difficulty level server requested settings for + * @returns Difficulty object + */ + getBotDifficulty(type: string, difficulty: string): Difficulty; + protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + getBotCap(): number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/CustomizationController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/CustomizationController.d.ts similarity index 81% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/CustomizationController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/CustomizationController.d.ts index 698e6be..a6c4730 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/CustomizationController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/CustomizationController.d.ts @@ -9,14 +9,14 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; export declare class CustomizationController { - private logger; - private itemEventRouter; - private databaseServer; - private saveServer; - private profileHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper); getTraderSuits(traderID: string, sessionID: string): ISuit[]; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; - private getAllTraderSuits; + protected getAllTraderSuits(sessionID: string): ISuit[]; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/DialogueController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/DialogueController.d.ts similarity index 79% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/DialogueController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/DialogueController.d.ts index 235594f..b15c4b6 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/DialogueController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/DialogueController.d.ts @@ -3,13 +3,13 @@ import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachme import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { - private httpResponse; - private saveServer; - private dialogueHelper; + protected httpResponse: HttpResponseUtil; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; @@ -19,7 +19,7 @@ export declare class DialogueController { setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void; setRead(dialogueIDs: string[], sessionID: string): void; getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse; - private messagesHaveUncollectedRewards; - private removeExpiredItems; + protected messagesHaveUncollectedRewards(messages: Message[]): boolean; + protected removeExpiredItems(sessionID: string): void; update(): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/GameController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/GameController.d.ts new file mode 100644 index 0000000..85ec418 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/GameController.d.ts @@ -0,0 +1,28 @@ +import { HttpServerHelper } from "../helpers/HttpServerHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; +import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; +import { Watermark } from "../utils/Watermark"; +export declare class GameController { + protected logger: ILogger; + protected watermark: Watermark; + protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); + gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; + protected logProfileDetails(fullProfile: IAkiProfile): void; + getGameConfig(sessionID: string): IGameConfigResponse; + getServer(): any[]; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HandbookController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HandbookController.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HandbookController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HandbookController.d.ts index f473437..52d2dd8 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HandbookController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HandbookController.d.ts @@ -1,8 +1,8 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class HandbookController { - private databaseServer; - private handbookHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper); load(): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HealthController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HealthController.d.ts similarity index 63% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HealthController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HealthController.d.ts index ca049f6..cc13603 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/HealthController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HealthController.d.ts @@ -11,15 +11,36 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { - private logger; - private itemEventRouter; - private itemHelper; - private paymentService; - private inventoryHelper; - private healthHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected inventoryHelper: InventoryHelper; + protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HideoutController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HideoutController.d.ts similarity index 51% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HideoutController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HideoutController.d.ts index f35c23b..3eefe1a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/HideoutController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/HideoutController.d.ts @@ -1,11 +1,14 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -14,6 +17,7 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -25,32 +29,74 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HideoutController { - private logger; - private hashUtil; - private timeUtil; - private databaseServer; - private randomUtil; - private inventoryHelper; - private saveServer; - private playerService; - private presetHelper; - private paymentHelper; - private itemEventRouter; - private httpResponse; - private profileHelper; - private hideoutHelper; - private configServer; - private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected inventoryHelper: InventoryHelper; + protected saveServer: SaveServer; + protected playerService: PlayerService; + protected presetHelper: PresetHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; + protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; + protected hideoutConfig: IHideoutConfig; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InraidController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InraidController.d.ts new file mode 100644 index 0000000..b899e7d --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InraidController.d.ts @@ -0,0 +1,44 @@ +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; +import { HealthHelper } from "../helpers/HealthHelper"; +import { InRaidHelper } from "../helpers/InRaidHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { QuestHelper } from "../helpers/QuestHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { InsuranceService } from "../services/InsuranceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class InraidController { + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; + protected healthHelper: HealthHelper; + protected traderHelper: TraderHelper; + protected insuranceService: InsuranceService; + protected inRaidHelper: InRaidHelper; + protected configServer: ConfigServer; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; + saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InsuranceController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InsuranceController.d.ts similarity index 63% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InsuranceController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InsuranceController.d.ts index b175a06..6895383 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InsuranceController.d.ts @@ -3,8 +3,10 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,23 +17,28 @@ import { PaymentService } from "../services/PaymentService"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceController { - private logger; - private randomUtil; - private itemEventRouter; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private profileHelper; - private dialogueHelper; - private paymentService; - private insuranceService; - private configServer; - private insuranceConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected itemEventRouter: ItemEventRouter; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected dialogueHelper: DialogueHelper; + protected paymentService: PaymentService; + protected insuranceService: InsuranceService; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; - doAbsolutelyNothing(): void; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InventoryController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InventoryController.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InventoryController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InventoryController.d.ts index 8235082..f57f731 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/InventoryController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/InventoryController.d.ts @@ -24,19 +24,23 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; - private presetHelper; - private inventoryHelper; - private profileHelper; - private paymentHelper; - private itemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected fenceService: FenceService; + protected presetHelper: PresetHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/LauncherController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/LauncherController.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/LauncherController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/LauncherController.d.ts index 2a30713..1af1f56 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/LauncherController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/LauncherController.d.ts @@ -3,23 +3,24 @@ import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { Info } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class LauncherController { - private hashUtil; - private saveServer; - private httpServerHelper; - private databaseServer; - private configServer; - private coreConfig; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected httpServerHelper: HttpServerHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected coreConfig: ICoreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; login(info: ILoginRequestData): string; register(info: IRegisterData): string; - private createAccount; + protected createAccount(info: IRegisterData): string; changeUsername(info: IChangeRequestData): string; changePassword(info: IChangeRequestData): string; wipe(info: IRegisterData): string; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/LocationController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/LocationController.d.ts similarity index 79% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/LocationController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/LocationController.d.ts index 41a8719..90b6d7a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/LocationController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/LocationController.d.ts @@ -6,11 +6,11 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class LocationController { - private jsonUtil; - private logger; - private locationGenerator; - private databaseServer; - private timeUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected locationGenerator: LocationGenerator; + protected databaseServer: DatabaseServer; + protected timeUtil: TimeUtil; constructor(jsonUtil: JsonUtil, logger: ILogger, locationGenerator: LocationGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil); get(location: string): ILocationBase; generate(name: string): ILocationBase; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/MatchController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/MatchController.d.ts new file mode 100644 index 0000000..71cb7d3 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/MatchController.d.ts @@ -0,0 +1,38 @@ +import { ApplicationContext } from "../context/ApplicationContext"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { TraderHelper } from "../helpers/TraderHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; +import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; +import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "../models/spt/config/IMatchConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { MatchLocationService } from "../services/MatchLocationService"; +export declare class MatchController { + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected matchLocationService: MatchLocationService; + protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; + protected matchConfig: IMatchConfig; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); + getEnabled(): boolean; + getProfile(info: IGetProfileRequestData): IPmcData[]; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; + deleteGroup(info: any): void; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; + startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; + endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/NoteController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/NoteController.d.ts similarity index 88% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/NoteController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/NoteController.d.ts index 4d3420e..ee70541 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/NoteController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { - private itemEventRouter; +export declare class NoteController { + protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/NotifierController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/NotifierController.d.ts similarity index 80% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/NotifierController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/NotifierController.d.ts index 36fef66..31d7bfe 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/NotifierController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/NotifierController.d.ts @@ -3,11 +3,11 @@ import { NotificationService } from "../services/NotificationService"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { - private notifierHelper; - private httpServerHelper; - private notificationService; - private pollInterval; - private timeout; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected notificationService: NotificationService; + protected pollInterval: number; + protected timeout: number; constructor(notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, notificationService: NotificationService); /** * Resolve an array of session notifications. diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/PresetBuildController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/PresetBuildController.d.ts similarity index 86% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/PresetBuildController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/PresetBuildController.d.ts index 11c5c3e..adf4084 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/PresetBuildController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/PresetBuildController.d.ts @@ -7,10 +7,10 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class PresetBuildController { - private hashUtil; - private itemEventRouter; - private itemHelper; - private saveServer; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer); getUserBuilds(sessionID: string): WeaponBuild[]; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/PresetController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/PresetController.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/PresetController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/PresetController.d.ts index 6ec8c55..ca1af1a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/PresetController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/PresetController.d.ts @@ -1,8 +1,8 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetController { - private presetHelper; - private databaseServer; + protected presetHelper: PresetHelper; + protected databaseServer: DatabaseServer; constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer); initialize(): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/ProfileController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/ProfileController.d.ts similarity index 66% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/ProfileController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/ProfileController.d.ts index c8bd5f1..8c89a02 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/ProfileController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -11,21 +12,30 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { - private hashUtil; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private traderHelper; - private extendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; + protected traderHelper: TraderHelper; + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/QuestController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/QuestController.d.ts new file mode 100644 index 0000000..2cbccfb --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/QuestController.d.ts @@ -0,0 +1,76 @@ +import { DialogueHelper } from "../helpers/DialogueHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; +import { QuestHelper } from "../helpers/QuestHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; +import { PlayerService } from "../services/PlayerService"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class QuestController { + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected questHelper: QuestHelper; + protected questConditionHelper: QuestConditionHelper; + protected playerService: PlayerService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ + getClientQuests(sessionID: string): IQuest[]; + acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ + completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void; + /** + * Returns a list of quests that should be failed when a quest is completed + * @param completedQuestId quest completed id + * @returns array of quests + */ + protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[]; + /** + * Fail the quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; + handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RagfairController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RagfairController.d.ts similarity index 73% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RagfairController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RagfairController.d.ts index 5b94a95..c4ffc15 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RagfairController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RagfairController.d.ts @@ -20,6 +20,7 @@ import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPric import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -33,32 +34,34 @@ import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsSer import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { - private logger; - private timeUtil; - private httpResponse; - private itemEventRouter; - private ragfairServer; - private ragfairPriceService; - private databaseServer; - private itemHelper; - private saveServer; - private ragfairSellHelper; - private ragfairTaxHelper; - private ragfairSortHelper; - private ragfairOfferHelper; - private profileHelper; - private paymentService; - private handbookHelper; - private paymentHelper; - private inventoryHelper; - private ragfairHelper; - private ragfairOfferService; - private ragfairRequiredItemsService; - private ragfairOfferGenerator; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; + protected ragfairServer: RagfairServer; + protected ragfairPriceService: RagfairPriceService; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; + protected ragfairSellHelper: RagfairSellHelper; + protected ragfairTaxHelper: RagfairTaxHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairOfferHelper: RagfairOfferHelper; + protected profileHelper: ProfileHelper; + protected paymentService: PaymentService; + protected handbookHelper: HandbookHelper; + protected paymentHelper: PaymentHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RepairController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RepairController.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RepairController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RepairController.d.ts index 77dd47a..0e78ef6 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RepairController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RepairController.d.ts @@ -5,21 +5,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; export declare class RepairController { - private logger; - private itemEventRouter; - private databaseServer; - private questHelper; - private traderHelper; - private paymentService; - private repairHelper; - private configServer; - private repairConfig; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected traderHelper: TraderHelper; + protected paymentService: PaymentService; + protected repairHelper: RepairHelper; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -36,5 +37,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RepeatableQuestController.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RepeatableQuestController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RepeatableQuestController.d.ts index 2dedc7e..98d05dd 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/RepeatableQuestController.d.ts @@ -4,17 +4,19 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { ELocationName } from "../models/enums/ELocationName"; -import { IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -48,22 +50,23 @@ export interface ITargetLocation { locations: string[]; } export declare class RepeatableQuestController { - private timeUtil; - private logger; - private randomUtil; - private mathUtil; - private jsonUtil; - private databaseServer; - private itemHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private itemEventRouter; - private paymentService; - private objectId; - private configServer; - private questConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + protected timeUtil: TimeUtil; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected mathUtil: MathUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected ragfairServerHelper: RagfairServerHelper; + protected itemEventRouter: ItemEventRouter; + protected paymentService: PaymentService; + protected objectId: ObjectId; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/TradeController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/TradeController.d.ts similarity index 85% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/TradeController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/TradeController.d.ts index f0a177b..c86745c 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/TradeController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/TradeController.d.ts @@ -9,11 +9,11 @@ import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTr import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { - private logger; - private itemEventRouter; - private tradeHelper; - private profileHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected tradeHelper: TradeHelper; + protected profileHelper: ProfileHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer); confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse; confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/TraderController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/TraderController.d.ts similarity index 77% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/TraderController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/TraderController.d.ts index 36eac75..7bab158 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/TraderController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/TraderController.d.ts @@ -8,14 +8,14 @@ import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { - private logger; - private databaseServer; - private traderAssortHelper; - private profileHelper; - private traderHelper; - private timeUtil; - private traderAssortService; - private jsonUtil; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected traderAssortHelper: TraderAssortHelper; + protected profileHelper: ProfileHelper; + protected traderHelper: TraderHelper; + protected timeUtil: TimeUtil; + protected traderAssortService: TraderAssortService; + protected jsonUtil: JsonUtil; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/WeatherController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/WeatherController.d.ts similarity index 62% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/WeatherController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/WeatherController.d.ts index 312c3a3..ca7f5eb 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/controllers/WeatherController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/WeatherController.d.ts @@ -1,10 +1,11 @@ import { WeatherGenerator } from "../generators/WeatherGenerator"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WeatherController { - private weatherGenerator; - private configServer; - private weatherConfig; + protected weatherGenerator: WeatherGenerator; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/WishlistController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/WishlistController.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/WishlistController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/WishlistController.d.ts index 5ef8df3..a96c522 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/controllers/WishlistController.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/controllers/WishlistController.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class WishlistController { - private itemEvenRouter; + protected itemEvenRouter: ItemEventRouter; constructor(itemEvenRouter: ItemEventRouter); addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/Container.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/Container.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/Container.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/Container.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/OnLoad.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/OnLoad.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/OnLoad.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/OnLoad.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/OnLoadOnUpdate.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/OnLoadOnUpdate.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/OnLoadOnUpdate.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/OnLoadOnUpdate.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/OnUpdate.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/OnUpdate.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/OnUpdate.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/OnUpdate.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/Router.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/Router.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/Router.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/Router.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/Serializer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/Serializer.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/di/Serializer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/di/Serializer.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotGenerator.d.ts new file mode 100644 index 0000000..a5fc0ad --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotGenerator.d.ts @@ -0,0 +1,96 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotInventoryGenerator } from "./BotInventoryGenerator"; +declare namespace BotGenerator { + interface IRandomisedBotLevelResult { + level: number; + exp: number; + } +} +export declare class BotGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected databaseServer: DatabaseServer; + protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; + protected botHelper: BotHelper; + protected gameEventHelper: GameEventHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); + /** + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns + */ + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; + protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ + protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; + protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ + protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ + protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; + protected generateId(bot: IBotBase): IBotBase; + protected generateInventoryID(profile: IBotBase): IBotBase; + protected getPMCDifficulty(requestedDifficulty: string): string; + /** + * Add a side-specific (usec/bear) dogtag item to a bots inventory + * @param bot bot to add dogtag to + * @returns Bot with dogtag added + */ + protected generateDogtag(bot: IBotBase): IBotBase; +} +export {}; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotInventoryGenerator.d.ts similarity index 58% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotInventoryGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotInventoryGenerator.d.ts index 0cdbacb..35d1ee8 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotInventoryGenerator.d.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; @@ -9,16 +9,16 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botWeaponGenerator; - private botLootGenerator; - private botGeneratorHelper; - private weightedRandomHelper; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootGenerator: BotLootGenerator; + protected botGeneratorHelper: BotGeneratorHelper; + protected weightedRandomHelper: WeightedRandomHelper; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; - private generateEquipment; - private generateInventoryBase; + protected generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + protected generateInventoryBase(): PmcInventory; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotLootGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotLootGenerator.d.ts new file mode 100644 index 0000000..c6a3f29 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotLootGenerator.d.ts @@ -0,0 +1,124 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; +export declare class BotLootGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotWeaponGenerator.d.ts new file mode 100644 index 0000000..9215214 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/BotWeaponGenerator.d.ts @@ -0,0 +1,173 @@ +import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class BotWeaponGenerator { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); + /** + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; + /** + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values + * @returns + */ + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/LocationGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/LocationGenerator.d.ts similarity index 54% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/LocationGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/LocationGenerator.d.ts index 4b96792..bd368b5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/LocationGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/LocationGenerator.d.ts @@ -6,6 +6,8 @@ import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; import { Item } from "../models/eft/common/tables/IItem"; import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILocationConfig } from "../models/spt/config/ILocationConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; @@ -18,27 +20,27 @@ export interface IContainerItem { height: number; } export declare class LocationGenerator { - private logger; - private jsonUtil; - private objectId; - private randomUtil; - private ragfairServerHelper; - private itemHelper; - private mathUtil; - private gameEventHelper; - private containerHelper; - private presetHelper; - private configServer; - private locationConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected objectId: ObjectId; + protected randomUtil: RandomUtil; + protected ragfairServerHelper: RagfairServerHelper; + protected itemHelper: ItemHelper; + protected mathUtil: MathUtil; + protected gameEventHelper: GameEventHelper; + protected containerHelper: ContainerHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected locationConfig: ILocationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; - private getLooseLootMultiplerForLocation; - private getStaticLootMultiplerForLocation; + protected getLooseLootMultiplerForLocation(location: string): number; + protected getStaticLootMultiplerForLocation(location: string): number; generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record, locationName: string): SpawnpointTemplate[]; - private createItem; - private getRandomCompatibleCaliberTemplateId; - private getRandomValidCaliber; - private drawAmmoTpl; - private createRandomMagCartridges; - private createCartidges; + protected createItem(tpl: string, staticAmmoDist: Record, parentId?: string): IContainerItem; + protected getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string; + protected getRandomValidCaliber(magTemplate: ITemplateItem): string; + protected drawAmmoTpl(caliber: string, staticAmmoDist: Record): string; + protected createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record, caliber?: string): Item; + protected createCartidges(parentId: string, ammoTpl: string, stackCount: number): Item; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/PMCLootGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/PMCLootGenerator.d.ts similarity index 56% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/PMCLootGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/PMCLootGenerator.d.ts index 601431b..64e6f7f 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/PMCLootGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/PMCLootGenerator.d.ts @@ -1,13 +1,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; export declare class PMCLootGenerator { - private itemHelper; - private databaseServer; - private configServer; - private pocketLootPool; - private backpackLootPool; - private botConfig; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected pocketLootPool: string[]; + protected backpackLootPool: string[]; + protected botConfig: IBotConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/RagfairAssortGenerator.d.ts similarity index 64% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/RagfairAssortGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/RagfairAssortGenerator.d.ts index 06d3250..cbdd7f2 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/RagfairAssortGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/RagfairAssortGenerator.d.ts @@ -4,22 +4,22 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairAssortGenerator { - private jsonUtil; - private hashUtil; - private itemHelper; - private databaseServer; - private generatedAssortItems; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected generatedAssortItems: Item[]; constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer); /** * Get an array of unique items that can be sold on the flea * @returns array of unique items */ getAssortItems(): Item[]; - private assortsAreGenerated; + protected assortsAreGenerated(): boolean; /** * Generate an array of items the flea can sell * @returns array of unique items */ - private generateRagfairAssortItems; - private createRagfairAssortItem; + protected generateRagfairAssortItems(): Item[]; + protected createRagfairAssortItem(tplId: string, id?: string): Item; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/RagfairOfferGenerator.d.ts similarity index 55% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/RagfairOfferGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/RagfairOfferGenerator.d.ts index e3fbe4a..3e7f4cc 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/generators/RagfairOfferGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/RagfairOfferGenerator.d.ts @@ -2,13 +2,16 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -17,37 +20,41 @@ import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairAssortGenerator } from "./RagfairAssortGenerator"; export declare class RagfairOfferGenerator { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private timeUtil; - private databaseServer; - private ragfairServerHelper; - private saveServer; - private presetHelper; - private ragfairAssortGenerator; - private ragfairOfferService; - private ragfairPriceService; - private fenceService; - private itemHelper; - private configServer; - private ragfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected ragfairServerHelper: RagfairServerHelper; + protected saveServer: SaveServer; + protected presetHelper: PresetHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected fenceService: FenceService; + protected itemHelper: ItemHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; - private getTraderId; - private getRating; - private getRatingGrowing; - private getOfferEndTime; + protected getTraderId(userID: string): string; + protected getRating(userID: string): number; + protected getRatingGrowing(userID: string): boolean; + protected getOfferEndTime(userID: string, time: number): number; /** * Create multiple offers for items by using a unique list of items we've generated previously * @param expiredOffers */ generateDynamicOffers(expiredOffers?: Item[]): void; generateTraderOffers(traderID: string): void; - private getItemCondition; - private addMissingCondition; - private getOfferRequirements; + protected getItemCondition(userID: string, items: Item[], itemDetails: ITemplateItem): Item[]; + protected addMissingCondition(item: Item): Item; + protected getOfferRequirements(items: Item[]): { + count: number; + _tpl: string; + }[]; /** * Create a flea offer and store it in the Ragfair server offers array */ diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/WeatherGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/WeatherGenerator.d.ts new file mode 100644 index 0000000..44cecbb --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/generators/WeatherGenerator.d.ts @@ -0,0 +1,33 @@ +import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; +import { ConfigServer } from "../servers/ConfigServer"; +import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; +import { RandomUtil } from "../utils/RandomUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class WeatherGenerator { + protected weightedRandomHelper: WeightedRandomHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; + constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); + calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; + generateWeather(data: IWeatherData): IWeatherData; + protected getWeightedFog(): string; + protected getWeightedRain(): number; + protected getRandomFloat(node: string): number; + protected getRandomInt(node: string): number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/AssortHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/AssortHelper.d.ts new file mode 100644 index 0000000..15586b9 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/AssortHelper.d.ts @@ -0,0 +1,36 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { ItemHelper } from "./ItemHelper"; +import { QuestHelper } from "./QuestHelper"; +export declare class AssortHelper { + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort assort items from a trader + * @returns assort items minus locked quest assorts + */ + stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort traders assorts + * @returns traders assorts minus locked loyality assorts + */ + stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove an item from an assort + * @param assort assort to modify + * @param itemID item id to remove from asort + * @returns Modified assort + */ + removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotGeneratorHelper.d.ts new file mode 100644 index 0000000..3cd7256 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotGeneratorHelper.d.ts @@ -0,0 +1,131 @@ +import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; +import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +import { ContainerHelper } from "./ContainerHelper"; +import { InventoryHelper } from "./InventoryHelper"; +import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; +export declare class BotGeneratorHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; + protected databaseServer: DatabaseServer; + protected durabilityLimitsHelper: DurabilityLimitsHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected containerHelper: ContainerHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot + * never return true for an item that has 0% spawn chance + * @param itemSlot slot the item sits in + * @param modSlot slot the mod sits in + * @param modSpawnChances Chances for various mod spawns + * @returns boolean true if it should spawn + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * e.g. mod_magazine + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; + /** + * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. + * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. + * Ammo is not put into the magazine directly but assigned to the magazine's slots: The "camora_xxx" slots. + * This function is a helper called by generateModsForItem for mods with parent type "CylinderMagazine" + * + * @param {object} items The items where the CylinderMagazine's camora are appended to + * @param {object} modPool modPool which should include available cartrigdes + * @param {string} parentId The CylinderMagazine's UID + * @param {object} parentTemplate The CylinderMagazine's template + */ + protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void; + /** + * Take a record of camoras and merge the compatable shells into one array + * @param camorasWithShells camoras we want to merge into one array + * @returns string array of shells fro luitple camora sources + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; + generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { + upd?: Upd; + }; + /** + * Create a repairable object for a weapon that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateWeaponRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + /** + * Create a repairable object for an armor that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string; + /** + * Sort by spawn chance, highest to lowest, higher is more common + * @param unsortedModArray String array to sort + * @returns Sorted string array + */ + protected sortModArray(unsortedModArray: string[]): string[]; + /** + * Can an item be added to an item without issue + * @param items + * @param tplToCheck + * @param equipmentSlot + * @returns true if possible + */ + isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; + /** + * Adds an item with all its childern into specified equipmentSlots, wherever it fits. + * @param equipmentSlots + * @param parentId + * @param parentTpl + * @param itemWithChildren + * @param inventory + * @returns a `boolean` indicating item was added + */ + addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; + protected itemAllowedInContainer(slot: Grid, itemTpl: string): boolean; +} +export declare class ExhaustableArray { + private itemPool; + private randomUtil; + private jsonUtil; + private pool; + constructor(itemPool: T[], randomUtil: RandomUtil, jsonUtil: JsonUtil); + getRandomValue(): T; + getFirstValue(): T; + hasValues(): boolean; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotHelper.d.ts new file mode 100644 index 0000000..9b89481 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/BotHelper.d.ts @@ -0,0 +1,45 @@ +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class BotHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); + getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; + getPmcDifficultySettings(type: string, difficulty: string): Difficulty; + /** + * Randomise the chance the PMC will attack their own side + * @param difficultySettings pmc difficulty settings + */ + randomisePmcHostility(difficultySettings: Difficulty): void; + isBotPmc(botRole: string): boolean; + isBotBoss(botRole: string): boolean; + isBotFollower(botRole: string): boolean; + /** + * Add a bot to the FRIENDLY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typeToAdd bot type to add to friendly list + */ + addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; + /** + * Add a bot to the ENEMY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to enemy list + */ + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; + /** + * Add a bot to the REVENGE_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to revenge list + */ + addBotToRevengeList(difficultySettings: Difficulty, typesToAdd: string[]): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ContainerHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ContainerHelper.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ContainerHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ContainerHelper.d.ts index 34cd1e4..3c2ee93 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ContainerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ContainerHelper.d.ts @@ -6,7 +6,7 @@ export declare class FindSlotResult { constructor(success?: boolean, x?: any, y?: any, rotation?: boolean); } export declare class ContainerHelper { - private locateSlot; + protected locateSlot(container2D: number[][], containerX: number, containerY: number, x: number, y: number, itemW: number, itemH: number): boolean; findSlotForItem(container2D: number[][], itemWidth: number, itemHeight: number): FindSlotResult; fillContainerMapWithItem(container2D: number[][], x: number, y: number, itemW: number, itemH: number, rotate: boolean): any; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/DialogueHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/DialogueHelper.d.ts similarity index 58% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/DialogueHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/DialogueHelper.d.ts index ae1f581..e3e2bda 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -7,15 +8,33 @@ import { ItemHelper } from "./ItemHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; import { NotifierHelper } from "./NotifierHelper"; export declare class DialogueHelper { - private hashUtil; - private saveServer; - private databaseServer; - private notifierHelper; - private notificationSendHelper; - private itemHelper; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected notificationSendHelper: NotificationSendHelper; + protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/DurabilityLimitsHelper.d.ts new file mode 100644 index 0000000..07a5db1 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/DurabilityLimitsHelper.d.ts @@ -0,0 +1,26 @@ +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +import { RandomUtil } from "../utils/RandomUtil"; +import { BotHelper } from "./BotHelper"; +export declare class DurabilityLimitsHelper { + protected randomUtil: RandomUtil; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); + getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; + getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; + getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; + getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; + protected generateMaxWeaponDurability(botRole: string): number; + protected generateMaxPmcArmorDurability(itemMaxDurability: number): number; + protected getLowestMaxWeaponFromConfig(botRole: string): number; + protected getHighestMaxWeaponDurabilityFromConfig(botRole: string): number; + protected generateWeaponDurability(botRole: string, maxDurability: number): number; + protected generateArmorDurability(botRole: string, maxDurability: number): number; + protected getMinWeaponDeltaFromConfig(botRole: string): number; + protected getMaxWeaponDeltaFromConfig(botRole: string): number; + protected getMinArmorDeltaFromConfig(botRole: string): number; + protected getMaxArmorDeltaFromConfig(botRole: string): number; +} diff --git a/Live/CWX_DeSharpener/server/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ExtendedProfileHelper.d.ts similarity index 100% rename from Live/CWX_DeSharpener/server/types/helpers/ExtendedProfileHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ExtendedProfileHelper.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/GameEventHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/GameEventHelper.d.ts similarity index 76% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/GameEventHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/GameEventHelper.d.ts index 8131d31..7613053 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/GameEventHelper.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { - private databaseServer; + protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HandbookHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HandbookHelper.d.ts similarity index 95% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HandbookHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HandbookHelper.d.ts index aed6984..b47d466 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HandbookHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HandbookHelper.d.ts @@ -9,7 +9,7 @@ export declare class LookupCollection { constructor(); } export declare class HandbookHelper { - private lookup; + protected lookup: LookupCollection; hydrateLookup(lookup: LookupCollection): void; getTemplatePrice(x: string): number; templatesWithParent(x: string): string[]; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HealthHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HealthHelper.d.ts new file mode 100644 index 0000000..3116c9c --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HealthHelper.d.ts @@ -0,0 +1,51 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class HealthHelper { + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ + resetVitality(sessionID: string): IAkiProfile; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HideoutHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HideoutHelper.d.ts similarity index 51% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HideoutHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HideoutHelper.d.ts index d6a4414..36e4009 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HideoutHelper.d.ts @@ -1,10 +1,12 @@ -import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; +import { Upd } from "../models/eft/common/tables/IItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -17,26 +19,22 @@ import { TimeUtil } from "../utils/TimeUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class HideoutHelper { - private logger; - private hashUtil; - private timeUtil; - private randomUtil; - private databaseServer; - private itemEventRouter; - private httpResponse; - private profileHelper; - private inventoryHelper; - private playerService; - private configServer; - static BITCOIN_FARM: string; - private WATER_COLLECTOR; - private BITCOIN; - private EXPEDITIONARY_FUEL_TANK; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; - private hideoutConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected inventoryHelper: InventoryHelper; + protected playerService: PlayerService; + protected configServer: ConfigServer; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; + protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** @@ -46,21 +44,20 @@ export declare class HideoutHelper { initProduction(recipeId: string, productionTime: number): Production; isProductionType(productive: Productive): productive is Production; applyPlayerUpgradesBonuses(pmcData: IPmcData, bonus: StageBonus): void; - private applySkillXPBoost; + protected applySkillXPBoost(pmcData: IPmcData, bonus: StageBonus): void; updatePlayerHideout(sessionID: string): void; - private updateWaterCollector; - private doesWaterCollectorHaveFilter; - private updateFuel; - private updateWaterFilters; - private getAreaUpdObject; - private updateAirFilters; - private updateBitcoinFarm; - private getBTCSlots; - private getManagementSkillsSlots; - private hasManagementSkillSlots; - private getHideoutManagementSkill; - private getHideoutManagementConsumptionBonus; + protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void; + protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean; + protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateWaterFilters(waterFilterArea: HideoutArea, pwProd: Production, isGeneratorOn: boolean, pmcData: IPmcData): HideoutArea; + protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd; + protected updateAirFilters(airFilterArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production; + protected getBTCSlots(pmcData: IPmcData): number; + protected getManagementSkillsSlots(): number; + protected hasManagementSkillSlots(pmcData: IPmcData): boolean; + protected getHideoutManagementSkill(pmcData: IPmcData): Common; + protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HttpServerHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HttpServerHelper.d.ts new file mode 100644 index 0000000..c6e5296 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/HttpServerHelper.d.ts @@ -0,0 +1,23 @@ +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class HttpServerHelper { + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected mime: { + css: string; + bin: string; + html: string; + jpg: string; + js: string; + json: string; + png: string; + svg: string; + txt: string; + }; + constructor(configServer: ConfigServer); + getMimeText(key: string): string; + buildUrl(): string; + getBackendUrl(): string; + getWebsocketUrl(): string; + sendTextJson(resp: any, output: any): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/InRaidHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/InRaidHelper.d.ts new file mode 100644 index 0000000..c3cbfbb --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/InRaidHelper.d.ts @@ -0,0 +1,97 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { InventoryHelper } from "./InventoryHelper"; +import { PaymentHelper } from "./PaymentHelper"; +export declare class InRaidHelper { + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; + constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ + addUpdToMoneyFromRaid(items: Item[]): void; + /** + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared + */ + deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; + getPlayerGear(items: Item[]): Item[]; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/InventoryHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/InventoryHelper.d.ts similarity index 70% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/InventoryHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/InventoryHelper.d.ts index 00e95d3..dc7cbca 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/InventoryHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/InventoryHelper.d.ts @@ -5,6 +5,7 @@ import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMe import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInventoryConfig } from "../models/spt/config/IInventoryConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -25,26 +26,26 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class InventoryHelper { - private logger; - private jsonUtil; - private hashUtil; - private httpResponse; - private fenceService; - private databaseServer; - private paymentHelper; - private traderAssortHelper; - private dialogueHelper; - private itemHelper; - private containerHelper; - private profileHelper; - private configServer; - private inventoryConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected httpResponse: HttpResponseUtil; + protected fenceService: FenceService; + protected databaseServer: DatabaseServer; + protected paymentHelper: PaymentHelper; + protected traderAssortHelper: TraderAssortHelper; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected containerHelper: ContainerHelper; + protected profileHelper: ProfileHelper; + protected configServer: ConfigServer; + protected inventoryConfig: IInventoryConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; - private getSizeByInventoryItemHash; - private getInventoryItemHash; + protected getSizeByInventoryItemHash(itemTpl: string, itemID: string, inventoryItemHash: InventoryHelper.InventoryItemHash): Record; + protected getInventoryItemHash(inventoryItem: Item[]): InventoryHelper.InventoryItemHash; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. @@ -56,9 +57,9 @@ export declare class InventoryHelper { * @param {string} sessionID * @returns Array */ - private getStashSlotMap; - private getStashType; - private getPlayerStashSize; + protected getStashSlotMap(pmcData: IPmcData, sessionID: string): number[][]; + protected getStashType(sessionID: string): string; + protected getPlayerStashSize(sessionID: string): Record; /** * Internal helper function to transfer an item from one profile to another. * fromProfileData: Profile of the source. @@ -73,5 +74,12 @@ export declare class InventoryHelper { /** * Internal helper function to handle cartridges in inventory if any of them exist. */ - private handleCartridges; + protected handleCartridges(items: Item[], body: IInventoryMoveRequestData): void; } +declare namespace InventoryHelper { + interface InventoryItemHash { + byItemId: Record; + byParentId: Record; + } +} +export {}; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ItemHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ItemHelper.d.ts similarity index 63% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ItemHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ItemHelper.d.ts index 5ff64b6..1701c62 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ItemHelper.d.ts @@ -1,15 +1,16 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; declare class ItemHelper { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); /** * Checks if a id is a valid item. Valid meaning that it's an item that be stored in stash @@ -18,7 +19,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward * or content of bot loot. Items that are tested as valid may be in a player backpack or stash. * @param {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 @@ -82,27 +83,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +163,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +189,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/NotificationSendHelper.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/NotificationSendHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/NotificationSendHelper.d.ts index b9298da..34e62d9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/NotificationSendHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/NotificationSendHelper.d.ts @@ -2,8 +2,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { - private httpServer; - private notificationService; + protected httpServer: IHttpServer; + protected notificationService: NotificationService; constructor(httpServer: IHttpServer, notificationService: NotificationService); /** * Send notification message to the appropiate channel diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/NotifierHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/NotifierHelper.d.ts similarity index 89% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/NotifierHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/NotifierHelper.d.ts index 0d524e9..738b69a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/NotifierHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/NotifierHelper.d.ts @@ -2,11 +2,11 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { - private httpServerHelper; + protected httpServerHelper: HttpServerHelper; /** * The default notification sent when waiting times out. */ - private defaultNotification; + protected defaultNotification: INotification; constructor(httpServerHelper: HttpServerHelper); getDefaultNotification(): INotification; /** Creates a new notification that displays the "Your offer was sold!" prompt and removes sold offer from "My Offers" on clientside */ diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/PaymentHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/PaymentHelper.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/PaymentHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/PaymentHelper.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/PresetHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/PresetHelper.d.ts similarity index 66% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/PresetHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/PresetHelper.d.ts index 0a24128..a469582 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/PresetHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { - private databaseServer; - private lookup; - constructor(databaseServer: DatabaseServer); + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected lookup: Record; + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ProfileHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ProfileHelper.d.ts similarity index 67% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ProfileHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ProfileHelper.d.ts index 508443c..6c150c8 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -20,6 +21,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; @@ -28,6 +35,12 @@ export declare class ProfileHelper { getPmcProfile(sessionID: string): IPmcData; getScavProfile(sessionID: string): IPmcData; getDefaultCounters(): Stats; - private isWiped; - private getServerVersion; + protected isWiped(sessionID: string): boolean; + protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/QuestConditionHelper.d.ts similarity index 76% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/QuestConditionHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/QuestConditionHelper.d.ts index 2a0ee94..90ee560 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/QuestConditionHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/QuestConditionHelper.d.ts @@ -3,5 +3,5 @@ export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLoyaltyConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; - private filterConditions; + protected filterConditions(q: AvailableForConditions[], questType: string, furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/QuestHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/QuestHelper.d.ts new file mode 100644 index 0000000..0f68cd5 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/QuestHelper.d.ts @@ -0,0 +1,115 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; +import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ItemEventRouter } from "../routers/ItemEventRouter"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; +import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; +import { DialogueHelper } from "./DialogueHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +import { RagfairServerHelper } from "./RagfairServerHelper"; +import { TraderHelper } from "./TraderHelper"; +export declare class QuestHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + protected ragfairServerHelper: RagfairServerHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected traderHelper: TraderHelper; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + questStatus(pmcData: IPmcData, questID: string): QuestStatus; + /** + * returns true is the condition is satisfied + */ + evaluateLevel(pmcProfile: IPmcData, cond: AvailableForConditions): boolean; + getDeltaQuests(before: IQuest[], after: IQuest[]): IQuest[]; + rewardSkillPoints(sessionID: string, pmcData: IPmcData, output: IItemEventRouterResponse, skillName: string, progress: number): void; + getQuestLocale(questId: string): any; + /** + * Debug Routine for showing some information on the + * quest list in question. + */ + dumpQuests(quests: any): void; + loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; + protected processReward(reward: Reward): any[]; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; + acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; + failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; + applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; + changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; + /** + * Get List of All Quests as an array + * @returns Array of IQuest objects + */ + questValues(): IQuest[]; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ + protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ + cleanQuestConditions(quest: IQuest): IQuest; + failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ + getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; + getFindItemIdForQuestItem(itemTpl: string): string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairHelper.d.ts similarity index 74% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairHelper.d.ts index 8e70bcd..2c8dbb5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairHelper.d.ts @@ -2,6 +2,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,16 +13,16 @@ import { ItemHelper } from "./ItemHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { - private logger; - private jsonUtil; - private traderAssortHelper; - private databaseServer; - private handbookHelper; - private itemHelper; - private ragfairLinkedItemService; - private utilityHelper; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected traderAssortHelper: TraderAssortHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected ragfairLinkedItemService: RagfairLinkedItemService; + protected utilityHelper: UtilityHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, traderAssortHelper: TraderAssortHelper, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, ragfairLinkedItemService: RagfairLinkedItemService, utilityHelper: UtilityHelper, configServer: ConfigServer); /** * Gets currency TAG from TPL @@ -31,7 +32,7 @@ export declare class RagfairHelper { getCurrencyTag(currency: string): string; filterCategories(sessionID: string, info: ISearchRequestData): string[]; getDisplayableAssorts(sessionID: string): Record; - private getCategoryList; + protected getCategoryList(handbookId: string): string[]; countCategories(result: IGetOffersResult): void; /** * Merges Root Items @@ -39,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairOfferHelper.d.ts similarity index 58% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairOfferHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairOfferHelper.d.ts index 3bf8add..8d03bee 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairOfferHelper.d.ts @@ -1,12 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -19,31 +23,32 @@ import { RagfairHelper } from "./RagfairHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { - private logger; - private timeUtil; - private hashUtil; - private itemEventRouter; - private databaseServer; - private saveServer; - private dialogueHelper; - private itemHelper; - private paymentHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private ragfairSortHelper; - private ragfairHelper; - private ragfairOfferService; - private configServer; - private static TPL_GOODS_SOLD; - private ragfairConfig; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected paymentHelper: PaymentHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected static goodSoldTemplate: string; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; - private getProfileOffers; - private deleteOfferByOfferId; - private completeOffer; + protected getProfileOffers(sessionID: string): IRagfairOffer[]; + protected deleteOfferByOfferId(sessionID: string, offerId: string): void; + protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, offer: IRagfairOffer, pmcProfile: IPmcData): boolean; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairSellHelper.d.ts similarity index 69% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairSellHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairSellHelper.d.ts index 929d112..6ec004a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairSellHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairSellHelper.d.ts @@ -1,14 +1,15 @@ import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairSellHelper { - private logger; - private randomUtil; - private timeUtil; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairServerHelper.d.ts similarity index 61% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairServerHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairServerHelper.d.ts index d29ba42..e4939d1 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairServerHelper.d.ts @@ -1,9 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -11,26 +14,27 @@ import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { - private randomUtil; - private hashUtil; - private saveServer; - private databaseServer; - private profileHelper; - private itemHelper; - private dialogueHelper; - private jsonUtil; - private configServer; - private ragfairConfig; - private questConfig; - private static TPL_GOODS_RETURNED; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected itemHelper: ItemHelper; + protected localeService: LocaleService; + protected dialogueHelper: DialogueHelper; + protected jsonUtil: JsonUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + protected static goodsReturnedTemplate: string; + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails * @returns boolean */ isItemValidRagfairItem(itemDetails: [boolean, ITemplateItem]): boolean; - private isItemBlacklisted; + protected isItemBlacklisted(itemTemplateId: string): boolean; isTrader(userID: string): boolean; isPlayer(userID: string): boolean; returnItems(sessionID: string, items: any[]): void; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairSortHelper.d.ts new file mode 100644 index 0000000..d20e10c --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairSortHelper.d.ts @@ -0,0 +1,14 @@ +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; +export declare class RagfairSortHelper { + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); + sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; + protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByName(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByPrice(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByExpiry(a: IRagfairOffer, b: IRagfairOffer): number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairTaxHelper.d.ts similarity index 62% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairTaxHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairTaxHelper.d.ts index e87334f..820facb 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/helpers/RagfairTaxHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RagfairTaxHelper.d.ts @@ -1,15 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { - private logger; - private databaseServer; - private ragfairPriceService; - private itemHelper; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected itemHelper: ItemHelper; constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); calculateTax(item: Item, pmcData: IPmcData, requirementsValue: number, offerItemCount: number, sellInOnePiece: boolean): number; - private calculateItemWorth; + protected calculateItemWorth(item: Item, itemTemplate: ITemplateItem, itemCount: number, pmcData: IPmcData, isRootItem?: boolean): number; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RepairHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RepairHelper.d.ts new file mode 100644 index 0000000..9a3ab29 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/RepairHelper.d.ts @@ -0,0 +1,21 @@ +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class RepairHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; + protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; + protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; + isWeaponTemplate(tpl: string): boolean; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/SecureContainerHelper.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/SecureContainerHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/SecureContainerHelper.d.ts index 8f246b6..9e2bc32 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/SecureContainerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/SecureContainerHelper.d.ts @@ -7,7 +7,7 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class SecureContainerHelper { - private itemHelper; + protected itemHelper: ItemHelper; constructor(itemHelper: ItemHelper); getSecureContainerItems(items: Item[]): string[]; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TradeHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TradeHelper.d.ts similarity index 73% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TradeHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TradeHelper.d.ts index 475390b..975062b 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/TradeHelper.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TradeHelper.d.ts @@ -2,7 +2,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { Upd } from "../models/eft/common/tables/IItem"; +import { Item, Upd } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -12,14 +12,14 @@ import { RagfairServer } from "../servers/RagfairServer"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { - private logger; - private itemEventRouter; - private traderHelper; - private itemHelper; - private paymentService; - private fenceService; - private inventoryHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected fenceService: FenceService; + protected inventoryHelper: InventoryHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer); /** * Buy item from flea or trader @@ -39,6 +39,6 @@ export declare class TradeHelper { * @returns */ sellItem(pmcData: IPmcData, body: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; - private incrementAssortBuyCount; - private checkPurchaseIsWithinTraderItemLimit; + protected incrementAssortBuyCount(assortBeingPurchased: Item, itemsPurchasedCount: number): void; + protected checkPurchaseIsWithinTraderItemLimit(assortBeingPurchased: Item, assortId: string, count: number): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderAssortHelper.d.ts new file mode 100644 index 0000000..91ba6b9 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderAssortHelper.d.ts @@ -0,0 +1,55 @@ +import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; +import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { TraderAssortService } from "../services/TraderAssortService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; +import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class TraderAssortHelper { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected traderAssortService: TraderAssortService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); + /** + * Get a traders assorts + * Can be used for returning ragfair / fence assorts + * @param sessionId session id + * @param traderId trader id + * @returns a traders assorts + */ + getAssort(sessionId: string, traderId: string): ITraderAssort; + /** + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) + * @param traderId trader id + * @returns array of Items + */ + protected getPristineTraderAssorts(traderId: string): Item[]; + /** + * Returns generated ragfair offers in a trader assort format + * @returns Trader assort object + */ + protected getRagfairDataAsTraderAssort(): ITraderAssort; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderHelper.d.ts new file mode 100644 index 0000000..b2e9d38 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/TraderHelper.d.ts @@ -0,0 +1,109 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { FenceService } from "../services/FenceService"; +import { PlayerService } from "../services/PlayerService"; +import { HandbookHelper } from "./HandbookHelper"; +import { ItemHelper } from "./ItemHelper"; +import { PaymentHelper } from "./PaymentHelper"; +import { ProfileHelper } from "./ProfileHelper"; +export declare class TraderHelper { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); + getTrader(traderID: string, sessionID: string): ITraderBase; + getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ + resetTrader(sessionID: string, traderID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ + getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ + lvlUp(traderID: string, sessionID: string): void; + getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ + traderFilter(traderFilters: string[], tplToCheck: string): boolean; + getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/UtilityHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/UtilityHelper.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/UtilityHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/UtilityHelper.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/WeightedRandomHelper.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/WeightedRandomHelper.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/helpers/WeightedRandomHelper.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/helpers/WeightedRandomHelper.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/BleedingEdgeEntry.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/BleedingEdgeEntry.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/BleedingEdgeEntry.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/BleedingEdgeEntry.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/Compiler.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/Compiler.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/Compiler.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/Compiler.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/DebugEntry.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/DebugEntry.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/DebugEntry.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/DebugEntry.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/ReleaseEntry.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/ReleaseEntry.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/ReleaseEntry.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/ReleaseEntry.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/TestEntry.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/TestEntry.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/ide/TestEntry.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/ide/TestEntry.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/BundleLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/BundleLoader.d.ts similarity index 80% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/BundleLoader.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/BundleLoader.d.ts index 4f7664c..06ad698 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/loaders/BundleLoader.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/BundleLoader.d.ts @@ -10,10 +10,10 @@ declare class BundleInfo { constructor(modpath: string, bundle: any, bundlePath: string, bundleFilepath: string); } export declare class BundleLoader { - private httpServerHelper; - private vfs; - private jsonUtil; - private bundles; + protected httpServerHelper: HttpServerHelper; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected bundles: Record; constructor(httpServerHelper: HttpServerHelper, vfs: VFS, jsonUtil: JsonUtil); getBundles(local: boolean): BundleInfo[]; getBundle(key: string, local: boolean): BundleInfo; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/DelayedModLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/DelayedModLoader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/DelayedModLoader.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/InitialModLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/InitialModLoader.d.ts similarity index 100% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/loaders/InitialModLoader.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/InitialModLoader.d.ts diff --git a/Live/CWX_WeatherPatcher/server/types/loaders/DelayedModLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostAkiModLoader.d.ts similarity index 51% rename from Live/CWX_WeatherPatcher/server/types/loaders/DelayedModLoader.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostAkiModLoader.d.ts index 7d0009f..edc6e5d 100644 --- a/Live/CWX_WeatherPatcher/server/types/loaders/DelayedModLoader.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostAkiModLoader.d.ts @@ -1,21 +1,21 @@ +import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; -import { InitialModLoader } from "./InitialModLoader"; -export declare class DelayedModLoader implements IModLoader { - private bundleLoader; - private handbookController; - private vfs; - private modCompilerService; - private initialModLoader; - constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; load(): void; - private executeMods; - private addBundles; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostDBModLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/common/MinMax.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/bot/IGenerateBotsRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/bot/IGenerateBotsRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/bot/IGenerateBotsRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IEmptyRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IEmptyRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IEmptyRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IEmptyRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IGlobals.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IGlobals.d.ts similarity index 99% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IGlobals.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IGlobals.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILocation.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILocation.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILocation.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILocation.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILocationBase.d.ts similarity index 94% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILocationBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/ILocationBase.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILocationsSourceDestinationBase.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILocationsSourceDestinationBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILocationsSourceDestinationBase.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILooseLoot.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILooseLoot.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/ILooseLoot.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/ILooseLoot.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IMetricsTableData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IMetricsTableData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IMetricsTableData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IMetricsTableData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IPmcData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IPmcData.d.ts new file mode 100644 index 0000000..5703e4b --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/IPmcData.d.ts @@ -0,0 +1,3 @@ +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/MemberCategory.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/common/MemberCategory.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/MemberCategory.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/request/IBaseInteractionRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/request/IBaseInteractionRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/request/IBaseInteractionRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IPmcData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotBase.d.ts similarity index 88% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IPmcData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotBase.d.ts index adc2aa5..0ee468e 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotBase.d.ts @@ -1,12 +1,13 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; +export interface IBotBase { _id: string; aid: string; - savage: string; + savage?: string; Info: Info; Customization: Customization; Health: Health; @@ -18,22 +19,15 @@ export interface IPmcData { BackendCounters: Record; InsuredItems: InsuredItem[]; Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; Quests: Quest[]; TradersInfo: Record; RagfairInfo: RagfairInfo; - WishList: string[]; RepeatableQuests: IPmcDataRepeatableQuest[]; + Bonuses: Bonus[]; + Notes: Notes; CarExtractCounts: CarExtractCounts; SurvivorClass: SurvivorClass; -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 + WishList: string[]; } export interface Info { EntryPoint: string; @@ -52,10 +46,13 @@ export interface Info { LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; + NeedWipeOptions: any[]; + lastCompletedWipe: LastCompleted; Bans: IBan[]; BannedState: boolean; BannedUntil: number; + IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -77,13 +74,6 @@ export declare enum BanType { Friends = 5, ChangeNickname = 6 } -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} export interface Customization { Head: string; Body: string; @@ -134,12 +124,16 @@ export interface Skills { export interface Common { Id: string; Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; } export interface Mastering { Id: string; Progress: number; + max?: number; + min?: number; } export interface Stats { CarriedQuestItems: string[]; @@ -190,6 +184,14 @@ export interface CounterKeyValue { Key: string[]; Value: number; } +export interface ConditionCounters { + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} export interface Aggressor { AccountId: string; ProfileId: string; @@ -249,14 +251,6 @@ export interface LastPlayerStateInfo { Level: number; MemberCategory: string; } -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} export interface BackendCounter { id: string; qid?: string; @@ -276,18 +270,19 @@ export interface Productive { inProgress?: boolean; StartTimestamp?: number; } -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} export interface Production extends Productive { RecipeId: string; SkipTime: number; ProductionTime: number; } +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} export interface HideoutArea { type: HideoutAreas; level: number; @@ -299,32 +294,38 @@ export interface HideoutArea { lastRecipe: string; } export interface HideoutSlot { - item: HideoutItem[]; + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; } export interface HideoutItem { _id: string; _tpl: string; upd?: Upd; } -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 } export interface Quest { qid: string; startTime: number; - status: string; - statusTimers?: StatusTimer; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ completedConditions?: string[]; } -export interface StatusTimer { - AvailableForStart?: number; -} export interface TraderInfo { loyaltyLevel: number; salesSum: number; @@ -337,5 +338,16 @@ export interface RagfairInfo { isRatingGrowing: boolean; offers: IRagfairOffer[]; } -export interface CarExtractCounts { +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotCore.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotCore.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotCore.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotCore.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotType.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotType.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ICustomizationItem.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ICustomizationItem.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ICustomizationItem.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ICustomizationItem.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IHandbookBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IHandbookBase.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IHandbookBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IHandbookBase.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IItem.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IItem.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IItem.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IItem.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ILocationsBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ILocationsBase.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ILocationsBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ILocationsBase.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ILootBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ILootBase.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ILootBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ILootBase.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IQuest.d.ts similarity index 94% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IQuest.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IQuest.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IRepeatableQuests.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IRepeatableQuests.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/IRepeatableQuests.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/IRepeatableQuests.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ITemplateItem.d.ts new file mode 100644 index 0000000..23a1a14 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ITemplateItem.d.ts @@ -0,0 +1,455 @@ +export interface ITemplateItem { + _id: string; + _name: string; + _parent: string; + _type: string; + _props: Props; + _proto: string; +} +export interface Props { + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; + Rarity?: string; + SpawnChance?: number; + CreditsPrice?: number; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; + Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; + CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; + foodUseTime?: number; + foodEffectType?: string; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; +} +export interface Prefab { + path: string; + rcid: string; +} +export interface Grid { + _name: string; + _id: string; + _parent: string; + _props: GridProps; + _proto: string; +} +export interface GridProps { + filters: GridFilter[]; + cellsH: number; + cellsV: number; + minCount: number; + maxCount: number; + maxWeight: number; + isSortingTable: boolean; +} +export interface GridFilter { + Filter: string[]; + ExcludedFilter: string[]; +} +export interface Slot { + _name: string; + _id: string; + _parent: string; + _props: SlotProps; + _max_count?: number; + _required: boolean; + _mergeSlotWithChildren: boolean; + _proto: string; +} +export interface SlotProps { + filters: SlotFilter[]; +} +export interface SlotFilter { + Shift?: number; + Filter: string[]; + AnimationIndex?: number; +} +export interface Xyz { + x: number; + y: number; + z: number; +} +export interface StackSlot { + _name?: string; + _id: string; + _parent: string; + _max_count: number; + _props: StackSlotProps; + _proto: string; + upd: any; +} +export interface StackSlotProps { + filters: SlotFilter[]; +} +export interface EffectsHealth { + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; +} +export interface EffectsHealthProps { + value: number; +} +export interface EffectsDamage { + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; +} +export interface EffectDamageProps { + delay: number; + duration: number; + fadeOut: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; +} +export interface Color { + r: number; + g: number; + b: number; + a: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ITrader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ITrader.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/common/tables/ITrader.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/common/tables/ITrader.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/customization/IBuyClothingRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/customization/IBuyClothingRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/customization/IBuyClothingRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/customization/IBuyClothingRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/customization/IWearClothingRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/customization/IWearClothingRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/customization/IWearClothingRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/customization/IWearClothingRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IFriendRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IFriendRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IFriendRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IFriendRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetAllAttachmentsRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetChatServerListRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetChatServerListRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetChatServerListRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetFriendListDataResponse.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetFriendListDataResponse.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetFriendListDataResponse.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogInfoRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogListRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogViewRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IPinDialogRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IPinDialogRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IPinDialogRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IPinDialogRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IRemoveDialogRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/IRemoveDialogRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/IRemoveDialogRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/ISendMessageRequest.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/ISendMessageRequest.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/ISendMessageRequest.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/ISendMessageRequest.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/ISetDialogReadRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/dialog/ISetDialogReadRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/dialog/ISetDialogReadRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/game/IGameConfigResponse.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IGameConfigResponse.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/game/IGameConfigResponse.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IGameConfigResponse.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IGameEmptyCrcRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/game/IGameEmptyCrcRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IGameEmptyCrcRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/game/IVersionValidateRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IVersionValidateRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/game/IVersionValidateRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/game/IVersionValidateRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/Effect.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/IHealthTreatmentRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/IHealthTreatmentRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/IHealthTreatmentRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/IOffraidEatRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/IOffraidEatRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/IOffraidEatRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/IOffraidEatRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/IOffraidHealRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/IOffraidHealRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/IOffraidHealRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/IOffraidHealRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/ISyncHealthRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/ISyncHealthRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/health/ISyncHealthRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/health/ISyncHealthRequestData.d.ts diff --git a/Live/CWX_DeSharpener/server/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/HideoutAreasEnum.d.ts similarity index 100% rename from Live/CWX_DeSharpener/server/types/models/eft/hideout/HideoutAreasEnum.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/HideoutAreasEnum.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/HideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutArea.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutArea.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutArea.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutArea.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutContinousProductionStartRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutProduction.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutProduction.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutProduction.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutProduction.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutPutItemInRequestData.d.ts diff --git a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutScavCase.d.ts similarity index 85% rename from Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutScavCase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_BushWhacker/CWX-BushWhacker 1.2.0/user/mods/CWX-BushWhacker 1.2.0/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutScavCaseStartRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutSettingsBase.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutSettingsBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutSettingsBase.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutSingleProductionStartRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutTakeItemOutRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutTakeProductionRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutToggleAreaRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutUpgradeCompleteRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/hideout/IHideoutUpgradeRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/httpResponse/IGetBodyResponseData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/httpResponse/IGetBodyResponseData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/httpResponse/IGetBodyResponseData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/httpResponse/INullResponseData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/httpResponse/INullResponseData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/httpResponse/INullResponseData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/httpResponse/INullResponseData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inRaid/IRegisterPlayerRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inRaid/ISaveProgressRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inRaid/ISaveProgressRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inRaid/ISaveProgressRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IGetInsuranceCostRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/insurance/IInsureRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IInsureRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/insurance/IInsureRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/insurance/IInsureRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IAddItemRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IAddItemRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IAddItemRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IAddItemRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryAddRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryAddRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryAddRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryBindRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryBindRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryBindRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryExamineRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryExamineRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryExamineRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryFoldRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryFoldRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryFoldRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryMergeRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryMergeRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryMergeRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryMoveRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryMoveRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryMoveRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventorySortRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventorySortRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventorySortRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventorySortRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventorySplitRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventorySplitRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventorySplitRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventorySwapRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventorySwapRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventorySwapRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryTagRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryTagRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryTagRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryToggleRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryToggleRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryToggleRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryTransferRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/inventory/IInventoryTransferRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/inventory/IInventoryTransferRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts similarity index 96% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IItemEventRouterRequest.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IChangeRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IChangeRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IChangeRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IChangeRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IGetMiniProfileRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/ILoginRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/ILoginRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/ILoginRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/ILoginRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IMiniProfile.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IMiniProfile.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IMiniProfile.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IMiniProfile.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IRegisterData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IRegisterData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IRegisterData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IRegisterData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IRemoveProfileData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IRemoveProfileData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/launcher/IRemoveProfileData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/launcher/IRemoveProfileData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/location/IGetLocationRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/location/IGetLocationRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/location/IGetLocationRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/location/IGetLocationRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IEndOfflineRaidRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/match/IEndOfflineRaidRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IEndOfflineRaidRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/match/IGetProfileRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IGetProfileRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/match/IGetProfileRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IGetProfileRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IStartOffineRaidRequestData.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/notes/INoteActionData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/notes/INoteActionData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/notes/INoteActionData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/notes/INoteActionData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/notifier/INotifier.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/notifier/INotifier.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/notifier/INotifier.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/notifier/INotifier.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/notifier/ISelectProfileRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/notifier/ISelectProfileRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/notifier/ISelectProfileRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts similarity index 88% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IAkiProfile.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IAkiProfile.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IAkiProfile.d.ts index 80dd02d..eaa66c1 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -126,12 +126,16 @@ export interface Chest { export interface Stomach { } export interface LeftArm { + Fracture?: number; } export interface RightArm { + Fracture?: number; } export interface LeftLeg { + Fracture?: number; } export interface RightLeg { + Fracture?: number; } export interface Inraid { location: string; @@ -149,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IProfileChangeNicknameRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IProfileChangeVoiceRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IProfileCreateRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IProfileCreateRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IProfileCreateRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IProfileCreateRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/ISearchFriendRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/ISearchFriendRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/ISearchFriendRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/ISearchFriendRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/ISearchFriendResponse.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/ISearchFriendResponse.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/ISearchFriendResponse.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/ISearchFriendResponse.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IValidateNicknameRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/profile/IValidateNicknameRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/profile/IValidateNicknameRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IAcceptQuestRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IAcceptQuestRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IAcceptQuestRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/ICompleteQuestRequestData.d.ts similarity index 85% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IHandoverQuestRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IHandoverQuestRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IHandoverQuestRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IListQuestsRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IListQuestsRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IListQuestsRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IListQuestsRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/quests/IRepeatableQuestChangeRequest.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IAddOfferRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IAddOfferRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IAddOfferRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IExtendOfferRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IExtendOfferRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IExtendOfferRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IGetItemPriceResult.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IGetItemPriceResult.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IGetItemPriceResult.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IGetMarketPriceRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IGetOffersResult.d.ts similarity index 80% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IGetOffersResult.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IRagfairOffer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IRagfairOffer.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IRagfairOffer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IRagfairOffer.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/IRemoveOfferRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/ISearchRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/ISearchRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/ragfair/ISearchRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/ISearchRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/repair/IBaseRepairActionDataRequest.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/repair/IRepairActionDataRequest.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/repair/IRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/repair/IRepairActionDataRequest.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/repair/IRepairActionDataRequest.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessBaseTradeRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessRagfairTradeRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessSellTradeRequestData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/trade/IProcessSellTradeRequestData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/trade/IProcessSellTradeRequestData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/weather/IWeatherData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/weather/IWeatherData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/weather/IWeatherData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/weather/IWeatherData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/wishlist/IWishlistActionData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/wishlist/IWishlistActionData.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/eft/wishlist/IWishlistActionData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/eft/wishlist/IWishlistActionData.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/AmmoTypes.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/BaseClasses.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BaseClasses.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/BaseClasses.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BaseClasses.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotAmount.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotDifficulty.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/ConfigTypes.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ConfigTypes.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/ConfigTypes.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ConfigTypes.d.ts index 6bd31e8..61d6f99 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ConfigTypes.d.ts @@ -8,11 +8,14 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ContainerTypes.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/ELocationName.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ELocationName.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/ELocationName.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/ELocationName.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/EquipmentSlots.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/EquipmentSlots.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/EquipmentSlots.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/EquipmentSlots.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/HideoutAreas.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/HideoutAreas.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/HideoutAreas.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/HideoutAreas.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/MemberCategory.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/MemberCategory.d.ts similarity index 100% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/enums/MemberCategory.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/MemberCategory.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/MessageType.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/MessageType.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/MessageType.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/MessageType.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/Money.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/Money.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/Money.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/Money.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestRewardType.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestStatus.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..ba65933 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,11 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7, + Expired = 8 +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/RaidMode.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/SkillTypes.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/Traders.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/Traders.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/enums/Traders.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/Traders.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_DeSharpener/server/types/models/external/mod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/mod.d.ts similarity index 100% rename from Live/CWX_DeSharpener/server/types/models/external/mod.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/mod.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/external/tsyringe.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/tsyringe.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/external/tsyringe.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/external/tsyringe.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/bindings/Route.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bindings/Route.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/bindings/Route.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bindings/Route.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IBotCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IBotCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IBotCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IBotCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IBundleCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IBundleCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IBundleCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IBundleCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ICustomizationCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ICustomizationCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ICustomizationCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IDataCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IDataCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IDataCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IDataCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IDialogueCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IDialogueCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IDialogueCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IGameCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IGameCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IGameCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IGameCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHandbookCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHandbookCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHandbookCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHealthCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHealthCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHealthCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHealthCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHideoutCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHideoutCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHideoutCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHttpCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHttpCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IHttpCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IHttpCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IInraidCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IInraidCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IInraidCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IInraidCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IInsuranceCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IInsuranceCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IInsuranceCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IInventoryCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IInventoryCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IInventoryCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IItemEventCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IItemEventCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IItemEventCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ILauncherCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ILauncherCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ILauncherCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ILocationCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ILocationCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ILocationCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ILocationCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IMatchCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IMatchCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IMatchCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IMatchCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IModCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IModCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IModCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IModCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/INoteCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/INoteCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/INoteCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/INoteCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/INotifierCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/INotifierCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/INotifierCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/INotifierCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IPresetCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IPresetCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IPresetCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IPresetCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IProfileCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IProfileCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IProfileCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IProfileCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IQuestCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IQuestCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IQuestCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IQuestCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IRagfairCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IRagfairCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IRagfairCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IRepairCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IRepairCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IRepairCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IRepairCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ISaveCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ISaveCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ISaveCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ISaveCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ITradeCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ITradeCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ITradeCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ITradeCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ITraderCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ITraderCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/ITraderCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/ITraderCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IWeatherCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IWeatherCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IWeatherCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IWishlistCallbacks.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/callbacks/IWishlistCallbacks.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/callbacks/IWishlistCallbacks.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IAirdropConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IAirdropConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IAirdropConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IAirdropConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IBaseConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IBaseConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IBaseConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IBaseConfig.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IBotConfig.d.ts similarity index 75% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IBotConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IBotConfig.d.ts index f8ea940..e171087 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -5,9 +6,13 @@ export interface IBotConfig extends IBaseConfig { bosses: string[]; durability: Durability; lootNValue: LootNvalue; + revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -17,6 +22,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -27,6 +33,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; @@ -86,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -96,17 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; + enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/ICoreConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ICoreConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/ICoreConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ICoreConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHealthConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHealthConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHealthConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHealthConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHideoutConfig.d.ts new file mode 100644 index 0000000..36d6246 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHideoutConfig.d.ts @@ -0,0 +1,7 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface IHideoutConfig extends IBaseConfig { + kind: "aki-hideout"; + runIntervalSeconds: number; + fuelDrainRateMultipler: number; + hoursForSkillCrafting: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHttpConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHttpConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IHttpConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IHttpConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInRaidConfig.d.ts similarity index 95% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInRaidConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInRaidConfig.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInsuranceConfig.d.ts similarity index 75% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInsuranceConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInventoryConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInventoryConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IInventoryConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IInventoryConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/ILocationConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ILocationConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/ILocationConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ILocationConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IMatchConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IMatchConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IMatchConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IMatchConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IQuestConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IQuestConfig.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IQuestConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IQuestConfig.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IRagfairConfig.d.ts similarity index 94% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IRagfairConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..c24e617 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -30,6 +31,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; @@ -39,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IRepairConfig.d.ts similarity index 66% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IRepairConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ITraderConfig.d.ts similarity index 59% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/ITraderConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/config/ITraderConfig.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IWeatherConfig.d.ts similarity index 86% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IWeatherConfig.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/controllers/IBotController.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/controllers/IBotController.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/controllers/IBotController.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/controllers/IBotController.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IBotGenerator.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IBotGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/ILocationGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/ILocationGenerator.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/ILocationGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/ILocationGenerator.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IPMCLootGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IPMCLootGenerator.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IPMCLootGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IPMCLootGenerator.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IRagfairAssortGenerator.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IRagfairAssortGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IRagfairAssortGenerator.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IRagfairOfferGenerator.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/generators/IRagfairOfferGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/generators/IRagfairOfferGenerator.d.ts diff --git a/Live/CWX_DeSharpener/server/types/models/spt/helpers/Traders.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/helpers/Traders.d.ts similarity index 100% rename from Live/CWX_DeSharpener/server/types/models/spt/helpers/Traders.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/helpers/Traders.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IMod.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IMod.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IMod.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IModLoader.d.ts similarity index 87% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IModLoader.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IModLoader.d.ts index 5398c9b..40a5e19 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IModLoader.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IModLoader.d.ts @@ -3,6 +3,5 @@ export interface IModLoader { load(container: DependencyContainer): void; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IPackageJsonData.d.ts similarity index 84% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IPackageJsonData.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/ragfair/IRagfairServerPrices.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/ragfair/IRagfairServerPrices.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/ragfair/IRagfairServerPrices.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IDatabaseTables.d.ts similarity index 69% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IDatabaseTables.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IDatabaseTables.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IHttpServer.d.ts similarity index 94% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IHttpServer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IHttpServer.d.ts index 50e5c91..c828399 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/server/IHttpServer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IHttpServer.d.ts @@ -1,4 +1,5 @@ /// +/// import http, { ServerResponse } from "http"; import { INotification } from "../../eft/notifier/INotifier"; export interface IHttpServer { diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/ILocaleBase.d.ts similarity index 97% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/ILocaleBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/ILocaleBase.d.ts index a20084d..8887c06 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/ILocaleBase.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/ILocaleBase.d.ts @@ -1,5 +1,5 @@ export interface ILocaleBase { - global: ILocaleGlobalBase; + global: Record; menu: Record; languages: ILanguageBase[]; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/ILocations.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/ILocations.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/ILocations.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/ILocations.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IServerBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IServerBase.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/IServerBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/IServerBase.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/ISettingsBase.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/ISettingsBase.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/server/ISettingsBase.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/server/ISettingsBase.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/IAsyncQueue.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/IAsyncQueue.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/IAsyncQueue.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/IAsyncQueue.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/ICommand.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/ICommand.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/ICommand.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/ICommand.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/ILogger.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/ILogger.d.ts similarity index 59% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/ILogger.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/models/spt/utils/ILogger.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/IUuidGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/IUuidGenerator.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/models/spt/utils/IUuidGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/models/spt/utils/IUuidGenerator.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/HttpRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/HttpRouter.d.ts new file mode 100644 index 0000000..f75a47d --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/HttpRouter.d.ts @@ -0,0 +1,16 @@ +/// +import { IncomingMessage } from "http"; +import { DynamicRouter, Router, StaticRouter } from "../di/Router"; +export declare class HttpRouter { + protected staticRouters: StaticRouter[]; + protected dynamicRoutes: DynamicRouter[]; + constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); + protected groupBy(list: T[], keyGetter: (t: T) => string): Map; + getResponse(req: IncomingMessage, info: any, sessionID: string): string; + protected handleRoute(url: string, info: any, sessionID: string, wrapper: ResponseWrapper, routers: Router[], dynamic: boolean): boolean; +} +declare class ResponseWrapper { + output: string; + constructor(output: string); +} +export {}; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/ImageRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/ImageRouter.d.ts similarity index 88% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/ImageRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/ImageRouter.d.ts index 97e580d..ab03977 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/ImageRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/ImageRouter.d.ts @@ -4,8 +4,8 @@ import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ImageRouteService } from "../services/mod/image/ImageRouteService"; import { VFS } from "../utils/VFS"; export declare class ImageRouter { - private vfs; - private imageRouteService; + protected vfs: VFS; + protected imageRouteService: ImageRouteService; constructor(vfs: VFS, imageRouteService: ImageRouteService); addRoute(key: string, valueToAdd: string): void; sendImage(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any, httpServer: IHttpServer): void; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/ItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/ItemEventRouter.d.ts similarity index 72% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/ItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/ItemEventRouter.d.ts index bb20152..b1ac5d9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/ItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/ItemEventRouter.d.ts @@ -5,13 +5,13 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { - private logger; - private jsonUtil; - private profileHelper; - private itemEventRouters; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected itemEventRouters: ItemEventRouterDefinition[]; constructor(logger: ILogger, jsonUtil: JsonUtil, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[]); - private output; + protected output: IItemEventRouterResponse; handleEvents(info: IItemEventRouterRequest, sessionID: string): IItemEventRouterResponse; getOutput(sessionID: string): IItemEventRouterResponse; - private resetOutput; + protected resetOutput(sessionID: string): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/BotDynamicRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/BotDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/BotDynamicRouter.d.ts index dd2f68a..6d0ab4b 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/BundleDynamicRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/BundleDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/BundleDynamicRouter.d.ts index be27008..a765410 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/CustomizationDynamicRouter.d.ts similarity index 81% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/CustomizationDynamicRouter.d.ts index 03a5967..2db7cc5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/DataDynamicRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/DataDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/DataDynamicRouter.d.ts index c30501a..836ed8d 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/HttpDynamicRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/HttpDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/HttpDynamicRouter.d.ts index b2933e9..a152b4d 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/InraidDynamicRouter.d.ts similarity index 84% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/InraidDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/InraidDynamicRouter.d.ts index ea4a9ae..7c0561f 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/LocationDynamicRouter.d.ts similarity index 84% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/LocationDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/LocationDynamicRouter.d.ts index 30741db..b8e5cdf 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/NotifierDynamicRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/NotifierDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/NotifierDynamicRouter.d.ts index 4786817..83c60c5 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/TraderDynamicRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/TraderDynamicRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/TraderDynamicRouter.d.ts index a100b4c..5b7cc1b 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/CustomizationItemEventRouter.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/CustomizationItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/CustomizationItemEventRouter.d.ts index 3025e2c..e78445e 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/HealthItemEventRouter.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/HealthItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/HealthItemEventRouter.d.ts index bad9af2..99847c6 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/HealthItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HealthItemEventRouter extends ItemEventRouterDefinition { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/HideoutItemEventRouter.d.ts similarity index 92% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/HideoutItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/HideoutItemEventRouter.d.ts index 2cec18b..e1e98af 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HideoutItemEventRouter extends ItemEventRouterDefinition { - private hideoutCallbacks; + protected hideoutCallbacks: HideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/InsuranceItemEventRouter.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/InsuranceItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/InsuranceItemEventRouter.d.ts index 8efc2c2..a922cc0 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/InventoryItemEventRouter.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/InventoryItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/InventoryItemEventRouter.d.ts index 1d93e7b..2619bb9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { - private inventoryCallbacks; + protected inventoryCallbacks: InventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/NoteItemEventRouter.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/NoteItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/NoteItemEventRouter.d.ts index 12af594..59bf598 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/NoteItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class NoteItemEventRouter extends ItemEventRouterDefinition { - private noteCallbacks; + protected noteCallbacks: NoteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/PresetBuildItemEventRouter.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7298c52..277db44 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { - private presetBuildCallbacks; + protected presetBuildCallbacks: PresetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/QuestItemEventRouter.d.ts similarity index 56% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/QuestItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/QuestItemEventRouter.d.ts index 9944ae9..a092aa6 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { - private questCallbacks; - constructor(questCallbacks: QuestCallbacks); + protected logger: ILogger; + protected questCallbacks: QuestCallbacks; + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/RagfairItemEventRouter.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/RagfairItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/RagfairItemEventRouter.d.ts index 88e52ba..9216cc5 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/RepairItemEventRouter.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/RepairItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/RepairItemEventRouter.d.ts index b292ded..5196ba9 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/RepairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RepairItemEventRouter extends ItemEventRouterDefinition { - private repairCallbacks; + protected repairCallbacks: RepairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/TradeItemEventRouter.d.ts similarity index 92% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/TradeItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/TradeItemEventRouter.d.ts index 1bca2b8..a43bb0a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/TradeItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class TradeItemEventRouter extends ItemEventRouterDefinition { - private tradeCallbacks; + protected tradeCallbacks: TradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/WishlistItemEventRouter.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/WishlistItemEventRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/WishlistItemEventRouter.d.ts index 38831f6..38497fb 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { - private wishlistCallbacks; + protected wishlistCallbacks: WishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/HealthSaveLoadRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/HealthSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/HealthSaveLoadRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/HealthSaveLoadRouter.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/InraidSaveLoadRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/InraidSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/InraidSaveLoadRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/InraidSaveLoadRouter.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/InsuranceSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/InsuranceSaveLoadRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/InsuranceSaveLoadRouter.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/ProfileSaveLoadRouter.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/save_load/ProfileSaveLoadRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/save_load/ProfileSaveLoadRouter.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/BundleSerializer.d.ts similarity index 87% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/BundleSerializer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/BundleSerializer.d.ts index 7952e9c..912db83 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/BundleSerializer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/BundleSerializer.d.ts @@ -3,8 +3,8 @@ import { BundleLoader } from "../../loaders/BundleLoader"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { ILogger } from "../../models/spt/utils/ILogger"; export declare class BundleSerializer extends Serializer { - private logger; - private bundleLoader; + protected logger: ILogger; + protected bundleLoader: BundleLoader; constructor(logger: ILogger, bundleLoader: BundleLoader); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/ImageSerializer.d.ts similarity index 90% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/ImageSerializer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/ImageSerializer.d.ts index 29340d0..0e040d4 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/serializers/ImageSerializer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/ImageSerializer.d.ts @@ -2,7 +2,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/NotifySerializer.d.ts similarity index 69% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/NotifySerializer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/NotifySerializer.d.ts index 8be8ac2..1779ac9 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/serializers/NotifySerializer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/serializers/NotifySerializer.d.ts @@ -3,9 +3,9 @@ import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { - private notifierController; - private httpServerHelper; + protected notifierController: NotifierController; + protected httpServerHelper: HttpServerHelper; constructor(notifierController: NotifierController, httpServerHelper: HttpServerHelper); - serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; + serialize(_sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/BotStaticRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/BotStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/BotStaticRouter.d.ts index d8b0bf4..aeea220 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/BotStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/BotStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/BundleStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/BundleStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/BundleStaticRouter.d.ts index 3905b82..fb682fc 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/BundleStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/BundleStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/CustomizationStaticRouter.d.ts similarity index 81% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/CustomizationStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/CustomizationStaticRouter.d.ts index 46c71b8..21bc4bb 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/CustomizationStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/DataStaticRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/DataStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/DataStaticRouter.d.ts index a493d3a..84ba7fd 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/DataStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/DataStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/DialogStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/DialogStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/DialogStaticRouter.d.ts index a59fb14..546cdf1 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/DialogStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/DialogStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { - private dialogueCallbacks; + protected dialogueCallbacks: DialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/GameStaticRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/GameStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/GameStaticRouter.d.ts index 988b673..a9a7496 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/GameStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/GameStaticRouter.d.ts @@ -1,6 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { - private gameCallbacks; + protected gameCallbacks: GameCallbacks; constructor(gameCallbacks: GameCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/HealthStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/HealthStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/HealthStaticRouter.d.ts index e644861..863fd5e 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/HealthStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/HealthStaticRouter.d.ts @@ -1,6 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/InraidStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/InraidStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/InraidStaticRouter.d.ts index 66ed860..b29ad23 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/InraidStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/InraidStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/InsuranceStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/InsuranceStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/InsuranceStaticRouter.d.ts index 8da26b3..5676499 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/InsuranceStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/ItemEventStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/ItemEventStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/ItemEventStaticRouter.d.ts index 08ba6bb..c30a7fc 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/ItemEventStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { - private itemEventCallbacks; + protected itemEventCallbacks: ItemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/LauncherStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/LauncherStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/LauncherStaticRouter.d.ts index 9d07f78..0040cbd 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/LauncherStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/LauncherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { - private launcherCallbacks; + protected launcherCallbacks: LauncherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/LocationStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/LocationStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/LocationStaticRouter.d.ts index 9c5c52e..b6de956 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/LocationStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/LocationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/MatchStaticRouter.d.ts similarity index 83% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/MatchStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/MatchStaticRouter.d.ts index d746381..9920a92 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/MatchStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/MatchStaticRouter.d.ts @@ -1,6 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { - private matchCallbacks; + protected matchCallbacks: MatchCallbacks; constructor(matchCallbacks: MatchCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/NotifierStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/NotifierStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/NotifierStaticRouter.d.ts index 1c8566d..8f1f5cc 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/NotifierStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/NotifierStaticRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/PresetStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/PresetStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/PresetStaticRouter.d.ts index 2272f82..a9e7458 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/PresetStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/PresetStaticRouter.d.ts @@ -1,6 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { - private presetCallbacks; + protected presetCallbacks: PresetBuildCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/ProfileStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/ProfileStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/ProfileStaticRouter.d.ts index fd787f1..83403f2 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/ProfileStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/ProfileStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { - private profileCallbacks; + protected profileCallbacks: ProfileCallbacks; constructor(profileCallbacks: ProfileCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/QuestStaticRouter.d.ts similarity index 83% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/QuestStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/QuestStaticRouter.d.ts index fda3c23..8f7ca0a 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/QuestStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/QuestStaticRouter.d.ts @@ -1,6 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { - private questCallbacks; + protected questCallbacks: QuestCallbacks; constructor(questCallbacks: QuestCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/RagfairStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/RagfairStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/RagfairStaticRouter.d.ts index 618374f..6c41467 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/RagfairStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/RagfairStaticRouter.d.ts @@ -1,6 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/TraderStaticRouter.d.ts similarity index 82% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/TraderStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/TraderStaticRouter.d.ts index 18f0629..41728a1 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/routers/static/TraderStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/TraderStaticRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/WeatherStaticRouter.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/WeatherStaticRouter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/WeatherStaticRouter.d.ts index 61b904d..72ed851 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/routers/static/WeatherStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/routers/static/WeatherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { - private weatherCallbacks; + protected weatherCallbacks: WeatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/ConfigServer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/ConfigServer.d.ts similarity index 75% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/ConfigServer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/ConfigServer.d.ts index 83af38d..a079be8 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/ConfigServer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/ConfigServer.d.ts @@ -3,10 +3,10 @@ import { VFS } from "../utils/VFS"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigTypes } from "../models/enums/ConfigTypes"; export declare class ConfigServer { - private logger; - private vfs; - private jsonUtil; - private configs; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected configs: Record; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil); getConfig(configType: ConfigTypes): T; getConfigByString(configType: string): T; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/DatabaseServer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/DatabaseServer.d.ts similarity index 80% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/DatabaseServer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/DatabaseServer.d.ts index 521bcf9..aa152d0 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/DatabaseServer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/DatabaseServer.d.ts @@ -1,6 +1,6 @@ import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { - private tableData; + protected tableData: IDatabaseTables; getTables(): IDatabaseTables; setTables(any: any): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/HttpServer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/HttpServer.d.ts similarity index 63% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/HttpServer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/HttpServer.d.ts index d0db7e4..44d802b 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/servers/HttpServer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/HttpServer.d.ts @@ -1,9 +1,12 @@ /// +/// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; @@ -13,24 +16,25 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { - private httpRouter; - private logger; - private randomUtil; - private jsonUtil; - private httpResponse; - private databaseServer; - private notifierHelper; - private httpServerHelper; - private serializers; - private configServer; + protected httpRouter: HttpRouter; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected serializers: Serializer[]; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); - private buffers; - private onReceive; - private onRespond; - private httpConfig; - private webSockets; - private websocketPingHandler; + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); + protected buffers: {}; + protected onReceive: {}; + protected onRespond: {}; + protected httpConfig: IHttpConfig; + protected webSockets: {}; + protected websocketPingHandler: any; getCookies(req: http.IncomingMessage): any; resetBuffer(sessionID: string): void; putInBuffer(sessionID: any, data: any, bufLength: number): boolean; @@ -42,6 +46,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; - private getRandomisedMessage; + protected getRandomisedMessage(): string; wsOnConnection(ws: any, req: any): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/RagfairServer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/RagfairServer.d.ts similarity index 67% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/RagfairServer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/RagfairServer.d.ts index cf56d64..bc86cdb 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/RagfairServer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/RagfairServer.d.ts @@ -1,22 +1,24 @@ import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; import { ConfigServer } from "./ConfigServer"; export declare class RagfairServer { - private logger; - private ragfairOfferGenerator; - private ragfairOfferService; - private ragfairCategoriesService; - private ragfairRequiredItemsService; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/SaveServer.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/SaveServer.d.ts similarity index 74% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/SaveServer.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/SaveServer.d.ts index fdf92e4..cb28f49 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/servers/SaveServer.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/servers/SaveServer.d.ts @@ -5,15 +5,15 @@ import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { - private vfs; - private saveLoadRouters; - private jsonUtil; - private hashUtil; - private logger; - private profileFilepath; - private profiles; - private onSave; - private saveMd5; + protected vfs: VFS; + protected saveLoadRouters: SaveLoadRouter[]; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected profileFilepath: string; + protected profiles: {}; + protected onSave: {}; + protected saveMd5: {}; constructor(vfs: VFS, saveLoadRouters: SaveLoadRouter[], jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger); load(): void; save(): void; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotLootCacheService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..cc71eee --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/BotLootCacheService.d.ts @@ -0,0 +1,82 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole bots role (assault / pmcBot etc) + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc Is the bot a PMC (alteres what loot is cached) + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/FenceService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/FenceService.d.ts similarity index 66% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/FenceService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/FenceService.d.ts index 27d14ef..79058c6 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/FenceService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/FenceService.d.ts @@ -4,6 +4,7 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +12,25 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class FenceService { - private logger; - private hashUtil; - private jsonUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private itemHelper; - private presetHelper; - private configServer; - private fenceAssort; - private traderConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected fenceAssort: ITraderAssort; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, configServer: ConfigServer); - private setFenceAssort; + protected setFenceAssort(fenceAssort: ITraderAssort): void; getFenceAssorts(): ITraderAssort; hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/HashCacheService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/HashCacheService.d.ts similarity index 71% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/HashCacheService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/HashCacheService.d.ts index c9b0170..5320f28 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/HashCacheService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/HashCacheService.d.ts @@ -3,13 +3,13 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; export declare class HashCacheService { - private vfs; - private hashUtil; - private jsonUtil; - private logger; - private jsonHashes; - private modHashes; - private readonly modCachePath; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected jsonHashes: any; + protected modHashes: any; + protected readonly modCachePath = "./user/cache/modCache.json"; constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); getStoredModHash(modName: string): string; modContentMatchesStoredHash(modName: string, modContent: string): boolean; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/InsuranceService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/InsuranceService.d.ts similarity index 59% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/InsuranceService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/InsuranceService.d.ts index 160faba..171bf10 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/InsuranceService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/InsuranceService.d.ts @@ -4,6 +4,7 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,18 +12,17 @@ import { SaveServer } from "../servers/SaveServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { - private logger; - private databaseServer; - private secureContainerHelper; - private randomUtil; - private timeUtil; - private saveServer; - private traderHelper; - private dialogueHelper; - private configServer; - private insured; - private templatesById; - private insuranceConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected secureContainerHelper: SecureContainerHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected traderHelper: TraderHelper; + protected dialogueHelper: DialogueHelper; + protected configServer: ConfigServer; + protected insured: Record>; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; @@ -31,11 +31,21 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - private addGearToSend; + protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/LocaleService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/MatchLocationService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/MatchLocationService.d.ts new file mode 100644 index 0000000..c027bec --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/MatchLocationService.d.ts @@ -0,0 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; +import { TimeUtil } from "../utils/TimeUtil"; +export declare class MatchLocationService { + protected timeUtil: TimeUtil; + protected locations: {}; + constructor(timeUtil: TimeUtil); + createGroup(sessionID: string, info: ICreateGroupRequestData): any; + deleteGroup(info: any): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ModCompilerService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ModCompilerService.d.ts new file mode 100644 index 0000000..26cb4ac --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ModCompilerService.d.ts @@ -0,0 +1,20 @@ +import * as ts from "typescript"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { VFS } from "../utils/VFS"; +import { HashCacheService } from "./HashCacheService"; +export declare class ModCompilerService { + protected logger: ILogger; + protected hashCacheService: HashCacheService; + protected vfs: VFS; + constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); + compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; + protected compile(fileNames: string[], options: ts.CompilerOptions): Promise; + protected buildDepth(depth: number): string; + protected getNodesModulesPath(depth: number): string; + protected getAkiPath(depth: number): string; + protected getAkiFolder(): string; + protected getNodesModulesFolder(): string; + protected calculateDepth(file: string): number; + protected areFilesReady(fileNames: string[]): boolean; + protected delay(ms: number): Promise; +} diff --git a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/NotificationService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/NotificationService.d.ts similarity index 72% rename from Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/NotificationService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/NotificationService.d.ts index 7e2a127..65a84dd 100644 --- a/Live/CWX_DeSharpener/CWX-DeSharpener 1.4.0/user/mods/CWX-DeSharpener 1.4.0/types/services/NotificationService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - protected messageQueue: {}; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/PaymentService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/PaymentService.d.ts similarity index 65% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/PaymentService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/PaymentService.d.ts index 0a6c4d6..a5e538f 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/PaymentService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/PaymentService.d.ts @@ -4,6 +4,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -11,14 +12,14 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { - private logger; - private httpResponse; - private databaseServer; - private handbookHelper; - private traderHelper; - private itemHelper; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request @@ -43,6 +44,23 @@ export declare class PaymentService { * inside the stash, that is it has the stash as * ancestor with slotId=hideout */ - private isItemInStash; + protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/PlayerService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/PlayerService.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/PlayerService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/PlayerService.d.ts index 99e5986..519b7e5 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/PlayerService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/PlayerService.d.ts @@ -3,8 +3,8 @@ import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPla import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PlayerService { - private logger; - private databaseServer; + protected logger: ILogger; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, databaseServer: DatabaseServer); /** * increases the profile skill and updates any output diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ProfileFixerService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..ed1dec7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/ProfileFixerService.d.ts @@ -0,0 +1,61 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairCategoriesService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairCategoriesService.d.ts new file mode 100644 index 0000000..83910e5 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairCategoriesService.d.ts @@ -0,0 +1,40 @@ +import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; +export declare class RagfairCategoriesService { + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairLinkedItemService.d.ts new file mode 100644 index 0000000..6c34ee0 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairLinkedItemService.d.ts @@ -0,0 +1,10 @@ +import { DatabaseServer } from "../servers/DatabaseServer"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +export declare class RagfairLinkedItemService { + protected databaseServer: DatabaseServer; + protected linkedItemsCache: Record>; + constructor(databaseServer: DatabaseServer); + getLinkedItems(linkedSearchId: string): Iterable; + protected buildLinkedItemTable(): void; + protected getFilters(item: ITemplateItem, slot: string): string[]; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairOfferService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairOfferService.d.ts similarity index 57% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairOfferService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairOfferService.d.ts index 9b1bf8d..7398a8f 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairOfferService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairOfferService.d.ts @@ -1,7 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -9,27 +11,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { - private logger; - private timeUtil; - private databaseServer; - private saveServer; - private ragfairServerHelper; - private profileHelper; - private itemEventRouter; - private httpResponse; - private configServer; - private playerOffersLoaded; - private toUpdate; - private expiredOffers; - private offers; - private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; + protected profileHelper: ProfileHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected playerOffersLoaded: boolean; + protected toUpdate: Record; + protected expiredOffers: Item[]; + protected offers: IRagfairOffer[]; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; @@ -57,8 +65,8 @@ export declare class RagfairOfferService { * Get an array of stale offers that are still shown to player * @returns IRagfairOffer array */ - private getStaleOffers; - private isStale; - private processStaleOffer; - private returnPlayerOffer; + protected getStaleOffers(): IRagfairOffer[]; + protected isStale(offer: IRagfairOffer, time: number): boolean; + protected processStaleOffer(staleOffer: IRagfairOffer): void; + protected returnPlayerOffer(offer: IRagfairOffer): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairPriceService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairPriceService.d.ts new file mode 100644 index 0000000..679fe1d --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairPriceService.d.ts @@ -0,0 +1,55 @@ +import { HandbookHelper } from "../helpers/HandbookHelper"; +import { ItemHelper } from "../helpers/ItemHelper"; +import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; +import { Item } from "../models/eft/common/tables/IItem"; +import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "../models/spt/ragfair/IRagfairServerPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class RagfairPriceService { + protected handbookHelper: HandbookHelper; + protected databaseServer: DatabaseServer; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected prices: IRagfairServerPrices; + constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); + generateStaticPrices(): void; + generateDynamicPrices(): void; + hasDynamicPrices(): boolean; + getDynamicPrice(itemTpl: string): number; + getAllFleaPrices(): Record; + getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; + getBarterPrice(barterScheme: IBarterScheme[]): number; + getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ + getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairRequiredItemsService.d.ts similarity index 71% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairRequiredItemsService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairRequiredItemsService.d.ts index e4582d0..b05fc65 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/RagfairRequiredItemsService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/RagfairRequiredItemsService.d.ts @@ -2,10 +2,10 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { - private logger; - private paymentHelper; - private ragfairOfferService; - private requiredItemsCache; + protected logger: ILogger; + protected paymentHelper: PaymentHelper; + protected ragfairOfferService: RagfairOfferService; + protected requiredItemsCache: {}; constructor(logger: ILogger, paymentHelper: PaymentHelper, ragfairOfferService: RagfairOfferService); getRequiredItems(searchId: string): any; buildRequiredItemTable(): void; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/TraderAssortService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/TraderAssortService.d.ts similarity index 78% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/TraderAssortService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/TraderAssortService.d.ts index ccb9e45..5ba2d05 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/TraderAssortService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/TraderAssortService.d.ts @@ -1,6 +1,6 @@ import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { - private pristineTraderAssorts; + protected pristineTraderAssorts: Record; getPristineTraderAssort(traderId: string): ITraderAssort; setPristineTraderAssort(traderId: string, assort: ITraderAssort): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/CustomItemService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/dynamicRouter/DynamicRouterMod.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/image/imageRouteService.d.ts similarity index 79% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/image/imageRouteService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/image/imageRouteService.d.ts index 854083c..29569b2 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/image/imageRouteService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/image/imageRouteService.d.ts @@ -1,5 +1,5 @@ export declare class ImageRouteService { - private routes; + protected routes: Record; addRoute(urlKey: string, route: string): void; getByKey(urlKey: string): string; existsByKey(urlKey: string): boolean; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onLoad/OnLoadMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onLoad/OnLoadMod.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onLoad/OnLoadMod.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onLoad/OnLoadMod.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onLoad/OnLoadModService.d.ts similarity index 82% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onLoad/OnLoadModService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onLoad/OnLoadModService.d.ts index 89bad14..f402103 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/onLoad/OnLoadModService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onLoad/OnLoadModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnLoadModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onUpdate/OnUpdateMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onUpdate/OnUpdateMod.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onUpdate/OnUpdateMod.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onUpdate/OnUpdateMod.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onUpdate/OnUpdateModService.d.ts similarity index 84% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onUpdate/OnUpdateModService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onUpdate/OnUpdateModService.d.ts index 32419f4..05d735b 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/onUpdate/OnUpdateModService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnUpdateModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/staticRouter/StaticRouterMod.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/staticRouter/StaticRouterMod.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/services/mod/staticRouter/StaticRouterMod.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/staticRouter/StaticRouterMod.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/staticRouter/StaticRouterModService.d.ts similarity index 86% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/staticRouter/StaticRouterModService.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/staticRouter/StaticRouterModService.d.ts index d4c42aa..f28fd45 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,7 +1,7 @@ import { DependencyContainer } from "tsyringe"; import { RouteAction } from "../../../di/Router"; export declare class StaticRouterModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/App.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/App.d.ts similarity index 51% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/App.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/App.d.ts index a11f576..dcc2669 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/App.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/App.d.ts @@ -3,12 +3,13 @@ import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { - private logger; - private timeUtil; - private onLoadComponents; - private onUpdateComponents; - private onUpdateLastRun; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected onLoadComponents: OnLoad[]; + protected onUpdateComponents: OnUpdate[]; + protected onUpdateLastRun: {}; constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; - private update; + protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/AyncQueue.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/AyncQueue.d.ts similarity index 85% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/AyncQueue.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/AyncQueue.d.ts index a99aa37..da6ab18 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/AyncQueue.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - private commandsQueue; + protected commandsQueue: ICommand[]; constructor(); waitFor(command: ICommand): Promise; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/DatabaseImporter.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/DatabaseImporter.d.ts similarity index 52% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/DatabaseImporter.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/DatabaseImporter.d.ts index 97dda30..483e135 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/DatabaseImporter.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/DatabaseImporter.d.ts @@ -1,18 +1,24 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { - private logger; - private vfs; - private jsonUtil; - private databaseServer; - private imageRouter; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/HashUtil.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/HashUtil.d.ts similarity index 91% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/HashUtil.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/HashUtil.d.ts index cf92b47..bacbf2a 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/HashUtil.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/HashUtil.d.ts @@ -2,7 +2,7 @@ import crypto from "crypto"; import { TimeUtil } from "./TimeUtil"; export declare class HashUtil { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); generate(): string; generateMd5ForData(data: string): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/HttpResponseUtil.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/HttpResponseUtil.d.ts similarity index 91% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/HttpResponseUtil.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/HttpResponseUtil.d.ts index 85c28bd..29502be 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/HttpResponseUtil.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/HttpResponseUtil.d.ts @@ -3,9 +3,9 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HttpResponseUtil { - private jsonUtil; + protected jsonUtil: JsonUtil; constructor(jsonUtil: JsonUtil); - private clearString; + protected clearString(s: string): any; noBody(data: any): any; getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; getUnclearedBody(data: any, err?: number, errmsg?: any): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/JsonUtil.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/JsonUtil.d.ts similarity index 85% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/JsonUtil.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/JsonUtil.d.ts index 20b7448..71e95f6 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/JsonUtil.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/JsonUtil.d.ts @@ -2,10 +2,10 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { - private vfs; - private hashUtil; - private logger; - private fileHashes; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected fileHashes: any; constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Logger.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Logger.d.ts new file mode 100644 index 0000000..3d9013f --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Logger.d.ts @@ -0,0 +1,58 @@ +/// +import fs from "fs"; +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; +export declare class WinstonLogger implements ILogger { + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + protected showDebugInConsole: boolean; + protected folderPath: string; + protected file: string; + protected filePath: string; + protected logLevels: { + levels: { + error: number; + warn: number; + succ: number; + info: number; + custom: number; + debug: number; + }; + colors: { + error: string; + warn: string; + succ: string; + info: string; + custom: string; + debug: string; + }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; + }; + protected logger: winston.Logger & SptLogger; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); + writeToLogFile(data: string | Daum): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; + error(data: string | Record): Promise; + warning(data: string | Record): Promise; + success(data: string | Record): Promise; + info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; + debug(data: string | Record, onlyShowInConsole?: boolean): Promise; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/MathUtil.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/MathUtil.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/MathUtil.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/MathUtil.d.ts diff --git a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/ObjectId.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/ObjectId.d.ts similarity index 55% rename from Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/ObjectId.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/ObjectId.d.ts index b100572..03aae56 100644 --- a/Live/CWX_MasterKey/CWX_MasterKey 1.2.0/user/mods/CWX-MasterKeys 1.2.0/types/utils/ObjectId.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/ObjectId.d.ts @@ -1,13 +1,13 @@ /// import { TimeUtil } from "./TimeUtil"; export declare class ObjectId { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); - private randomBytes; - private constglobalCounter; - private consttime; - private globalCounter; - private time; + protected randomBytes: Buffer; + protected constglobalCounter: number; + protected consttime: number; + protected globalCounter: number; + protected time: number; incGlobalCounter(): number; toHexString(byteArray: string | any[] | Buffer): string; generate(): string; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/RandomUtil.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/RandomUtil.d.ts similarity index 99% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/RandomUtil.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/RandomUtil.d.ts index 3a3ecb6..c24dd60 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/RandomUtil.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/RandomUtil.d.ts @@ -103,8 +103,8 @@ export declare class ProbabilityObject { constructor(key: K, relativeProbability: number, data?: V); } export declare class RandomUtil { - private jsonUtil; - private logger; + protected jsonUtil: JsonUtil; + protected logger: ILogger; constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/TimeUtil.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/TimeUtil.d.ts new file mode 100644 index 0000000..eed4e6d --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/TimeUtil.d.ts @@ -0,0 +1,18 @@ +export declare class TimeUtil { + static readonly oneHourAsSeconds = 3600; + formatTime(date: Date): string; + formatDate(date: Date): string; + getDate(): string; + getTime(): string; + getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/UUidGenerator.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/UUidGenerator.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/UUidGenerator.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/UUidGenerator.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/VFS.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/VFS.d.ts similarity index 95% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/VFS.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/VFS.d.ts index d567615..e5eaf02 100644 --- a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/VFS.d.ts +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/VFS.d.ts @@ -1,11 +1,12 @@ /// +/// import "reflect-metadata"; import fs from "fs"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { - private asyncQueue; - private uuidGenerator; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; accessFilePromisify: (path: fs.PathLike, mode?: number) => Promise; copyFilePromisify: (src: fs.PathLike, dst: fs.PathLike, flags?: number) => Promise; mkdirPromisify: (path: fs.PathLike, options: fs.MakeDirectoryOptions & { diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Watermark.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Watermark.d.ts new file mode 100644 index 0000000..c6dc120 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/Watermark.d.ts @@ -0,0 +1,46 @@ +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class WatermarkLocale { + protected locales: { + "en-US": { + description: string[]; + warning: string[]; + modding: string[]; + }; + "zh-CN": { + description: string[]; + warning: string[]; + modding: string[]; + }; + }; + getLocale(): string; + getDescription(): string[]; + getWarning(): string[]; + getModding(): string[]; +} +export declare class Watermark { + protected logger: ILogger; + protected configServer: ConfigServer; + protected watermarkLocale?: WatermarkLocale; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); + protected text: string[]; + protected versionLabel: string; + initialize(): void; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; + getVersionLabel(): string; + /** Set window title */ + setTitle(): void; + /** Reset console cursor to top */ + resetCursor(): void; + /** Draw the watermark */ + draw(): void; + /** Caculate text length */ + protected textLength(s: string): number; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/decorators/Singleton.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/decorators/Singleton.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/decorators/Singleton.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/decorators/Singleton.d.ts diff --git a/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/decorators/constructor.d.ts b/Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/decorators/constructor.d.ts similarity index 100% rename from Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.3.0/user/mods/CWX-WeatherPatcher 2.3.0/types/utils/decorators/constructor.d.ts rename to Live/CWX_WeatherPatcher/CWX_WeatherPatcher 2.4.1/user/mods/CWX-WeatherPatcher 2.4.1/types/utils/decorators/constructor.d.ts diff --git a/Live/CWX_WeatherPatcher/CustomGlobalFogPatch.cs b/Live/CWX_WeatherPatcher/CustomGlobalFogPatch.cs index d1bfa56..5f6535d 100644 --- a/Live/CWX_WeatherPatcher/CustomGlobalFogPatch.cs +++ b/Live/CWX_WeatherPatcher/CustomGlobalFogPatch.cs @@ -14,7 +14,6 @@ namespace CWX_WeatherPatcher private static void PostFixPatch(ref CustomGlobalFog __instance) { __instance.FuncStart = 0f; - Logger.LogMessage("MADE CHANGES TO CUSTOMGLOBALFOG!"); } } } diff --git a/Live/CWX_WeatherPatcher/GClassPatch.cs b/Live/CWX_WeatherPatcher/GClassPatch.cs index df1a8c4..1ef309e 100644 --- a/Live/CWX_WeatherPatcher/GClassPatch.cs +++ b/Live/CWX_WeatherPatcher/GClassPatch.cs @@ -1,5 +1,6 @@ using Aki.Reflection.Patching; using System.Reflection; +using EFT; namespace CWX_WeatherPatcher { @@ -7,11 +8,11 @@ namespace CWX_WeatherPatcher { protected override MethodBase GetTargetMethod() { - return typeof(GClass1699).GetMethod("smethod_0", BindingFlags.NonPublic | BindingFlags.Static); + return typeof(WeatherClass).GetMethod("smethod_0", BindingFlags.NonPublic | BindingFlags.Static); } [PatchPostfix] - private static void PatchPostfix(ref GClass1699 __result) + private static void PatchPostfix(ref WeatherClass __result) { __result.Cloudness = -1; __result.WindDirection = 8; @@ -21,8 +22,6 @@ namespace CWX_WeatherPatcher __result.ScaterringFogDensity = 0; __result.GlobalFogDensity = 0; __result.GlobalFogHeight = 0; - - Logger.LogMessage("MADE CHANGES TO GClass1694 SMETHOD_0!"); } } } diff --git a/Live/CWX_WeatherPatcher/GlobalSuppressions.cs b/Live/CWX_WeatherPatcher/GlobalSuppressions.cs deleted file mode 100644 index f802835..0000000 --- a/Live/CWX_WeatherPatcher/GlobalSuppressions.cs +++ /dev/null @@ -1,13 +0,0 @@ -// This file is used by Code Analysis to maintain SuppressMessage -// attributes that are applied to this project. -// Project-level suppressions either have no target or are given -// a specific target and scoped to a namespace, type, member, etc. - -using System.Diagnostics.CodeAnalysis; - -[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.CWX_WeatherPatch2.PostFixPatch(CustomGlobalFog@)")] -[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.CWX_WeatherPatch3.PostFixPatch(LevelSettings@)")] -[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.CWX_WeatherPatch4.PostFixPatch(TOD_Scattering@)")] -[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatch.CWX_WeatherPatch5.PatchPostFix")] -[assembly: SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.Plugin.Awake")] -[assembly: SuppressMessage("Roslynator", "RCS1213:Remove unused member declaration.", Justification = "", Scope = "member", Target = "~M:CWX_WeatherPatcher.Plugin.Awake")] diff --git a/Live/CWX_WeatherPatcher/LevelSettingsPatch.cs b/Live/CWX_WeatherPatcher/LevelSettingsPatch.cs index 5df3691..7eace25 100644 --- a/Live/CWX_WeatherPatcher/LevelSettingsPatch.cs +++ b/Live/CWX_WeatherPatcher/LevelSettingsPatch.cs @@ -15,7 +15,6 @@ namespace CWX_WeatherPatcher { __instance.fog = false; __instance.fogEndDistance = 0f; - Logger.LogMessage("MADE CHANGES TO LEVELSETTINGS!"); } } } diff --git a/Live/CWX_WeatherPatcher/Program.cs b/Live/CWX_WeatherPatcher/Program.cs index fa307b1..9b1bc02 100644 --- a/Live/CWX_WeatherPatcher/Program.cs +++ b/Live/CWX_WeatherPatcher/Program.cs @@ -4,13 +4,11 @@ using EFT.Weather; namespace CWX_WeatherPatcher { - [BepInPlugin("com.CWX.WeatherPatcher", "CWX-WeatherPatcher", "3.0.0")] + [BepInPlugin("com.CWX.WeatherPatcher", "CWX-WeatherPatcher", "2.4.0")] public class Plugin : BaseUnityPlugin { private void Awake() { - Logger.LogMessage("Loading: CWX-WeatherPatcher - V3.0.0"); - new GClassPatch().Enable(); new CustomGlobalFogPatch().Enable(); new LevelSettingsPatch().Enable(); diff --git a/Live/CWX_WeatherPatcher/TOD_ScatteringPatch.cs b/Live/CWX_WeatherPatcher/TOD_ScatteringPatch.cs index 8e3c703..1042acd 100644 --- a/Live/CWX_WeatherPatcher/TOD_ScatteringPatch.cs +++ b/Live/CWX_WeatherPatcher/TOD_ScatteringPatch.cs @@ -15,7 +15,6 @@ namespace CWX_WeatherPatcher { __instance.GlobalDensity = 0f; __instance.HeightFalloff = 0f; - Logger.LogMessage("MADE CHANGES TO TOD_SCATTERING FOG!"); } } } diff --git a/Live/CWX_WeatherPatcher/server/dist/package.json b/Live/CWX_WeatherPatcher/server/dist/package.json index bca8c16..56d3d94 100644 --- a/Live/CWX_WeatherPatcher/server/dist/package.json +++ b/Live/CWX_WeatherPatcher/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "WeatherPatcher", "author": "CWX", - "version": "2.3.0", + "version": "2.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.0.0", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_WeatherPatcher/server/dist/src/mod.ts b/Live/CWX_WeatherPatcher/server/dist/src/mod.ts index 8a3bdce..a4178fa 100644 --- a/Live/CWX_WeatherPatcher/server/dist/src/mod.ts +++ b/Live/CWX_WeatherPatcher/server/dist/src/mod.ts @@ -1,21 +1,14 @@ import { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -class CWX_MasterKey implements IMod +class CWX_WeatherPatcher implements IPreAkiLoadMod { private pkg; - public load(container: DependencyContainer): void + public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } - - public delayedLoad(container: DependencyContainer): void - { return } } -module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file +module.exports = { mod: new CWX_WeatherPatcher() } \ No newline at end of file diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BotCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BotCallbacks.d.ts index 9602975..2db60dc 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BotCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BotCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { - private botController; - private httpResponse; + protected botController: BotController; + protected httpResponse: HttpResponseUtil; constructor(botController: BotController, httpResponse: HttpResponseUtil); getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string; getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BundleCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BundleCallbacks.d.ts index b007ab8..b28abe1 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BundleCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/BundleCallbacks.d.ts @@ -1,15 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BundleCallbacks { - private logger; - private httpResponse; - private httpServer; - private bundleLoader; - private configServer; - private httpConfig; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); sendBundle(sessionID: string, req: any, resp: any, body: any): any; getBundles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/CustomizationCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/CustomizationCallbacks.d.ts index 918b8b6..3bab8c0 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/CustomizationCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/CustomizationCallbacks.d.ts @@ -9,9 +9,9 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { - private customizationController; - private saveServer; - private httpResponse; + protected customizationController: CustomizationController; + protected saveServer: SaveServer; + protected httpResponse: HttpResponseUtil; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DataCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DataCallbacks.d.ts index 018420e..cfb1c16 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DataCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DataCallbacks.d.ts @@ -12,8 +12,8 @@ import { ISettingsBase } from "../models/spt/server/ISettingsBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { - private httpResponse; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DialogueCallbacks.d.ts index 3b6fbd1..634f90b 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DialogueCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/DialogueCallbacks.d.ts @@ -21,10 +21,10 @@ import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { - private hashUtil; - private timeUtil; - private httpResponse; - private dialogueController; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected dialogueController: DialogueController; constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/GameCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/GameCallbacks.d.ts index 44a30ea..06da1b5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/GameCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/GameCallbacks.d.ts @@ -2,15 +2,16 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { - private httpResponse; - private watermark; - private gameController; + protected httpResponse: HttpResponseUtil; + protected watermark: Watermark; + protected gameController: GameController; constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HandbookCallbacks.d.ts index 0db5fec..891e375 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HandbookCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HandbookCallbacks.d.ts @@ -1,7 +1,7 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; export declare class HandbookCallbacks extends OnLoad { - private handbookController; + protected handbookController: HandbookController; constructor(handbookController: HandbookController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HealthCallbacks.d.ts index a50dd42..8672be7 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HealthCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HealthCallbacks.d.ts @@ -9,10 +9,17 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { - private httpResponse; - private profileHelper; - private healthController; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HideoutCallbacks.d.ts index 3698176..99ab4c9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HideoutCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HideoutCallbacks.d.ts @@ -11,11 +11,12 @@ import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutTog import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HideoutCallbacks extends OnUpdate { - private hideoutController; - private configServer; - private hideoutConfig; + protected hideoutController: HideoutController; + protected configServer: ConfigServer; + protected hideoutConfig: IHideoutConfig; constructor(hideoutController: HideoutController, // TODO: delay needed configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HttpCallbacks.d.ts index 9fe387d..94c97bd 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HttpCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/HttpCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoad } from "../di/OnLoad"; import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { - private httpServer; + protected httpServer: IHttpServer; constructor(httpServer: IHttpServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InraidCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InraidCallbacks.d.ts index 2d53227..05bcce4 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InraidCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InraidCallbacks.d.ts @@ -3,14 +3,16 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { - private inraidController; - private httpResponse; - private configServer; - private airdropConfig; - private inraidConfig; + protected inraidController: InraidController; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected airdropConfig: IAirdropConfig; + protected inraidConfig: IInRaidConfig; constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InsuranceCallbacks.d.ts index 79feb67..6819960 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InsuranceCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InsuranceCallbacks.d.ts @@ -3,20 +3,22 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { InsuranceService } from "../services/InsuranceService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { - private insuranceController; - private insuranceService; - private httpResponse; - private configServer; - private insuranceConfig; + protected insuranceController: InsuranceController; + protected insuranceService: InsuranceService; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InventoryCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InventoryCallbacks.d.ts index 9795aa0..9ab1486 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InventoryCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/InventoryCallbacks.d.ts @@ -18,7 +18,7 @@ import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryT import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { - private inventoryController; + protected inventoryController: InventoryController; constructor(inventoryController: InventoryController); moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ItemEventCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ItemEventCallbacks.d.ts index 74e79c4..f4f04f9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ItemEventCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ItemEventCallbacks.d.ts @@ -4,8 +4,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { - private httpResponse; - private itemEventRouter; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LauncherCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LauncherCallbacks.d.ts index 4bd5e2c..c022325 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LauncherCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LauncherCallbacks.d.ts @@ -8,10 +8,10 @@ import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { - private httpResponse; - private launcherController; - private saveServer; - private watermark; + protected httpResponse: HttpResponseUtil; + protected launcherController: LauncherController; + protected saveServer: SaveServer; + protected watermark: Watermark; constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LocationCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LocationCallbacks.d.ts index 5ecab74..cc69369 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LocationCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/LocationCallbacks.d.ts @@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { - private httpResponse; - private locationController; + protected httpResponse: HttpResponseUtil; + protected locationController: LocationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/MatchCallbacks.d.ts index 63d38d9..2a92ef5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/MatchCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/MatchCallbacks.d.ts @@ -1,34 +1,41 @@ import { MatchController } from "../controllers/MatchController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { - private httpResponse; - private jsonUtil; - private matchController; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected jsonUtil: JsonUtil; + protected matchController: MatchController; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; deleteGroup(url: string, info: any, sessionID: string): INullResponseData; startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ModCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ModCallbacks.d.ts index 2011f0e..58342dc 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ModCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ModCallbacks.d.ts @@ -1,17 +1,18 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { - private logger; - private httpResponse; - private httpServer; - private modLoader; - private configServer; - private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected postAkiModLoader: PostAkiModLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NoteCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NoteCallbacks.d.ts index fd7c5ca..d39d400 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NoteCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NoteCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { - private noteController; + protected noteController: NoteController; constructor(noteController: NoteController); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NotifierCallbacks.d.ts index 416e6a3..c42058f 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/NotifierCallbacks.d.ts @@ -6,9 +6,9 @@ import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { - private httpServerHelper; - private httpResponse; - private notifierController; + protected httpServerHelper: HttpServerHelper; + protected httpResponse: HttpResponseUtil; + protected notifierController: NotifierController; constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetBuildCallbacks.d.ts index 639c33f..541715a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; @@ -6,10 +7,10 @@ import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPreset import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { - private httpResponse; - private presetBuildController; + protected httpResponse: HttpResponseUtil; + protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetCallbacks.d.ts index f62afd6..4553f8f 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/PresetCallbacks.d.ts @@ -1,7 +1,7 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; export declare class PresetCallbacks extends OnLoad { - private presetController; + protected presetController: PresetController; constructor(presetController: PresetController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ProfileCallbacks.d.ts index efce47d..6a86fc0 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ProfileCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -12,9 +13,9 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { - private httpResponse; - private timeUtil; - private profileController; + protected httpResponse: HttpResponseUtil; + protected timeUtil: TimeUtil; + protected profileController: ProfileController; constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/QuestCallbacks.d.ts index f742096..559c29e 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/QuestCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/QuestCallbacks.d.ts @@ -13,9 +13,9 @@ import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestD import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { - private httpResponse; - private questController; - private repeatableQuestController; + protected httpResponse: HttpResponseUtil; + protected questController: QuestController; + protected repeatableQuestController: RepeatableQuestController; constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RagfairCallbacks.d.ts index 152475f..3a405c9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RagfairCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RagfairCallbacks.d.ts @@ -3,34 +3,39 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairCallbacks extends OnLoadOnUpdate { - private httpResponse; - private logger; - private jsonUtil; - private ragfairServer; - private ragfairController; - private configServer; - private ragfairConfig; + protected httpResponse: HttpResponseUtil; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected ragfairServer: RagfairServer; + protected ragfairController: RagfairController; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RepairCallbacks.d.ts index f63ec18..63733fa 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RepairCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/RepairCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; export declare class RepairCallbacks { - private repairController; + protected repairController: RepairController; constructor(repairController: RepairController); traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/SaveCallbacks.d.ts index b7219a0..bbb6e53 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/SaveCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/SaveCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { - private saveServer; + protected saveServer: SaveServer; constructor(saveServer: SaveServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TradeCallbacks.d.ts index 9928951..272ae46 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TradeCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TradeCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { - private tradeController; + protected tradeController: TradeController; constructor(tradeController: TradeController); processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TraderCallbacks.d.ts index 2a8af7f..128d9b2 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TraderCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/TraderCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { - private httpResponse; - private traderController; + protected httpResponse: HttpResponseUtil; + protected traderController: TraderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WeatherCallbacks.d.ts index e40ab3e..ae784c8 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WeatherCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WeatherCallbacks.d.ts @@ -3,8 +3,8 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { - private httpResponse; - private weatherController; + protected httpResponse: HttpResponseUtil; + protected weatherController: WeatherController; constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WishlistCallbacks.d.ts index e0249fd..c2cc2a8 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WishlistCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/callbacks/WishlistCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; export declare class WishlistCallbacks { - private wishlistController; + protected wishlistController: WishlistController; constructor(wishlistController: WishlistController); addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/context/ApplicationContext.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariable.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariableType.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/BotController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/BotController.d.ts index 8ecb97f..5e6f05d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/BotController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/BotController.d.ts @@ -4,17 +4,32 @@ import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequest import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class BotController { - private databaseServer; - private botGenerator; - private botHelper; - private configServer; - private botConfig; + protected databaseServer: DatabaseServer; + protected botGenerator: BotGenerator; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); - getBotLimit(type: string): number; - getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + /** + * Return the number of bot loadout varieties to be generated + * @param type bot Type we want the loadout gen count for + * @returns + */ + getBotPresetGenerationLimit(type: string): number; + getBotCoreDifficulty(): IBotCore; + /** + * Get bot difficulty settings + * adjust PMC settings to ensure they engage the correct bot types + * @param type what bot the server is requesting settings for + * @param difficulty difficulty level server requested settings for + * @returns Difficulty object + */ + getBotDifficulty(type: string, difficulty: string): Difficulty; + protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/CustomizationController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/CustomizationController.d.ts index 698e6be..a6c4730 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/CustomizationController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/CustomizationController.d.ts @@ -9,14 +9,14 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; export declare class CustomizationController { - private logger; - private itemEventRouter; - private databaseServer; - private saveServer; - private profileHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper); getTraderSuits(traderID: string, sessionID: string): ISuit[]; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; - private getAllTraderSuits; + protected getAllTraderSuits(sessionID: string): ISuit[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/DialogueController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/DialogueController.d.ts index 235594f..b15c4b6 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/DialogueController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/DialogueController.d.ts @@ -3,13 +3,13 @@ import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachme import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { - private httpResponse; - private saveServer; - private dialogueHelper; + protected httpResponse: HttpResponseUtil; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; @@ -19,7 +19,7 @@ export declare class DialogueController { setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void; setRead(dialogueIDs: string[], sessionID: string): void; getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse; - private messagesHaveUncollectedRewards; - private removeExpiredItems; + protected messagesHaveUncollectedRewards(messages: Message[]): boolean; + protected removeExpiredItems(sessionID: string): void; update(): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/GameController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/GameController.d.ts index bb2a55a..85ec418 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/GameController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/GameController.d.ts @@ -2,27 +2,27 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { Watermark } from "../utils/Watermark"; export declare class GameController { - private logger; - private watermark; - private httpServerHelper; - private profileHelper; - private configServer; - private httpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + protected logger: ILogger; + protected watermark: Watermark; + protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - private addMissingBonusesProperty; - private addMissingRepeatableQuestsProperty; - private addMissingWeaponRepairSkill; - private addMissingAkiVersionTagToProfile; - private addMissingArmorRepairSkill; - private fixNullTraderSalesSums; - private removeDanglingConditionCounters; - private removeDanglingBackendCounters; + protected logProfileDetails(fullProfile: IAkiProfile): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; - private getActiveRepeatableQuests; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/HandbookController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/HandbookController.d.ts index f473437..52d2dd8 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/HandbookController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/HandbookController.d.ts @@ -1,8 +1,8 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class HandbookController { - private databaseServer; - private handbookHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper); load(): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/HealthController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/HealthController.d.ts index ca049f6..cc13603 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/HealthController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/HealthController.d.ts @@ -11,15 +11,36 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { - private logger; - private itemEventRouter; - private itemHelper; - private paymentService; - private inventoryHelper; - private healthHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected inventoryHelper: InventoryHelper; + protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/HideoutController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/HideoutController.d.ts index f35c23b..3eefe1a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/HideoutController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/HideoutController.d.ts @@ -1,11 +1,14 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -14,6 +17,7 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -25,32 +29,74 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HideoutController { - private logger; - private hashUtil; - private timeUtil; - private databaseServer; - private randomUtil; - private inventoryHelper; - private saveServer; - private playerService; - private presetHelper; - private paymentHelper; - private itemEventRouter; - private httpResponse; - private profileHelper; - private hideoutHelper; - private configServer; - private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected inventoryHelper: InventoryHelper; + protected saveServer: SaveServer; + protected playerService: PlayerService; + protected presetHelper: PresetHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; + protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; + protected hideoutConfig: IHideoutConfig; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/InraidController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/InraidController.d.ts index c1cd6f5..b899e7d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/InraidController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/InraidController.d.ts @@ -1,30 +1,44 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { - private saveServer; - private jsonUtil; - private databaseServer; - private questHelper; - private itemHelper; - private extendedProfileHelper; - private healthHelper; - private traderHelper; - private insuranceService; - private inRaidHelper; - private configServer; - private inraidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; + protected healthHelper: HealthHelper; + protected traderHelper: TraderHelper; + protected insuranceService: InsuranceService; + protected inRaidHelper: InRaidHelper; + protected configServer: ConfigServer; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/InsuranceController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/InsuranceController.d.ts index b175a06..6895383 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/InsuranceController.d.ts @@ -3,8 +3,10 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,23 +17,28 @@ import { PaymentService } from "../services/PaymentService"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceController { - private logger; - private randomUtil; - private itemEventRouter; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private profileHelper; - private dialogueHelper; - private paymentService; - private insuranceService; - private configServer; - private insuranceConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected itemEventRouter: ItemEventRouter; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected dialogueHelper: DialogueHelper; + protected paymentService: PaymentService; + protected insuranceService: InsuranceService; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; - doAbsolutelyNothing(): void; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/InventoryController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/InventoryController.d.ts index 8235082..f57f731 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/InventoryController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/InventoryController.d.ts @@ -24,19 +24,23 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; - private presetHelper; - private inventoryHelper; - private profileHelper; - private paymentHelper; - private itemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected fenceService: FenceService; + protected presetHelper: PresetHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/LauncherController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/LauncherController.d.ts index 2a30713..1af1f56 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/LauncherController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/LauncherController.d.ts @@ -3,23 +3,24 @@ import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { Info } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class LauncherController { - private hashUtil; - private saveServer; - private httpServerHelper; - private databaseServer; - private configServer; - private coreConfig; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected httpServerHelper: HttpServerHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected coreConfig: ICoreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; login(info: ILoginRequestData): string; register(info: IRegisterData): string; - private createAccount; + protected createAccount(info: IRegisterData): string; changeUsername(info: IChangeRequestData): string; changePassword(info: IChangeRequestData): string; wipe(info: IRegisterData): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/LocationController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/LocationController.d.ts index 41a8719..90b6d7a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/LocationController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/LocationController.d.ts @@ -6,11 +6,11 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class LocationController { - private jsonUtil; - private logger; - private locationGenerator; - private databaseServer; - private timeUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected locationGenerator: LocationGenerator; + protected databaseServer: DatabaseServer; + protected timeUtil: TimeUtil; constructor(jsonUtil: JsonUtil, logger: ILogger, locationGenerator: LocationGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil); get(location: string): ILocationBase; generate(name: string): ILocationBase; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/MatchController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/MatchController.d.ts index 84abbe3..71cb7d3 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/MatchController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/MatchController.d.ts @@ -1,28 +1,38 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "../models/spt/config/IMatchConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { - private saveServer; - private profileHelper; - private matchLocationService; - private traderHelper; - private configServer; - private matchConfig; - private inraidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected matchLocationService: MatchLocationService; + protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; + protected matchConfig: IMatchConfig; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; - private getMatch; - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/NoteController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/NoteController.d.ts index 4d3420e..ee70541 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/NoteController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { - private itemEventRouter; +export declare class NoteController { + protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/NotifierController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/NotifierController.d.ts index 36fef66..31d7bfe 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/NotifierController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/NotifierController.d.ts @@ -3,11 +3,11 @@ import { NotificationService } from "../services/NotificationService"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { - private notifierHelper; - private httpServerHelper; - private notificationService; - private pollInterval; - private timeout; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected notificationService: NotificationService; + protected pollInterval: number; + protected timeout: number; constructor(notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, notificationService: NotificationService); /** * Resolve an array of session notifications. diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetBuildController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetBuildController.d.ts index 11c5c3e..adf4084 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetBuildController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetBuildController.d.ts @@ -7,10 +7,10 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class PresetBuildController { - private hashUtil; - private itemEventRouter; - private itemHelper; - private saveServer; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer); getUserBuilds(sessionID: string): WeaponBuild[]; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetController.d.ts index 6ec8c55..ca1af1a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/PresetController.d.ts @@ -1,8 +1,8 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetController { - private presetHelper; - private databaseServer; + protected presetHelper: PresetHelper; + protected databaseServer: DatabaseServer; constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer); initialize(): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/ProfileController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/ProfileController.d.ts index c8bd5f1..8c89a02 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/ProfileController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -11,21 +12,30 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { - private hashUtil; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private traderHelper; - private extendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; + protected traderHelper: TraderHelper; + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/QuestController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/QuestController.d.ts index d8caee5..2cbccfb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/QuestController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/QuestController.d.ts @@ -4,34 +4,73 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { PlayerService } from "../services/PlayerService"; import { TimeUtil } from "../utils/TimeUtil"; export declare class QuestController { - private logger; - private timeUtil; - private itemEventRouter; - private databaseServer; - private itemHelper; - private dialogueHelper; - private profileHelper; - private questHelper; - private questConditionHelper; - private playerService; - private configServer; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected questHelper: QuestHelper; + protected questConditionHelper: QuestConditionHelper; + protected playerService: PlayerService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ getClientQuests(sessionID: string): IQuest[]; acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void; + /** + * Returns a list of quests that should be failed when a quest is completed + * @param completedQuestId quest completed id + * @returns array of quests + */ + protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[]; + /** + * Fail the quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/RagfairController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/RagfairController.d.ts index 5b94a95..c4ffc15 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/RagfairController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/RagfairController.d.ts @@ -20,6 +20,7 @@ import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPric import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -33,32 +34,34 @@ import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsSer import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { - private logger; - private timeUtil; - private httpResponse; - private itemEventRouter; - private ragfairServer; - private ragfairPriceService; - private databaseServer; - private itemHelper; - private saveServer; - private ragfairSellHelper; - private ragfairTaxHelper; - private ragfairSortHelper; - private ragfairOfferHelper; - private profileHelper; - private paymentService; - private handbookHelper; - private paymentHelper; - private inventoryHelper; - private ragfairHelper; - private ragfairOfferService; - private ragfairRequiredItemsService; - private ragfairOfferGenerator; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; + protected ragfairServer: RagfairServer; + protected ragfairPriceService: RagfairPriceService; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; + protected ragfairSellHelper: RagfairSellHelper; + protected ragfairTaxHelper: RagfairTaxHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairOfferHelper: RagfairOfferHelper; + protected profileHelper: ProfileHelper; + protected paymentService: PaymentService; + protected handbookHelper: HandbookHelper; + protected paymentHelper: PaymentHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepairController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepairController.d.ts index 77dd47a..0e78ef6 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepairController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepairController.d.ts @@ -5,21 +5,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; export declare class RepairController { - private logger; - private itemEventRouter; - private databaseServer; - private questHelper; - private traderHelper; - private paymentService; - private repairHelper; - private configServer; - private repairConfig; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected traderHelper: TraderHelper; + protected paymentService: PaymentService; + protected repairHelper: RepairHelper; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -36,5 +37,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepeatableQuestController.d.ts index 2dedc7e..98d05dd 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/RepeatableQuestController.d.ts @@ -4,17 +4,19 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { ELocationName } from "../models/enums/ELocationName"; -import { IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -48,22 +50,23 @@ export interface ITargetLocation { locations: string[]; } export declare class RepeatableQuestController { - private timeUtil; - private logger; - private randomUtil; - private mathUtil; - private jsonUtil; - private databaseServer; - private itemHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private itemEventRouter; - private paymentService; - private objectId; - private configServer; - private questConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + protected timeUtil: TimeUtil; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected mathUtil: MathUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected ragfairServerHelper: RagfairServerHelper; + protected itemEventRouter: ItemEventRouter; + protected paymentService: PaymentService; + protected objectId: ObjectId; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/TradeController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/TradeController.d.ts index f0a177b..c86745c 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/TradeController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/TradeController.d.ts @@ -9,11 +9,11 @@ import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTr import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { - private logger; - private itemEventRouter; - private tradeHelper; - private profileHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected tradeHelper: TradeHelper; + protected profileHelper: ProfileHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer); confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse; confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/TraderController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/TraderController.d.ts index 36eac75..7bab158 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/TraderController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/TraderController.d.ts @@ -8,14 +8,14 @@ import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { - private logger; - private databaseServer; - private traderAssortHelper; - private profileHelper; - private traderHelper; - private timeUtil; - private traderAssortService; - private jsonUtil; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected traderAssortHelper: TraderAssortHelper; + protected profileHelper: ProfileHelper; + protected traderHelper: TraderHelper; + protected timeUtil: TimeUtil; + protected traderAssortService: TraderAssortService; + protected jsonUtil: JsonUtil; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/WeatherController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/WeatherController.d.ts index 312c3a3..ca7f5eb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/WeatherController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/WeatherController.d.ts @@ -1,10 +1,11 @@ import { WeatherGenerator } from "../generators/WeatherGenerator"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WeatherController { - private weatherGenerator; - private configServer; - private weatherConfig; + protected weatherGenerator: WeatherGenerator; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/controllers/WishlistController.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/controllers/WishlistController.d.ts index 5ef8df3..a96c522 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/controllers/WishlistController.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/controllers/WishlistController.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class WishlistController { - private itemEvenRouter; + protected itemEvenRouter: ItemEventRouter; constructor(itemEvenRouter: ItemEventRouter); addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotGenerator.d.ts index e2565b7..a5fc0ad 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotGenerator.d.ts @@ -1,36 +1,96 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; -export declare class BotGenerator { - private logger; - private hashUtil; - private randomUtil; - private jsonUtil; - private databaseServer; - private botInventoryGenerator; - private botHelper; - private gameEventHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - private generateBot; - private generateRandomLevel; - /** Converts health object to the required format */ - private generateHealth; - private generateSkills; - private getPmcRole; - private removeChristmasItemsFromBotInventory; - private generateId; - private generateInventoryID; - private getPMCDifficulty; - private generateDogtag; +declare namespace BotGenerator { + interface IRandomisedBotLevelResult { + level: number; + exp: number; + } } +export declare class BotGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected databaseServer: DatabaseServer; + protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; + protected botHelper: BotHelper; + protected gameEventHelper: GameEventHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); + /** + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns + */ + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; + protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ + protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; + protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ + protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ + protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; + protected generateId(bot: IBotBase): IBotBase; + protected generateInventoryID(profile: IBotBase): IBotBase; + protected getPMCDifficulty(requestedDifficulty: string): string; + /** + * Add a side-specific (usec/bear) dogtag item to a bots inventory + * @param bot bot to add dogtag to + * @returns Bot with dogtag added + */ + protected generateDogtag(bot: IBotBase): IBotBase; +} +export {}; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotInventoryGenerator.d.ts index 0cdbacb..35d1ee8 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotInventoryGenerator.d.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; @@ -9,16 +9,16 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botWeaponGenerator; - private botLootGenerator; - private botGeneratorHelper; - private weightedRandomHelper; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootGenerator: BotLootGenerator; + protected botGeneratorHelper: BotGeneratorHelper; + protected weightedRandomHelper: WeightedRandomHelper; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; - private generateEquipment; - private generateInventoryBase; + protected generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + protected generateInventoryBase(): PmcInventory; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotLootGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotLootGenerator.d.ts index 1d8c8e1..c6a3f29 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotLootGenerator.d.ts @@ -1,27 +1,124 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private botGeneratorHelper; - private pmcLootGenerator; - private configServer; - private botConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; - private getRandomisedCount; - private addLootFromPool; - /** Compares two item templates by their price to spawn chance ratio */ - private compareByValue; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotWeaponGenerator.d.ts index e8f91cb..9215214 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/BotWeaponGenerator.d.ts @@ -1,44 +1,173 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { - private logger; - private hashUtil; - private databaseServer; - private itemHelper; - private weightedRandomHelper; - private botGeneratorHelper; - private randomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - private isWeaponValid; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - private generateExtraMagazines; - private addBullets; + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values * @returns */ - private getCompatibleAmmo; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - private fillExistingMagazines; + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/LocationGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/LocationGenerator.d.ts index 4b96792..bd368b5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/LocationGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/LocationGenerator.d.ts @@ -6,6 +6,8 @@ import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; import { Item } from "../models/eft/common/tables/IItem"; import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILocationConfig } from "../models/spt/config/ILocationConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; @@ -18,27 +20,27 @@ export interface IContainerItem { height: number; } export declare class LocationGenerator { - private logger; - private jsonUtil; - private objectId; - private randomUtil; - private ragfairServerHelper; - private itemHelper; - private mathUtil; - private gameEventHelper; - private containerHelper; - private presetHelper; - private configServer; - private locationConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected objectId: ObjectId; + protected randomUtil: RandomUtil; + protected ragfairServerHelper: RagfairServerHelper; + protected itemHelper: ItemHelper; + protected mathUtil: MathUtil; + protected gameEventHelper: GameEventHelper; + protected containerHelper: ContainerHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected locationConfig: ILocationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; - private getLooseLootMultiplerForLocation; - private getStaticLootMultiplerForLocation; + protected getLooseLootMultiplerForLocation(location: string): number; + protected getStaticLootMultiplerForLocation(location: string): number; generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record, locationName: string): SpawnpointTemplate[]; - private createItem; - private getRandomCompatibleCaliberTemplateId; - private getRandomValidCaliber; - private drawAmmoTpl; - private createRandomMagCartridges; - private createCartidges; + protected createItem(tpl: string, staticAmmoDist: Record, parentId?: string): IContainerItem; + protected getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string; + protected getRandomValidCaliber(magTemplate: ITemplateItem): string; + protected drawAmmoTpl(caliber: string, staticAmmoDist: Record): string; + protected createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record, caliber?: string): Item; + protected createCartidges(parentId: string, ammoTpl: string, stackCount: number): Item; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/PMCLootGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/PMCLootGenerator.d.ts index 601431b..64e6f7f 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/PMCLootGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/PMCLootGenerator.d.ts @@ -1,13 +1,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; export declare class PMCLootGenerator { - private itemHelper; - private databaseServer; - private configServer; - private pocketLootPool; - private backpackLootPool; - private botConfig; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected pocketLootPool: string[]; + protected backpackLootPool: string[]; + protected botConfig: IBotConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairAssortGenerator.d.ts index 06d3250..cbdd7f2 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairAssortGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairAssortGenerator.d.ts @@ -4,22 +4,22 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairAssortGenerator { - private jsonUtil; - private hashUtil; - private itemHelper; - private databaseServer; - private generatedAssortItems; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected generatedAssortItems: Item[]; constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer); /** * Get an array of unique items that can be sold on the flea * @returns array of unique items */ getAssortItems(): Item[]; - private assortsAreGenerated; + protected assortsAreGenerated(): boolean; /** * Generate an array of items the flea can sell * @returns array of unique items */ - private generateRagfairAssortItems; - private createRagfairAssortItem; + protected generateRagfairAssortItems(): Item[]; + protected createRagfairAssortItem(tplId: string, id?: string): Item; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairOfferGenerator.d.ts index e3fbe4a..3e7f4cc 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairOfferGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/RagfairOfferGenerator.d.ts @@ -2,13 +2,16 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -17,37 +20,41 @@ import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairAssortGenerator } from "./RagfairAssortGenerator"; export declare class RagfairOfferGenerator { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private timeUtil; - private databaseServer; - private ragfairServerHelper; - private saveServer; - private presetHelper; - private ragfairAssortGenerator; - private ragfairOfferService; - private ragfairPriceService; - private fenceService; - private itemHelper; - private configServer; - private ragfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected ragfairServerHelper: RagfairServerHelper; + protected saveServer: SaveServer; + protected presetHelper: PresetHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected fenceService: FenceService; + protected itemHelper: ItemHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; - private getTraderId; - private getRating; - private getRatingGrowing; - private getOfferEndTime; + protected getTraderId(userID: string): string; + protected getRating(userID: string): number; + protected getRatingGrowing(userID: string): boolean; + protected getOfferEndTime(userID: string, time: number): number; /** * Create multiple offers for items by using a unique list of items we've generated previously * @param expiredOffers */ generateDynamicOffers(expiredOffers?: Item[]): void; generateTraderOffers(traderID: string): void; - private getItemCondition; - private addMissingCondition; - private getOfferRequirements; + protected getItemCondition(userID: string, items: Item[], itemDetails: ITemplateItem): Item[]; + protected addMissingCondition(item: Item): Item; + protected getOfferRequirements(items: Item[]): { + count: number; + _tpl: string; + }[]; /** * Create a flea offer and store it in the Ragfair server offers array */ diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/generators/WeatherGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/generators/WeatherGenerator.d.ts index b9faa3a..44cecbb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/generators/WeatherGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/generators/WeatherGenerator.d.ts @@ -1,19 +1,33 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { - private weightedRandomHelper; - private randomUtil; - private timeUtil; - private configServer; - private weatherConfig; + protected weightedRandomHelper: WeightedRandomHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; generateWeather(data: IWeatherData): IWeatherData; - private getWeightedFog; - private getWeightedRain; - private getRandomFloat; - private getRandomInt; + protected getWeightedFog(): string; + protected getWeightedRain(): number; + protected getRandomFloat(node: string): number; + protected getRandomInt(node: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/AssortHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/AssortHelper.d.ts index 33cb5c6..15586b9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/AssortHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/AssortHelper.d.ts @@ -5,12 +5,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; export declare class AssortHelper { - private logger; - private itemHelper; - private databaseServer; - private questHelper; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort assort items from a trader + * @returns assort items minus locked quest assorts + */ + stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort traders assorts + * @returns traders assorts minus locked loyality assorts + */ + stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove an item from an assort + * @param assort assort to modify + * @param itemID item id to remove from asort + * @returns Modified assort + */ removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; - stripQuestAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; - stripLoyaltyAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotGeneratorHelper.d.ts index 141f71d..3cd7256 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotGeneratorHelper.d.ts @@ -1,8 +1,9 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; +import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,20 +13,50 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ContainerHelper } from "./ContainerHelper"; import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; export declare class BotGeneratorHelper { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private durabilityLimitsHelper; - private itemHelper; - private inventoryHelper; - private containerHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; + protected databaseServer: DatabaseServer; + protected durabilityLimitsHelper: DurabilityLimitsHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected containerHelper: ContainerHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot + * never return true for an item that has 0% spawn chance + * @param itemSlot slot the item sits in + * @param modSlot slot the mod sits in + * @param modSpawnChances Chances for various mod spawns + * @returns boolean true if it should spawn + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * e.g. mod_magazine + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; /** * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. @@ -37,16 +68,56 @@ export declare class BotGeneratorHelper { * @param {string} parentId The CylinderMagazine's UID * @param {object} parentTemplate The CylinderMagazine's template */ - private fillCamora; + protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void; + /** + * Take a record of camoras and merge the compatable shells into one array + * @param camorasWithShells camoras we want to merge into one array + * @returns string array of shells fro luitple camora sources + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { - "upd"?: Upd; + upd?: Upd; }; - private getModTplFromItemDb; + /** + * Create a repairable object for a weapon that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateWeaponRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + /** + * Create a repairable object for an armor that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string; + /** + * Sort by spawn chance, highest to lowest, higher is more common + * @param unsortedModArray String array to sort + * @returns Sorted string array + */ + protected sortModArray(unsortedModArray: string[]): string[]; + /** + * Can an item be added to an item without issue + * @param items + * @param tplToCheck + * @param equipmentSlot + * @returns true if possible + */ isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. - * Returns a `boolean` indicating success. */ + /** + * Adds an item with all its childern into specified equipmentSlots, wherever it fits. + * @param equipmentSlots + * @param parentId + * @param parentTpl + * @param itemWithChildren + * @param inventory + * @returns a `boolean` indicating item was added + */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; - private itemAllowedInContainer; + protected itemAllowedInContainer(slot: Grid, itemTpl: string): boolean; } export declare class ExhaustableArray { private itemPool; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotHelper.d.ts index d901362..9b89481 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/BotHelper.d.ts @@ -1,22 +1,45 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotHelper { - private logger; - private jsonUtil; - private databaseServer; - private randomUtil; - private configServer; - private botConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; + /** + * Randomise the chance the PMC will attack their own side + * @param difficultySettings pmc difficulty settings + */ randomisePmcHostility(difficultySettings: Difficulty): void; isBotPmc(botRole: string): boolean; isBotBoss(botRole: string): boolean; isBotFollower(botRole: string): boolean; + /** + * Add a bot to the FRIENDLY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typeToAdd bot type to add to friendly list + */ addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; + /** + * Add a bot to the ENEMY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to enemy list + */ + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; + /** + * Add a bot to the REVENGE_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to revenge list + */ + addBotToRevengeList(difficultySettings: Difficulty, typesToAdd: string[]): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ContainerHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ContainerHelper.d.ts index 34cd1e4..3c2ee93 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ContainerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ContainerHelper.d.ts @@ -6,7 +6,7 @@ export declare class FindSlotResult { constructor(success?: boolean, x?: any, y?: any, rotation?: boolean); } export declare class ContainerHelper { - private locateSlot; + protected locateSlot(container2D: number[][], containerX: number, containerY: number, x: number, y: number, itemW: number, itemH: number): boolean; findSlotForItem(container2D: number[][], itemWidth: number, itemHeight: number): FindSlotResult; fillContainerMapWithItem(container2D: number[][], x: number, y: number, itemW: number, itemH: number, rotate: boolean): any; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/DialogueHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/DialogueHelper.d.ts index ae1f581..e3e2bda 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -7,15 +8,33 @@ import { ItemHelper } from "./ItemHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; import { NotifierHelper } from "./NotifierHelper"; export declare class DialogueHelper { - private hashUtil; - private saveServer; - private databaseServer; - private notifierHelper; - private notificationSendHelper; - private itemHelper; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected notificationSendHelper: NotificationSendHelper; + protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/DurabilityLimitsHelper.d.ts index 609bc7d..07a5db1 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/DurabilityLimitsHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,25 +1,26 @@ import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { - private randomUtil; - private botHelper; - private configServer; - private botConfig; + protected randomUtil: RandomUtil; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - private generateMaxWeaponDurability; - private generateMaxPmcArmorDurability; - private getLowestMaxWeaponFromConfig; - private getHighestMaxWeaponDurabilityFromConfig; - private generateWeaponDurability; - private generateArmorDurability; - private getMinWeaponDeltaFromConfig; - private getMaxWeaponDeltaFromConfig; - private getMinArmorDeltaFromConfig; - private getMaxArmorDeltaFromConfig; + protected generateMaxWeaponDurability(botRole: string): number; + protected generateMaxPmcArmorDurability(itemMaxDurability: number): number; + protected getLowestMaxWeaponFromConfig(botRole: string): number; + protected getHighestMaxWeaponDurabilityFromConfig(botRole: string): number; + protected generateWeaponDurability(botRole: string, maxDurability: number): number; + protected generateArmorDurability(botRole: string, maxDurability: number): number; + protected getMinWeaponDeltaFromConfig(botRole: string): number; + protected getMaxWeaponDeltaFromConfig(botRole: string): number; + protected getMinArmorDeltaFromConfig(botRole: string): number; + protected getMaxArmorDeltaFromConfig(botRole: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ExtendedProfileHelper.d.ts index 4dd7d3a..c05d88e 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ExtendedProfileHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ExtendedProfileHelper.d.ts @@ -1,22 +1,27 @@ import { BotGenerator } from "../generators/BotGenerator"; -import { IPmcData } from "../models/eft/common/IPmcData"; +import { IPmcData, Skills, Stats } from "../models/eft/common/IPmcData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { FenceService } from "../services/FenceService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { Watermark } from "../utils/Watermark"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; +/** + * This class needs to exist outside of ProfileHelper to ensure cyclic deps don't cause the server to fail on load + */ export declare class ExtendedProfileHelper extends ProfileHelper { - private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, botLootCacheService: BotLootCacheService, fenceService: FenceService, botGenerator: BotGenerator); generatePlayerScav(sessionID: string): IPmcData; - private getScavSkills; - private removeSecureContainer; - private getDefaultScavSkills; - private getScavStats; - private getScavLevel; - private getScavExperience; - private setScavCooldownTimer; + protected getScavSkills(sessionID: string): Skills; + protected removeSecureContainer(profile: IPmcData): IPmcData; + protected getDefaultScavSkills(): Skills; + protected getScavStats(sessionID: string): Stats; + protected getScavLevel(sessionID: string): number; + protected getScavExperience(sessionID: string): number; + protected setScavCooldownTimer(profile: IPmcData, pmcData: IPmcData): IPmcData; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/GameEventHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/GameEventHelper.d.ts index 8131d31..7613053 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/GameEventHelper.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { - private databaseServer; + protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HandbookHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HandbookHelper.d.ts index aed6984..b47d466 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HandbookHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HandbookHelper.d.ts @@ -9,7 +9,7 @@ export declare class LookupCollection { constructor(); } export declare class HandbookHelper { - private lookup; + protected lookup: LookupCollection; hydrateLookup(lookup: LookupCollection): void; getTemplatePrice(x: string): number; templatesWithParent(x: string): string[]; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HealthHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HealthHelper.d.ts index bb160a3..3116c9c 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HealthHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HealthHelper.d.ts @@ -1,23 +1,51 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HealthHelper { - private jsonUtil; - private logger; - private timeUtil; - private saveServer; - private configServer; - private healthConfig; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - private saveHealth; - private saveEffects; - private addEffect; - private isEmpty; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HideoutHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HideoutHelper.d.ts index d6a4414..36e4009 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HideoutHelper.d.ts @@ -1,10 +1,12 @@ -import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; +import { Upd } from "../models/eft/common/tables/IItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -17,26 +19,22 @@ import { TimeUtil } from "../utils/TimeUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class HideoutHelper { - private logger; - private hashUtil; - private timeUtil; - private randomUtil; - private databaseServer; - private itemEventRouter; - private httpResponse; - private profileHelper; - private inventoryHelper; - private playerService; - private configServer; - static BITCOIN_FARM: string; - private WATER_COLLECTOR; - private BITCOIN; - private EXPEDITIONARY_FUEL_TANK; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; - private hideoutConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected inventoryHelper: InventoryHelper; + protected playerService: PlayerService; + protected configServer: ConfigServer; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; + protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** @@ -46,21 +44,20 @@ export declare class HideoutHelper { initProduction(recipeId: string, productionTime: number): Production; isProductionType(productive: Productive): productive is Production; applyPlayerUpgradesBonuses(pmcData: IPmcData, bonus: StageBonus): void; - private applySkillXPBoost; + protected applySkillXPBoost(pmcData: IPmcData, bonus: StageBonus): void; updatePlayerHideout(sessionID: string): void; - private updateWaterCollector; - private doesWaterCollectorHaveFilter; - private updateFuel; - private updateWaterFilters; - private getAreaUpdObject; - private updateAirFilters; - private updateBitcoinFarm; - private getBTCSlots; - private getManagementSkillsSlots; - private hasManagementSkillSlots; - private getHideoutManagementSkill; - private getHideoutManagementConsumptionBonus; + protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void; + protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean; + protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateWaterFilters(waterFilterArea: HideoutArea, pwProd: Production, isGeneratorOn: boolean, pmcData: IPmcData): HideoutArea; + protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd; + protected updateAirFilters(airFilterArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production; + protected getBTCSlots(pmcData: IPmcData): number; + protected getManagementSkillsSlots(): number; + protected hasManagementSkillSlots(pmcData: IPmcData): boolean; + protected getHideoutManagementSkill(pmcData: IPmcData): Common; + protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HttpServerHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HttpServerHelper.d.ts index 2e40814..c6e5296 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/HttpServerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/HttpServerHelper.d.ts @@ -1,8 +1,19 @@ +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HttpServerHelper { - private configServer; - private httpConfig; - private mime; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected mime: { + css: string; + bin: string; + html: string; + jpg: string; + js: string; + json: string; + png: string; + svg: string; + txt: string; + }; constructor(configServer: ConfigServer); getMimeText(key: string): string; buildUrl(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/InRaidHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/InRaidHelper.d.ts index e79d384..c3cbfbb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -8,26 +9,89 @@ import { JsonUtil } from "../utils/JsonUtil"; import { InventoryHelper } from "./InventoryHelper"; import { PaymentHelper } from "./PaymentHelper"; export declare class InRaidHelper { - private logger; - private saveServer; - private jsonUtil; - private databaseServer; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - private removePlayer; - private removeMapAccessKey; + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; getPlayerGear(items: Item[]): Item[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/InventoryHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/InventoryHelper.d.ts index 00e95d3..dc7cbca 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/InventoryHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/InventoryHelper.d.ts @@ -5,6 +5,7 @@ import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMe import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInventoryConfig } from "../models/spt/config/IInventoryConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -25,26 +26,26 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class InventoryHelper { - private logger; - private jsonUtil; - private hashUtil; - private httpResponse; - private fenceService; - private databaseServer; - private paymentHelper; - private traderAssortHelper; - private dialogueHelper; - private itemHelper; - private containerHelper; - private profileHelper; - private configServer; - private inventoryConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected httpResponse: HttpResponseUtil; + protected fenceService: FenceService; + protected databaseServer: DatabaseServer; + protected paymentHelper: PaymentHelper; + protected traderAssortHelper: TraderAssortHelper; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected containerHelper: ContainerHelper; + protected profileHelper: ProfileHelper; + protected configServer: ConfigServer; + protected inventoryConfig: IInventoryConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; - private getSizeByInventoryItemHash; - private getInventoryItemHash; + protected getSizeByInventoryItemHash(itemTpl: string, itemID: string, inventoryItemHash: InventoryHelper.InventoryItemHash): Record; + protected getInventoryItemHash(inventoryItem: Item[]): InventoryHelper.InventoryItemHash; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. @@ -56,9 +57,9 @@ export declare class InventoryHelper { * @param {string} sessionID * @returns Array */ - private getStashSlotMap; - private getStashType; - private getPlayerStashSize; + protected getStashSlotMap(pmcData: IPmcData, sessionID: string): number[][]; + protected getStashType(sessionID: string): string; + protected getPlayerStashSize(sessionID: string): Record; /** * Internal helper function to transfer an item from one profile to another. * fromProfileData: Profile of the source. @@ -73,5 +74,12 @@ export declare class InventoryHelper { /** * Internal helper function to handle cartridges in inventory if any of them exist. */ - private handleCartridges; + protected handleCartridges(items: Item[], body: IInventoryMoveRequestData): void; } +declare namespace InventoryHelper { + interface InventoryItemHash { + byItemId: Record; + byParentId: Record; + } +} +export {}; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ItemHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ItemHelper.d.ts index 5ff64b6..1701c62 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ItemHelper.d.ts @@ -1,15 +1,16 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; declare class ItemHelper { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); /** * Checks if a id is a valid item. Valid meaning that it's an item that be stored in stash @@ -18,7 +19,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward * or content of bot loot. Items that are tested as valid may be in a player backpack or stash. * @param {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 @@ -82,27 +83,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +163,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +189,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotificationSendHelper.d.ts index b9298da..34e62d9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotificationSendHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotificationSendHelper.d.ts @@ -2,8 +2,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { - private httpServer; - private notificationService; + protected httpServer: IHttpServer; + protected notificationService: NotificationService; constructor(httpServer: IHttpServer, notificationService: NotificationService); /** * Send notification message to the appropiate channel diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotifierHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotifierHelper.d.ts index 0d524e9..738b69a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotifierHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/NotifierHelper.d.ts @@ -2,11 +2,11 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { - private httpServerHelper; + protected httpServerHelper: HttpServerHelper; /** * The default notification sent when waiting times out. */ - private defaultNotification; + protected defaultNotification: INotification; constructor(httpServerHelper: HttpServerHelper); getDefaultNotification(): INotification; /** Creates a new notification that displays the "Your offer was sold!" prompt and removes sold offer from "My Offers" on clientside */ diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/PresetHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/PresetHelper.d.ts index 0a24128..a469582 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/PresetHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { - private databaseServer; - private lookup; - constructor(databaseServer: DatabaseServer); + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected lookup: Record; + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ProfileHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ProfileHelper.d.ts index 508443c..6c150c8 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -20,6 +21,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; @@ -28,6 +35,12 @@ export declare class ProfileHelper { getPmcProfile(sessionID: string): IPmcData; getScavProfile(sessionID: string): IPmcData; getDefaultCounters(): Stats; - private isWiped; - private getServerVersion; + protected isWiped(sessionID: string): boolean; + protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestConditionHelper.d.ts index 2a0ee94..90ee560 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestConditionHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestConditionHelper.d.ts @@ -3,5 +3,5 @@ export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLoyaltyConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; - private filterConditions; + protected filterConditions(q: AvailableForConditions[], questType: string, furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestHelper.d.ts index 9e2dd5e..0f68cd5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/QuestHelper.d.ts @@ -1,12 +1,15 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -17,23 +20,23 @@ import { ProfileHelper } from "./ProfileHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { - private logger; - private jsonUtil; - private timeUtil; - private hashUtil; - private itemHelper; - private itemEventRouter; - private databaseServer; - private ragfairServerHelper; - private dialogueHelper; - private profileHelper; - private paymentHelper; - private traderHelper; - private configServer; - private questConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + protected ragfairServerHelper: RagfairServerHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected traderHelper: TraderHelper; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -45,24 +48,68 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; - private processReward; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + protected processReward(reward: Reward): any[]; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; /** * Get List of All Quests as an array + * @returns Array of IQuest objects */ questValues(): IQuest[]; - private cleanQuestList; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ + protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ cleanQuestConditions(quest: IQuest): IQuest; failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; getFindItemIdForQuestItem(itemTpl: string): string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairHelper.d.ts index 8e70bcd..2c8dbb5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairHelper.d.ts @@ -2,6 +2,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,16 +13,16 @@ import { ItemHelper } from "./ItemHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { - private logger; - private jsonUtil; - private traderAssortHelper; - private databaseServer; - private handbookHelper; - private itemHelper; - private ragfairLinkedItemService; - private utilityHelper; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected traderAssortHelper: TraderAssortHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected ragfairLinkedItemService: RagfairLinkedItemService; + protected utilityHelper: UtilityHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, traderAssortHelper: TraderAssortHelper, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, ragfairLinkedItemService: RagfairLinkedItemService, utilityHelper: UtilityHelper, configServer: ConfigServer); /** * Gets currency TAG from TPL @@ -31,7 +32,7 @@ export declare class RagfairHelper { getCurrencyTag(currency: string): string; filterCategories(sessionID: string, info: ISearchRequestData): string[]; getDisplayableAssorts(sessionID: string): Record; - private getCategoryList; + protected getCategoryList(handbookId: string): string[]; countCategories(result: IGetOffersResult): void; /** * Merges Root Items @@ -39,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairOfferHelper.d.ts index 3bf8add..8d03bee 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairOfferHelper.d.ts @@ -1,12 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -19,31 +23,32 @@ import { RagfairHelper } from "./RagfairHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { - private logger; - private timeUtil; - private hashUtil; - private itemEventRouter; - private databaseServer; - private saveServer; - private dialogueHelper; - private itemHelper; - private paymentHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private ragfairSortHelper; - private ragfairHelper; - private ragfairOfferService; - private configServer; - private static TPL_GOODS_SOLD; - private ragfairConfig; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected paymentHelper: PaymentHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected static goodSoldTemplate: string; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; - private getProfileOffers; - private deleteOfferByOfferId; - private completeOffer; + protected getProfileOffers(sessionID: string): IRagfairOffer[]; + protected deleteOfferByOfferId(sessionID: string, offerId: string): void; + protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, offer: IRagfairOffer, pmcProfile: IPmcData): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSellHelper.d.ts index 929d112..6ec004a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSellHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSellHelper.d.ts @@ -1,14 +1,15 @@ import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairSellHelper { - private logger; - private randomUtil; - private timeUtil; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairServerHelper.d.ts index d29ba42..e4939d1 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairServerHelper.d.ts @@ -1,9 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -11,26 +14,27 @@ import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { - private randomUtil; - private hashUtil; - private saveServer; - private databaseServer; - private profileHelper; - private itemHelper; - private dialogueHelper; - private jsonUtil; - private configServer; - private ragfairConfig; - private questConfig; - private static TPL_GOODS_RETURNED; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected itemHelper: ItemHelper; + protected localeService: LocaleService; + protected dialogueHelper: DialogueHelper; + protected jsonUtil: JsonUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + protected static goodsReturnedTemplate: string; + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails * @returns boolean */ isItemValidRagfairItem(itemDetails: [boolean, ITemplateItem]): boolean; - private isItemBlacklisted; + protected isItemBlacklisted(itemTemplateId: string): boolean; isTrader(userID: string): boolean; isPlayer(userID: string): boolean; returnItems(sessionID: string, items: any[]): void; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSortHelper.d.ts index e9d8069..d20e10c 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSortHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairSortHelper.d.ts @@ -1,12 +1,14 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; export declare class RagfairSortHelper { - private databaseServer; - constructor(databaseServer: DatabaseServer); + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; - private sortOffersByID; - private sortOffersByRating; - private sortOffersByName; - private sortOffersByPrice; - private sortOffersByExpiry; + protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByName(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByPrice(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByExpiry(a: IRagfairOffer, b: IRagfairOffer): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairTaxHelper.d.ts index e87334f..820facb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairTaxHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RagfairTaxHelper.d.ts @@ -1,15 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { - private logger; - private databaseServer; - private ragfairPriceService; - private itemHelper; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected itemHelper: ItemHelper; constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); calculateTax(item: Item, pmcData: IPmcData, requirementsValue: number, offerItemCount: number, sellInOnePiece: boolean): number; - private calculateItemWorth; + protected calculateItemWorth(item: Item, itemTemplate: ITemplateItem, itemCount: number, pmcData: IPmcData, isRootItem?: boolean): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RepairHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RepairHelper.d.ts index 47123e1..9a3ab29 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/RepairHelper.d.ts @@ -1,20 +1,21 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RepairHelper { - private logger; - private jsonUtil; - private randomUtil; - private databaseServer; - private configServer; - private repairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; - private getRandomisedArmorRepairDegredationValue; - private getRandomisedWeaponRepairDegredationValue; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; + protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; + protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/SecureContainerHelper.d.ts index 8f246b6..9e2bc32 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/SecureContainerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/SecureContainerHelper.d.ts @@ -7,7 +7,7 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class SecureContainerHelper { - private itemHelper; + protected itemHelper: ItemHelper; constructor(itemHelper: ItemHelper); getSecureContainerItems(items: Item[]): string[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/TradeHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/TradeHelper.d.ts index 475390b..975062b 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/TradeHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/TradeHelper.d.ts @@ -2,7 +2,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { Upd } from "../models/eft/common/tables/IItem"; +import { Item, Upd } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -12,14 +12,14 @@ import { RagfairServer } from "../servers/RagfairServer"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { - private logger; - private itemEventRouter; - private traderHelper; - private itemHelper; - private paymentService; - private fenceService; - private inventoryHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected fenceService: FenceService; + protected inventoryHelper: InventoryHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer); /** * Buy item from flea or trader @@ -39,6 +39,6 @@ export declare class TradeHelper { * @returns */ sellItem(pmcData: IPmcData, body: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; - private incrementAssortBuyCount; - private checkPurchaseIsWithinTraderItemLimit; + protected incrementAssortBuyCount(assortBeingPurchased: Item, itemsPurchasedCount: number): void; + protected checkPurchaseIsWithinTraderItemLimit(assortBeingPurchased: Item, assortId: string, count: number): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderAssortHelper.d.ts index d95879c..91ba6b9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderAssortHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderAssortHelper.d.ts @@ -1,23 +1,55 @@ -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderAssortHelper { - private logger; - private jsonUtil; - private databaseServer; - private profileHelper; - private assortHelper; - private ragfairAssortGenerator; - private ragfairOfferGenerator; - private traderAssortService; - private fenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected traderAssortService: TraderAssortService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); + /** + * Get a traders assorts + * Can be used for returning ragfair / fence assorts + * @param sessionId session id + * @param traderId trader id + * @returns a traders assorts + */ getAssort(sessionId: string, traderId: string): ITraderAssort; + /** + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) + * @param traderId trader id + * @returns array of Items + */ + protected getPristineTraderAssorts(traderId: string): Item[]; + /** + * Returns generated ragfair offers in a trader assort format + * @returns Trader assort object + */ + protected getRagfairDataAsTraderAssort(): ITraderAssort; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderHelper.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderHelper.d.ts index ec64d59..b2e9d38 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/helpers/TraderHelper.d.ts @@ -1,5 +1,8 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +14,96 @@ import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderHelper { - private logger; - private databaseServer; - private saveServer; - private profileHelper; - private paymentHelper; - private itemHelper; - private handbookHelper; - private playerService; - private fenceService; - private configServer; - private traderConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); getTrader(traderID: string, sessionID: string): ITraderBase; getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ lvlUp(traderID: string, sessionID: string): void; getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ traderFilter(traderFilters: string[], tplToCheck: string): boolean; getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/loaders/BundleLoader.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/loaders/BundleLoader.d.ts index 4f7664c..06ad698 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/loaders/BundleLoader.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/loaders/BundleLoader.d.ts @@ -10,10 +10,10 @@ declare class BundleInfo { constructor(modpath: string, bundle: any, bundlePath: string, bundleFilepath: string); } export declare class BundleLoader { - private httpServerHelper; - private vfs; - private jsonUtil; - private bundles; + protected httpServerHelper: HttpServerHelper; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected bundles: Record; constructor(httpServerHelper: HttpServerHelper, vfs: VFS, jsonUtil: JsonUtil); getBundles(local: boolean): BundleInfo[]; getBundle(key: string, local: boolean): BundleInfo; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/loaders/DelayedModLoader.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/loaders/DelayedModLoader.d.ts index 7d0009f..2a05604 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/loaders/DelayedModLoader.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/loaders/DelayedModLoader.d.ts @@ -1,3 +1,4 @@ +import { DependencyContainer } from "tsyringe"; import { HandbookController } from "../controllers/HandbookController"; import { IModLoader } from "../models/spt/mod/IModLoader"; import { ModCompilerService } from "../services/ModCompilerService"; @@ -5,17 +6,16 @@ import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; import { InitialModLoader } from "./InitialModLoader"; export declare class DelayedModLoader implements IModLoader { - private bundleLoader; - private handbookController; - private vfs; - private modCompilerService; - private initialModLoader; + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected initialModLoader: InitialModLoader; constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, initialModLoader: InitialModLoader); getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; load(): void; - private executeMods; - private addBundles; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/loaders/InitialModLoader.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/loaders/InitialModLoader.d.ts index 5957d35..68e47fe 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/loaders/InitialModLoader.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/loaders/InitialModLoader.d.ts @@ -1,5 +1,8 @@ import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { ModCompilerService } from "../services/ModCompilerService"; @@ -7,52 +10,55 @@ import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; import { BundleLoader } from "./BundleLoader"; export declare class InitialModLoader implements IModLoader { - private logger; - private vfs; - private jsonUtil; - private modCompilerService; - private bundleLoader; - private configServer; - private static container; - private readonly basepath; - private imported; - private onLoad; - private akiConfig; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); load(container: DependencyContainer): Promise; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ getImportedModsNames(): string[]; getModPath(mod: string): string; - private importClass; - private importMods; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; /** * * @param mods Get an array of broken/invalid mods by name * @returns Mod names array */ - private getBrokenMods; + protected getBrokenMods(mods: string[]): string[]; /** * Get packageJson data for mods * @param mods mods to get packageJson for * @returns dictionary */ - private getModsPackageData; + protected getModsPackageData(mods: string[]): Record; /** * Does mod have "delayedLoad(" string in its entry class * @param modFolderName folder name * @param modToValidate package.json details * @returns boolean */ - private isModSpt300Compatible; - private isModCombatibleWithAki; - private executeMods; - private sortModsLoadOrder; - private addMod; - private areModDependenciesFulfilled; - private isModCompatible; - private validMod; - private getLoadOrderRecursive; - private getLoadOrder; + protected isModSpt300Compatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(mod: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; getContainer(): DependencyContainer; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/loaders/PostAkiModLoader.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/loaders/PostAkiModLoader.d.ts new file mode 100644 index 0000000..edc6e5d --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/loaders/PostAkiModLoader.d.ts @@ -0,0 +1,21 @@ +import { DependencyContainer } from "tsyringe"; +import { HandbookController } from "../controllers/HandbookController"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + getModPath(mod: string): string; + load(): void; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/loaders/PostDBModLoader.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/common/MinMax.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IGlobals.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IGlobals.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/ILocationBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IPmcData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IPmcData.d.ts index adc2aa5..5703e4b 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/IPmcData.d.ts @@ -1,341 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IQuest.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts index c2ba762..23a1a14 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/common/tables/ITemplateItem.d.ts @@ -7,284 +7,362 @@ export interface ITemplateItem { _proto: string; } export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; Rarity?: string; SpawnChance?: number; CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; foodUseTime?: number; foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; } export interface Prefab { path: string; @@ -315,27 +393,18 @@ export interface Slot { _id: string; _parent: string; _props: SlotProps; + _max_count?: number; _required: boolean; _mergeSlotWithChildren: boolean; _proto: string; } export interface SlotProps { - filters: Filter[]; + filters: SlotFilter[]; } -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { +export interface SlotFilter { + Shift?: number; Filter: string[]; + AnimationIndex?: number; } export interface Xyz { x: number; @@ -345,53 +414,38 @@ export interface Xyz { export interface StackSlot { _name?: string; _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; + _parent: string; _max_count: number; - _props?: StackSlotProps; - _proto?: string; + _props: StackSlotProps; + _proto: string; upd: any; } export interface StackSlotProps { - filters: Filter[]; + filters: SlotFilter[]; } export interface EffectsHealth { - Hydration: Hydration; + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; } -export interface Hydration { +export interface EffectsHealthProps { value: number; } export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; } -export interface Pain { +export interface EffectDamageProps { delay: number; duration: number; fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; } export interface Color { r: number; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/health/Effect.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/IAkiProfile.d.ts index 80dd02d..eaa66c1 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -126,12 +126,16 @@ export interface Chest { export interface Stomach { } export interface LeftArm { + Fracture?: number; } export interface RightArm { + Fracture?: number; } export interface LeftLeg { + Fracture?: number; } export interface RightLeg { + Fracture?: number; } export interface Inraid { location: string; @@ -149,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/AmmoTypes.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotAmount.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotDifficulty.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/ConfigTypes.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/ConfigTypes.d.ts index 6bd31e8..61d6f99 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/ConfigTypes.d.ts @@ -8,11 +8,14 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/ContainerTypes.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestRewardType.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestStatus.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..ba65933 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,11 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7, + Expired = 8 +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/RaidMode.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/SkillTypes.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IBotConfig.d.ts index f8ea940..e171087 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -5,9 +6,13 @@ export interface IBotConfig extends IBaseConfig { bosses: string[]; durability: Durability; lootNValue: LootNvalue; + revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -17,6 +22,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -27,6 +33,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; @@ -86,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -96,17 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; + enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInRaidConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..c24e617 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -30,6 +31,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; @@ -39,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ITraderConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IModLoader.d.ts index 5398c9b..40a5e19 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IModLoader.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IModLoader.d.ts @@ -3,6 +3,5 @@ export interface IModLoader { load(container: DependencyContainer): void; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IDatabaseTables.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IHttpServer.d.ts index 50e5c91..c828399 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IHttpServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/IHttpServer.d.ts @@ -1,4 +1,5 @@ /// +/// import http, { ServerResponse } from "http"; import { INotification } from "../../eft/notifier/INotifier"; export interface IHttpServer { diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/ILocaleBase.d.ts index a20084d..8887c06 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/ILocaleBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/server/ILocaleBase.d.ts @@ -1,5 +1,5 @@ export interface ILocaleBase { - global: ILocaleGlobalBase; + global: Record; menu: Record; languages: ILanguageBase[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/utils/ILogger.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/models/spt/utils/ILogger.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/HttpRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/HttpRouter.d.ts index 44edc0b..f75a47d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/HttpRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/HttpRouter.d.ts @@ -1,11 +1,16 @@ /// import { IncomingMessage } from "http"; -import { DynamicRouter, StaticRouter } from "../di/Router"; +import { DynamicRouter, Router, StaticRouter } from "../di/Router"; export declare class HttpRouter { - private staticRouters; - private dynamicRoutes; + protected staticRouters: StaticRouter[]; + protected dynamicRoutes: DynamicRouter[]; constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); - private groupBy; + protected groupBy(list: T[], keyGetter: (t: T) => string): Map; getResponse(req: IncomingMessage, info: any, sessionID: string): string; - private handleRoute; + protected handleRoute(url: string, info: any, sessionID: string, wrapper: ResponseWrapper, routers: Router[], dynamic: boolean): boolean; } +declare class ResponseWrapper { + output: string; + constructor(output: string); +} +export {}; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/ImageRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/ImageRouter.d.ts index 97e580d..ab03977 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/ImageRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/ImageRouter.d.ts @@ -4,8 +4,8 @@ import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ImageRouteService } from "../services/mod/image/ImageRouteService"; import { VFS } from "../utils/VFS"; export declare class ImageRouter { - private vfs; - private imageRouteService; + protected vfs: VFS; + protected imageRouteService: ImageRouteService; constructor(vfs: VFS, imageRouteService: ImageRouteService); addRoute(key: string, valueToAdd: string): void; sendImage(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any, httpServer: IHttpServer): void; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/ItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/ItemEventRouter.d.ts index bb20152..b1ac5d9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/ItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/ItemEventRouter.d.ts @@ -5,13 +5,13 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { - private logger; - private jsonUtil; - private profileHelper; - private itemEventRouters; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected itemEventRouters: ItemEventRouterDefinition[]; constructor(logger: ILogger, jsonUtil: JsonUtil, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[]); - private output; + protected output: IItemEventRouterResponse; handleEvents(info: IItemEventRouterRequest, sessionID: string): IItemEventRouterResponse; getOutput(sessionID: string): IItemEventRouterResponse; - private resetOutput; + protected resetOutput(sessionID: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts index dd2f68a..6d0ab4b 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts index be27008..a765410 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts index 03a5967..2db7cc5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts index c30501a..836ed8d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts index b2933e9..a152b4d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts index ea4a9ae..7c0561f 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts index 30741db..b8e5cdf 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts index 4786817..83c60c5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts index a100b4c..5b7cc1b 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts index 3025e2c..e78445e 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts index bad9af2..99847c6 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HealthItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HealthItemEventRouter extends ItemEventRouterDefinition { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts index 2cec18b..e1e98af 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HideoutItemEventRouter extends ItemEventRouterDefinition { - private hideoutCallbacks; + protected hideoutCallbacks: HideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts index 8efc2c2..a922cc0 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts index 1d93e7b..2619bb9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { - private inventoryCallbacks; + protected inventoryCallbacks: InventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts index 12af594..59bf598 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/NoteItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class NoteItemEventRouter extends ItemEventRouterDefinition { - private noteCallbacks; + protected noteCallbacks: NoteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7298c52..277db44 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { - private presetBuildCallbacks; + protected presetBuildCallbacks: PresetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts index 9944ae9..a092aa6 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { - private questCallbacks; - constructor(questCallbacks: QuestCallbacks); + protected logger: ILogger; + protected questCallbacks: QuestCallbacks; + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts index 88e52ba..9216cc5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts index b292ded..5196ba9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/RepairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RepairItemEventRouter extends ItemEventRouterDefinition { - private repairCallbacks; + protected repairCallbacks: RepairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts index 1bca2b8..a43bb0a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/TradeItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class TradeItemEventRouter extends ItemEventRouterDefinition { - private tradeCallbacks; + protected tradeCallbacks: TradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts index 38831f6..38497fb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { - private wishlistCallbacks; + protected wishlistCallbacks: WishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/BundleSerializer.d.ts index 7952e9c..912db83 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/BundleSerializer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/BundleSerializer.d.ts @@ -3,8 +3,8 @@ import { BundleLoader } from "../../loaders/BundleLoader"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { ILogger } from "../../models/spt/utils/ILogger"; export declare class BundleSerializer extends Serializer { - private logger; - private bundleLoader; + protected logger: ILogger; + protected bundleLoader: BundleLoader; constructor(logger: ILogger, bundleLoader: BundleLoader); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/ImageSerializer.d.ts index 29340d0..0e040d4 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/ImageSerializer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/ImageSerializer.d.ts @@ -2,7 +2,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/NotifySerializer.d.ts index 8be8ac2..1779ac9 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/NotifySerializer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/serializers/NotifySerializer.d.ts @@ -3,9 +3,9 @@ import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { - private notifierController; - private httpServerHelper; + protected notifierController: NotifierController; + protected httpServerHelper: HttpServerHelper; constructor(notifierController: NotifierController, httpServerHelper: HttpServerHelper); - serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; + serialize(_sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BotStaticRouter.d.ts index d8b0bf4..aeea220 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BotStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BotStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BundleStaticRouter.d.ts index 3905b82..fb682fc 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BundleStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/BundleStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/CustomizationStaticRouter.d.ts index 46c71b8..21bc4bb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/CustomizationStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DataStaticRouter.d.ts index a493d3a..84ba7fd 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DataStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DataStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DialogStaticRouter.d.ts index a59fb14..546cdf1 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DialogStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/DialogStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { - private dialogueCallbacks; + protected dialogueCallbacks: DialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/GameStaticRouter.d.ts index 988b673..a9a7496 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/GameStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/GameStaticRouter.d.ts @@ -1,6 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { - private gameCallbacks; + protected gameCallbacks: GameCallbacks; constructor(gameCallbacks: GameCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/HealthStaticRouter.d.ts index e644861..863fd5e 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/HealthStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/HealthStaticRouter.d.ts @@ -1,6 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InraidStaticRouter.d.ts index 66ed860..b29ad23 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InraidStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InraidStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InsuranceStaticRouter.d.ts index 8da26b3..5676499 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InsuranceStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ItemEventStaticRouter.d.ts index 08ba6bb..c30a7fc 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ItemEventStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { - private itemEventCallbacks; + protected itemEventCallbacks: ItemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LauncherStaticRouter.d.ts index 9d07f78..0040cbd 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LauncherStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LauncherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { - private launcherCallbacks; + protected launcherCallbacks: LauncherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LocationStaticRouter.d.ts index 9c5c52e..b6de956 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LocationStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/LocationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/MatchStaticRouter.d.ts index d746381..9920a92 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/MatchStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/MatchStaticRouter.d.ts @@ -1,6 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { - private matchCallbacks; + protected matchCallbacks: MatchCallbacks; constructor(matchCallbacks: MatchCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/NotifierStaticRouter.d.ts index 1c8566d..8f1f5cc 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/NotifierStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/NotifierStaticRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/PresetStaticRouter.d.ts index 2272f82..a9e7458 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/PresetStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/PresetStaticRouter.d.ts @@ -1,6 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { - private presetCallbacks; + protected presetCallbacks: PresetBuildCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ProfileStaticRouter.d.ts index fd787f1..83403f2 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ProfileStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/ProfileStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { - private profileCallbacks; + protected profileCallbacks: ProfileCallbacks; constructor(profileCallbacks: ProfileCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/QuestStaticRouter.d.ts index fda3c23..8f7ca0a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/QuestStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/QuestStaticRouter.d.ts @@ -1,6 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { - private questCallbacks; + protected questCallbacks: QuestCallbacks; constructor(questCallbacks: QuestCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/RagfairStaticRouter.d.ts index 618374f..6c41467 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/RagfairStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/RagfairStaticRouter.d.ts @@ -1,6 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/TraderStaticRouter.d.ts index 18f0629..41728a1 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/TraderStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/TraderStaticRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/WeatherStaticRouter.d.ts index 61b904d..72ed851 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/routers/static/WeatherStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/routers/static/WeatherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { - private weatherCallbacks; + protected weatherCallbacks: WeatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/servers/ConfigServer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/servers/ConfigServer.d.ts index 83af38d..a079be8 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/servers/ConfigServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/servers/ConfigServer.d.ts @@ -3,10 +3,10 @@ import { VFS } from "../utils/VFS"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigTypes } from "../models/enums/ConfigTypes"; export declare class ConfigServer { - private logger; - private vfs; - private jsonUtil; - private configs; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected configs: Record; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil); getConfig(configType: ConfigTypes): T; getConfigByString(configType: string): T; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/servers/DatabaseServer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/servers/DatabaseServer.d.ts index 521bcf9..aa152d0 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/servers/DatabaseServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/servers/DatabaseServer.d.ts @@ -1,6 +1,6 @@ import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { - private tableData; + protected tableData: IDatabaseTables; getTables(): IDatabaseTables; setTables(any: any): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/servers/HttpServer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/servers/HttpServer.d.ts index d0db7e4..44d802b 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/servers/HttpServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/servers/HttpServer.d.ts @@ -1,9 +1,12 @@ /// +/// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; @@ -13,24 +16,25 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { - private httpRouter; - private logger; - private randomUtil; - private jsonUtil; - private httpResponse; - private databaseServer; - private notifierHelper; - private httpServerHelper; - private serializers; - private configServer; + protected httpRouter: HttpRouter; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected serializers: Serializer[]; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); - private buffers; - private onReceive; - private onRespond; - private httpConfig; - private webSockets; - private websocketPingHandler; + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); + protected buffers: {}; + protected onReceive: {}; + protected onRespond: {}; + protected httpConfig: IHttpConfig; + protected webSockets: {}; + protected websocketPingHandler: any; getCookies(req: http.IncomingMessage): any; resetBuffer(sessionID: string): void; putInBuffer(sessionID: any, data: any, bufLength: number): boolean; @@ -42,6 +46,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; - private getRandomisedMessage; + protected getRandomisedMessage(): string; wsOnConnection(ws: any, req: any): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/servers/RagfairServer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/servers/RagfairServer.d.ts index cf56d64..bc86cdb 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/servers/RagfairServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/servers/RagfairServer.d.ts @@ -1,22 +1,24 @@ import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; import { ConfigServer } from "./ConfigServer"; export declare class RagfairServer { - private logger; - private ragfairOfferGenerator; - private ragfairOfferService; - private ragfairCategoriesService; - private ragfairRequiredItemsService; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Live/CWX_WeatherPatcher/server/dist/types/servers/SaveServer.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/servers/SaveServer.d.ts index fdf92e4..cb28f49 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/servers/SaveServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/servers/SaveServer.d.ts @@ -5,15 +5,15 @@ import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { - private vfs; - private saveLoadRouters; - private jsonUtil; - private hashUtil; - private logger; - private profileFilepath; - private profiles; - private onSave; - private saveMd5; + protected vfs: VFS; + protected saveLoadRouters: SaveLoadRouter[]; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected profileFilepath: string; + protected profiles: {}; + protected onSave: {}; + protected saveMd5: {}; constructor(vfs: VFS, saveLoadRouters: SaveLoadRouter[], jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger); load(): void; save(): void; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/BotLootCacheService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..cc71eee --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/BotLootCacheService.d.ts @@ -0,0 +1,82 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole bots role (assault / pmcBot etc) + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc Is the bot a PMC (alteres what loot is cached) + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/FenceService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/FenceService.d.ts index 27d14ef..79058c6 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/FenceService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/FenceService.d.ts @@ -4,6 +4,7 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +12,25 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class FenceService { - private logger; - private hashUtil; - private jsonUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private itemHelper; - private presetHelper; - private configServer; - private fenceAssort; - private traderConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected fenceAssort: ITraderAssort; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, configServer: ConfigServer); - private setFenceAssort; + protected setFenceAssort(fenceAssort: ITraderAssort): void; getFenceAssorts(): ITraderAssort; hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/HashCacheService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/HashCacheService.d.ts index c9b0170..5320f28 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/HashCacheService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/HashCacheService.d.ts @@ -3,13 +3,13 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; export declare class HashCacheService { - private vfs; - private hashUtil; - private jsonUtil; - private logger; - private jsonHashes; - private modHashes; - private readonly modCachePath; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected jsonHashes: any; + protected modHashes: any; + protected readonly modCachePath = "./user/cache/modCache.json"; constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); getStoredModHash(modName: string): string; modContentMatchesStoredHash(modName: string, modContent: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/InsuranceService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/InsuranceService.d.ts index 160faba..171bf10 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/InsuranceService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/InsuranceService.d.ts @@ -4,6 +4,7 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,18 +12,17 @@ import { SaveServer } from "../servers/SaveServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { - private logger; - private databaseServer; - private secureContainerHelper; - private randomUtil; - private timeUtil; - private saveServer; - private traderHelper; - private dialogueHelper; - private configServer; - private insured; - private templatesById; - private insuranceConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected secureContainerHelper: SecureContainerHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected traderHelper: TraderHelper; + protected dialogueHelper: DialogueHelper; + protected configServer: ConfigServer; + protected insured: Record>; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; @@ -31,11 +31,21 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - private addGearToSend; + protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/LocaleService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/MatchLocationService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/MatchLocationService.d.ts index f7b7d3b..c027bec 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/MatchLocationService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/MatchLocationService.d.ts @@ -1,8 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { TimeUtil } from "../utils/TimeUtil"; export declare class MatchLocationService { - private timeUtil; - private locations; + protected timeUtil: TimeUtil; + protected locations: {}; constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/ModCompilerService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/ModCompilerService.d.ts index cf7cc21..26cb4ac 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/ModCompilerService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/ModCompilerService.d.ts @@ -1,15 +1,20 @@ +import * as ts from "typescript"; import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { - private logger; - private hashCacheService; - private vfs; + protected logger: ILogger; + protected hashCacheService: HashCacheService; + protected vfs: VFS; constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; - private compile; - private buildDepth; - private calculateDepth; - private areFilesReady; - private delay; + protected compile(fileNames: string[], options: ts.CompilerOptions): Promise; + protected buildDepth(depth: number): string; + protected getNodesModulesPath(depth: number): string; + protected getAkiPath(depth: number): string; + protected getAkiFolder(): string; + protected getNodesModulesFolder(): string; + protected calculateDepth(file: string): number; + protected areFilesReady(fileNames: string[]): boolean; + protected delay(ms: number): Promise; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/NotificationService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/NotificationService.d.ts index 9c6c143..65a84dd 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/NotificationService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - private messageQueue; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/PaymentService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/PaymentService.d.ts index 0a6c4d6..a5e538f 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/PaymentService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/PaymentService.d.ts @@ -4,6 +4,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -11,14 +12,14 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { - private logger; - private httpResponse; - private databaseServer; - private handbookHelper; - private traderHelper; - private itemHelper; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request @@ -43,6 +44,23 @@ export declare class PaymentService { * inside the stash, that is it has the stash as * ancestor with slotId=hideout */ - private isItemInStash; + protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/PlayerService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/PlayerService.d.ts index 99e5986..519b7e5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/PlayerService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/PlayerService.d.ts @@ -3,8 +3,8 @@ import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPla import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PlayerService { - private logger; - private databaseServer; + protected logger: ILogger; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, databaseServer: DatabaseServer); /** * increases the profile skill and updates any output diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/ProfileFixerService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..ed1dec7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/ProfileFixerService.d.ts @@ -0,0 +1,61 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairCategoriesService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairCategoriesService.d.ts index fb9efa2..83910e5 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairCategoriesService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairCategoriesService.d.ts @@ -1,10 +1,40 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - private categories; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairLinkedItemService.d.ts index 3dbcf6f..6c34ee0 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairLinkedItemService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairLinkedItemService.d.ts @@ -1,9 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; export declare class RagfairLinkedItemService { - private databaseServer; - private linkedItemsCache; + protected databaseServer: DatabaseServer; + protected linkedItemsCache: Record>; constructor(databaseServer: DatabaseServer); getLinkedItems(linkedSearchId: string): Iterable; - private buildLinkedItemTable; - private getFilters; + protected buildLinkedItemTable(): void; + protected getFilters(item: ITemplateItem, slot: string): string[]; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairOfferService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairOfferService.d.ts index 9b1bf8d..7398a8f 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairOfferService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairOfferService.d.ts @@ -1,7 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -9,27 +11,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { - private logger; - private timeUtil; - private databaseServer; - private saveServer; - private ragfairServerHelper; - private profileHelper; - private itemEventRouter; - private httpResponse; - private configServer; - private playerOffersLoaded; - private toUpdate; - private expiredOffers; - private offers; - private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; + protected profileHelper: ProfileHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected playerOffersLoaded: boolean; + protected toUpdate: Record; + protected expiredOffers: Item[]; + protected offers: IRagfairOffer[]; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; @@ -57,8 +65,8 @@ export declare class RagfairOfferService { * Get an array of stale offers that are still shown to player * @returns IRagfairOffer array */ - private getStaleOffers; - private isStale; - private processStaleOffer; - private returnPlayerOffer; + protected getStaleOffers(): IRagfairOffer[]; + protected isStale(offer: IRagfairOffer, time: number): boolean; + protected processStaleOffer(staleOffer: IRagfairOffer): void; + protected returnPlayerOffer(offer: IRagfairOffer): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairPriceService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairPriceService.d.ts index 7cdf854..679fe1d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairPriceService.d.ts @@ -1,22 +1,25 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "../models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RagfairPriceService { - private handbookHelper; - private databaseServer; - private logger; - private itemHelper; - private presetHelper; - private randomUtil; - private configServer; - private ragfairConfig; - private prices; + protected handbookHelper: HandbookHelper; + protected databaseServer: DatabaseServer; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected prices: IRagfairServerPrices; constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); generateStaticPrices(): void; generateDynamicPrices(): void; @@ -24,7 +27,29 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairRequiredItemsService.d.ts index e4582d0..b05fc65 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairRequiredItemsService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/RagfairRequiredItemsService.d.ts @@ -2,10 +2,10 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { - private logger; - private paymentHelper; - private ragfairOfferService; - private requiredItemsCache; + protected logger: ILogger; + protected paymentHelper: PaymentHelper; + protected ragfairOfferService: RagfairOfferService; + protected requiredItemsCache: {}; constructor(logger: ILogger, paymentHelper: PaymentHelper, ragfairOfferService: RagfairOfferService); getRequiredItems(searchId: string): any; buildRequiredItemTable(): void; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/TraderAssortService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/TraderAssortService.d.ts index ccb9e45..5ba2d05 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/TraderAssortService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/TraderAssortService.d.ts @@ -1,6 +1,6 @@ import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { - private pristineTraderAssorts; + protected pristineTraderAssorts: Record; getPristineTraderAssort(traderId: string): ITraderAssort; setPristineTraderAssort(traderId: string, assort: ITraderAssort): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/CustomItemService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/image/imageRouteService.d.ts index 854083c..29569b2 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/image/imageRouteService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/image/imageRouteService.d.ts @@ -1,5 +1,5 @@ export declare class ImageRouteService { - private routes; + protected routes: Record; addRoute(urlKey: string, route: string): void; getByKey(urlKey: string): string; existsByKey(urlKey: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts index 89bad14..f402103 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onLoad/OnLoadModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnLoadModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts index 32419f4..05d735b 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnUpdateModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts index d4c42aa..f28fd45 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,7 +1,7 @@ import { DependencyContainer } from "tsyringe"; import { RouteAction } from "../../../di/Router"; export declare class StaticRouterModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/App.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/App.d.ts index a11f576..dcc2669 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/App.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/App.d.ts @@ -3,12 +3,13 @@ import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { - private logger; - private timeUtil; - private onLoadComponents; - private onUpdateComponents; - private onUpdateLastRun; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected onLoadComponents: OnLoad[]; + protected onUpdateComponents: OnUpdate[]; + protected onUpdateLastRun: {}; constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; - private update; + protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/AyncQueue.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/AyncQueue.d.ts index a99aa37..da6ab18 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/AyncQueue.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - private commandsQueue; + protected commandsQueue: ICommand[]; constructor(); waitFor(command: ICommand): Promise; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/DatabaseImporter.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/DatabaseImporter.d.ts index 97dda30..483e135 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/DatabaseImporter.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/DatabaseImporter.d.ts @@ -1,18 +1,24 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { - private logger; - private vfs; - private jsonUtil; - private databaseServer; - private imageRouter; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/HashUtil.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/HashUtil.d.ts index cf92b47..bacbf2a 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/HashUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/HashUtil.d.ts @@ -2,7 +2,7 @@ import crypto from "crypto"; import { TimeUtil } from "./TimeUtil"; export declare class HashUtil { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); generate(): string; generateMd5ForData(data: string): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/HttpResponseUtil.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/HttpResponseUtil.d.ts index 85c28bd..29502be 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/HttpResponseUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/HttpResponseUtil.d.ts @@ -3,9 +3,9 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HttpResponseUtil { - private jsonUtil; + protected jsonUtil: JsonUtil; constructor(jsonUtil: JsonUtil); - private clearString; + protected clearString(s: string): any; noBody(data: any): any; getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; getUnclearedBody(data: any, err?: number, errmsg?: any): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/JsonUtil.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/JsonUtil.d.ts index 20b7448..71e95f6 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/JsonUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/JsonUtil.d.ts @@ -2,10 +2,10 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { - private vfs; - private hashUtil; - private logger; - private fileHashes; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected fileHashes: any; constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/Logger.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/Logger.d.ts index 9d5b32a..3d9013f 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/Logger.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/Logger.d.ts @@ -1,25 +1,58 @@ /// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class WinstonLogger implements ILogger { - private asyncQueue; - private uuidGenerator; - private showDebugInConsole; - private folderPath; - private file; - private filePath; - private logLevels; - private logger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + protected showDebugInConsole: boolean; + protected folderPath: string; + protected file: string; + protected filePath: string; + protected logLevels: { + levels: { + error: number; + warn: number; + succ: number; + info: number; + custom: number; + debug: number; + }; + colors: { + error: string; + warn: string; + succ: string; + info: string; + custom: string; + debug: string; + }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; + }; + protected logger: winston.Logger & SptLogger; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; warning(data: string | Record): Promise; success(data: string | Record): Promise; info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; debug(data: string | Record, onlyShowInConsole?: boolean): Promise; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/ObjectId.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/ObjectId.d.ts index b100572..03aae56 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/ObjectId.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/ObjectId.d.ts @@ -1,13 +1,13 @@ /// import { TimeUtil } from "./TimeUtil"; export declare class ObjectId { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); - private randomBytes; - private constglobalCounter; - private consttime; - private globalCounter; - private time; + protected randomBytes: Buffer; + protected constglobalCounter: number; + protected consttime: number; + protected globalCounter: number; + protected time: number; incGlobalCounter(): number; toHexString(byteArray: string | any[] | Buffer): string; generate(): string; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/RandomUtil.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/RandomUtil.d.ts index 3a3ecb6..c24dd60 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/RandomUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/RandomUtil.d.ts @@ -103,8 +103,8 @@ export declare class ProbabilityObject { constructor(key: K, relativeProbability: number, data?: V); } export declare class RandomUtil { - private jsonUtil; - private logger; + protected jsonUtil: JsonUtil; + protected logger: ILogger; constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/TimeUtil.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/TimeUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/VFS.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/VFS.d.ts index d567615..e5eaf02 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/VFS.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/VFS.d.ts @@ -1,11 +1,12 @@ /// +/// import "reflect-metadata"; import fs from "fs"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { - private asyncQueue; - private uuidGenerator; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; accessFilePromisify: (path: fs.PathLike, mode?: number) => Promise; copyFilePromisify: (src: fs.PathLike, dst: fs.PathLike, flags?: number) => Promise; mkdirPromisify: (path: fs.PathLike, options: fs.MakeDirectoryOptions & { diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/Watermark.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/Watermark.d.ts index 3a8cb3a..c6dc120 100644 --- a/Live/CWX_WeatherPatcher/server/dist/types/utils/Watermark.d.ts +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/Watermark.d.ts @@ -1,22 +1,39 @@ +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WatermarkLocale { - private locales; + protected locales: { + "en-US": { + description: string[]; + warning: string[]; + modding: string[]; + }; + "zh-CN": { + description: string[]; + warning: string[]; + modding: string[]; + }; + }; getLocale(): string; getDescription(): string[]; getWarning(): string[]; getModding(): string[]; } export declare class Watermark { - private logger; - private configServer; - private watermarkLocale?; - private akiConfig; + protected logger: ILogger; + protected configServer: ConfigServer; + protected watermarkLocale?: WatermarkLocale; + protected akiConfig: ICoreConfig; constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); - private text; - private versionLabel; + protected text: string[]; + protected versionLabel: string; initialize(): void; - getVersionTag(): string; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; getVersionLabel(): string; /** Set window title */ setTitle(): void; @@ -25,5 +42,5 @@ export declare class Watermark { /** Draw the watermark */ draw(): void; /** Caculate text length */ - private textLength; + protected textLength(s: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/dist/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_WeatherPatcher/server/dist/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/dist/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +} diff --git a/Live/CWX_WeatherPatcher/server/package.json b/Live/CWX_WeatherPatcher/server/package.json index bca8c16..56d3d94 100644 --- a/Live/CWX_WeatherPatcher/server/package.json +++ b/Live/CWX_WeatherPatcher/server/package.json @@ -1,10 +1,10 @@ { "name": "WeatherPatcher", "author": "CWX", - "version": "2.3.0", + "version": "2.4.1", "license": "NCSA", "main": "src/mod.js", - "akiVersion": "3.0.0", + "akiVersion": "3.2.0", "scripts": { "setup:environment": "npm i", "build:unzipped": "copyfiles -e \"./node_modules/**/*.*\" -e \"./dist/**/*.*\" -e \"./package-lock.json\" -e \"./tsconfig.json\" -e \"./README.txt\" -e \"./mod.code-workspace\" ./**/*.* ./dist", diff --git a/Live/CWX_WeatherPatcher/server/src/mod.ts b/Live/CWX_WeatherPatcher/server/src/mod.ts index 8a3bdce..a4178fa 100644 --- a/Live/CWX_WeatherPatcher/server/src/mod.ts +++ b/Live/CWX_WeatherPatcher/server/src/mod.ts @@ -1,21 +1,14 @@ import { DependencyContainer } from "tsyringe"; -import { IMod } from "@spt-aki/models/external/mod"; -import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; +import { IPreAkiLoadMod } from "@spt-aki/models/external/IPreAkiLoadMod"; -class CWX_MasterKey implements IMod +class CWX_WeatherPatcher implements IPreAkiLoadMod { private pkg; - public load(container: DependencyContainer): void + public preAkiLoad(container: DependencyContainer): void { - // get the logger from the server container - const logger = container.resolve("WinstonLogger"); this.pkg = require("../package.json") - logger.info(`Loading: ${this.pkg.author}: ${this.pkg.name} - ${this.pkg.version}`); } - - public delayedLoad(container: DependencyContainer): void - { return } } -module.exports = { mod: new CWX_MasterKey() } \ No newline at end of file +module.exports = { mod: new CWX_WeatherPatcher() } \ No newline at end of file diff --git a/Live/CWX_WeatherPatcher/server/types/Utils.d.ts b/Live/CWX_WeatherPatcher/server/types/Utils.d.ts deleted file mode 100644 index e69de29..0000000 diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/BotCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/BotCallbacks.d.ts index 9602975..2db60dc 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/BotCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/BotCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BotCallbacks { - private botController; - private httpResponse; + protected botController: BotController; + protected httpResponse: HttpResponseUtil; constructor(botController: BotController, httpResponse: HttpResponseUtil); getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string; getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/BundleCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/BundleCallbacks.d.ts index b007ab8..b28abe1 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/BundleCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/BundleCallbacks.d.ts @@ -1,15 +1,16 @@ import { BundleLoader } from "../loaders/BundleLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class BundleCallbacks { - private logger; - private httpResponse; - private httpServer; - private bundleLoader; - private configServer; - private httpConfig; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, bundleLoader: BundleLoader, configServer: ConfigServer); sendBundle(sessionID: string, req: any, resp: any, body: any): any; getBundles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/CustomizationCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/CustomizationCallbacks.d.ts index 918b8b6..3bab8c0 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/CustomizationCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/CustomizationCallbacks.d.ts @@ -9,9 +9,9 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class CustomizationCallbacks { - private customizationController; - private saveServer; - private httpResponse; + protected customizationController: CustomizationController; + protected saveServer: SaveServer; + protected httpResponse: HttpResponseUtil; constructor(customizationController: CustomizationController, saveServer: SaveServer, httpResponse: HttpResponseUtil); getSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<{ _id: string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/DataCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/DataCallbacks.d.ts index 018420e..cfb1c16 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/DataCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/DataCallbacks.d.ts @@ -12,8 +12,8 @@ import { ISettingsBase } from "../models/spt/server/ISettingsBase"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DataCallbacks { - private httpResponse; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, databaseServer: DatabaseServer); getSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/DialogueCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/DialogueCallbacks.d.ts index 3b6fbd1..634f90b 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/DialogueCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/DialogueCallbacks.d.ts @@ -21,10 +21,10 @@ import { HashUtil } from "../utils/HashUtil"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class DialogueCallbacks extends OnUpdate { - private hashUtil; - private timeUtil; - private httpResponse; - private dialogueController; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected dialogueController: DialogueController; constructor(hashUtil: HashUtil, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, dialogueController: DialogueController); getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/GameCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/GameCallbacks.d.ts index 44a30ea..06da1b5 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/GameCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/GameCallbacks.d.ts @@ -2,15 +2,16 @@ import { GameController } from "../controllers/GameController"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; import { IGameEmptyCrcRequestData } from "../models/eft/game/IGameEmptyCrcRequestData"; +import { IReportNicknameRequestData } from "../models/eft/game/IReportNicknameRequestData"; import { IVersionValidateRequestData } from "../models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class GameCallbacks { - private httpResponse; - private watermark; - private gameController; + protected httpResponse: HttpResponseUtil; + protected watermark: Watermark; + protected gameController: GameController; constructor(httpResponse: HttpResponseUtil, watermark: Watermark, gameController: GameController); versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData; gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -20,5 +21,6 @@ declare class GameCallbacks { validateGameVersion(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; gameKeepalive(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getVersion(url: string, info: IEmptyRequestData, sessionID: string): string; + reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData; } export { GameCallbacks }; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/HandbookCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/HandbookCallbacks.d.ts index 0db5fec..891e375 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/HandbookCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/HandbookCallbacks.d.ts @@ -1,7 +1,7 @@ import { HandbookController } from "../controllers/HandbookController"; import { OnLoad } from "../di/OnLoad"; export declare class HandbookCallbacks extends OnLoad { - private handbookController; + protected handbookController: HandbookController; constructor(handbookController: HandbookController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/HealthCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/HealthCallbacks.d.ts index a50dd42..8672be7 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/HealthCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/HealthCallbacks.d.ts @@ -9,10 +9,17 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class HealthCallbacks { - private httpResponse; - private profileHelper; - private healthController; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected healthController: HealthController; constructor(httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, healthController: HealthController); + /** + * Custom aki server request found in modules/HealthSynchronizer.cs + * @param url + * @param info HealthListener.Instance.CurrentHealth class + * @param sessionID session id + * @returns empty response, no data sent back to client + */ syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): IGetBodyResponseData; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/HideoutCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/HideoutCallbacks.d.ts index 3698176..99ab4c9 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/HideoutCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/HideoutCallbacks.d.ts @@ -11,11 +11,12 @@ import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutTog import { IHideoutUpgradeCompleteRequestData } from "../models/eft/hideout/IHideoutUpgradeCompleteRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HideoutCallbacks extends OnUpdate { - private hideoutController; - private configServer; - private hideoutConfig; + protected hideoutController: HideoutController; + protected configServer: ConfigServer; + protected hideoutConfig: IHideoutConfig; constructor(hideoutController: HideoutController, // TODO: delay needed configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/HttpCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/HttpCallbacks.d.ts index 9fe387d..94c97bd 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/HttpCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/HttpCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoad } from "../di/OnLoad"; import { IHttpServer } from "../models/spt/server/IHttpServer"; export declare class HttpCallbacks extends OnLoad { - private httpServer; + protected httpServer: IHttpServer; constructor(httpServer: IHttpServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/InraidCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/InraidCallbacks.d.ts index 2d53227..05bcce4 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/InraidCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/InraidCallbacks.d.ts @@ -3,14 +3,16 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IAirdropConfig } from "../models/spt/config/IAirdropConfig"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InraidCallbacks { - private inraidController; - private httpResponse; - private configServer; - private airdropConfig; - private inraidConfig; + protected inraidController: InraidController; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected airdropConfig: IAirdropConfig; + protected inraidConfig: IInRaidConfig; constructor(inraidController: InraidController, httpResponse: HttpResponseUtil, configServer: ConfigServer); registerPlayer(url: string, info: IRegisterPlayerRequestData, sessionID: string): INullResponseData; saveProgress(url: string, info: ISaveProgressRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/InsuranceCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/InsuranceCallbacks.d.ts index 79feb67..6819960 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/InsuranceCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/InsuranceCallbacks.d.ts @@ -3,20 +3,22 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { InsuranceService } from "../services/InsuranceService"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class InsuranceCallbacks extends OnLoadOnUpdate { - private insuranceController; - private insuranceService; - private httpResponse; - private configServer; - private insuranceConfig; + protected insuranceController: InsuranceController; + protected insuranceService: InsuranceService; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(insuranceController: InsuranceController, insuranceService: InsuranceService, httpResponse: HttpResponseUtil, configServer: ConfigServer); onLoad(): void; - getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; + getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): IGetBodyResponseData; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(secondsSinceLastRun: number): boolean; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/InventoryCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/InventoryCallbacks.d.ts index 9795aa0..9ab1486 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/InventoryCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/InventoryCallbacks.d.ts @@ -18,7 +18,7 @@ import { IInventoryToggleRequestData } from "../models/eft/inventory/IInventoryT import { IInventoryTransferRequestData } from "../models/eft/inventory/IInventoryTransferRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class InventoryCallbacks { - private inventoryController; + protected inventoryController: InventoryController; constructor(inventoryController: InventoryController); moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse; removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/ItemEventCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/ItemEventCallbacks.d.ts index 74e79c4..f4f04f9 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/ItemEventCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/ItemEventCallbacks.d.ts @@ -4,8 +4,8 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class ItemEventCallbacks { - private httpResponse; - private itemEventRouter; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; constructor(httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter); handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/LauncherCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/LauncherCallbacks.d.ts index 4bd5e2c..c022325 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/LauncherCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/LauncherCallbacks.d.ts @@ -8,10 +8,10 @@ import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { Watermark } from "../utils/Watermark"; declare class LauncherCallbacks { - private httpResponse; - private launcherController; - private saveServer; - private watermark; + protected httpResponse: HttpResponseUtil; + protected launcherController: LauncherController; + protected saveServer: SaveServer; + protected watermark: Watermark; constructor(httpResponse: HttpResponseUtil, launcherController: LauncherController, saveServer: SaveServer, watermark: Watermark); connect(): string; login(url: string, info: ILoginRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/LocationCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/LocationCallbacks.d.ts index 5ecab74..cc69369 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/LocationCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/LocationCallbacks.d.ts @@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { IGetLocationRequestData } from "../models/eft/location/IGetLocationRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class LocationCallbacks { - private httpResponse; - private locationController; + protected httpResponse: HttpResponseUtil; + protected locationController: LocationController; constructor(httpResponse: HttpResponseUtil, locationController: LocationController); getLocationData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/MatchCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/MatchCallbacks.d.ts index 63d38d9..2a92ef5 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/MatchCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/MatchCallbacks.d.ts @@ -1,34 +1,41 @@ import { MatchController } from "../controllers/MatchController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; +import { IPutMetricsRequestData } from "../models/eft/match/IPutMetricsRequestData"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IUpdatePingRequestData } from "../models/eft/match/IUpdatePingRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class MatchCallbacks { - private httpResponse; - private jsonUtil; - private matchController; - private databaseServer; + protected httpResponse: HttpResponseUtil; + protected jsonUtil: JsonUtil; + protected matchController: MatchController; + protected databaseServer: DatabaseServer; constructor(httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, matchController: MatchController, databaseServer: DatabaseServer); - updatePing(url: string, info: any, sessionID: string): INullResponseData; - exitMatch(url: string, info: any, sessionID: string): INullResponseData; - exitToMenu(url: string, info: any, sessionID: string): INullResponseData; - startGroupSearch(url: string, info: any, sessionID: string): INullResponseData; - stopGroupSearch(url: string, info: any, sessionID: string): INullResponseData; + updatePing(url: string, info: IUpdatePingRequestData, sessionID: string): INullResponseData; + exitMatch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + exitToMenu(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + startGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; + stopGroupSearch(url: string, info: IEmptyRequestData, sessionID: string): INullResponseData; sendGroupInvite(url: string, info: any, sessionID: string): INullResponseData; acceptGroupInvite(url: string, info: any, sessionID: string): INullResponseData; cancelGroupInvite(url: string, info: any, sessionID: string): INullResponseData; - putMetrics(url: string, info: any, sessionID: string): INullResponseData; + putMetrics(url: string, info: IPutMetricsRequestData, sessionID: string): INullResponseData; getProfile(url: string, info: IGetProfileRequestData, sessionID: string): IGetBodyResponseData; - serverAvailable(url: string, info: any, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; - joinMatch(url: string, info: any, sessionID: string): IGetBodyResponseData; + serverAvailable(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData | IGetBodyResponseData; + joinMatch(url: string, info: IJoinMatchRequestData, sessionID: string): IGetBodyResponseData; getMetrics(url: string, info: any, sessionID: string): IGetBodyResponseData; - getGroupStatus(url: string, info: any, sessionID: string): IGetBodyResponseData; - createGroup(url: string, info: any, sessionID: string): IGetBodyResponseData; + getGroupStatus(url: string, info: IGetGroupStatusRequestData, sessionID: string): IGetBodyResponseData; + createGroup(url: string, info: ICreateGroupRequestData, sessionID: string): IGetBodyResponseData; deleteGroup(url: string, info: any, sessionID: string): INullResponseData; startOfflineRaid(url: string, info: IStartOfflineRaidRequestData, sessionID: string): INullResponseData; endOfflineRaid(url: string, info: IEndOfflineRaidRequestData, sessionID: string): INullResponseData; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/ModCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/ModCallbacks.d.ts index 2011f0e..58342dc 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/ModCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/ModCallbacks.d.ts @@ -1,17 +1,18 @@ import { OnLoad } from "../di/OnLoad"; -import { DelayedModLoader } from "../loaders/DelayedModLoader"; +import { PostAkiModLoader } from "../loaders/PostAkiModLoader"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; declare class ModCallbacks extends OnLoad { - private logger; - private httpResponse; - private httpServer; - private modLoader; - private configServer; - private httpConfig; - constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, modLoader: DelayedModLoader, configServer: ConfigServer); + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected httpServer: IHttpServer; + protected postAkiModLoader: PostAkiModLoader; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + constructor(logger: ILogger, httpResponse: HttpResponseUtil, httpServer: IHttpServer, postAkiModLoader: PostAkiModLoader, configServer: ConfigServer); onLoad(): void; getRoute(): string; sendBundle(sessionID: string, req: any, resp: any, body: any): void; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/NoteCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/NoteCallbacks.d.ts index fd7c5ca..d39d400 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/NoteCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/NoteCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; export declare class NoteCallbacks { - private noteController; + protected noteController: NoteController; constructor(noteController: NoteController); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/NotifierCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/NotifierCallbacks.d.ts index 416e6a3..c42058f 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/NotifierCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/NotifierCallbacks.d.ts @@ -6,9 +6,9 @@ import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { ISelectProfileRequestData } from "../models/eft/notifier/ISelectProfileRequestData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class NotifierCallbacks { - private httpServerHelper; - private httpResponse; - private notifierController; + protected httpServerHelper: HttpServerHelper; + protected httpResponse: HttpResponseUtil; + protected notifierController: NotifierController; constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, notifierController: NotifierController); /** * If we don't have anything to send, it's ok to not send anything back diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/PresetBuildCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/PresetBuildCallbacks.d.ts index 639c33f..541715a 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/PresetBuildCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/PresetBuildCallbacks.d.ts @@ -1,4 +1,5 @@ import { PresetBuildController } from "../controllers/PresetBuildController"; +import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; @@ -6,10 +7,10 @@ import { IPresetBuildActionRequestData } from "../models/eft/presetBuild/IPreset import { WeaponBuild } from "../models/eft/profile/IAkiProfile"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PresetBuildCallbacks { - private httpResponse; - private presetBuildController; + protected httpResponse: HttpResponseUtil; + protected presetBuildController: PresetBuildController; constructor(httpResponse: HttpResponseUtil, presetBuildController: PresetBuildController); - getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData; + getHandbookUserlist(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; removeBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/PresetCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/PresetCallbacks.d.ts index f62afd6..4553f8f 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/PresetCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/PresetCallbacks.d.ts @@ -1,7 +1,7 @@ import { PresetController } from "../controllers/PresetController"; import { OnLoad } from "../di/OnLoad"; export declare class PresetCallbacks extends OnLoad { - private presetController; + protected presetController: PresetController; constructor(presetController: PresetController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/ProfileCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/ProfileCallbacks.d.ts index efce47d..6a86fc0 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/ProfileCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/ProfileCallbacks.d.ts @@ -3,6 +3,7 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IGetMiniProfileRequestData } from "../models/eft/launcher/IGetMiniProfileRequestData"; +import { GetProfileStatusResponseData } from "../models/eft/profile/GetProfileStatusResponseData"; import { IProfileChangeNicknameRequestData } from "../models/eft/profile/IProfileChangeNicknameRequestData"; import { IProfileChangeVoiceRequestData } from "../models/eft/profile/IProfileChangeVoiceRequestData"; import { IProfileCreateRequestData } from "../models/eft/profile/IProfileCreateRequestData"; @@ -12,9 +13,9 @@ import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNic import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileCallbacks { - private httpResponse; - private timeUtil; - private profileController; + protected httpResponse: HttpResponseUtil; + protected timeUtil: TimeUtil; + protected profileController: ProfileController; constructor(httpResponse: HttpResponseUtil, timeUtil: TimeUtil, profileController: ProfileController); createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData; getProfileData(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; @@ -23,7 +24,14 @@ export declare class ProfileCallbacks { changeNickname(url: string, info: IProfileChangeNicknameRequestData, sessionID: string): IGetBodyResponseData; validateNickname(url: string, info: IValidateNicknameRequestData, sessionID: string): IGetBodyResponseData; getReservedNickname(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; - getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; + /** + * Called when creating a character, when you choose a character face/voice + * @param url + * @param info response (empty) + * @param sessionID + * @returns + */ + getProfileStatus(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; searchFriend(url: string, info: ISearchFriendRequestData, sessionID: string): IGetBodyResponseData; getMiniProfile(url: string, info: IGetMiniProfileRequestData, sessionID: string): string; getAllMiniProfiles(url: string, info: any, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/QuestCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/QuestCallbacks.d.ts index f742096..559c29e 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/QuestCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/QuestCallbacks.d.ts @@ -13,9 +13,9 @@ import { IListQuestsRequestData } from "../models/eft/quests/IListQuestsRequestD import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class QuestCallbacks { - private httpResponse; - private questController; - private repeatableQuestController; + protected httpResponse: HttpResponseUtil; + protected questController: QuestController; + protected repeatableQuestController: RepeatableQuestController; constructor(httpResponse: HttpResponseUtil, questController: QuestController, repeatableQuestController: RepeatableQuestController); changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse; acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/RagfairCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/RagfairCallbacks.d.ts index 152475f..3a405c9 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/RagfairCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/RagfairCallbacks.d.ts @@ -3,34 +3,39 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; +import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAddOfferRequestData } from "../models/eft/ragfair/IAddOfferRequestData"; import { IExtendOfferRequestData } from "../models/eft/ragfair/IExtendOfferRequestData"; import { IGetItemPriceResult } from "../models/eft/ragfair/IGetItemPriceResult"; import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPriceRequestData"; +import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRemoveOfferRequestData } from "../models/eft/ragfair/IRemoveOfferRequestData"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { ISendRagfairReportRequestData } from "../models/eft/ragfair/ISendRagfairReportRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RagfairServer } from "../servers/RagfairServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairCallbacks extends OnLoadOnUpdate { - private httpResponse; - private logger; - private jsonUtil; - private ragfairServer; - private ragfairController; - private configServer; - private ragfairConfig; + protected httpResponse: HttpResponseUtil; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected ragfairServer: RagfairServer; + protected ragfairController: RagfairController; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(httpResponse: HttpResponseUtil, logger: ILogger, jsonUtil: JsonUtil, ragfairServer: RagfairServer, ragfairController: RagfairController, configServer: ConfigServer); onLoad(): void; getRoute(): string; - search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; + search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData; getMarketPrice(url: string, info: IGetMarketPriceRequestData, sessionID: string): IGetBodyResponseData; getItemPrices(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; addOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; removeOffer(pmcData: IPmcData, info: IRemoveOfferRequestData, sessionID: string): IItemEventRouterResponse; extendOffer(pmcData: IPmcData, info: IExtendOfferRequestData, sessionID: string): IItemEventRouterResponse; onUpdate(timeSinceLastRun: number): boolean; + sendReport(url: string, info: ISendRagfairReportRequestData, sessionID: string): INullResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/RepairCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/RepairCallbacks.d.ts index f63ec18..63733fa 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/RepairCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/RepairCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; export declare class RepairCallbacks { - private repairController; + protected repairController: RepairController; constructor(repairController: RepairController); traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/SaveCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/SaveCallbacks.d.ts index b7219a0..bbb6e53 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/SaveCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/SaveCallbacks.d.ts @@ -1,7 +1,7 @@ import { OnLoadOnUpdate } from "../di/OnLoadOnUpdate"; import { SaveServer } from "../servers/SaveServer"; export declare class SaveCallbacks extends OnLoadOnUpdate { - private saveServer; + protected saveServer: SaveServer; constructor(saveServer: SaveServer); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/TradeCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/TradeCallbacks.d.ts index 9928951..272ae46 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/TradeCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/TradeCallbacks.d.ts @@ -4,7 +4,7 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTradeRequestData"; import { IProcessRagfairTradeRequestData } from "../models/eft/trade/IProcessRagfairTradeRequestData"; export declare class TradeCallbacks { - private tradeController; + protected tradeController: TradeController; constructor(tradeController: TradeController); processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse; processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/TraderCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/TraderCallbacks.d.ts index 2a8af7f..128d9b2 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/TraderCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/TraderCallbacks.d.ts @@ -5,8 +5,8 @@ import { IBarterScheme, ITraderAssort, ITraderBase } from "../models/eft/common/ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class TraderCallbacks extends OnLoadOnUpdate { - private httpResponse; - private traderController; + protected httpResponse: HttpResponseUtil; + protected traderController: TraderController; constructor(httpResponse: HttpResponseUtil, traderController: TraderController); onLoad(): void; getRoute(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/WeatherCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/WeatherCallbacks.d.ts index e40ab3e..ae784c8 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/WeatherCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/WeatherCallbacks.d.ts @@ -3,8 +3,8 @@ import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class WeatherCallbacks { - private httpResponse; - private weatherController; + protected httpResponse: HttpResponseUtil; + protected weatherController: WeatherController; constructor(httpResponse: HttpResponseUtil, weatherController: WeatherController); getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/types/callbacks/WishlistCallbacks.d.ts b/Live/CWX_WeatherPatcher/server/types/callbacks/WishlistCallbacks.d.ts index e0249fd..c2cc2a8 100644 --- a/Live/CWX_WeatherPatcher/server/types/callbacks/WishlistCallbacks.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/callbacks/WishlistCallbacks.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; export declare class WishlistCallbacks { - private wishlistController; + protected wishlistController: WishlistController; constructor(wishlistController: WishlistController); addToWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishlist(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/context/ApplicationContext.d.ts b/Live/CWX_WeatherPatcher/server/types/context/ApplicationContext.d.ts new file mode 100644 index 0000000..a155bcd --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/context/ApplicationContext.d.ts @@ -0,0 +1,9 @@ +import { ContextVariable } from "./ContextVariable"; +import { ContextVariableType } from "./ContextVariableType"; +export declare class ApplicationContext { + private variables; + private static holderMaxSize; + getLatestValue(type: ContextVariableType): ContextVariable; + getValues(type: ContextVariableType): ContextVariable[]; + addValue(type: ContextVariableType, value: any): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/context/ContextVariable.d.ts b/Live/CWX_WeatherPatcher/server/types/context/ContextVariable.d.ts new file mode 100644 index 0000000..e438947 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/context/ContextVariable.d.ts @@ -0,0 +1,10 @@ +import { ContextVariableType } from "./ContextVariableType"; +export declare class ContextVariable { + private value; + private timestamp; + private type; + constructor(value: any, type: ContextVariableType); + getValue(): any; + getTimestamp(): Date; + getType(): ContextVariableType; +} diff --git a/Live/CWX_WeatherPatcher/server/types/context/ContextVariableType.d.ts b/Live/CWX_WeatherPatcher/server/types/context/ContextVariableType.d.ts new file mode 100644 index 0000000..5fc1704 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/context/ContextVariableType.d.ts @@ -0,0 +1,4 @@ +export declare enum ContextVariableType { + SESSION_ID = 0, + MATCH_INFO = 1 +} diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/BotController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/BotController.d.ts index 8ecb97f..5e6f05d 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/BotController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/BotController.d.ts @@ -4,17 +4,32 @@ import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequest import { IBotBase } from "../models/eft/common/tables/IBotBase"; import { IBotCore } from "../models/eft/common/tables/IBotCore"; import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class BotController { - private databaseServer; - private botGenerator; - private botHelper; - private configServer; - private botConfig; + protected databaseServer: DatabaseServer; + protected botGenerator: BotGenerator; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(databaseServer: DatabaseServer, botGenerator: BotGenerator, botHelper: BotHelper, configServer: ConfigServer); - getBotLimit(type: string): number; - getBotDifficulty(type: string, difficulty: string): IBotCore | Difficulty; - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; + /** + * Return the number of bot loadout varieties to be generated + * @param type bot Type we want the loadout gen count for + * @returns + */ + getBotPresetGenerationLimit(type: string): number; + getBotCoreDifficulty(): IBotCore; + /** + * Get bot difficulty settings + * adjust PMC settings to ensure they engage the correct bot types + * @param type what bot the server is requesting settings for + * @param difficulty difficulty level server requested settings for + * @returns Difficulty object + */ + getBotDifficulty(type: string, difficulty: string): Difficulty; + protected getPmcDifficultySettings(pmcType: "bear" | "usec", difficulty: string): Difficulty; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; getBotCap(): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/CustomizationController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/CustomizationController.d.ts index 698e6be..a6c4730 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/CustomizationController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/CustomizationController.d.ts @@ -9,14 +9,14 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; export declare class CustomizationController { - private logger; - private itemEventRouter; - private databaseServer; - private saveServer; - private profileHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper); getTraderSuits(traderID: string, sessionID: string): ISuit[]; wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse; buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse; - private getAllTraderSuits; + protected getAllTraderSuits(sessionID: string): ISuit[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/DialogueController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/DialogueController.d.ts index 235594f..b15c4b6 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/DialogueController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/DialogueController.d.ts @@ -3,13 +3,13 @@ import { IGetAllAttachmentsResponse } from "../models/eft/dialog/IGetAllAttachme import { IGetFriendListDataResponse } from "../models/eft/dialog/IGetFriendListDataResponse"; import { IGetMailDialogViewResponseData } from "../models/eft/dialog/IGetMailDialogViewResponseData"; import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyResponseData"; -import { DialogueInfo } from "../models/eft/profile/IAkiProfile"; +import { DialogueInfo, Message } from "../models/eft/profile/IAkiProfile"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class DialogueController { - private httpResponse; - private saveServer; - private dialogueHelper; + protected httpResponse: HttpResponseUtil; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; constructor(httpResponse: HttpResponseUtil, saveServer: SaveServer, dialogueHelper: DialogueHelper); getFriendList(sessionID: string): IGetFriendListDataResponse; generateDialogueList(sessionID: string): IGetBodyResponseData; @@ -19,7 +19,7 @@ export declare class DialogueController { setDialoguePin(dialogueID: string, shouldPin: boolean, sessionID: string): void; setRead(dialogueIDs: string[], sessionID: string): void; getAllAttachments(dialogueID: string, sessionID: string): IGetAllAttachmentsResponse; - private messagesHaveUncollectedRewards; - private removeExpiredItems; + protected messagesHaveUncollectedRewards(messages: Message[]): boolean; + protected removeExpiredItems(sessionID: string): void; update(): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/GameController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/GameController.d.ts index bb2a55a..85ec418 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/GameController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/GameController.d.ts @@ -2,27 +2,27 @@ import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { IGameConfigResponse } from "../models/eft/game/IGameConfigResponse"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; +import { LocaleService } from "../services/LocaleService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { Watermark } from "../utils/Watermark"; export declare class GameController { - private logger; - private watermark; - private httpServerHelper; - private profileHelper; - private configServer; - private httpConfig; - constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); + protected logger: ILogger; + protected watermark: Watermark; + protected httpServerHelper: HttpServerHelper; + protected localeService: LocaleService; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected coreConfig: ICoreConfig; + constructor(logger: ILogger, watermark: Watermark, httpServerHelper: HttpServerHelper, localeService: LocaleService, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, configServer: ConfigServer); gameStart(_url: string, _info: IEmptyRequestData, sessionID: string): void; - private addMissingBonusesProperty; - private addMissingRepeatableQuestsProperty; - private addMissingWeaponRepairSkill; - private addMissingAkiVersionTagToProfile; - private addMissingArmorRepairSkill; - private fixNullTraderSalesSums; - private removeDanglingConditionCounters; - private removeDanglingBackendCounters; + protected logProfileDetails(fullProfile: IAkiProfile): void; getGameConfig(sessionID: string): IGameConfigResponse; getServer(): any[]; - private getActiveRepeatableQuests; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/HandbookController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/HandbookController.d.ts index f473437..52d2dd8 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/HandbookController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/HandbookController.d.ts @@ -1,8 +1,8 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class HandbookController { - private databaseServer; - private handbookHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; constructor(databaseServer: DatabaseServer, handbookHelper: HandbookHelper); load(): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/HealthController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/HealthController.d.ts index ca049f6..cc13603 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/HealthController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/HealthController.d.ts @@ -11,15 +11,36 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class HealthController { - private logger; - private itemEventRouter; - private itemHelper; - private paymentService; - private inventoryHelper; - private healthHelper; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected inventoryHelper: InventoryHelper; + protected healthHelper: HealthHelper; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, paymentService: PaymentService, inventoryHelper: InventoryHelper, healthHelper: HealthHelper); - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; + /** + * stores in-raid player health + * @param pmcData Player profile + * @param info Request data + * @param sessionID + * @param addEffects Should effects found be added or removed from profile + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + /** + * When healing in menu + * @param pmcData + * @param body + * @param sessionID + * @returns + */ offraidHeal(pmcData: IPmcData, body: IOffraidHealRequestData, sessionID: string): IItemEventRouterResponse; offraidEat(pmcData: IPmcData, body: IOffraidEatRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Occurs on post-raid healing page + * @param pmcData player profile + * @param info Request data from client + * @param sessionID Session id + * @returns + */ healthTreatment(pmcData: IPmcData, info: IHealthTreatmentRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/HideoutController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/HideoutController.d.ts index f35c23b..3eefe1a 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/HideoutController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/HideoutController.d.ts @@ -1,11 +1,14 @@ +import { ScavCaseRewardGenerator } from "../generators/ScavCaseRewardGenerator"; import { HideoutHelper } from "../helpers/HideoutHelper"; import { InventoryHelper } from "../helpers/InventoryHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutArea, Product } from "../models/eft/common/tables/IBotBase"; import { HideoutUpgradeCompleteRequestData } from "../models/eft/hideout/HideoutUpgradeCompleteRequestData"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; +import { IHideoutProduction } from "../models/eft/hideout/IHideoutProduction"; import { IHideoutPutItemInRequestData } from "../models/eft/hideout/IHideoutPutItemInRequestData"; import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; @@ -14,6 +17,7 @@ import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideou import { IHideoutToggleAreaRequestData } from "../models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutUpgradeRequestData } from "../models/eft/hideout/IHideoutUpgradeRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -25,32 +29,74 @@ import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HideoutController { - private logger; - private hashUtil; - private timeUtil; - private databaseServer; - private randomUtil; - private inventoryHelper; - private saveServer; - private playerService; - private presetHelper; - private paymentHelper; - private itemEventRouter; - private httpResponse; - private profileHelper; - private hideoutHelper; - private configServer; - private hideoutConfig; - constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, configServer: ConfigServer); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected inventoryHelper: InventoryHelper; + protected saveServer: SaveServer; + protected playerService: PlayerService; + protected presetHelper: PresetHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected hideoutHelper: HideoutHelper; + protected scavCaseRewardGenerator: ScavCaseRewardGenerator; + protected configServer: ConfigServer; + protected static nameBackendCountersCrafting: string; + protected hideoutConfig: IHideoutConfig; + constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, inventoryHelper: InventoryHelper, saveServer: SaveServer, playerService: PlayerService, presetHelper: PresetHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, hideoutHelper: HideoutHelper, scavCaseRewardGenerator: ScavCaseRewardGenerator, configServer: ConfigServer); upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse; upgradeComplete(pmcData: IPmcData, body: HideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse; - putItemsInAreaSlots(pmcData: IPmcData, body: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Create item in hideout slot item array, remove item from player inventory + * @param pmcData Profile data + * @param addItemToHideoutRequest reqeust from client to place item in area slot + * @param sessionID Session id + * @returns IItemEventRouterResponse object + */ + putItemsInAreaSlots(pmcData: IPmcData, addItemToHideoutRequest: IHideoutPutItemInRequestData, sessionID: string): IItemEventRouterResponse; takeItemsFromAreaSlots(pmcData: IPmcData, body: IHideoutTakeItemOutRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Find resource item in hideout area, add copy to player inventory, remove Item from hideout slot + * @param sessionID Session id + * @param pmcData Profile to update + * @param removeResourceRequest client request + * @param output response to send to client + * @param hideoutArea Area fuel is being removed from + * @returns IItemEventRouterResponse response + */ + protected removeResourceFromArea(sessionID: string, pmcData: IPmcData, removeResourceRequest: IHideoutTakeItemOutRequestData, output: IItemEventRouterResponse, hideoutArea: HideoutArea): IItemEventRouterResponse; toggleArea(pmcData: IPmcData, body: IHideoutToggleAreaRequestData, sessionID: string): IItemEventRouterResponse; singleProductionStart(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Handles event after clicking 'start' on the scav case hideout page + * @param pmcData player profile + * @param body client request object + * @param sessionID session id + * @returns item event router response + */ scavCaseProductionStart(pmcData: IPmcData, body: IHideoutScavCaseStartRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Add generated scav case rewards to player profile + * @param pmcData player profile to add rewards to + * @param rewards reward items to add to profile + */ + protected addScavCaseRewardsToProfile(pmcData: IPmcData, rewards: Product[]): void; continuousProductionStart(pmcData: IPmcData, body: IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; takeProduction(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; + protected handleRecipie(sessionID: string, recipe: IHideoutProduction, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Handles giving rewards stored in player profile to player after clicking 'get rewards' + * @param sessionID + * @param pmcData + * @param body + * @param output + * @returns + */ + protected handleScavCase(sessionID: string, pmcData: IPmcData, body: IHideoutTakeProductionRequestData, output: IItemEventRouterResponse): IItemEventRouterResponse; registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; update(): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/InraidController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/InraidController.d.ts index c1cd6f5..b899e7d 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/InraidController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/InraidController.d.ts @@ -1,30 +1,44 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { HealthHelper } from "../helpers/HealthHelper"; import { InRaidHelper } from "../helpers/InRaidHelper"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IRegisterPlayerRequestData } from "../models/eft/inRaid/IRegisterPlayerRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { InsuranceService } from "../services/InsuranceService"; import { JsonUtil } from "../utils/JsonUtil"; +import { TimeUtil } from "../utils/TimeUtil"; export declare class InraidController { - private saveServer; - private jsonUtil; - private databaseServer; - private questHelper; - private itemHelper; - private extendedProfileHelper; - private healthHelper; - private traderHelper; - private insuranceService; - private inRaidHelper; - private configServer; - private inraidConfig; - constructor(saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, extendedProfileHelper: ExtendedProfileHelper, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected playerScavGenerator: PlayerScavGenerator; + protected healthHelper: HealthHelper; + protected traderHelper: TraderHelper; + protected insuranceService: InsuranceService; + protected inRaidHelper: InRaidHelper; + protected configServer: ConfigServer; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, jsonUtil: JsonUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, questHelper: QuestHelper, itemHelper: ItemHelper, profileHelper: ProfileHelper, playerScavGenerator: PlayerScavGenerator, healthHelper: HealthHelper, traderHelper: TraderHelper, insuranceService: InsuranceService, inRaidHelper: InRaidHelper, configServer: ConfigServer); addPlayer(sessionID: string, info: IRegisterPlayerRequestData): void; saveProgress(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Mark inventory items as FiR if player survived raid, otherwise remove FiR from them + * @param offraidData Save Progress Request + * @param pmcData player profile + * @param isPlayerScav Was the player a pScav + */ + private markOrRemoveFoundInRaidItems; + private handlePostRaidPlayerScavProcess; + private handlePostRaidPlayerScavKarmaChanges; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/InsuranceController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/InsuranceController.d.ts index b175a06..6895383 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/InsuranceController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/InsuranceController.d.ts @@ -3,8 +3,10 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IGetInsuranceCostRequestData } from "../models/eft/insurance/IGetInsuranceCostRequestData"; +import { IGetInsuranceCostResponseData } from "../models/eft/insurance/IGetInsuranceCostResponseData"; import { IInsureRequestData } from "../models/eft/insurance/IInsureRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -15,23 +17,28 @@ import { PaymentService } from "../services/PaymentService"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceController { - private logger; - private randomUtil; - private itemEventRouter; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private profileHelper; - private dialogueHelper; - private paymentService; - private insuranceService; - private configServer; - private insuranceConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected itemEventRouter: ItemEventRouter; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileHelper: ProfileHelper; + protected dialogueHelper: DialogueHelper; + protected paymentService: PaymentService; + protected insuranceService: InsuranceService; + protected configServer: ConfigServer; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, randomUtil: RandomUtil, itemEventRouter: ItemEventRouter, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileHelper: ProfileHelper, dialogueHelper: DialogueHelper, paymentService: PaymentService, // TODO: delay required insuranceService: InsuranceService, configServer: ConfigServer); processReturn(): void; insure(pmcData: IPmcData, body: IInsureRequestData, sessionID: string): IItemEventRouterResponse; - cost(info: IGetInsuranceCostRequestData, sessionID: string): any; - doAbsolutelyNothing(): void; + /** + * Calculate insurance cost + * @param info request object + * @param sessionID session id + * @returns response object to send to client + */ + cost(info: IGetInsuranceCostRequestData, sessionID: string): IGetInsuranceCostResponseData; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/InventoryController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/InventoryController.d.ts index 8235082..f57f731 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/InventoryController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/InventoryController.d.ts @@ -24,19 +24,23 @@ import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRout import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { FenceService } from "../services/FenceService"; +import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class InventoryController { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; - private presetHelper; - private inventoryHelper; - private profileHelper; - private paymentHelper; - private itemEventRouter; - constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected fenceService: FenceService; + protected presetHelper: PresetHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairOfferService: RagfairOfferService; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemEventRouter: ItemEventRouter; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, fenceService: FenceService, presetHelper: PresetHelper, inventoryHelper: InventoryHelper, ragfairOfferService: RagfairOfferService, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemEventRouter: ItemEventRouter); /** * Move Item * change location of item with parentId and slotId @@ -93,9 +97,19 @@ export declare class InventoryController { tagItem(pmcData: IPmcData, body: IInventoryTagRequestData, sessionID: string): IItemEventRouterResponse; bindItem(pmcData: IPmcData, body: IInventoryBindRequestData, sessionID: string): IItemEventRouterResponse; /** - * Handles examining of the item * + * Handles examining an item + * @param pmcData player profile + * @param body request object + * @param sessionID session id + * @returns response */ examineItem(pmcData: IPmcData, body: IInventoryExamineRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Get the tplid of an item from the examine request object + * @param body response request + * @returns tplid + */ + protected getExaminedItemTpl(body: IInventoryExamineRequestData): string; readEncyclopedia(pmcData: IPmcData, body: IInventoryReadEncyclopediaRequestData, sessionID: string): IItemEventRouterResponse; /** * Handles sorting of Inventory. diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/LauncherController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/LauncherController.d.ts index 2a30713..1af1f56 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/LauncherController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/LauncherController.d.ts @@ -3,23 +3,24 @@ import { IChangeRequestData } from "../models/eft/launcher/IChangeRequestData"; import { ILoginRequestData } from "../models/eft/launcher/ILoginRequestData"; import { IRegisterData } from "../models/eft/launcher/IRegisterData"; import { Info } from "../models/eft/profile/IAkiProfile"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class LauncherController { - private hashUtil; - private saveServer; - private httpServerHelper; - private databaseServer; - private configServer; - private coreConfig; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected httpServerHelper: HttpServerHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected coreConfig: ICoreConfig; constructor(hashUtil: HashUtil, saveServer: SaveServer, httpServerHelper: HttpServerHelper, databaseServer: DatabaseServer, configServer: ConfigServer); connect(): any; find(sessionIdKey: string): Info; login(info: ILoginRequestData): string; register(info: IRegisterData): string; - private createAccount; + protected createAccount(info: IRegisterData): string; changeUsername(info: IChangeRequestData): string; changePassword(info: IChangeRequestData): string; wipe(info: IRegisterData): string; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/LocationController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/LocationController.d.ts index 41a8719..90b6d7a 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/LocationController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/LocationController.d.ts @@ -6,11 +6,11 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class LocationController { - private jsonUtil; - private logger; - private locationGenerator; - private databaseServer; - private timeUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected locationGenerator: LocationGenerator; + protected databaseServer: DatabaseServer; + protected timeUtil: TimeUtil; constructor(jsonUtil: JsonUtil, logger: ILogger, locationGenerator: LocationGenerator, databaseServer: DatabaseServer, timeUtil: TimeUtil); get(location: string): ILocationBase; generate(name: string): ILocationBase; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/MatchController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/MatchController.d.ts index 84abbe3..71cb7d3 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/MatchController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/MatchController.d.ts @@ -1,28 +1,38 @@ +import { ApplicationContext } from "../context/ApplicationContext"; import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "../models/eft/match/IEndOfflineRaidRequestData"; +import { IGetGroupStatusRequestData } from "../models/eft/match/IGetGroupStatusRequestData"; import { IGetProfileRequestData } from "../models/eft/match/IGetProfileRequestData"; +import { IJoinMatchRequestData } from "../models/eft/match/IJoinMatchRequestData"; +import { IJoinMatchResult } from "../models/eft/match/IJoinMatchResult"; import { IStartOfflineRaidRequestData } from "../models/eft/match/IStartOffineRaidRequestData"; +import { IInRaidConfig } from "../models/spt/config/IInRaidConfig"; +import { IMatchConfig } from "../models/spt/config/IMatchConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { MatchLocationService } from "../services/MatchLocationService"; export declare class MatchController { - private saveServer; - private profileHelper; - private matchLocationService; - private traderHelper; - private configServer; - private matchConfig; - private inraidConfig; - constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, configServer: ConfigServer); + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected matchLocationService: MatchLocationService; + protected traderHelper: TraderHelper; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; + protected matchConfig: IMatchConfig; + protected inraidConfig: IInRaidConfig; + constructor(saveServer: SaveServer, profileHelper: ProfileHelper, matchLocationService: MatchLocationService, traderHelper: TraderHelper, botLootCacheService: BotLootCacheService, configServer: ConfigServer, applicationContext: ApplicationContext); getEnabled(): boolean; getProfile(info: IGetProfileRequestData): IPmcData[]; - private getMatch; - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; - joinMatch(info: any, sessionID: string): any[]; - getGroupStatus(info: any): any; + joinMatch(info: IJoinMatchRequestData, sessionID: string): IJoinMatchResult[]; + protected getMatch(location: string): any; + getGroupStatus(info: IGetGroupStatusRequestData): any; startOfflineRaid(info: IStartOfflineRaidRequestData, sessionID: string): void; endOfflineRaid(info: IEndOfflineRaidRequestData, sessionID: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/NoteController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/NoteController.d.ts index 4d3420e..ee70541 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/NoteController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/NoteController.d.ts @@ -2,11 +2,10 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { INoteActionData } from "../models/eft/notes/INoteActionData"; import { ItemEventRouter } from "../routers/ItemEventRouter"; -declare class NoteController { - private itemEventRouter; +export declare class NoteController { + protected itemEventRouter: ItemEventRouter; constructor(itemEventRouter: ItemEventRouter); addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; deleteNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse; } -export { NoteController }; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/NotifierController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/NotifierController.d.ts index 36fef66..31d7bfe 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/NotifierController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/NotifierController.d.ts @@ -3,11 +3,11 @@ import { NotificationService } from "../services/NotificationService"; import { INotifierChannel } from "../models/eft/notifier/INotifier"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; export declare class NotifierController { - private notifierHelper; - private httpServerHelper; - private notificationService; - private pollInterval; - private timeout; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected notificationService: NotificationService; + protected pollInterval: number; + protected timeout: number; constructor(notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, notificationService: NotificationService); /** * Resolve an array of session notifications. diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/PresetBuildController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/PresetBuildController.d.ts index 11c5c3e..adf4084 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/PresetBuildController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/PresetBuildController.d.ts @@ -7,10 +7,10 @@ import { ItemEventRouter } from "../routers/ItemEventRouter"; import { SaveServer } from "../servers/SaveServer"; import { HashUtil } from "../utils/HashUtil"; export declare class PresetBuildController { - private hashUtil; - private itemEventRouter; - private itemHelper; - private saveServer; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; constructor(hashUtil: HashUtil, itemEventRouter: ItemEventRouter, itemHelper: ItemHelper, saveServer: SaveServer); getUserBuilds(sessionID: string): WeaponBuild[]; saveBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/PresetController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/PresetController.d.ts index 6ec8c55..ca1af1a 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/PresetController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/PresetController.d.ts @@ -1,8 +1,8 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PresetController { - private presetHelper; - private databaseServer; + protected presetHelper: PresetHelper; + protected databaseServer: DatabaseServer; constructor(presetHelper: PresetHelper, databaseServer: DatabaseServer); initialize(): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/ProfileController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/ProfileController.d.ts index c8bd5f1..8c89a02 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/ProfileController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/ProfileController.d.ts @@ -1,5 +1,6 @@ -import { ExtendedProfileHelper } from "../helpers/ExtendedProfileHelper"; +import { PlayerScavGenerator } from "../generators/PlayerScavGenerator"; import { ItemHelper } from "../helpers/ItemHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { IMiniProfile } from "../models/eft/launcher/IMiniProfile"; @@ -11,21 +12,30 @@ import { ISearchFriendResponse } from "../models/eft/profile/ISearchFriendRespon import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class ProfileController { - private hashUtil; - private timeUtil; - private saveServer; - private databaseServer; - private itemHelper; - private traderHelper; - private extendedProfileHelper; - constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, traderHelper: TraderHelper, extendedProfileHelper: ExtendedProfileHelper); + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected profileFixerService: ProfileFixerService; + protected playerScavGenerator: PlayerScavGenerator; + protected traderHelper: TraderHelper; + protected profileHelper: ProfileHelper; + constructor(hashUtil: HashUtil, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, profileFixerService: ProfileFixerService, playerScavGenerator: PlayerScavGenerator, traderHelper: TraderHelper, profileHelper: ProfileHelper); getMiniProfiles(): IMiniProfile[]; getMiniProfile(sessionID: string): any; getCompleteProfile(sessionID: string): IPmcData[]; createProfile(info: IProfileCreateRequestData, sessionID: string): void; + /** + * Generate a player scav object + * pmc profile MUST exist first before pscav can be generated + * @param sessionID + * @returns IPmcData object + */ generatePlayerScav(sessionID: string): IPmcData; validateNickname(info: IValidateNicknameRequestData, sessionID: string): string; changeNickname(info: IProfileChangeNicknameRequestData, sessionID: string): string; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/QuestController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/QuestController.d.ts index d8caee5..2cbccfb 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/QuestController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/QuestController.d.ts @@ -4,34 +4,73 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { QuestConditionHelper } from "../helpers/QuestConditionHelper"; import { QuestHelper } from "../helpers/QuestHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { IQuest } from "../models/eft/common/tables/IQuest"; +import { IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; import { IHandoverQuestRequestData } from "../models/eft/quests/IHandoverQuestRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { PlayerService } from "../services/PlayerService"; import { TimeUtil } from "../utils/TimeUtil"; export declare class QuestController { - private logger; - private timeUtil; - private itemEventRouter; - private databaseServer; - private itemHelper; - private dialogueHelper; - private profileHelper; - private questHelper; - private questConditionHelper; - private playerService; - private configServer; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected questHelper: QuestHelper; + protected questConditionHelper: QuestConditionHelper; + protected playerService: PlayerService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, questHelper: QuestHelper, questConditionHelper: QuestConditionHelper, playerService: PlayerService, localeService: LocaleService, configServer: ConfigServer); + /** + * Get all quests visible to player + * Exclude quests with incomplete preconditions (level/loyalty) + * @param sessionID session id + * @returns array of IQuest + */ getClientQuests(sessionID: string): IQuest[]; acceptQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; acceptRepeatableQuest(pmcData: IPmcData, acceptedQuest: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Remove completed quest from profile + * Add newly unlocked quests to profile + * Also recalculate thier level due to exp rewards + * @param pmcData Player profile + * @param body completed quest request + * @param sessionID session id + * @returns ItemEvent response + */ completeQuest(pmcData: IPmcData, body: ICompleteQuestRequestData, sessionID: string): IItemEventRouterResponse; + /** + * Send a popup to player on completion of a quest + * @param sessionID session id + * @param pmcData player profile + * @param completedQuestId completed quest id + * @param questRewards rewards given to player + */ + protected sendDialogMessageOnQuestComplete(sessionID: string, pmcData: IPmcData, completedQuestId: string, questRewards: Reward[]): void; + /** + * Returns a list of quests that should be failed when a quest is completed + * @param completedQuestId quest completed id + * @returns array of quests + */ + protected getQuestsFailedByCompletingQuest(completedQuestId: string): IQuest[]; + /** + * Fail the quests provided + * @param sessionID session id + * @param pmcData player profile + * @param questsToFail quests to fail + */ + protected failQuests(sessionID: string, pmcData: IPmcData, questsToFail: IQuest[]): void; handoverQuest(pmcData: IPmcData, body: IHandoverQuestRequestData, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/RagfairController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/RagfairController.d.ts index 5b94a95..c4ffc15 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/RagfairController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/RagfairController.d.ts @@ -20,6 +20,7 @@ import { IGetMarketPriceRequestData } from "../models/eft/ragfair/IGetMarketPric import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -33,32 +34,34 @@ import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsSer import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairController { - private logger; - private timeUtil; - private httpResponse; - private itemEventRouter; - private ragfairServer; - private ragfairPriceService; - private databaseServer; - private itemHelper; - private saveServer; - private ragfairSellHelper; - private ragfairTaxHelper; - private ragfairSortHelper; - private ragfairOfferHelper; - private profileHelper; - private paymentService; - private handbookHelper; - private paymentHelper; - private inventoryHelper; - private ragfairHelper; - private ragfairOfferService; - private ragfairRequiredItemsService; - private ragfairOfferGenerator; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected httpResponse: HttpResponseUtil; + protected itemEventRouter: ItemEventRouter; + protected ragfairServer: RagfairServer; + protected ragfairPriceService: RagfairPriceService; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected saveServer: SaveServer; + protected ragfairSellHelper: RagfairSellHelper; + protected ragfairTaxHelper: RagfairTaxHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairOfferHelper: RagfairOfferHelper; + protected profileHelper: ProfileHelper; + protected paymentService: PaymentService; + protected handbookHelper: HandbookHelper; + protected paymentHelper: PaymentHelper; + protected inventoryHelper: InventoryHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, timeUtil: TimeUtil, httpResponse: HttpResponseUtil, itemEventRouter: ItemEventRouter, ragfairServer: RagfairServer, ragfairPriceService: RagfairPriceService, databaseServer: DatabaseServer, itemHelper: ItemHelper, saveServer: SaveServer, ragfairSellHelper: RagfairSellHelper, ragfairTaxHelper: RagfairTaxHelper, ragfairSortHelper: RagfairSortHelper, ragfairOfferHelper: RagfairOfferHelper, profileHelper: ProfileHelper, paymentService: PaymentService, handbookHelper: HandbookHelper, paymentHelper: PaymentHelper, inventoryHelper: InventoryHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, ragfairRequiredItemsService: RagfairRequiredItemsService, ragfairOfferGenerator: RagfairOfferGenerator, configServer: ConfigServer); getOffers(sessionID: string, info: ISearchRequestData): IGetOffersResult; + protected isLinkedSearch(info: ISearchRequestData): boolean; + protected isRequiredSearch(info: ISearchRequestData): boolean; update(): void; getItemPrice(info: IGetMarketPriceRequestData): IGetItemPriceResult; addPlayerOffer(pmcData: IPmcData, info: IAddOfferRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/RepairController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/RepairController.d.ts index 77dd47a..0e78ef6 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/RepairController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/RepairController.d.ts @@ -5,21 +5,22 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepairActionDataRequest } from "../models/eft/repair/IRepairActionDataRequest"; import { ITraderRepairActionDataRequest } from "../models/eft/repair/ITraderRepairActionDataRequest"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; export declare class RepairController { - private logger; - private itemEventRouter; - private databaseServer; - private questHelper; - private traderHelper; - private paymentService; - private repairHelper; - private configServer; - private repairConfig; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; + protected traderHelper: TraderHelper; + protected paymentService: PaymentService; + protected repairHelper: RepairHelper; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, questHelper: QuestHelper, traderHelper: TraderHelper, paymentService: PaymentService, repairHelper: RepairHelper, configServer: ConfigServer); /** * Repair with trader @@ -36,5 +37,5 @@ export declare class RepairController { * @param sessionID session id * @returns item event router action */ - repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; + repairWithKit(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/RepeatableQuestController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/RepeatableQuestController.d.ts index 2dedc7e..98d05dd 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/RepeatableQuestController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/RepeatableQuestController.d.ts @@ -4,17 +4,19 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { IEmptyRequestData } from "../models/eft/common/IEmptyRequestData"; import { Exit } from "../models/eft/common/ILocationBase"; -import { IPmcData, TraderInfo } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { TraderInfo } from "../models/eft/common/tables/IBotBase"; import { ICompletion, ICompletionAvailableFor, IElimination, IEliminationCondition, IExploration, IExplorationCondition, IPmcDataRepeatableQuest, IRepeatableQuest, IReward, IRewards } from "../models/eft/common/tables/IRepeatableQuests"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRepeatableQuestChangeRequest } from "../models/eft/quests/IRepeatableQuestChangeRequest"; import { ELocationName } from "../models/enums/ELocationName"; -import { IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IQuestConfig, IRepeatableQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { PaymentService } from "../services/PaymentService"; +import { ProfileFixerService } from "../services/ProfileFixerService"; import { JsonUtil } from "../utils/JsonUtil"; import { MathUtil } from "../utils/MathUtil"; import { ObjectId } from "../utils/ObjectId"; @@ -48,22 +50,23 @@ export interface ITargetLocation { locations: string[]; } export declare class RepeatableQuestController { - private timeUtil; - private logger; - private randomUtil; - private mathUtil; - private jsonUtil; - private databaseServer; - private itemHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private itemEventRouter; - private paymentService; - private objectId; - private configServer; - private questConfig; - constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); + protected timeUtil: TimeUtil; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected mathUtil: MathUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected profileFixerService: ProfileFixerService; + protected ragfairServerHelper: RagfairServerHelper; + protected itemEventRouter: ItemEventRouter; + protected paymentService: PaymentService; + protected objectId: ObjectId; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(timeUtil: TimeUtil, logger: ILogger, randomUtil: RandomUtil, mathUtil: MathUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, profileFixerService: ProfileFixerService, ragfairServerHelper: RagfairServerHelper, itemEventRouter: ItemEventRouter, paymentService: PaymentService, objectId: ObjectId, configServer: ConfigServer); /** * This is the method reached by the /client/repeatalbeQuests/activityPeriods endpoint * Returns an array of objects in the format of repeatable quests to the client. diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/TradeController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/TradeController.d.ts index f0a177b..c86745c 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/TradeController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/TradeController.d.ts @@ -9,11 +9,11 @@ import { IProcessBaseTradeRequestData } from "../models/eft/trade/IProcessBaseTr import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ILogger } from "../models/spt/utils/ILogger"; declare class TradeController { - private logger; - private itemEventRouter; - private tradeHelper; - private profileHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected tradeHelper: TradeHelper; + protected profileHelper: ProfileHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, tradeHelper: TradeHelper, profileHelper: ProfileHelper, ragfairServer: RagfairServer); confirmTrading(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string, foundInRaid?: boolean, upd?: Upd): IItemEventRouterResponse; confirmRagfairTrading(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/TraderController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/TraderController.d.ts index 36eac75..7bab158 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/TraderController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/TraderController.d.ts @@ -8,14 +8,14 @@ import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class TraderController { - private logger; - private databaseServer; - private traderAssortHelper; - private profileHelper; - private traderHelper; - private timeUtil; - private traderAssortService; - private jsonUtil; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected traderAssortHelper: TraderAssortHelper; + protected profileHelper: ProfileHelper; + protected traderHelper: TraderHelper; + protected timeUtil: TimeUtil; + protected traderAssortService: TraderAssortService; + protected jsonUtil: JsonUtil; constructor(logger: ILogger, databaseServer: DatabaseServer, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, timeUtil: TimeUtil, traderAssortService: TraderAssortService, jsonUtil: JsonUtil); load(): void; getTrader(traderID: string, sessionID: string): ITraderBase; diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/WeatherController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/WeatherController.d.ts index 312c3a3..ca7f5eb 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/WeatherController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/WeatherController.d.ts @@ -1,10 +1,11 @@ import { WeatherGenerator } from "../generators/WeatherGenerator"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WeatherController { - private weatherGenerator; - private configServer; - private weatherConfig; + protected weatherGenerator: WeatherGenerator; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weatherGenerator: WeatherGenerator, configServer: ConfigServer); generate(): IWeatherData; } diff --git a/Live/CWX_WeatherPatcher/server/types/controllers/WishlistController.d.ts b/Live/CWX_WeatherPatcher/server/types/controllers/WishlistController.d.ts index 5ef8df3..a96c522 100644 --- a/Live/CWX_WeatherPatcher/server/types/controllers/WishlistController.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/controllers/WishlistController.d.ts @@ -3,7 +3,7 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { IWishlistActionData } from "../models/eft/wishlist/IWishlistActionData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class WishlistController { - private itemEvenRouter; + protected itemEvenRouter: ItemEventRouter; constructor(itemEvenRouter: ItemEventRouter); addToWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; removeFromWishList(pmcData: IPmcData, body: IWishlistActionData, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/generators/BotGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/BotGenerator.d.ts index e2565b7..a5fc0ad 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/BotGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/BotGenerator.d.ts @@ -1,36 +1,96 @@ import { BotHelper } from "../helpers/BotHelper"; import { GameEventHelper } from "../helpers/GameEventHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; import { IGenerateBotsRequestData } from "../models/eft/bot/IGenerateBotsRequestData"; -import { IBotBase } from "../models/eft/common/tables/IBotBase"; +import { Health as PmcHealth, IBotBase, Skills } from "../models/eft/common/tables/IBotBase"; +import { Health, IBotType, Inventory } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotEquipmentFilterService } from "../services/BotEquipmentFilterService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotInventoryGenerator } from "./BotInventoryGenerator"; -export declare class BotGenerator { - private logger; - private hashUtil; - private randomUtil; - private jsonUtil; - private databaseServer; - private botInventoryGenerator; - private botHelper; - private gameEventHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); - generate(info: IGenerateBotsRequestData, playerScav?: boolean): IBotBase[]; - private generateBot; - private generateRandomLevel; - /** Converts health object to the required format */ - private generateHealth; - private generateSkills; - private getPmcRole; - private removeChristmasItemsFromBotInventory; - private generateId; - private generateInventoryID; - private getPMCDifficulty; - private generateDogtag; +declare namespace BotGenerator { + interface IRandomisedBotLevelResult { + level: number; + exp: number; + } } +export declare class BotGenerator { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected databaseServer: DatabaseServer; + protected botInventoryGenerator: BotInventoryGenerator; + protected botEquipmentFilterService: BotEquipmentFilterService; + protected botHelper: BotHelper; + protected gameEventHelper: GameEventHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, jsonUtil: JsonUtil, profileHelper: ProfileHelper, databaseServer: DatabaseServer, botInventoryGenerator: BotInventoryGenerator, botEquipmentFilterService: BotEquipmentFilterService, botHelper: BotHelper, gameEventHelper: GameEventHelper, configServer: ConfigServer); + /** + * Generate a player scav bot object + * @param role e.g. assault / pmcbot + * @param difficulty easy/normal/hard/impossible + * @param botTemplate base bot template to use (e.g. assault/pmcbot) + * @returns + */ + generatePlayerScav(role: string, difficulty: string, botTemplate: IBotType): IBotBase; + generate(sessionId: string, info: IGenerateBotsRequestData): IBotBase[]; + /** + * Choose if a bot should become a PMC by checking if bot type is allowed to become a Pmc in botConfig.convertFromChances and doing a random int check + * @param botRole the bot role to check if should be a pmc + * @returns true if should be a pmc + */ + protected shouldBotBePmc(botRole: string): boolean; + /** + * Get a randomised PMC side based on bot config value 'isUsec' + * @returns pmc side as string + */ + protected getRandomisedPmcSide(): string; + /** + * Get a clone of the database\bots\base.json file + * @returns IBotBase object + */ + protected getCloneOfBotBase(): IBotBase; + protected generateBot(bot: IBotBase, role: string, node: IBotType, isPmc: boolean, isPlayerScav?: boolean): IBotBase; + /** + * Log the number of PMCs generated to the debug console + */ + protected logPmcGeneratedCount(output: IBotBase[]): void; + protected generateRandomLevel(min: number, max: number): BotGenerator.IRandomisedBotLevelResult; + /** + * Converts health object to the required format + * @param healthObj health object from bot json + * @param playerScav Is a pscav bot being generated + * @returns PmcHealth object + */ + protected generateHealth(healthObj: Health, playerScav?: boolean): PmcHealth; + protected generateSkills(skillsObj: Skills): Skills; + /** + * Convert from pmc side (usec/bear) to the side as defined in the bot config (usecType/bearType) + * @param pmcSide eft side (usec/bear) + * @returns pmc side as defined in config + */ + protected getPmcRole(pmcSide: string): string; + /** + * Iterate through bots inventory and loot to find and remove christmas items (as defined in GameEventHelper) + * @param nodeInventory Bots inventory to iterate over + */ + protected removeChristmasItemsFromBotInventory(nodeInventory: Inventory): void; + protected generateId(bot: IBotBase): IBotBase; + protected generateInventoryID(profile: IBotBase): IBotBase; + protected getPMCDifficulty(requestedDifficulty: string): string; + /** + * Add a side-specific (usec/bear) dogtag item to a bots inventory + * @param bot bot to add dogtag to + * @returns Bot with dogtag added + */ + protected generateDogtag(bot: IBotBase): IBotBase; +} +export {}; diff --git a/Live/CWX_WeatherPatcher/server/types/generators/BotInventoryGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/BotInventoryGenerator.d.ts index 0cdbacb..35d1ee8 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/BotInventoryGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/BotInventoryGenerator.d.ts @@ -1,5 +1,5 @@ -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { Inventory, Chances, Generation } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, Chances, Generation, Mods } from "../models/eft/common/tables/IBotType"; import { HashUtil } from "../utils/HashUtil"; import { RandomUtil } from "../utils/RandomUtil"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; @@ -9,16 +9,16 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; export declare class BotInventoryGenerator { - private logger; - private hashUtil; - private randomUtil; - private databaseServer; - private botWeaponGenerator; - private botLootGenerator; - private botGeneratorHelper; - private weightedRandomHelper; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootGenerator: BotLootGenerator; + protected botGeneratorHelper: BotGeneratorHelper; + protected weightedRandomHelper: WeightedRandomHelper; constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, botWeaponGenerator: BotWeaponGenerator, botLootGenerator: BotLootGenerator, botGeneratorHelper: BotGeneratorHelper, weightedRandomHelper: WeightedRandomHelper); generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; - private generateEquipment; - private generateInventoryBase; + protected generateEquipment(equipmentSlot: string, equipmentPool: Record, modPool: Mods, spawnChances: Chances, botRole: string, inventory: PmcInventory): void; + protected generateInventoryBase(): PmcInventory; } diff --git a/Live/CWX_WeatherPatcher/server/types/generators/BotLootGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/BotLootGenerator.d.ts index 1d8c8e1..c6a3f29 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/BotLootGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/BotLootGenerator.d.ts @@ -1,27 +1,124 @@ -import { PMCLootGenerator } from "../generators/PMCLootGenerator"; import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { HandbookHelper } from "../helpers/HandbookHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { ItemMinMax, Items } from "../models/eft/common/tables/IBotType"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Chances, Inventory, ItemMinMax, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; import { HashUtil } from "../utils/HashUtil"; -import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; +import { BotWeaponGenerator } from "./BotWeaponGenerator"; export declare class BotLootGenerator { - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private botGeneratorHelper; - private pmcLootGenerator; - private configServer; - private botConfig; - constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, pmcLootGenerator: PMCLootGenerator, configServer: ConfigServer); - generateLoot(lootPool: Items, itemCounts: ItemMinMax, isPmc: boolean, inventory: PmcInventory): void; - private getRandomisedCount; - private addLootFromPool; - /** Compares two item templates by their price to spawn chance ratio */ - private compareByValue; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected botWeaponGenerator: BotWeaponGenerator; + protected botLootCacheService: BotLootCacheService; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, botGeneratorHelper: BotGeneratorHelper, botWeaponGenerator: BotWeaponGenerator, botLootCacheService: BotLootCacheService, configServer: ConfigServer); + generateLoot(templateInventory: Inventory, itemCounts: ItemMinMax, isPmc: boolean, botRole: string, botInventory: PmcInventory, equipmentChances: Chances): void; + protected getRandomisedCount(min: number, max: number, nValue: number): number; + /** + * Take random items from a pool and add to an inventory until totalItemCount or totalValueLimit is reached + * @param pool pool of items to pick from + * @param equipmentSlots What equality slot will the loot items be added to + * @param totalItemCount Max count of items to add + * @param inventoryToAddItemsTo bot inventory loot will be added to + * @param botRole role of the bot loot is being generated for (assault/pmcbot) + * @param useLimits should item limit counts be used as defined in config/bot.json + * @param totalValueLimitRub total value of loot allowed in roubles + * @param isPmc is the bot being generated for a pmc + */ + protected addLootFromPool(pool: ITemplateItem[], equipmentSlots: string[], totalItemCount: number, inventoryToAddItemsTo: PmcInventory, botRole: string, useLimits?: boolean, totalValueLimitRub?: number, isPmc?: boolean): void; + /** + * Add generated weapons to inventory as loot + * @param botInventory inventory to add preset to + * @param equipmentSlot slot to place the preset in (backpack) + * @param templateInventory bots template, assault.json + * @param modChances chances for mods to spawn on weapon + * @param botRole bots role, .e.g. pmcBot + * @param isPmc are we generating for a pmc + */ + protected addLooseWeaponsToInventorySlot(botInventory: PmcInventory, equipmentSlot: string, templateInventory: Inventory, modChances: ModsChances, botRole: string, isPmc: boolean): void; + /** + * Get a random item from the pool parameter using the biasedRandomNumber system + * @param pool pool of items to pick an item from + * @param isPmc is the bot being created a pmc + * @returns ITemplateItem object + */ + protected getRandomItemFromPool(pool: ITemplateItem[], isPmc: boolean): ITemplateItem; + /** + * Get the loot nvalue from botconfig + * @param isPmc if true the pmc nvalue is returned + * @returns nvalue as number + */ + protected getBotLootNValue(isPmc: boolean): number; + /** + * Update item limit array to contain items that have a limit + * All values are set to 0 + * @param isPmc is the bot a pmc + * @param botRole role the bot has + * @param limitCount + */ + protected initItemLimitArray(isPmc: boolean, botRole: string, limitCount: Record): void; + /** + * Check if an item has reached its bot-specific spawn limit + * @param itemTemplate Item we check to see if its reached spawn limit + * @param botRole Bot type + * @param isPmc Is bot we're working with a pmc + * @param limitCount spawn limits for items on bot + * @param itemSpawnLimits the limits this bot is allowed to have + * @returns true if item has reached spawn limit + */ + protected itemHasReachedSpawnLimit(itemTemplate: ITemplateItem, botRole: string, isPmc: boolean, limitCount: Record, itemSpawnLimits: Record): boolean; + /** + * Is the item an ammo box + * @param props props of the item to check + * @returns true if item is an ammo box + */ + protected isAmmoBox(props: Props): boolean; + /** + * Create an object that contains the ammo stack for an ammo box + * @param parentId ammo box id + * @param props ammo box props + * @returns Item object + */ + protected createAmmoForAmmoBox(parentId: string, props: Props): Item; + /** + * Randomise the stack size of a money object, uses different values for pmc or scavs + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param moneyItem Money stack to randomise + */ + protected randomiseMoneyStackSize(isPmc: boolean, itemTemplate: ITemplateItem, moneyItem: Item): void; + /** + * Randomise the size of an ammo stack + * @param isPmc is this a PMC + * @param itemTemplate item details + * @param ammoItem Ammo stack to randomise + */ + protected randomiseAmmoStackSize(isPmc: boolean, itemTemplate: ITemplateItem, ammoItem: Item): void; + /** + * Get spawn limits for a specific bot type from bot.json config + * If no limit found for a non pmc bot, fall back to defaults + * @param isPmc is the bot we want limits for a pmc + * @param botRole what role does the bot have + * @returns dictionary of tplIds and limit + */ + protected getItemSpawnLimitsForBotType(isPmc: boolean, botRole: string): Record; + /** + * Get the parentId or tplId of item inside spawnLimits object if it exists + * @param itemTemplate item we want to look for in spawn limits + * @param spawnLimits Limits to check for item + * @returns id as string, otherwise undefined + */ + protected getMatchingIdFromSpawnLimits(itemTemplate: ITemplateItem, spawnLimits: Record): string; } diff --git a/Live/CWX_WeatherPatcher/server/types/generators/BotWeaponGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/BotWeaponGenerator.d.ts index e8f91cb..9215214 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/BotWeaponGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/BotWeaponGenerator.d.ts @@ -1,44 +1,173 @@ import { BotGeneratorHelper } from "../helpers/BotGeneratorHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; -import { MinMax, Mods, ModsChances } from "../models/eft/common/tables/IBotType"; +import { MinMax } from "../models/common/MinMax"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; +import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { GenerateWeaponResult } from "../models/spt/bots/GenerateWeaponResult"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; +import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotWeaponGenerator { - private logger; - private hashUtil; - private databaseServer; - private itemHelper; - private weightedRandomHelper; - private botGeneratorHelper; - private randomUtil; - constructor(logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil); - generateWeapon(equipmentSlot: string, weaponPool: Record, modPool: Mods, modChances: ModsChances, magCounts: MinMax, botRole: string, isPmc: boolean, inventory: PmcInventory): void; - /** Checks if all required slots are occupied on a weapon and all it's mods */ - private isWeaponValid; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected databaseServer: DatabaseServer; + protected itemHelper: ItemHelper; + protected weightedRandomHelper: WeightedRandomHelper; + protected botGeneratorHelper: BotGeneratorHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected readonly modMagazineSlotId = "mod_magazine"; + protected botConfig: IBotConfig; + constructor(jsonUtil: JsonUtil, logger: ILogger, hashUtil: HashUtil, databaseServer: DatabaseServer, itemHelper: ItemHelper, weightedRandomHelper: WeightedRandomHelper, botGeneratorHelper: BotGeneratorHelper, randomUtil: RandomUtil, configServer: ConfigServer); /** - * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. - * Additionally, adds extra bullets to SecuredContainer - * - * @param {*} weaponMods - * @param {*} weaponTemplate - * @param {*} magCounts - * @param {*} ammoTpl - * @returns - */ - private generateExtraMagazines; - private addBullets; + * Get a random weapon from a bots pool of weapons (weighted) + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @returns weapon tpl + */ + pickWeightedWeaponTplFromPool(equipmentSlot: string, botTemplateInventory: Inventory): string; /** - * Finds and returns tpl of ammo that should be used, while making sure it's compatible - * - * @param {*} weaponMods - * @param {*} weaponTemplate + * Generated a weapon based on the supplied weapon tpl + * @param weaponTpl weapon tpl to generate (use pickWeightedWeaponTplFromPool()) + * @param equipmentSlot slot to fit into, primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateWeaponByTpl(weaponTpl: string, equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Generate an entirely random weapon + * @param equipmentSlot Primary/secondary/holster + * @param botTemplateInventory e.g. assault.json + * @param weaponParentId + * @param modChances + * @param botRole + * @param isPmc + * @returns GenerateWeaponResult object + */ + generateRandomWeapon(equipmentSlot: string, botTemplateInventory: Inventory, weaponParentId: string, modChances: ModsChances, botRole: string, isPmc: boolean): GenerateWeaponResult; + /** + * Create array with weapon base as only element + * Add additional properties as required + * @param weaponTpl + * @param weaponParentId + * @param equipmentSlot + * @param weaponItemTemplate + * @param botRole for durability values * @returns */ - private getCompatibleAmmo; - /** Fill existing magazines to full, while replacing their contents with specified ammo */ - private fillExistingMagazines; + constructWeaponBaseArray(weaponTpl: string, weaponParentId: string, equipmentSlot: string, weaponItemTemplate: ITemplateItem, botRole: string): Item[]; + /** + * Add compatible magazines to an inventory based on a generated weapon + * @param weaponDetails + * @param magCounts + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + */ + addExtraMagazinesToInventory(weaponDetails: GenerateWeaponResult, magCounts: MinMax, inventory: PmcInventory, botRole: string): void; + /** + * Get the mods necessary to kit out a weapon to its preset level + * @param weaponTpl weapon to find preset for + * @param equipmentSlot the slot the weapon will be placed in + * @param weaponParentId Value used for the parentid + * @returns array of weapon mods + */ + protected getPresetWeaponMods(weaponTpl: string, equipmentSlot: string, weaponParentId: string, itemTemplate: ITemplateItem, botRole: string): Item[]; + /** Checks if all required slots are occupied on a weapon and all it's mods */ + protected isWeaponValid(weaponItemArray: Item[]): boolean; + /** + * Generates extra magazines or bullets (if magazine is internal) and adds them to TacticalVest and Pockets. + * Additionally, adds extra bullets to SecuredContainer + * @param weaponMods + * @param weaponTemplate + * @param magCounts + * @param ammoTpl + * @param inventory + * @param botRole the bot type we're getting generating extra mags for + * @returns + */ + protected generateExtraMagazines(weaponMods: Item[], weaponTemplate: ITemplateItem, magCounts: MinMax, ammoTpl: string, inventory: PmcInventory, botRole: string): void; + /** + * Get a randomised number of bullets for a specific magazine + * @param magCounts min and max count of magazines + * @param magTemplate magazine to generate bullet count for + * @returns bullet count number + */ + protected getRandomisedBulletCount(magCounts: MinMax, magTemplate: ITemplateItem): number; + /** + * Get a randomised count of magazines + * @param magCounts min and max value returned value can be between + * @returns numberical value of magazine count + */ + protected getRandomisedMagazineCount(magCounts: MinMax): number; + /** + * Add ammo to the secure container + * @param stackCount How many stacks of ammo to add + * @param ammoTpl Ammo type to add + * @param stackSize Size of the ammo stack to add + * @param inventory Player inventory + */ + protected addAmmoToSecureContainer(stackCount: number, ammoTpl: string, stackSize: number, inventory: PmcInventory): void; + /** + * Get a weapons magazine tpl from a weapon template + * @param weaponMods mods from a weapon template + * @param weaponTemplate Weapon to get magazine tpl for + * @param botRole the bot type we are getting the magazine for + * @returns magazine tpl string + */ + protected getMagazineTplFromWeaponTemplate(weaponMods: Item[], weaponTemplate: ITemplateItem, botRole: string): string; + /** + * Get a weapons default magazine template id + * @param weaponTemplate weapon to get default magazine for + * @returns tpl of magazine + */ + protected getWeaponsDefaultMagazineTpl(weaponTemplate: ITemplateItem): string; + protected addBulletsToVestAndPockets(ammoTpl: string, bulletCount: number, inventory: PmcInventory): void; + /** + * Finds and return a compatible ammo tpl based on the bots ammo weightings (x.json/inventory/equipment/ammo) + * @param ammo a list of ammo tpls the weapon can use + * @param weaponTemplate the weapon we want to pick ammo for + * @param isPmc is the ammo being gathered for a pmc (runs pmc ammo filtering) + * @returns an ammo tpl that works with the desired gun + */ + protected getCompatibleAmmo(ammo: Record>, weaponTemplate: ITemplateItem, isPmc: boolean): string; + /** + * Get a weapons compatible cartridge caliber + * @param weaponTemplate Weapon to look up caliber of + * @returns caliber as string + */ + protected getWeaponCaliber(weaponTemplate: ITemplateItem): string; + /** + * Fill existing magazines to full, while replacing their contents with specified ammo + * @param weaponMods + * @param magazine + * @param ammoTpl + */ + protected fillExistingMagazines(weaponMods: Item[], magazine: Item, ammoTpl: string): void; + /** + * Add cartridge item to weapon Item array, if it already exists, update + * @param weaponMods Weapon items array to amend + * @param magazine magazine item details we're adding cartridges to + * @param chosenAmmo cartridge to put into the magazine + * @param newStackSize how many cartridges should go into the magazine + */ + protected addOrUpdateMagazinesChildWithAmmo(weaponMods: Item[], magazine: Item, chosenAmmo: string, newStackSize: number): void; + /** + * Fill each Camora with a bullet + * @param weaponMods Weapon mods to find and update camora mod(s) from + * @param magazineId magazine id to find and add to + * @param ammoTpl ammo template id to hydate with + */ + protected fillCamorasWithAmmo(weaponMods: Item[], magazineId: string, ammoTpl: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/generators/LocationGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/LocationGenerator.d.ts index 4b96792..bd368b5 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/LocationGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/LocationGenerator.d.ts @@ -6,6 +6,8 @@ import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { ILooseLoot, SpawnpointTemplate } from "../models/eft/common/ILooseLoot"; import { Item } from "../models/eft/common/tables/IItem"; import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "../models/eft/common/tables/ILootBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { ILocationConfig } from "../models/spt/config/ILocationConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { JsonUtil } from "../utils/JsonUtil"; @@ -18,27 +20,27 @@ export interface IContainerItem { height: number; } export declare class LocationGenerator { - private logger; - private jsonUtil; - private objectId; - private randomUtil; - private ragfairServerHelper; - private itemHelper; - private mathUtil; - private gameEventHelper; - private containerHelper; - private presetHelper; - private configServer; - private locationConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected objectId: ObjectId; + protected randomUtil: RandomUtil; + protected ragfairServerHelper: RagfairServerHelper; + protected itemHelper: ItemHelper; + protected mathUtil: MathUtil; + protected gameEventHelper: GameEventHelper; + protected containerHelper: ContainerHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected locationConfig: ILocationConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, objectId: ObjectId, randomUtil: RandomUtil, ragfairServerHelper: RagfairServerHelper, itemHelper: ItemHelper, mathUtil: MathUtil, gameEventHelper: GameEventHelper, containerHelper: ContainerHelper, presetHelper: PresetHelper, configServer: ConfigServer); generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record, staticAmmoDist: Record, locationName: string): IStaticContainerProps; - private getLooseLootMultiplerForLocation; - private getStaticLootMultiplerForLocation; + protected getLooseLootMultiplerForLocation(location: string): number; + protected getStaticLootMultiplerForLocation(location: string): number; generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record, locationName: string): SpawnpointTemplate[]; - private createItem; - private getRandomCompatibleCaliberTemplateId; - private getRandomValidCaliber; - private drawAmmoTpl; - private createRandomMagCartridges; - private createCartidges; + protected createItem(tpl: string, staticAmmoDist: Record, parentId?: string): IContainerItem; + protected getRandomCompatibleCaliberTemplateId(item: ITemplateItem): string; + protected getRandomValidCaliber(magTemplate: ITemplateItem): string; + protected drawAmmoTpl(caliber: string, staticAmmoDist: Record): string; + protected createRandomMagCartridges(magTemplate: ITemplateItem, parentId: string, staticAmmoDist: Record, caliber?: string): Item; + protected createCartidges(parentId: string, ammoTpl: string, stackCount: number): Item; } diff --git a/Live/CWX_WeatherPatcher/server/types/generators/PMCLootGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/PMCLootGenerator.d.ts index 601431b..64e6f7f 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/PMCLootGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/PMCLootGenerator.d.ts @@ -1,13 +1,14 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { DatabaseServer } from "../servers/DatabaseServer"; import { ConfigServer } from "../servers/ConfigServer"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; export declare class PMCLootGenerator { - private itemHelper; - private databaseServer; - private configServer; - private pocketLootPool; - private backpackLootPool; - private botConfig; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected pocketLootPool: string[]; + protected backpackLootPool: string[]; + protected botConfig: IBotConfig; constructor(itemHelper: ItemHelper, databaseServer: DatabaseServer, configServer: ConfigServer); generatePMCPocketLootPool(): string[]; generatePMCBackpackLootPool(): string[]; diff --git a/Live/CWX_WeatherPatcher/server/types/generators/PlayerScavGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/PlayerScavGenerator.d.ts new file mode 100644 index 0000000..bb2c730 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/generators/PlayerScavGenerator.d.ts @@ -0,0 +1,67 @@ +import { BotHelper } from "../helpers/BotHelper"; +import { ProfileHelper } from "../helpers/ProfileHelper"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Skills, Stats } from "../models/eft/common/tables/IBotBase"; +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { IPlayerScavConfig, KarmaLevel } from "../models/spt/config/IPlayerScavConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { SaveServer } from "../servers/SaveServer"; +import { BotLootCacheService } from "../services/BotLootCacheService"; +import { FenceService } from "../services/FenceService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { BotGenerator } from "./BotGenerator"; +export declare class PlayerScavGenerator { + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected botHelper: BotHelper; + protected jsonUtil: JsonUtil; + protected fenceService: FenceService; + protected botLootCacheService: BotLootCacheService; + protected botGenerator: BotGenerator; + protected configServer: ConfigServer; + protected playerScavConfig: IPlayerScavConfig; + constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, botHelper: BotHelper, jsonUtil: JsonUtil, fenceService: FenceService, botLootCacheService: BotLootCacheService, botGenerator: BotGenerator, configServer: ConfigServer); + /** + * Update a player profile to include a new player scav profile + * @param sessionID session id to specify what profile is updated + * @returns profile object + */ + generate(sessionID: string): IPmcData; + /** + * Get the scav karama level for a profile + * Is also the fence trader rep level + * @param pmcData pmc profile + * @returns karma level + */ + protected getScavKarmaLevel(pmcData: IPmcData): number; + /** + * Get a baseBot template + * If the parameter doesnt match "assault", take parts from the loot type and apply to the return bot template + * @param botTypeForLoot bot type to use for inventory/chances + * @returns IBotType object + */ + protected constructBotBaseTemplate(botTypeForLoot: string): IBotType; + /** + * Adjust equipment/mod/item generation values based on scav karma levels + * @param karmaSettings Values to modify the bot template with + * @param baseBotNode bot template to modify according to karama level settings + */ + protected adjustBotTemplateWithKarmaSpecificSettings(karmaSettings: KarmaLevel, baseBotNode: IBotType): void; + protected getScavSkills(scavProfile: IPmcData): Skills; + protected getDefaultScavSkills(): Skills; + protected getScavStats(scavProfile: IPmcData): Stats; + protected getScavLevel(scavProfile: IPmcData): number; + protected getScavExperience(scavProfile: IPmcData): number; + /** + * Set cooldown till pscav is playable + * take into account scav cooldown bonus + * @param scavData scav profile + * @param pmcData pmc profile + * @returns + */ + protected setScavCooldownTimer(scavData: IPmcData, pmcData: IPmcData): IPmcData; +} diff --git a/Live/CWX_WeatherPatcher/server/types/generators/RagfairAssortGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/RagfairAssortGenerator.d.ts index 06d3250..cbdd7f2 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/RagfairAssortGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/RagfairAssortGenerator.d.ts @@ -4,22 +4,22 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; export declare class RagfairAssortGenerator { - private jsonUtil; - private hashUtil; - private itemHelper; - private databaseServer; - private generatedAssortItems; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected generatedAssortItems: Item[]; constructor(jsonUtil: JsonUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer); /** * Get an array of unique items that can be sold on the flea * @returns array of unique items */ getAssortItems(): Item[]; - private assortsAreGenerated; + protected assortsAreGenerated(): boolean; /** * Generate an array of items the flea can sell * @returns array of unique items */ - private generateRagfairAssortItems; - private createRagfairAssortItem; + protected generateRagfairAssortItems(): Item[]; + protected createRagfairAssortItem(tplId: string, id?: string): Item; } diff --git a/Live/CWX_WeatherPatcher/server/types/generators/RagfairOfferGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/RagfairOfferGenerator.d.ts index e3fbe4a..3e7f4cc 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/RagfairOfferGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/RagfairOfferGenerator.d.ts @@ -2,13 +2,16 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { FenceService } from "../services/FenceService"; +import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { HashUtil } from "../utils/HashUtil"; @@ -17,37 +20,41 @@ import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; import { RagfairAssortGenerator } from "./RagfairAssortGenerator"; export declare class RagfairOfferGenerator { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private timeUtil; - private databaseServer; - private ragfairServerHelper; - private saveServer; - private presetHelper; - private ragfairAssortGenerator; - private ragfairOfferService; - private ragfairPriceService; - private fenceService; - private itemHelper; - private configServer; - private ragfairConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected ragfairServerHelper: RagfairServerHelper; + protected saveServer: SaveServer; + protected presetHelper: PresetHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairPriceService: RagfairPriceService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected fenceService: FenceService; + protected itemHelper: ItemHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, timeUtil: TimeUtil, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, saveServer: SaveServer, presetHelper: PresetHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferService: RagfairOfferService, ragfairPriceService: RagfairPriceService, ragfairCategoriesService: RagfairCategoriesService, fenceService: FenceService, itemHelper: ItemHelper, configServer: ConfigServer); createOffer(userID: string, time: number, items: Item[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece?: boolean): IRagfairOffer; - private getTraderId; - private getRating; - private getRatingGrowing; - private getOfferEndTime; + protected getTraderId(userID: string): string; + protected getRating(userID: string): number; + protected getRatingGrowing(userID: string): boolean; + protected getOfferEndTime(userID: string, time: number): number; /** * Create multiple offers for items by using a unique list of items we've generated previously * @param expiredOffers */ generateDynamicOffers(expiredOffers?: Item[]): void; generateTraderOffers(traderID: string): void; - private getItemCondition; - private addMissingCondition; - private getOfferRequirements; + protected getItemCondition(userID: string, items: Item[], itemDetails: ITemplateItem): Item[]; + protected addMissingCondition(item: Item): Item; + protected getOfferRequirements(items: Item[]): { + count: number; + _tpl: string; + }[]; /** * Create a flea offer and store it in the Ragfair server offers array */ diff --git a/Live/CWX_WeatherPatcher/server/types/generators/ScavCaseRewardGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/ScavCaseRewardGenerator.d.ts new file mode 100644 index 0000000..c7d6ab7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/generators/ScavCaseRewardGenerator.d.ts @@ -0,0 +1,105 @@ +import { ItemHelper } from "../helpers/ItemHelper"; +import { Product } from "../models/eft/common/tables/IBotBase"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IHideoutScavCase } from "../models/eft/hideout/IHideoutScavCase"; +import { IHideoutScavCaseStartRequestData } from "../models/eft/hideout/IHideoutScavCaseStartRequestData"; +import { IScavCaseConfig } from "../models/spt/config/IScavCaseConfig"; +import { RewardCountAndPriceDetails, ScavCaseRewardCountsAndPrices } from "../models/spt/hideout/ScavCaseRewardCountsAndPrices"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { RagfairPriceService } from "../services/RagfairPriceService"; +import { HashUtil } from "../utils/HashUtil"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ScavCaseRewardGenerator { + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected configServer: ConfigServer; + protected scavCaseConfig: IScavCaseConfig; + constructor(logger: ILogger, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, configServer: ConfigServer); + /** + * Create an array of rewards that will be given to the player upon completing their scav case build + * @param body client request + * @returns Product array + */ + generate(body: IHideoutScavCaseStartRequestData): Product[]; + /** + * Get all db items that are not blacklisted in scavcase config + * @returns filtered array of db items + */ + protected getDbItems(): ITemplateItem[]; + /** + * Check if a template id has a blacklisted parent id + * @param tplid template id to check + * @returns true if item is blacklisted + */ + protected itemHasBlacklistedParent(tplid: string): boolean; + /** + * Pick a number of items to be rewards, the count is defined by the values in + * @param items item pool to pick rewards from + * @param itemFilters how the rewards should be filtered down (by item count) + * @returns + */ + protected pickRandomRewards(items: ITemplateItem[], itemFilters: RewardCountAndPriceDetails, rarity: string): ITemplateItem[]; + /** + * Choose if money should be a reward based on the moneyRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be money + */ + protected rewardShouldBeMoney(): boolean; + /** + * Choose if ammo should be a reward based on the ammoRewardChancePercent config chance in scavCaseConfig + * @returns true if reward should be ammo + */ + protected rewardShouldBeAmmo(): boolean; + /** + * Choose from rouble/dollar/euro at random + */ + protected getRandomMoney(): ITemplateItem; + /** + * Get a random ammo from items.json that is not in the ammo blacklist AND inside the price rage defined in scavcase.json config + * @param rarity The rarity this ammo reward is for + * @returns random ammo item from items.json + */ + protected getRandomAmmo(rarity: string): ITemplateItem; + /** + * Take all the rewards picked create the Product object array ready to return to calling code + * Also add a stack count to ammo and money + * @param rewardItems items to convert + * @returns Product array + */ + protected randomiseContainerItemRewards(rewardItems: ITemplateItem[], rarity: string): Product[]; + /** + * Add a randomised stack count to ammo or money items + * @param item money or ammo item + * @param resultItem money or ammo item with a randomise stack size + */ + protected addStackCountToAmmoAndMoney(item: ITemplateItem, resultItem: { + _id: string; + _tpl: string; + upd: any; + }, rarity: string): void; + /** + * + * @param dbItems all items from the items.json + * @param itemFilters controls how the dbItems will be filtered and returned (handbook price) + * @returns filtered dbItems array + */ + protected getFilteredItemsByPrice(dbItems: ITemplateItem[], itemFilters: RewardCountAndPriceDetails): ITemplateItem[]; + /** + * Gathers the reward options from config and scavcase.json into a single object + * @param scavCaseDetails scavcase.json values + * @returns ScavCaseRewardCountsAndPrices object + */ + protected getScavCaseRewardCountsAndPrices(scavCaseDetails: IHideoutScavCase): ScavCaseRewardCountsAndPrices; + /** + * Randomises the size of ammo and money stacks + * @param itemToCalculate ammo or money item + * @param rarity rarity (common/rare/superrare) + * @returns value to set stack count to + */ + protected getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem, rarity: string): number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/generators/WeatherGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/generators/WeatherGenerator.d.ts index b9faa3a..44cecbb 100644 --- a/Live/CWX_WeatherPatcher/server/types/generators/WeatherGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/generators/WeatherGenerator.d.ts @@ -1,19 +1,33 @@ import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper"; import { ConfigServer } from "../servers/ConfigServer"; import { IWeatherData } from "../models/eft/weather/IWeatherData"; +import { IWeatherConfig } from "../models/spt/config/IWeatherConfig"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class WeatherGenerator { - private weightedRandomHelper; - private randomUtil; - private timeUtil; - private configServer; - private weatherConfig; + protected weightedRandomHelper: WeightedRandomHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected weatherConfig: IWeatherConfig; constructor(weightedRandomHelper: WeightedRandomHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateTime(data: IWeatherData): IWeatherData; + /** + * Get server uptime seconds multiplied by a multiplier and add to current time as seconds + * Format to BSGs requirements + * @param computedDate current date + * @returns formatted time + */ + protected getAcceleratedTime(computedDate: Date): string; + /** + * Get current time formatted to fit BSGs requirement + * @param computedDate + * @returns + */ + protected getNormalTime(computedDate: Date): string; generateWeather(data: IWeatherData): IWeatherData; - private getWeightedFog; - private getWeightedRain; - private getRandomFloat; - private getRandomInt; + protected getWeightedFog(): string; + protected getWeightedRain(): number; + protected getRandomFloat(node: string): number; + protected getRandomInt(node: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/AssortHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/AssortHelper.d.ts index 33cb5c6..15586b9 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/AssortHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/AssortHelper.d.ts @@ -5,12 +5,32 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { ItemHelper } from "./ItemHelper"; import { QuestHelper } from "./QuestHelper"; export declare class AssortHelper { - private logger; - private itemHelper; - private databaseServer; - private questHelper; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected databaseServer: DatabaseServer; + protected questHelper: QuestHelper; constructor(logger: ILogger, itemHelper: ItemHelper, databaseServer: DatabaseServer, questHelper: QuestHelper); + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort assort items from a trader + * @returns assort items minus locked quest assorts + */ + stripLockedQuestAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove assorts from a trader that have not been unlocked yet + * @param pmcProfile player profile + * @param traderId traders id + * @param assort traders assorts + * @returns traders assorts minus locked loyality assorts + */ + stripLockedLoyaltyAssort(pmcProfile: IPmcData, traderId: string, assort: ITraderAssort): ITraderAssort; + /** + * Remove an item from an assort + * @param assort assort to modify + * @param itemID item id to remove from asort + * @returns Modified assort + */ removeItemFromAssort(assort: ITraderAssort, itemID: string): ITraderAssort; - stripQuestAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; - stripLoyaltyAssort(pmcProfile: IPmcData, sessionId: string, traderId: string, assort: ITraderAssort): ITraderAssort; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/BotGeneratorHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/BotGeneratorHelper.d.ts index 141f71d..3cd7256 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/BotGeneratorHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/BotGeneratorHelper.d.ts @@ -1,8 +1,9 @@ import { DurabilityLimitsHelper } from "../helpers/DurabilityLimitsHelper"; -import { Inventory as PmcInventory } from "../models/eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase"; import { Mods, ModsChances } from "../models/eft/common/tables/IBotType"; -import { Item, Upd } from "../models/eft/common/tables/IItem"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { Item, Repairable, Upd } from "../models/eft/common/tables/IItem"; +import { Grid, ITemplateItem, Slot } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,20 +13,50 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ContainerHelper } from "./ContainerHelper"; import { InventoryHelper } from "./InventoryHelper"; import { ItemHelper } from "./ItemHelper"; +import { ProbabilityHelper } from "./ProbabilityHelper"; export declare class BotGeneratorHelper { - private logger; - private jsonUtil; - private hashUtil; - private randomUtil; - private databaseServer; - private durabilityLimitsHelper; - private itemHelper; - private inventoryHelper; - private containerHelper; - private configServer; - private botConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); - generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances, isPmc?: boolean): Item[]; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected randomUtil: RandomUtil; + protected probabilityHelper: ProbabilityHelper; + protected databaseServer: DatabaseServer; + protected durabilityLimitsHelper: DurabilityLimitsHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected containerHelper: ContainerHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, randomUtil: RandomUtil, probabilityHelper: ProbabilityHelper, databaseServer: DatabaseServer, durabilityLimitsHelper: DurabilityLimitsHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, containerHelper: ContainerHelper, configServer: ConfigServer); + generateModsForItem(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem, modSpawnChances: ModsChances): Item[]; + /** + * Is this magazine cylinder related (revolvers and grenade launchers) + * @param magazineParentName the name of the magazines parent + * @returns true if it is cylinder related + */ + magazineIsCylinderRelated(magazineParentName: string): boolean; + /** + * randomly choose if a mod should be spawned, 100% for required mods OR mod is ammo slot + * never return true for an item that has 0% spawn chance + * @param itemSlot slot the item sits in + * @param modSlot slot the mod sits in + * @param modSpawnChances Chances for various mod spawns + * @returns boolean true if it should spawn + */ + protected shouldModBeSpawned(itemSlot: Slot, modSlot: string, modSpawnChances: ModsChances): boolean; + /** + * Get a list of containers that hold ammo + * e.g. mod_magazine + * @returns string array + */ + protected getAmmoContainers(): string[]; + /** + * Get the slot details for an item (chamber/cartridge/slot) + * @param modSlot e.g patron_in_weapon + * @param parentTemplate item template + * @returns + */ + protected getModItemSlot(modSlot: string, parentTemplate: ITemplateItem): Slot; /** * With the shotgun revolver (60db29ce99594040e04c4a27) 12.12 introduced CylinderMagazines. * Those magazines (e.g. 60dc519adf4c47305f6d410d) have a "Cartridges" entry with a _max_count=0. @@ -37,16 +68,56 @@ export declare class BotGeneratorHelper { * @param {string} parentId The CylinderMagazine's UID * @param {object} parentTemplate The CylinderMagazine's template */ - private fillCamora; + protected fillCamora(items: Item[], modPool: Mods, parentId: string, parentTemplate: ITemplateItem): void; + /** + * Take a record of camoras and merge the compatable shells into one array + * @param camorasWithShells camoras we want to merge into one array + * @returns string array of shells fro luitple camora sources + */ + protected mergeCamoraPoolsTogether(camorasWithShells: Record): string[]; generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole?: any): { - "upd"?: Upd; + upd?: Upd; }; - private getModTplFromItemDb; + /** + * Create a repairable object for a weapon that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateWeaponRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + /** + * Create a repairable object for an armor that containers durability + max durability properties + * @param itemTemplate weapon object being generated for + * @param botRole type of bot being generated for + * @returns Repairable object + */ + protected generateArmorRepairableProperties(itemTemplate: ITemplateItem, botRole: string): Repairable; + protected getModTplFromItemDb(modTpl: string, parentSlot: Slot, modSlot: string, items: Item[]): string; + /** + * Sort by spawn chance, highest to lowest, higher is more common + * @param unsortedModArray String array to sort + * @returns Sorted string array + */ + protected sortModArray(unsortedModArray: string[]): string[]; + /** + * Can an item be added to an item without issue + * @param items + * @param tplToCheck + * @param equipmentSlot + * @returns true if possible + */ isItemIncompatibleWithCurrentItems(items: Item[], tplToCheck: string, equipmentSlot: string): boolean; - /** Adds an item with all its childern into specified equipmentSlots, wherever it fits. - * Returns a `boolean` indicating success. */ + /** + * Adds an item with all its childern into specified equipmentSlots, wherever it fits. + * @param equipmentSlots + * @param parentId + * @param parentTpl + * @param itemWithChildren + * @param inventory + * @returns a `boolean` indicating item was added + */ addItemWithChildrenToEquipmentSlot(equipmentSlots: string[], parentId: string, parentTpl: string, itemWithChildren: Item[], inventory: PmcInventory): boolean; - private itemAllowedInContainer; + protected itemAllowedInContainer(slot: Grid, itemTpl: string): boolean; } export declare class ExhaustableArray { private itemPool; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/BotHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/BotHelper.d.ts index d901362..9b89481 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/BotHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/BotHelper.d.ts @@ -1,22 +1,45 @@ -import { Difficulty } from "../models/eft/common/tables/IBotType"; +import { Difficulty, IBotType } from "../models/eft/common/tables/IBotType"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class BotHelper { - private logger; - private jsonUtil; - private databaseServer; - private randomUtil; - private configServer; - private botConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, randomUtil: RandomUtil, configServer: ConfigServer); getBotDifficultySettings(type: string, difficulty: string): Difficulty; + getBotTemplate(role: string): IBotType; getPmcDifficultySettings(type: string, difficulty: string): Difficulty; + /** + * Randomise the chance the PMC will attack their own side + * @param difficultySettings pmc difficulty settings + */ randomisePmcHostility(difficultySettings: Difficulty): void; isBotPmc(botRole: string): boolean; isBotBoss(botRole: string): boolean; isBotFollower(botRole: string): boolean; + /** + * Add a bot to the FRIENDLY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typeToAdd bot type to add to friendly list + */ addBotToFriendlyList(difficultySettings: Difficulty, typeToAdd: string): void; + /** + * Add a bot to the ENEMY_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to enemy list + */ + addBotToEnemyList(difficultySettings: Difficulty, typesToAdd: string[], typeBeingEdited: string): void; + /** + * Add a bot to the REVENGE_BOT_TYPES array + * @param difficultySettings bot settings to alter + * @param typesToAdd bot type to add to revenge list + */ + addBotToRevengeList(difficultySettings: Difficulty, typesToAdd: string[]): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/ContainerHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/ContainerHelper.d.ts index 34cd1e4..3c2ee93 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/ContainerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/ContainerHelper.d.ts @@ -6,7 +6,7 @@ export declare class FindSlotResult { constructor(success?: boolean, x?: any, y?: any, rotation?: boolean); } export declare class ContainerHelper { - private locateSlot; + protected locateSlot(container2D: number[][], containerX: number, containerY: number, x: number, y: number, itemW: number, itemH: number): boolean; findSlotForItem(container2D: number[][], itemWidth: number, itemHeight: number): FindSlotResult; fillContainerMapWithItem(container2D: number[][], x: number, y: number, itemW: number, itemH: number, rotate: boolean): any; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/DialogueHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/DialogueHelper.d.ts index ae1f581..e3e2bda 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/DialogueHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/DialogueHelper.d.ts @@ -1,3 +1,4 @@ +import { Item } from "../models/eft/common/tables/IItem"; import { Dialogue, MessageContent, MessagePreview } from "../models/eft/profile/IAkiProfile"; import { MessageType } from "../models/enums/MessageType"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -7,15 +8,33 @@ import { ItemHelper } from "./ItemHelper"; import { NotificationSendHelper } from "./NotificationSendHelper"; import { NotifierHelper } from "./NotifierHelper"; export declare class DialogueHelper { - private hashUtil; - private saveServer; - private databaseServer; - private notifierHelper; - private notificationSendHelper; - private itemHelper; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected notificationSendHelper: NotificationSendHelper; + protected itemHelper: ItemHelper; constructor(hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, notificationSendHelper: NotificationSendHelper, itemHelper: ItemHelper); createMessageContext(templateId: string, messageType: MessageType, maxStoreTime: number): MessageContent; + /** + * Add a templated message to the dialogue. + * @param dialogueID + * @param messageContent + * @param sessionID + * @param rewards + */ addDialogueMessage(dialogueID: string, messageContent: MessageContent, sessionID: string, rewards?: any[]): void; + /** + * Get the preview contents of the last message in a dialogue. + * @param dialogue + * @returns + */ getMessagePreview(dialogue: Dialogue): MessagePreview; - getMessageItemContents(messageID: string, sessionID: string): any[]; + /** + * Get the item contents for a particular message. + * @param messageID + * @param sessionID + * @returns + */ + getMessageItemContents(messageID: string, sessionID: string): Item[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/DurabilityLimitsHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/DurabilityLimitsHelper.d.ts index 609bc7d..07a5db1 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/DurabilityLimitsHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/DurabilityLimitsHelper.d.ts @@ -1,25 +1,26 @@ import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IBotConfig } from "../models/spt/config/IBotConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { BotHelper } from "./BotHelper"; export declare class DurabilityLimitsHelper { - private randomUtil; - private botHelper; - private configServer; - private botConfig; + protected randomUtil: RandomUtil; + protected botHelper: BotHelper; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; constructor(randomUtil: RandomUtil, botHelper: BotHelper, configServer: ConfigServer); getRandomisedMaxWeaponDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedMaxArmorDurability(itemTemplate: ITemplateItem, botRole: string): number; getRandomisedWeaponDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; getRandomisedArmorDurability(itemTemplate: ITemplateItem, botRole: string, maxDurability: number): number; - private generateMaxWeaponDurability; - private generateMaxPmcArmorDurability; - private getLowestMaxWeaponFromConfig; - private getHighestMaxWeaponDurabilityFromConfig; - private generateWeaponDurability; - private generateArmorDurability; - private getMinWeaponDeltaFromConfig; - private getMaxWeaponDeltaFromConfig; - private getMinArmorDeltaFromConfig; - private getMaxArmorDeltaFromConfig; + protected generateMaxWeaponDurability(botRole: string): number; + protected generateMaxPmcArmorDurability(itemMaxDurability: number): number; + protected getLowestMaxWeaponFromConfig(botRole: string): number; + protected getHighestMaxWeaponDurabilityFromConfig(botRole: string): number; + protected generateWeaponDurability(botRole: string, maxDurability: number): number; + protected generateArmorDurability(botRole: string, maxDurability: number): number; + protected getMinWeaponDeltaFromConfig(botRole: string): number; + protected getMaxWeaponDeltaFromConfig(botRole: string): number; + protected getMinArmorDeltaFromConfig(botRole: string): number; + protected getMaxArmorDeltaFromConfig(botRole: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/ExtendedProfileHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/ExtendedProfileHelper.d.ts deleted file mode 100644 index 4dd7d3a..0000000 --- a/Live/CWX_WeatherPatcher/server/types/helpers/ExtendedProfileHelper.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { BotGenerator } from "../generators/BotGenerator"; -import { IPmcData } from "../models/eft/common/IPmcData"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { SaveServer } from "../servers/SaveServer"; -import { FenceService } from "../services/FenceService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { TimeUtil } from "../utils/TimeUtil"; -import { Watermark } from "../utils/Watermark"; -import { ItemHelper } from "./ItemHelper"; -import { ProfileHelper } from "./ProfileHelper"; -export declare class ExtendedProfileHelper extends ProfileHelper { - private botGenerator; - constructor(jsonUtil: JsonUtil, watermark: Watermark, timeUtil: TimeUtil, saveServer: SaveServer, databaseServer: DatabaseServer, itemHelper: ItemHelper, fenceService: FenceService, botGenerator: BotGenerator); - generatePlayerScav(sessionID: string): IPmcData; - private getScavSkills; - private removeSecureContainer; - private getDefaultScavSkills; - private getScavStats; - private getScavLevel; - private getScavExperience; - private setScavCooldownTimer; -} diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/GameEventHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/GameEventHelper.d.ts index 8131d31..7613053 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/GameEventHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/GameEventHelper.d.ts @@ -1,8 +1,8 @@ import { DatabaseServer } from "../servers/DatabaseServer"; export declare class GameEventHelper { - private databaseServer; + protected databaseServer: DatabaseServer; constructor(databaseServer: DatabaseServer); - get EVENT(): Record; + get events(): Record; get christmasEventItems(): string[]; itemIsChristmasRelated(itemId: string): boolean; christmasEventEnabled(): boolean; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/HandbookHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/HandbookHelper.d.ts index aed6984..b47d466 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/HandbookHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/HandbookHelper.d.ts @@ -9,7 +9,7 @@ export declare class LookupCollection { constructor(); } export declare class HandbookHelper { - private lookup; + protected lookup: LookupCollection; hydrateLookup(lookup: LookupCollection): void; getTemplatePrice(x: string): number; templatesWithParent(x: string): string[]; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/HealthHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/HealthHelper.d.ts index bb160a3..3116c9c 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/HealthHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/HealthHelper.d.ts @@ -1,23 +1,51 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ISyncHealthRequestData } from "../models/eft/health/ISyncHealthRequestData"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { IHealthConfig } from "../models/spt/config/IHealthConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { SaveServer } from "../servers/SaveServer"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class HealthHelper { - private jsonUtil; - private logger; - private timeUtil; - private saveServer; - private configServer; - private healthConfig; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected configServer: ConfigServer; + protected healthConfig: IHealthConfig; constructor(jsonUtil: JsonUtil, logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer); + /** + * Resets the profiles vitality/healh and vitality/effects properties to their defaults + * @param sessionID Session Id + * @returns updated profile + */ resetVitality(sessionID: string): IAkiProfile; - saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string): void; - private saveHealth; - private saveEffects; - private addEffect; - private isEmpty; + /** + * Update player profile with changes from request object + * @param pmcData Player profile + * @param info Request object + * @param sessionID Session id + * @param addEffects Should effects be added or removed (default - add) + */ + saveVitality(pmcData: IPmcData, info: ISyncHealthRequestData, sessionID: string, addEffects?: boolean): void; + protected saveHealth(pmcData: IPmcData, sessionID: string): void; + /** + * Save effects to profile + * Works by removing all effects and adding them back from profile + * Remoces empty 'Effects' objects if found + * @param pmcData Player profile + * @param sessionID Session id + * @param addEffects Should effects be added back to profile + * @returns + */ + protected saveEffects(pmcData: IPmcData, sessionID: string, addEffects: boolean): void; + /** + * Add effect to body part in profile + * @param pmcData Player profile + * @param effectBodyPart body part to edit + * @param effectType Effect to add to body part + */ + protected addEffect(pmcData: IPmcData, effectBodyPart: string, effectType: string): void; + protected isEmpty(map: any): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/HideoutHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/HideoutHelper.d.ts index d6a4414..36e4009 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/HideoutHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/HideoutHelper.d.ts @@ -1,10 +1,12 @@ -import { IPmcData, Production, Productive } from "../models/eft/common/IPmcData"; -import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Common, HideoutArea, Production, Productive } from "../models/eft/common/tables/IBotBase"; +import { Upd } from "../models/eft/common/tables/IItem"; import { StageBonus } from "../models/eft/hideout/IHideoutArea"; import { IHideoutContinousProductionStartRequestData } from "../models/eft/hideout/IHideoutContinousProductionStartRequestData"; import { IHideoutSingleProductionStartRequestData } from "../models/eft/hideout/IHideoutSingleProductionStartRequestData"; import { IHideoutTakeProductionRequestData } from "../models/eft/hideout/IHideoutTakeProductionRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IHideoutConfig } from "../models/spt/config/IHideoutConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -17,26 +19,22 @@ import { TimeUtil } from "../utils/TimeUtil"; import { InventoryHelper } from "./InventoryHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class HideoutHelper { - private logger; - private hashUtil; - private timeUtil; - private randomUtil; - private databaseServer; - private itemEventRouter; - private httpResponse; - private profileHelper; - private inventoryHelper; - private playerService; - private configServer; - static BITCOIN_FARM: string; - private WATER_COLLECTOR; - private BITCOIN; - private EXPEDITIONARY_FUEL_TANK; - static NAME_BACKENDCOUNTERS_CRAFTING: string; - static SKILL_NAME_HIDEOUT: string; - static HOUR_FOR_SKILL_CRAFTING: number; - static SKILL_NAME_CRAFITING: string; - private hideoutConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected timeUtil: TimeUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected profileHelper: ProfileHelper; + protected inventoryHelper: InventoryHelper; + protected playerService: PlayerService; + protected configServer: ConfigServer; + static bitcoinFarm: string; + static waterCollector: string; + static bitcoin: string; + static expeditionaryFuelTank: string; + protected hideoutConfig: IHideoutConfig; constructor(logger: ILogger, hashUtil: HashUtil, timeUtil: TimeUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, profileHelper: ProfileHelper, inventoryHelper: InventoryHelper, playerService: PlayerService, configServer: ConfigServer); registerProduction(pmcData: IPmcData, body: IHideoutSingleProductionStartRequestData | IHideoutContinousProductionStartRequestData, sessionID: string): IItemEventRouterResponse; /** @@ -46,21 +44,20 @@ export declare class HideoutHelper { initProduction(recipeId: string, productionTime: number): Production; isProductionType(productive: Productive): productive is Production; applyPlayerUpgradesBonuses(pmcData: IPmcData, bonus: StageBonus): void; - private applySkillXPBoost; + protected applySkillXPBoost(pmcData: IPmcData, bonus: StageBonus): void; updatePlayerHideout(sessionID: string): void; - private updateWaterCollector; - private doesWaterCollectorHaveFilter; - private updateFuel; - private updateWaterFilters; - private getAreaUpdObject; - private updateAirFilters; - private updateBitcoinFarm; - private getBTCSlots; - private getManagementSkillsSlots; - private hasManagementSkillSlots; - private getHideoutManagementSkill; - private getHideoutManagementConsumptionBonus; + protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void; + protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean; + protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateWaterFilters(waterFilterArea: HideoutArea, pwProd: Production, isGeneratorOn: boolean, pmcData: IPmcData): HideoutArea; + protected getAreaUpdObject(stackCount: number, resourceValue: number, resourceUnitsConsumed: number): Upd; + protected updateAirFilters(airFilterArea: HideoutArea, pmcData: IPmcData): HideoutArea; + protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production; + protected getBTCSlots(pmcData: IPmcData): number; + protected getManagementSkillsSlots(): number; + protected hasManagementSkillSlots(pmcData: IPmcData): boolean; + protected getHideoutManagementSkill(pmcData: IPmcData): Common; + protected getHideoutManagementConsumptionBonus(pmcData: IPmcData): number; isProduction(productive: Productive): productive is Production; getBTC(pmcData: IPmcData, body: IHideoutTakeProductionRequestData, sessionID: string): IItemEventRouterResponse; - getRandomAmountRewardForScavCase(itemToCalculate: ITemplateItem): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/HttpServerHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/HttpServerHelper.d.ts index 2e40814..c6e5296 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/HttpServerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/HttpServerHelper.d.ts @@ -1,8 +1,19 @@ +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { ConfigServer } from "../servers/ConfigServer"; export declare class HttpServerHelper { - private configServer; - private httpConfig; - private mime; + protected configServer: ConfigServer; + protected httpConfig: IHttpConfig; + protected mime: { + css: string; + bin: string; + html: string; + jpg: string; + js: string; + json: string; + png: string; + svg: string; + txt: string; + }; constructor(configServer: ConfigServer); getMimeText(key: string): string; buildUrl(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/InRaidHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/InRaidHelper.d.ts index e79d384..c3cbfbb 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/InRaidHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/InRaidHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Victim } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Victim } from "../models/eft/common/tables/IBotBase"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ILogger } from "../models/spt/utils/ILogger"; @@ -8,26 +9,89 @@ import { JsonUtil } from "../utils/JsonUtil"; import { InventoryHelper } from "./InventoryHelper"; import { PaymentHelper } from "./PaymentHelper"; export declare class InRaidHelper { - private logger; - private saveServer; - private jsonUtil; - private databaseServer; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected saveServer: SaveServer; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, saveServer: SaveServer, jsonUtil: JsonUtil, databaseServer: DatabaseServer, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); - private removePlayer; - private removeMapAccessKey; + /** + * Reset the SPT inraid property stored in a profile to 'none' + * @param sessionID Session id + */ + protected removePlayer(sessionID: string): void; + /** + * Some maps have one-time-use keys (e.g. Labs + * Remove the relevant key from an inventory based on the post-raid request data passed in + * @param offraidData post-raid data + * @param sessionID Session id + */ + protected removeMapAccessKey(offraidData: ISaveProgressRequestData, sessionID: string): void; + /** + * Check an array of items and add an upd object to money items with a stack count of 1 + * Single stack money items have no upd object and thus no StackObjectsCount, causing issues + * @param items Items array to check + */ addUpdToMoneyFromRaid(items: Item[]): void; /** - * Add positive karma for PMC kills - * @param {*} existingFenceStanding - * @param {*} victims + * Add karma changes up and return the new value + * @param existingFenceStanding Current fence standing level + * @param victims Array of kills player performed + * @returns adjusted karma level after kills are taken into account + */ + calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): number; + /** + * Reset a profile to a baseline, used post-raid + * Reset points earned during session property + * Increment exp + * Remove Labs keycard + * @param profileData Profile to update + * @param saveProgressRequest post raid save data request data + * @param sessionID Sessino id + * @returns Reset profile object + */ + updateProfileBaseStats(profileData: IPmcData, saveProgressRequest: ISaveProgressRequestData, sessionID: string): IPmcData; + /** + * Adds SpawnedInSession property to items found in a raid + * Removes SpawnedInSession for non-scav players if item was taken into raid with SpawnedInSession = true + * @param preRaidProfile profile to update + * @param postRaidProfile profile to upate inventory contents of + * @param isPlayerScav Was this a p scav raid + * @returns + */ + addSpawnedInSessionPropertyToItems(preRaidProfile: IPmcData, postRaidProfile: IPmcData, isPlayerScav: boolean): IPmcData; + /** + * Iterate over inventory items and remove the property that defines an item as Found in Raid + * Only removes property if item had FiR when entering raid + * @param postRaidProfile profile to update items for + * @returns Updated profile with SpawnedInSession removed + */ + removeSpawnedInSessionPropertyFromItems(postRaidProfile: IPmcData): IPmcData; + /** + * Update a players inventory post-raid + * Remove equipped items from pre-raid + * Add new items found in raid to profile + * Store insurance items in profile + * @param sessionID + * @param pmcData Profile to update + * @param postRaidProfile Profile returned by client after a raid + * @returns Updated profile + */ + setInventory(sessionID: string, pmcData: IPmcData, postRaidProfile: IPmcData): IPmcData; + /** + * Clear pmc inventory of all items except those that are exempt + * Used post-raid to remove items after death + * @param pmcData Player profile + * @param sessionID Session id + * @returns Player profile with pmc inventory cleared */ - calculateFenceStandingChangeFromKills(existingFenceStanding: number, victims: Victim[]): void; - setBaseStats(profileData: IPmcData, offraidData: ISaveProgressRequestData, sessionID: string): IPmcData; - markFoundItems(pmcData: IPmcData, profile: IPmcData, isPlayerScav: boolean): IPmcData; - removeFoundInRaidStatusFromItems(profile: IPmcData): IPmcData; - setInventory(sessionID: string, pmcData: IPmcData, profile: IPmcData): IPmcData; deleteInventory(pmcData: IPmcData, sessionID: string): IPmcData; + /** + * Does the provided items slotId mean its kept on the player after death + * @param slotId slotid of item to check + * @returns true if item is kept after death + */ + isItemKeptAfterDeath(slotId: string): boolean; getPlayerGear(items: Item[]): Item[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/InventoryHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/InventoryHelper.d.ts index 00e95d3..dc7cbca 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/InventoryHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/InventoryHelper.d.ts @@ -5,6 +5,7 @@ import { IInventoryMergeRequestData } from "../models/eft/inventory/IInventoryMe import { IInventoryMoveRequestData } from "../models/eft/inventory/IInventoryMoveRequestData"; import { IInventorySplitRequestData } from "../models/eft/inventory/IInventorySplitRequestData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; +import { IInventoryConfig } from "../models/spt/config/IInventoryConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -25,26 +26,26 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class InventoryHelper { - private logger; - private jsonUtil; - private hashUtil; - private httpResponse; - private fenceService; - private databaseServer; - private paymentHelper; - private traderAssortHelper; - private dialogueHelper; - private itemHelper; - private containerHelper; - private profileHelper; - private configServer; - private inventoryConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected httpResponse: HttpResponseUtil; + protected fenceService: FenceService; + protected databaseServer: DatabaseServer; + protected paymentHelper: PaymentHelper; + protected traderAssortHelper: TraderAssortHelper; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected containerHelper: ContainerHelper; + protected profileHelper: ProfileHelper; + protected configServer: ConfigServer; + protected inventoryConfig: IInventoryConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, hashUtil: HashUtil, httpResponse: HttpResponseUtil, fenceService: FenceService, databaseServer: DatabaseServer, paymentHelper: PaymentHelper, traderAssortHelper: TraderAssortHelper, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, containerHelper: ContainerHelper, profileHelper: ProfileHelper, configServer: ConfigServer); addItem(pmcData: IPmcData, body: IAddItemRequestData, output: IItemEventRouterResponse, sessionID: string, callback: any, foundInRaid?: boolean, addUpd?: any): IItemEventRouterResponse; removeItem(pmcData: IPmcData, itemId: string, sessionID: string, output?: IItemEventRouterResponse): IItemEventRouterResponse; getItemSize(itemTpl: string, itemID: string, inventoryItem: Item[]): Record; - private getSizeByInventoryItemHash; - private getInventoryItemHash; + protected getSizeByInventoryItemHash(itemTpl: string, itemID: string, inventoryItemHash: InventoryHelper.InventoryItemHash): Record; + protected getInventoryItemHash(inventoryItem: Item[]): InventoryHelper.InventoryItemHash; getContainerMap(containerW: number, containerH: number, itemList: Item[], containerId: string): number[][]; /** * Based on the item action, determine whose inventories we should be looking at for from and to. @@ -56,9 +57,9 @@ export declare class InventoryHelper { * @param {string} sessionID * @returns Array */ - private getStashSlotMap; - private getStashType; - private getPlayerStashSize; + protected getStashSlotMap(pmcData: IPmcData, sessionID: string): number[][]; + protected getStashType(sessionID: string): string; + protected getPlayerStashSize(sessionID: string): Record; /** * Internal helper function to transfer an item from one profile to another. * fromProfileData: Profile of the source. @@ -73,5 +74,12 @@ export declare class InventoryHelper { /** * Internal helper function to handle cartridges in inventory if any of them exist. */ - private handleCartridges; + protected handleCartridges(items: Item[], body: IInventoryMoveRequestData): void; } +declare namespace InventoryHelper { + interface InventoryItemHash { + byItemId: Record; + byParentId: Record; + } +} +export {}; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/ItemHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/ItemHelper.d.ts index 5ff64b6..1701c62 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/ItemHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/ItemHelper.d.ts @@ -1,15 +1,16 @@ -import { InsuredItem, IPmcData } from "../models/eft/common/IPmcData"; -import { Item } from "../models/eft/common/tables/IItem"; -import { ITemplateItem, StackSlot } from "../models/eft/common/tables/ITemplateItem"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { InsuredItem } from "../models/eft/common/tables/IBotBase"; +import { Item, Repairable } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; declare class ItemHelper { - private logger; - private hashUtil; - private jsonUtil; - private databaseServer; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); /** * Checks if a id is a valid item. Valid meaning that it's an item that be stored in stash @@ -18,7 +19,7 @@ declare class ItemHelper { */ isValidItem(tpl: string, invalidBaseTypes?: string[]): boolean; /** - * Checks if a id is a valid item. Valid meaning that it's an item that may be a reward + * Checks if an id is a valid item. Valid meaning that it's an item that may be a reward * or content of bot loot. Items that are tested as valid may be in a player backpack or stash. * @param {*} tpl template id of item to check * @returns boolean: true if item is valid reward @@ -36,7 +37,7 @@ declare class ItemHelper { * @param {string} baseclassTpl the baseclass to check for * @return {boolean} is the tpl a descendent? */ - isOfBaseclass(tpl: string, baseclassTpl: string): any; + isOfBaseclass(tpl: string, baseclassTpl: string): boolean; /** * Returns the item price based on the handbook or as a fallback from the prices.json if the item is not * found in the handbook. If the price can't be found at all return 0 @@ -82,27 +83,77 @@ declare class ItemHelper { * @param {string} parentId The id of the AmmoBox instance these StackSlotItems should be children of * @returns {array} The array of StackSlotItems */ - generateStackSlotItems(item: ITemplateItem, parentId: string): StackSlot[]; + generateItemsFromStackSlot(item: ITemplateItem, parentId: string): Item[]; + /** + * Gets item data from items.json + * @param tpl items template id to look up + * @returns bool - is valid + template item object as array + */ getItem(tpl: string): [boolean, ITemplateItem]; + /** + * get normalized value (0-1) based on item condition + * @param item + * @returns number between 0 and 1 + */ getItemQualityModifier(item: Item): number; + /** + * Get a quality value based on a repairable items (weapon/armor) current state between current and max durability + * @param itemDetails + * @param repairable repairable object + * @param item + * @returns a number between 0 and 1 + */ + protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number; + /** + * Recursive function that looks at every item from parameter and gets their childrens Ids + * @param items + * @param itemID + * @returns an array of strings + */ findAndReturnChildrenByItems(items: Item[], itemID: string): string[]; /** * A variant of findAndReturnChildren where the output is list of item objects instead of their ids. + * @param items + * @param baseItemId + * @returns An array of Item objects */ findAndReturnChildrenAsItems(items: Item[], baseItemId: string): Item[]; /** - * find children of the item in a given assort (weapons parts for example, need recursive loop function) + * Find children of the item in a given assort (weapons parts for example, need recursive loop function) + * @param itemIdToFind Template id of item to check for + * @param assort Array of items to check in + * @returns Array of children of requested item */ findAndReturnChildrenByAssort(itemIdToFind: string, assort: Item[]): Item[]; + /** + * Check if the passed in item has buy count restrictions + * @param itemToCheck Item to check + * @returns true if it has buy restrictions + */ hasBuyRestrictions(itemToCheck: Item): boolean; /** - * Is Dogtag - * Checks if an item is a dogtag. Used under profile_f.js to modify preparePrice based - * on the level of the dogtag + * is the passed in template id a dog tag + * @param tpl Template id to check + * @returns true if it is a dogtag */ isDogtag(tpl: string): boolean; + /** + * Can the item passed in be sold to a trader because it is raw money + * @param tpl Item template id to check + * @returns true if unsellable + */ isNotSellable(tpl: string): boolean; + /** + * Gets the identifier for a child using slotId, locationX and locationY. + * @param item + * @returns "slotId OR slotid,locationX,locationY" + */ getChildId(item: Item): string; + /** + * Can the pased in item be stacked + * @param tpl item to check + * @returns true if it can be stacked + */ isItemTplStackable(tpl: string): boolean; /** * split item stack if it exceeds StackMaxSize @@ -112,15 +163,17 @@ declare class ItemHelper { * Find Barter items in the inventory * @param {string} by * @param {Object} pmcData - * @param {string} barter_itemID - * @returns Array + * @param {string} barterItemId + * @returns Array of Item objects */ - findBarterItems(by: string, pmcData: IPmcData, barter_itemID: string): any[]; + findBarterItems(by: string, pmcData: IPmcData, barterItemId: string): Item[]; /** - * @param {Object} pmcData - * @param {Array} items - * @param {Object} fastPanel - * @returns Array + * + * @param pmcData + * @param items + * @param insuredItems insured items to not replace ids for + * @param fastPanel + * @returns */ replaceIDs(pmcData: IPmcData, items: Item[], insuredItems?: InsuredItem[], fastPanel?: any): any[]; /** @@ -136,6 +189,12 @@ declare class ItemHelper { * @returns boolean */ isQuestItem(tpl: string): boolean; + /** + * Get the inventory size of an item + * @param items + * @param rootItemId + * @returns ItemSize object (width and height) + */ getItemSize(items: Item[], rootItemId: string): ItemHelper.ItemSize; } declare namespace ItemHelper { diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/NotificationSendHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/NotificationSendHelper.d.ts index b9298da..34e62d9 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/NotificationSendHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/NotificationSendHelper.d.ts @@ -2,8 +2,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { NotificationService } from "../services/NotificationService"; export declare class NotificationSendHelper { - private httpServer; - private notificationService; + protected httpServer: IHttpServer; + protected notificationService: NotificationService; constructor(httpServer: IHttpServer, notificationService: NotificationService); /** * Send notification message to the appropiate channel diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/NotifierHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/NotifierHelper.d.ts index 0d524e9..738b69a 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/NotifierHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/NotifierHelper.d.ts @@ -2,11 +2,11 @@ import { INotification } from "../models/eft/notifier/INotifier"; import { Message, MessageContentRagfair } from "../models/eft/profile/IAkiProfile"; import { HttpServerHelper } from "./HttpServerHelper"; export declare class NotifierHelper { - private httpServerHelper; + protected httpServerHelper: HttpServerHelper; /** * The default notification sent when waiting times out. */ - private defaultNotification; + protected defaultNotification: INotification; constructor(httpServerHelper: HttpServerHelper); getDefaultNotification(): INotification; /** Creates a new notification that displays the "Your offer was sold!" prompt and removes sold offer from "My Offers" on clientside */ diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/PresetHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/PresetHelper.d.ts index 0a24128..a469582 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/PresetHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/PresetHelper.d.ts @@ -1,9 +1,11 @@ import { Preset } from "../models/eft/common/IGlobals"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; export declare class PresetHelper { - private databaseServer; - private lookup; - constructor(databaseServer: DatabaseServer); + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected lookup: Record; + constructor(jsonUtil: JsonUtil, databaseServer: DatabaseServer); hydratePresetStore(input: Record): void; isPreset(id: string): boolean; hasPreset(templateId: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/ProbabilityHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/ProbabilityHelper.d.ts new file mode 100644 index 0000000..7a0676c --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/helpers/ProbabilityHelper.d.ts @@ -0,0 +1,14 @@ +import { ILogger } from "../models/spt/utils/ILogger"; +import { RandomUtil } from "../utils/RandomUtil"; +export declare class ProbabilityHelper { + protected logger: ILogger; + protected randomUtil: RandomUtil; + constructor(logger: ILogger, randomUtil: RandomUtil); + /** + * Chance to roll a number out of 100 + * @param chance Percentage chance roll should success + * @param scale scale of chance to allow support of numbers > 1-100 + * @returns true if success + */ + rollChance(chance: number, scale?: number): boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/ProfileHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/ProfileHelper.d.ts index 508443c..6c150c8 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/ProfileHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/ProfileHelper.d.ts @@ -1,4 +1,5 @@ -import { IPmcData, Stats } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; +import { Stats } from "../models/eft/common/tables/IBotBase"; import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; import { IValidateNicknameRequestData } from "../models/eft/profile/IValidateNicknameRequestData"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -20,6 +21,12 @@ export declare class ProfileHelper { resetProfileQuestCondition(sessionID: string, conditionId: string): void; getCompleteProfile(sessionID: string): IPmcData[]; isNicknameTaken(info: IValidateNicknameRequestData, sessionID: string): boolean; + /** + * Add experience to a PMC inside the players profile + * @param sessionID Session id + * @param experienceToAdd Experiecne to add to PMC character + */ + addExperienceToPmc(sessionID: string, experienceToAdd: number): void; getProfileByPmcId(pmcId: string): IPmcData; getExperience(level: number): number; getMaxLevel(): number; @@ -28,6 +35,12 @@ export declare class ProfileHelper { getPmcProfile(sessionID: string): IPmcData; getScavProfile(sessionID: string): IPmcData; getDefaultCounters(): Stats; - private isWiped; - private getServerVersion; + protected isWiped(sessionID: string): boolean; + protected getServerVersion(): string; + /** + * Iterate over player profile inventory items and find the secure container and remove it + * @param profile Profile to remove secure container from + * @returns profile without secure container + */ + removeSecureContainer(profile: IPmcData): IPmcData; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/QuestConditionHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/QuestConditionHelper.d.ts index 2a0ee94..90ee560 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/QuestConditionHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/QuestConditionHelper.d.ts @@ -3,5 +3,5 @@ export declare class QuestConditionHelper { getQuestConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLevelConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; getLoyaltyConditions(q: AvailableForConditions[], furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; - private filterConditions; + protected filterConditions(q: AvailableForConditions[], questType: string, furtherFilter?: (a: AvailableForConditions) => AvailableForConditions[]): AvailableForConditions[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/QuestHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/QuestHelper.d.ts index 9e2dd5e..0f68cd5 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/QuestHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/QuestHelper.d.ts @@ -1,12 +1,15 @@ -import { IPmcData, Quest } from "../models/eft/common/IPmcData"; +import { IPmcData } from "../models/eft/common/IPmcData"; import { AvailableForConditions, AvailableForProps, IQuest, Reward } from "../models/eft/common/tables/IQuest"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IAcceptQuestRequestData } from "../models/eft/quests/IAcceptQuestRequestData"; import { ICompleteQuestRequestData } from "../models/eft/quests/ICompleteQuestRequestData"; +import { QuestStatus } from "../models/enums/QuestStatus"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -17,23 +20,23 @@ import { ProfileHelper } from "./ProfileHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { TraderHelper } from "./TraderHelper"; export declare class QuestHelper { - private logger; - private jsonUtil; - private timeUtil; - private hashUtil; - private itemHelper; - private itemEventRouter; - private databaseServer; - private ragfairServerHelper; - private dialogueHelper; - private profileHelper; - private paymentHelper; - private traderHelper; - private configServer; - private questConfig; - constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); - static get STATUS(): Record; - questStatus(pmcData: IPmcData, questID: string): string; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemHelper: ItemHelper; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + protected ragfairServerHelper: RagfairServerHelper; + protected dialogueHelper: DialogueHelper; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected traderHelper: TraderHelper; + protected configServer: ConfigServer; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, timeUtil: TimeUtil, hashUtil: HashUtil, itemHelper: ItemHelper, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, localeService: LocaleService, ragfairServerHelper: RagfairServerHelper, dialogueHelper: DialogueHelper, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, traderHelper: TraderHelper, configServer: ConfigServer); + questStatus(pmcData: IPmcData, questID: string): QuestStatus; /** * returns true is the condition is satisfied */ @@ -45,24 +48,68 @@ export declare class QuestHelper { * Debug Routine for showing some information on the * quest list in question. */ - dumpQuests(quests: any, label?: any): void; + dumpQuests(quests: any): void; loyaltyRequirementCheck(loyaltyRequirementProperties: AvailableForProps, profile: IPmcData): boolean; - private processReward; - getQuestRewardItems(quest: IQuest, state: string): Reward[]; - addQuestToPMCData(pmcData: IPmcData, quest: Quest, newState: string, acceptedQuest: IAcceptQuestRequestData): void; + protected processReward(reward: Reward): any[]; + getQuestRewardItems(quest: IQuest, state: QuestStatus): Reward[]; + /** + * Add quest with new state value to pmc profile + * @param pmcData profile to add quest to + * @param newState state the new quest should be in when added + * @param acceptedQuest Details of quest being added + */ + addQuestToPMCData(pmcData: IPmcData, newState: QuestStatus, acceptedQuest: IAcceptQuestRequestData): void; acceptedUnlocked(acceptedQuestId: string, sessionID: string): IQuest[]; failedUnlocked(failedQuestId: string, sessionID: string): IQuest[]; applyMoneyBoost(quest: IQuest, moneyBoost: number): IQuest; changeItemStack(pmcData: IPmcData, id: string, value: number, sessionID: string, output: any): void; /** * Get List of All Quests as an array + * @returns Array of IQuest objects */ questValues(): IQuest[]; - private cleanQuestList; + /** + * Reest AvailableForStart conditions for quests + * @param quests queststo clean + * @returns quest array without conditions + */ + protected cleanQuestList(quests: IQuest[]): IQuest[]; + /** + * Reset AvailableForStart conditions on a quest + * @param quest quest to clean + * @returns reset IQuest object + */ cleanQuestConditions(quest: IQuest): IQuest; failQuest(pmcData: IPmcData, body: any, sessionID: string): any; + /** + * Get quest by id from database + * @param questId questid to look for + * @param pmcData player profile + * @returns IQuest object + */ getQuestFromDb(questId: string, pmcData: IPmcData): IQuest; - getQuestLocaleIdFromDb(messageId: string, localisation?: string): string; - applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: string, sessionID: string): any[]; + getQuestLocaleIdFromDb(messageId: string): string; + /** + * Alter a quests state + Add a record to tis status timers object + * @param pmcData Profile to update + * @param newQuestState new state the qeust should be in + * @param questId id of the quest to alter the status of + */ + updateQuestState(pmcData: IPmcData, newQuestState: QuestStatus, questId: string): void; + /** + * Give player quest rewards - Skills/exp/trader standing/items/assort unlocks + * @param pmcData Player profile + * @param body complete quest request + * @param state State of the quest now its complete + * @param sessionID Seession id + * @returns array of reward objects + */ + applyQuestReward(pmcData: IPmcData, body: ICompleteQuestRequestData, state: QuestStatus, sessionID: string): Reward[]; + /** + * Get the intel center bonus a player has + * @param pmcData player profile + * @returns bonus in percent + */ + protected getIntelCenterRewardBonus(pmcData: IPmcData): number; getFindItemIdForQuestItem(itemTpl: string): string; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairHelper.d.ts index 8e70bcd..2c8dbb5 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairHelper.d.ts @@ -2,6 +2,7 @@ import { Item } from "../models/eft/common/tables/IItem"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; import { IGetOffersResult } from "../models/eft/ragfair/IGetOffersResult"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -12,16 +13,16 @@ import { ItemHelper } from "./ItemHelper"; import { TraderAssortHelper } from "./TraderAssortHelper"; import { UtilityHelper } from "./UtilityHelper"; export declare class RagfairHelper { - private logger; - private jsonUtil; - private traderAssortHelper; - private databaseServer; - private handbookHelper; - private itemHelper; - private ragfairLinkedItemService; - private utilityHelper; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected traderAssortHelper: TraderAssortHelper; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected ragfairLinkedItemService: RagfairLinkedItemService; + protected utilityHelper: UtilityHelper; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, traderAssortHelper: TraderAssortHelper, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, ragfairLinkedItemService: RagfairLinkedItemService, utilityHelper: UtilityHelper, configServer: ConfigServer); /** * Gets currency TAG from TPL @@ -31,7 +32,7 @@ export declare class RagfairHelper { getCurrencyTag(currency: string): string; filterCategories(sessionID: string, info: ISearchRequestData): string[]; getDisplayableAssorts(sessionID: string): Record; - private getCategoryList; + protected getCategoryList(handbookId: string): string[]; countCategories(result: IGetOffersResult): void; /** * Merges Root Items @@ -39,5 +40,4 @@ export declare class RagfairHelper { */ mergeStackable(items: Item[]): Item[]; getCurrencySymbol(currencyTpl: string): string; - formatCurrency(moneyAmount: number): string; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairOfferHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairOfferHelper.d.ts index 3bf8add..8d03bee 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairOfferHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairOfferHelper.d.ts @@ -1,12 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { ISearchRequestData } from "../models/eft/ragfair/ISearchRequestData"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { HashUtil } from "../utils/HashUtil"; import { TimeUtil } from "../utils/TimeUtil"; @@ -19,31 +23,32 @@ import { RagfairHelper } from "./RagfairHelper"; import { RagfairServerHelper } from "./RagfairServerHelper"; import { RagfairSortHelper } from "./RagfairSortHelper"; export declare class RagfairOfferHelper { - private logger; - private timeUtil; - private hashUtil; - private itemEventRouter; - private databaseServer; - private saveServer; - private dialogueHelper; - private itemHelper; - private paymentHelper; - private presetHelper; - private profileHelper; - private ragfairServerHelper; - private ragfairSortHelper; - private ragfairHelper; - private ragfairOfferService; - private configServer; - private static TPL_GOODS_SOLD; - private ragfairConfig; - private questConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected hashUtil: HashUtil; + protected itemEventRouter: ItemEventRouter; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected dialogueHelper: DialogueHelper; + protected itemHelper: ItemHelper; + protected paymentHelper: PaymentHelper; + protected presetHelper: PresetHelper; + protected profileHelper: ProfileHelper; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairSortHelper: RagfairSortHelper; + protected ragfairHelper: RagfairHelper; + protected ragfairOfferService: RagfairOfferService; + protected localeService: LocaleService; + protected configServer: ConfigServer; + protected static goodSoldTemplate: string; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, hashUtil: HashUtil, itemEventRouter: ItemEventRouter, databaseServer: DatabaseServer, saveServer: SaveServer, dialogueHelper: DialogueHelper, itemHelper: ItemHelper, paymentHelper: PaymentHelper, presetHelper: PresetHelper, profileHelper: ProfileHelper, ragfairServerHelper: RagfairServerHelper, ragfairSortHelper: RagfairSortHelper, ragfairHelper: RagfairHelper, ragfairOfferService: RagfairOfferService, localeService: LocaleService, configServer: ConfigServer); getValidOffers(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; getOffersForBuild(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, pmcProfile: IPmcData): IRagfairOffer[]; processOffers(sessionID: string): boolean; - private getProfileOffers; - private deleteOfferByOfferId; - private completeOffer; + protected getProfileOffers(sessionID: string): IRagfairOffer[]; + protected deleteOfferByOfferId(sessionID: string, offerId: string): void; + protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse; isDisplayableOffer(info: ISearchRequestData, itemsToAdd: string[], assorts: Record, offer: IRagfairOffer, pmcProfile: IPmcData): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSellHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSellHelper.d.ts index 929d112..6ec004a 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSellHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSellHelper.d.ts @@ -1,14 +1,15 @@ import { SellResult } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class RagfairSellHelper { - private logger; - private randomUtil; - private timeUtil; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, randomUtil: RandomUtil, timeUtil: TimeUtil, configServer: ConfigServer); calculateSellChance(baseChance: number, offerPrice: number, requirementsPriceInRub: number): number; rollForSale(sellChance: number, count: number): SellResult[]; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairServerHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairServerHelper.d.ts index d29ba42..e4939d1 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairServerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairServerHelper.d.ts @@ -1,9 +1,12 @@ -import { MemberCategory } from "../models/enums/MemberCategory"; import { Item } from "../models/eft/common/tables/IItem"; import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; +import { MemberCategory } from "../models/enums/MemberCategory"; +import { IQuestConfig } from "../models/spt/config/IQuestConfig"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; +import { LocaleService } from "../services/LocaleService"; import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; @@ -11,26 +14,27 @@ import { DialogueHelper } from "./DialogueHelper"; import { ItemHelper } from "./ItemHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class RagfairServerHelper { - private randomUtil; - private hashUtil; - private saveServer; - private databaseServer; - private profileHelper; - private itemHelper; - private dialogueHelper; - private jsonUtil; - private configServer; - private ragfairConfig; - private questConfig; - private static TPL_GOODS_RETURNED; - constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); + protected randomUtil: RandomUtil; + protected hashUtil: HashUtil; + protected saveServer: SaveServer; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected itemHelper: ItemHelper; + protected localeService: LocaleService; + protected dialogueHelper: DialogueHelper; + protected jsonUtil: JsonUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected questConfig: IQuestConfig; + protected static goodsReturnedTemplate: string; + constructor(randomUtil: RandomUtil, hashUtil: HashUtil, saveServer: SaveServer, databaseServer: DatabaseServer, profileHelper: ProfileHelper, itemHelper: ItemHelper, localeService: LocaleService, dialogueHelper: DialogueHelper, jsonUtil: JsonUtil, configServer: ConfigServer); /** * Is item valid / on blacklist / quest item * @param itemDetails * @returns boolean */ isItemValidRagfairItem(itemDetails: [boolean, ITemplateItem]): boolean; - private isItemBlacklisted; + protected isItemBlacklisted(itemTemplateId: string): boolean; isTrader(userID: string): boolean; isPlayer(userID: string): boolean; returnItems(sessionID: string, items: any[]): void; diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSortHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSortHelper.d.ts index e9d8069..d20e10c 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSortHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairSortHelper.d.ts @@ -1,12 +1,14 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; import { DatabaseServer } from "../servers/DatabaseServer"; +import { LocaleService } from "../services/LocaleService"; export declare class RagfairSortHelper { - private databaseServer; - constructor(databaseServer: DatabaseServer); + protected databaseServer: DatabaseServer; + protected localeService: LocaleService; + constructor(databaseServer: DatabaseServer, localeService: LocaleService); sortOffers(offers: IRagfairOffer[], type: number, direction?: number): IRagfairOffer[]; - private sortOffersByID; - private sortOffersByRating; - private sortOffersByName; - private sortOffersByPrice; - private sortOffersByExpiry; + protected sortOffersByID(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByRating(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByName(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByPrice(a: IRagfairOffer, b: IRagfairOffer): number; + protected sortOffersByExpiry(a: IRagfairOffer, b: IRagfairOffer): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairTaxHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairTaxHelper.d.ts index e87334f..820facb 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/RagfairTaxHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/RagfairTaxHelper.d.ts @@ -1,15 +1,16 @@ import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RagfairPriceService } from "../services/RagfairPriceService"; import { ItemHelper } from "./ItemHelper"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairTaxHelper { - private logger; - private databaseServer; - private ragfairPriceService; - private itemHelper; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected ragfairPriceService: RagfairPriceService; + protected itemHelper: ItemHelper; constructor(logger: ILogger, databaseServer: DatabaseServer, ragfairPriceService: RagfairPriceService, itemHelper: ItemHelper); calculateTax(item: Item, pmcData: IPmcData, requirementsValue: number, offerItemCount: number, sellInOnePiece: boolean): number; - private calculateItemWorth; + protected calculateItemWorth(item: Item, itemTemplate: ITemplateItem, itemCount: number, pmcData: IPmcData, isRootItem?: boolean): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/RepairHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/RepairHelper.d.ts index 47123e1..9a3ab29 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/RepairHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/RepairHelper.d.ts @@ -1,20 +1,21 @@ -import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { IRepairConfig } from "../models/spt/config/IRepairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RepairHelper { - private logger; - private jsonUtil; - private randomUtil; - private databaseServer; - private configServer; - private repairConfig; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected configServer: ConfigServer; + protected repairConfig: IRepairConfig; constructor(logger: ILogger, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, configServer: ConfigServer); - updateItemDurability(itemToRepairId: string, amountToRepair: number, pmcData: IPmcData, useRepairKit?: boolean): Item; - private getRandomisedArmorRepairDegredationValue; - private getRandomisedWeaponRepairDegredationValue; + updateItemDurability(itemToRepair: Item, itemToRepairDetails: ITemplateItem, isArmor: boolean, amountToRepair: number, useRepairKit?: boolean, applyRandomDegradation?: boolean): Item; + protected getRandomisedArmorRepairDegredationValue(armorMaterial: string, isRepairKit: boolean, armorMax: number): number; + protected getRandomisedWeaponRepairDegredationValue(itemProps: Props, isRepairKit: boolean, armorMax: number): number; isWeaponTemplate(tpl: string): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/SecureContainerHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/SecureContainerHelper.d.ts index 8f246b6..9e2bc32 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/SecureContainerHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/SecureContainerHelper.d.ts @@ -7,7 +7,7 @@ export interface OwnerInventoryItems { isMail: boolean; } export declare class SecureContainerHelper { - private itemHelper; + protected itemHelper: ItemHelper; constructor(itemHelper: ItemHelper); getSecureContainerItems(items: Item[]): string[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/TradeHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/TradeHelper.d.ts index 475390b..975062b 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/TradeHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/TradeHelper.d.ts @@ -2,7 +2,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; -import { Upd } from "../models/eft/common/tables/IItem"; +import { Item, Upd } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -12,14 +12,14 @@ import { RagfairServer } from "../servers/RagfairServer"; import { FenceService } from "../services/FenceService"; import { PaymentService } from "../services/PaymentService"; export declare class TradeHelper { - private logger; - private itemEventRouter; - private traderHelper; - private itemHelper; - private paymentService; - private fenceService; - private inventoryHelper; - private ragfairServer; + protected logger: ILogger; + protected itemEventRouter: ItemEventRouter; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected paymentService: PaymentService; + protected fenceService: FenceService; + protected inventoryHelper: InventoryHelper; + protected ragfairServer: RagfairServer; constructor(logger: ILogger, itemEventRouter: ItemEventRouter, traderHelper: TraderHelper, itemHelper: ItemHelper, paymentService: PaymentService, fenceService: FenceService, inventoryHelper: InventoryHelper, ragfairServer: RagfairServer); /** * Buy item from flea or trader @@ -39,6 +39,6 @@ export declare class TradeHelper { * @returns */ sellItem(pmcData: IPmcData, body: IProcessSellTradeRequestData, sessionID: string): IItemEventRouterResponse; - private incrementAssortBuyCount; - private checkPurchaseIsWithinTraderItemLimit; + protected incrementAssortBuyCount(assortBeingPurchased: Item, itemsPurchasedCount: number): void; + protected checkPurchaseIsWithinTraderItemLimit(assortBeingPurchased: Item, assortId: string, count: number): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/TraderAssortHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/TraderAssortHelper.d.ts index d95879c..91ba6b9 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/TraderAssortHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/TraderAssortHelper.d.ts @@ -1,23 +1,55 @@ -import { ITraderAssort } from "../models/eft/common/tables/ITrader"; -import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairAssortGenerator } from "../generators/RagfairAssortGenerator"; import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; +import { Item } from "../models/eft/common/tables/IItem"; +import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { FenceService } from "../services/FenceService"; import { TraderAssortService } from "../services/TraderAssortService"; import { JsonUtil } from "../utils/JsonUtil"; +import { MathUtil } from "../utils/MathUtil"; import { AssortHelper } from "./AssortHelper"; +import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderAssortHelper { - private logger; - private jsonUtil; - private databaseServer; - private profileHelper; - private assortHelper; - private ragfairAssortGenerator; - private ragfairOfferGenerator; - private traderAssortService; - private fenceService; - constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService); + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected mathUtil: MathUtil; + protected databaseServer: DatabaseServer; + protected profileHelper: ProfileHelper; + protected assortHelper: AssortHelper; + protected paymentHelper: PaymentHelper; + protected ragfairAssortGenerator: RagfairAssortGenerator; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected traderAssortService: TraderAssortService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; + constructor(logger: ILogger, jsonUtil: JsonUtil, mathUtil: MathUtil, databaseServer: DatabaseServer, profileHelper: ProfileHelper, assortHelper: AssortHelper, paymentHelper: PaymentHelper, ragfairAssortGenerator: RagfairAssortGenerator, ragfairOfferGenerator: RagfairOfferGenerator, traderAssortService: TraderAssortService, fenceService: FenceService, configServer: ConfigServer); + /** + * Get a traders assorts + * Can be used for returning ragfair / fence assorts + * @param sessionId session id + * @param traderId trader id + * @returns a traders assorts + */ getAssort(sessionId: string, traderId: string): ITraderAssort; + /** + * Iterate over all assorts barter_scheme values, find barters selling for money and multiply by multipler in config + * @param traderAssort Assorts to multiple price of + */ + protected multiplyItemPricesByConfigMultipler(traderAssort: ITraderAssort): void; + /** + * Get an array of pristine trader items prior to any alteration by player (as they were on server start) + * @param traderId trader id + * @returns array of Items + */ + protected getPristineTraderAssorts(traderId: string): Item[]; + /** + * Returns generated ragfair offers in a trader assort format + * @returns Trader assort object + */ + protected getRagfairDataAsTraderAssort(): ITraderAssort; } diff --git a/Live/CWX_WeatherPatcher/server/types/helpers/TraderHelper.d.ts b/Live/CWX_WeatherPatcher/server/types/helpers/TraderHelper.d.ts index ec64d59..b2e9d38 100644 --- a/Live/CWX_WeatherPatcher/server/types/helpers/TraderHelper.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/helpers/TraderHelper.d.ts @@ -1,5 +1,8 @@ +import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme, ITraderAssort, ITraderBase, LoyaltyLevel } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +14,96 @@ import { ItemHelper } from "./ItemHelper"; import { PaymentHelper } from "./PaymentHelper"; import { ProfileHelper } from "./ProfileHelper"; export declare class TraderHelper { - private logger; - private databaseServer; - private saveServer; - private profileHelper; - private paymentHelper; - private itemHelper; - private handbookHelper; - private playerService; - private fenceService; - private configServer; - private traderConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected profileHelper: ProfileHelper; + protected paymentHelper: PaymentHelper; + protected itemHelper: ItemHelper; + protected handbookHelper: HandbookHelper; + protected playerService: PlayerService; + protected fenceService: FenceService; + protected configServer: ConfigServer; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, saveServer: SaveServer, profileHelper: ProfileHelper, paymentHelper: PaymentHelper, itemHelper: ItemHelper, handbookHelper: HandbookHelper, playerService: PlayerService, fenceService: FenceService, configServer: ConfigServer); getTrader(traderID: string, sessionID: string): ITraderBase; getTraderAssortsById(traderId: string): ITraderAssort; + /** + * Reset a profiles trader data back to its initial state as seen by a level 1 player + * Does NOT take into account different profile levels + * @param sessionID session id + * @param traderID trader id to reset + */ resetTrader(sessionID: string, traderID: string): void; - changeTraderDisplay(traderID: string, status: boolean, sessionID: string): void; + /** + * Alter a traders unlocked status + * @param traderID Trader to alter + * @param status New status to use + * @param sessionID Session id + */ + setTraderUnlockedState(traderID: string, status: boolean, sessionID: string): void; + /** + * Get a list of items and their prices from player inventory that can be sold to a trader + * @param traderID trader id being traded with + * @param sessionID session id + * @returns IBarterScheme[][] + */ getPurchasesData(traderID: string, sessionID: string): Record; + /** + * Should item be skipped when selling to trader according to its sell categories and other checks + * @param pmcData + * @param item + * @param sellCategory + * @returns true if should NOT be sold to trader + */ + protected isItemUnSellableToTrader(pmcData: IPmcData, item: Item, sellCategory: string[]): boolean; + /** + * Can this weapon be sold to a trader with its current durabiltiy level + * @param traderID + * @param item + * @returns boolean + */ + protected isWeaponAndBelowTraderBuyDurability(traderID: string, item: Item): boolean; + /** + * Get the price of an item and all of its attached children + * Take into account bonuses/adjsutments e.g. discounts + * @param pmcData profile data + * @param item item to calculate price of + * @param buyPriceCoefficient + * @param fenceInfo fence data + * @param traderBase trader details + * @param currencyTpl Currency to get price as + * @returns price of item + children + */ + protected getAdjustedItemPrice(pmcData: IPmcData, item: Item, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderBase: ITraderBase, currencyTpl: string): number; + /** + * Get the raw price of item+child items from handbook without any modification + * @param pmcData profile data + * @param item item to calculate price of + * @returns price as number + */ + protected getRawItemPrice(pmcData: IPmcData, item: Item): number; + protected getTraderDiscount(trader: ITraderBase, buyPriceCoefficient: number, fenceInfo: FenceLevel, traderID: string): number; + /** + * Add standing to a trader and level them up if exp goes over level threshold + * @param sessionID Session id + * @param traderId traders id + * @param standingToAdd Standing value to add to trader + */ + addStandingToTrader(sessionID: string, traderId: string, standingToAdd: number): void; + /** + * Calculate traders level based on exp amount and increments level if over threshold + * @param traderID trader to process + * @param sessionID session id + */ lvlUp(traderID: string, sessionID: string): void; getTraderUpdateSeconds(traderId: string): number; + /** + * check if an item is allowed to be sold to a trader + * @param traderFilters array of allowed categories + * @param tplToCheck itemTpl of inventory + * @returns boolean + */ traderFilter(traderFilters: string[], tplToCheck: string): boolean; getLoyaltyLevel(traderID: string, pmcData: IPmcData): LoyaltyLevel; } diff --git a/Live/CWX_WeatherPatcher/server/types/loaders/BundleLoader.d.ts b/Live/CWX_WeatherPatcher/server/types/loaders/BundleLoader.d.ts index 4f7664c..06ad698 100644 --- a/Live/CWX_WeatherPatcher/server/types/loaders/BundleLoader.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/loaders/BundleLoader.d.ts @@ -10,10 +10,10 @@ declare class BundleInfo { constructor(modpath: string, bundle: any, bundlePath: string, bundleFilepath: string); } export declare class BundleLoader { - private httpServerHelper; - private vfs; - private jsonUtil; - private bundles; + protected httpServerHelper: HttpServerHelper; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected bundles: Record; constructor(httpServerHelper: HttpServerHelper, vfs: VFS, jsonUtil: JsonUtil); getBundles(local: boolean): BundleInfo[]; getBundle(key: string, local: boolean): BundleInfo; diff --git a/Live/CWX_WeatherPatcher/server/types/loaders/InitialModLoader.d.ts b/Live/CWX_WeatherPatcher/server/types/loaders/InitialModLoader.d.ts deleted file mode 100644 index 5957d35..0000000 --- a/Live/CWX_WeatherPatcher/server/types/loaders/InitialModLoader.d.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { DependencyContainer } from "tsyringe"; -import { IModLoader } from "../models/spt/mod/IModLoader"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { ConfigServer } from "../servers/ConfigServer"; -import { ModCompilerService } from "../services/ModCompilerService"; -import { JsonUtil } from "../utils/JsonUtil"; -import { VFS } from "../utils/VFS"; -import { BundleLoader } from "./BundleLoader"; -export declare class InitialModLoader implements IModLoader { - private logger; - private vfs; - private jsonUtil; - private modCompilerService; - private bundleLoader; - private configServer; - private static container; - private readonly basepath; - private imported; - private onLoad; - private akiConfig; - constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); - load(container: DependencyContainer): Promise; - getBundles(local: boolean): string; - getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; - getModPath(mod: string): string; - private importClass; - private importMods; - /** - * - * @param mods Get an array of broken/invalid mods by name - * @returns Mod names array - */ - private getBrokenMods; - /** - * Get packageJson data for mods - * @param mods mods to get packageJson for - * @returns dictionary - */ - private getModsPackageData; - /** - * Does mod have "delayedLoad(" string in its entry class - * @param modFolderName folder name - * @param modToValidate package.json details - * @returns boolean - */ - private isModSpt300Compatible; - private isModCombatibleWithAki; - private executeMods; - private sortModsLoadOrder; - private addMod; - private areModDependenciesFulfilled; - private isModCompatible; - private validMod; - private getLoadOrderRecursive; - private getLoadOrder; - getContainer(): DependencyContainer; -} diff --git a/Live/CWX_WeatherPatcher/server/types/loaders/PostAkiModLoader.d.ts b/Live/CWX_WeatherPatcher/server/types/loaders/PostAkiModLoader.d.ts new file mode 100644 index 0000000..edc6e5d --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/loaders/PostAkiModLoader.d.ts @@ -0,0 +1,21 @@ +import { DependencyContainer } from "tsyringe"; +import { HandbookController } from "../controllers/HandbookController"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostAkiModLoader implements IModLoader { + protected bundleLoader: BundleLoader; + protected handbookController: HandbookController; + protected vfs: VFS; + protected modCompilerService: ModCompilerService; + protected preAkiModLoader: PreAkiModLoader; + constructor(bundleLoader: BundleLoader, handbookController: HandbookController, vfs: VFS, modCompilerService: ModCompilerService, preAkiModLoader: PreAkiModLoader); + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + getModPath(mod: string): string; + load(): void; + protected executeMods(container: DependencyContainer): void; + protected addBundles(): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/loaders/PostDBModLoader.d.ts b/Live/CWX_WeatherPatcher/server/types/loaders/PostDBModLoader.d.ts new file mode 100644 index 0000000..5101b7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/loaders/PostDBModLoader.d.ts @@ -0,0 +1,11 @@ +import { DependencyContainer } from "tsyringe"; +import { OnLoad } from "../di/OnLoad"; +import { PreAkiModLoader } from "./PreAkiModLoader"; +export declare class PostDBModLoader implements OnLoad { + protected preAkiModLoader: PreAkiModLoader; + constructor(preAkiModLoader: PreAkiModLoader); + onLoad(): void; + getRoute(): string; + getModPath(mod: string): string; + protected executeMods(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/loaders/PreAkiModLoader.d.ts b/Live/CWX_WeatherPatcher/server/types/loaders/PreAkiModLoader.d.ts new file mode 100644 index 0000000..6ded3c6 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/loaders/PreAkiModLoader.d.ts @@ -0,0 +1,64 @@ +import { DependencyContainer } from "tsyringe"; +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; +import { ModLoader } from "../models/spt/mod/IMod"; +import { IModLoader } from "../models/spt/mod/IModLoader"; +import { IPackageJsonData } from "../models/spt/mod/IPackageJsonData"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +import { ModCompilerService } from "../services/ModCompilerService"; +import { JsonUtil } from "../utils/JsonUtil"; +import { VFS } from "../utils/VFS"; +import { BundleLoader } from "./BundleLoader"; +export declare class PreAkiModLoader implements IModLoader { + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected modCompilerService: ModCompilerService; + protected bundleLoader: BundleLoader; + protected configServer: ConfigServer; + protected static container: DependencyContainer; + protected readonly basepath = "user/mods/"; + protected imported: Record; + protected akiConfig: ICoreConfig; + constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, modCompilerService: ModCompilerService, bundleLoader: BundleLoader, configServer: ConfigServer); + load(container: DependencyContainer): Promise; + getBundles(local: boolean): string; + getBundle(key: string, local: boolean): void; + /** + * Returns a list of mods with preserved load order + * @returns Array of mod names in load order + */ + getImportedModsNames(): string[]; + getModPath(mod: string): string; + protected importClass(name: string, filepath: string, container: DependencyContainer): void; + protected importMods(): Promise; + /** + * + * @param mods Get an array of broken/invalid mods by name + * @returns Mod names array + */ + protected getBrokenMods(mods: string[]): string[]; + /** + * Get packageJson data for mods + * @param mods mods to get packageJson for + * @returns dictionary + */ + protected getModsPackageData(mods: string[]): Record; + /** + * Does mod have "delayedLoad(" string in its entry class + * @param modFolderName folder name + * @param modToValidate package.json details + * @returns boolean + */ + protected isModSpt3XXCompatible(modFolderName: string, modToValidate: IPackageJsonData): boolean; + protected isModCombatibleWithAki(mod: IPackageJsonData): boolean; + protected executeMods(container: DependencyContainer): void; + sortModsLoadOrder(): string[]; + protected addMod(mod: string): Promise; + protected areModDependenciesFulfilled(pkg: IPackageJsonData, loadedMods: Record): boolean; + protected isModCompatible(mod: IPackageJsonData, loadedMods: Record): boolean; + protected validMod(mod: string): boolean; + protected getLoadOrderRecursive(mod: string, result: Record, visited: Record): void; + protected getLoadOrder(mods: Record): Record; + getContainer(): DependencyContainer; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/common/MinMax.d.ts b/Live/CWX_WeatherPatcher/server/types/models/common/MinMax.d.ts new file mode 100644 index 0000000..bc118a8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/common/MinMax.d.ts @@ -0,0 +1,4 @@ +export interface MinMax { + max: number; + min: number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/IGlobals.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/IGlobals.d.ts index 456895c..9d28dbc 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/IGlobals.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/IGlobals.d.ts @@ -1128,8 +1128,11 @@ export interface Inertia { SprintAccelerationLimits: xyz; SideTime: xyz; DiagonalTime: xyz; + MaxTimeWithoutInput: xyz; MinDirectionBlendTime: number; - MoveTime: number; + MoveTimeRange: xyz; + ProneDirectionAccelerationRange: xyz; + ProneSpeedAccelerationRange: xyz; MinMovementAccelerationRangeRight: xyz; MaxMovementAccelerationRangeRight: xyz; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/ILocationBase.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/ILocationBase.d.ts index ad48d32..b1dd448 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/ILocationBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/ILocationBase.d.ts @@ -26,6 +26,7 @@ export interface ILocationBase { DisabledForScav: boolean; DisabledScavExits: string; Enabled: boolean; + EnableCoop: boolean; GlobalLootChanceModifier: number; IconX: number; IconY: number; @@ -41,6 +42,7 @@ export interface ILocationBase { MinDistToFreePoint: number; MinMaxBots: MinMaxBot[]; MinPlayers: number; + MaxCoopGroup: number; Name: string; NewSpawn: boolean; OcculsionCullingEnabled: boolean; @@ -48,6 +50,8 @@ export interface ILocationBase { OpenZones: string; Preview: Preview; RequiredPlayerLevel: number; + PmcMaxPlayersInGroup: number; + ScavMaxPlayersInGroup: number; Rules: string; SafeLocation: boolean; Scene: Scene; @@ -55,7 +59,8 @@ export interface ILocationBase { UnixDateTime: number; _Id: string; doors: any[]; - escape_time_limit: number; + EscapeTimeLimit: number; + EscapeTimeLimitCoop: number; exit_access_time: number; exit_count: number; exit_time: number; @@ -63,6 +68,7 @@ export interface ILocationBase { filter_ex: string[]; limits: ILimit[]; matching_min_seconds: number; + GenerateLocalLootCache: boolean; maxItemCountInLocation: MaxItemCountInLocation[]; sav_summon_seconds: number; tmp_location_field_remove_me: number; @@ -106,6 +112,7 @@ export interface BossLocationSpawn { BossName: string; BossPlayer: boolean; BossZone: string; + RandomTimeSpawn: boolean; Time: number; TriggerId: string; TriggerName: string; diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/IPmcData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/IPmcData.d.ts index adc2aa5..5703e4b 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/IPmcData.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/IPmcData.d.ts @@ -1,341 +1,3 @@ -import { IRagfairOffer } from "../ragfair/IRagfairOffer"; -import { IPmcDataRepeatableQuest } from "./tables/IRepeatableQuests"; -import { Item, Upd } from "./tables/IItem"; -import { HideoutAreas } from "../../enums/HideoutAreas"; -import { MemberCategory } from "../../enums/MemberCategory"; -export interface IPmcData { - _id: string; - aid: string; - savage: string; - Info: Info; - Customization: Customization; - Health: Health; - Inventory: Inventory; - Skills: Skills; - Stats: Stats; - Encyclopedia: Record; - ConditionCounters: ConditionCounters; - BackendCounters: Record; - InsuredItems: InsuredItem[]; - Hideout: Hideout; - Bonuses: Bonus[]; - Notes: Notes; - Quests: Quest[]; - TradersInfo: Record; - RagfairInfo: RagfairInfo; - WishList: string[]; - RepeatableQuests: IPmcDataRepeatableQuest[]; - CarExtractCounts: CarExtractCounts; - SurvivorClass: SurvivorClass; -} -export declare enum SurvivorClass { - Unknown = 0, - Neutralizer = 1, - Marauder = 2, - Paramedic = 3, - Survivor = 4 -} -export interface Info { - EntryPoint: string; - Nickname: string; - LowerNickname: string; - Side: string; - Voice: string; - Level: number; - Experience: number; - RegistrationDate: number; - GameVersion: string; - AccountType: number; - MemberCategory: MemberCategory; - lockedMoveCommands: boolean; - SavageLockTime: number; - LastTimePlayedAsSavage: number; - Settings: Settings; - NicknameChangeDate: number; - IsStreamerModeAvailable: boolean; - Bans: IBan[]; - BannedState: boolean; - BannedUntil: number; -} -export interface Settings { - Role: string; - BotDifficulty: string; - Experience: number; - StandingForKill: number; - AggressorBonus: number; -} -export interface IBan { - type: BanType; - dateTime: number; -} -export declare enum BanType { - Chat = 0, - RagFair = 1, - Voip = 2, - Trading = 3, - Online = 4, - Friends = 5, - ChangeNickname = 6 -} -export interface Notes { - Notes: Note[]; -} -export interface Note { - Time: number; - Text: string; -} -export interface Customization { - Head: string; - Body: string; - Feet: string; - Hands: string; -} -export interface Health { - Hydration: CurrentMax; - Energy: CurrentMax; - Temperature: CurrentMax; - BodyParts: BodyPartsHealth; - UpdateTime: number; -} -export interface BodyPartsHealth { - Head: BodyPartHealth; - Chest: BodyPartHealth; - Stomach: BodyPartHealth; - LeftArm: BodyPartHealth; - RightArm: BodyPartHealth; - LeftLeg: BodyPartHealth; - RightLeg: BodyPartHealth; -} -export interface BodyPartHealth { - Health: CurrentMax; - Effects?: Record; -} -export interface CurrentMax { - Current: number; - Maximum: number; -} -export interface Inventory { - items: Item[]; - equipment: string; - stash: string; - sortingTable: string; - questRaidItems: string; - questStashItems: string; - fastPanel: FastPanel; -} -export interface FastPanel { -} -export interface Skills { - Common: Common[]; - Mastering: Mastering[]; - Bonuses?: any[]; - Points: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession: number; - LastAccess: number; -} -export interface Mastering { - Id: string; - Progress: number; -} -export interface Stats { - CarriedQuestItems: string[]; - Victims: Victim[]; - TotalSessionExperience: number; - LastSessionDate: number; - SessionCounters: SessionCounters; - OverallCounters: OverallCounters; - SessionExperienceMult?: number; - ExperienceBonusMult?: number; - Aggressor?: Aggressor; - DroppedItems?: IDroppedItem[]; - FoundInRaidItems?: FoundInRaidItem[]; - DamageHistory?: DamageHistory; - DeathCause?: DeathCause; - LastPlayerState?: LastPlayerState; - TotalInGameTime: number; - SurvivorClass?: string; -} -export interface IDroppedItem { - QuestId: string; - ItemId: string; - ZoneId: string; -} -export interface FoundInRaidItem { - QuestId: string; - ItemId: string; -} -export interface Victim { - AccountId: string; - ProfileId: string; - Name: string; - Side: string; - BodyPart: string; - Time: string; - Distance: number; - Level: number; - Weapon: string; - Role: string; -} -export interface SessionCounters { - Items: CounterKeyValue[]; -} -export interface OverallCounters { - Items: CounterKeyValue[]; -} -export interface CounterKeyValue { - Key: string[]; - Value: number; -} -export interface Aggressor { - AccountId: string; - ProfileId: string; - MainProfileNickname: string; - Name: string; - Side: string; - BodyPart: string; - HeadSegment: string; - WeaponName: string; - Category: string; -} -export interface DamageHistory { - LethalDamagePart: string; - LethalDamage: LethalDamage; - BodyParts: BodyPartsDamageHistory; -} -export interface LethalDamage { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface BodyPartsDamageHistory { - Head: DamageStats[]; - Chest: DamageStats[]; - Stomach: DamageStats[]; - LeftArm: DamageStats[]; - RightArm: DamageStats[]; - LeftLeg: DamageStats[]; - RightLeg: DamageStats[]; - Common: DamageStats[]; -} -export interface DamageStats { - Amount: number; - Type: string; - SourceId: string; - OverDamageFrom: string; - Blunt: boolean; - ImpactsCount: number; -} -export interface DeathCause { - DamageType: string; - Side: string; - Role: string; - WeaponId: string; -} -export interface LastPlayerState { - Info: LastPlayerStateInfo; - Customization: Record; - Equipment: any; -} -export interface LastPlayerStateInfo { - Nickname: string; - Side: string; - Level: number; - MemberCategory: string; -} -export interface ConditionCounters { - Counters: Counter[]; -} -export interface Counter { - id: string; - value: number; - qid: string; -} -export interface BackendCounter { - id: string; - qid?: string; - value: number; -} -export interface InsuredItem { - tid: string; - itemId: string; -} -export interface Hideout { - Production: Record; - Areas: HideoutArea[]; -} -export interface Productive { - Products: Product[]; - Progress?: number; - inProgress?: boolean; - StartTimestamp?: number; -} -export interface Product { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface ScavCase extends Productive { -} -export interface Production extends Productive { - RecipeId: string; - SkipTime: number; - ProductionTime: number; -} -export interface HideoutArea { - type: HideoutAreas; - level: number; - active: boolean; - passiveBonusesEnabled: boolean; - completeTime: number; - constructing: boolean; - slots: HideoutSlot[]; - lastRecipe: string; -} -export interface HideoutSlot { - item: HideoutItem[]; -} -export interface HideoutItem { - _id: string; - _tpl: string; - upd?: Upd; -} -export interface Bonus { - type: string; - templateId?: string; - passive?: boolean; - production?: boolean; - visible?: boolean; - value?: number; - icon?: string; -} -export interface Quest { - qid: string; - startTime: number; - status: string; - statusTimers?: StatusTimer; - completedConditions?: string[]; -} -export interface StatusTimer { - AvailableForStart?: number; -} -export interface TraderInfo { - loyaltyLevel: number; - salesSum: number; - standing: number; - nextResupply: number; - unlocked: boolean; -} -export interface RagfairInfo { - rating: number; - isRatingGrowing: boolean; - offers: IRagfairOffer[]; -} -export interface CarExtractCounts { +import { IBotBase } from "./tables/IBotBase"; +export interface IPmcData extends IBotBase { } diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/MemberCategory.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/MemberCategory.d.ts deleted file mode 100644 index 3bd9a21..0000000 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/MemberCategory.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -export declare enum MemberCategory { - Default = 0, - Developer = 1, - UniqueId = 2, - Trader = 4, - Group = 8, - System = 16, - ChatModerator = 32, - ChatModeratorWithPermanentBan = 64, - UnitTest = 128, - Sherpa = 256, - Emissary = 512 -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotBase.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotBase.d.ts index 677fd49..0ee468e 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotBase.d.ts @@ -1,23 +1,36 @@ -import { BackendCounter, Bonus } from "../IPmcData"; -import { Item } from "./IItem"; +import { HideoutAreas } from "../../../enums/HideoutAreas"; +import { MemberCategory } from "../../../enums/MemberCategory"; +import { QuestStatus } from "../../../enums/QuestStatus"; +import { IRagfairOffer } from "../../ragfair/IRagfairOffer"; +import { Item, Upd } from "./IItem"; +import { IPmcDataRepeatableQuest } from "./IRepeatableQuests"; export interface IBotBase { _id: string; aid: string; - savage: any; + savage?: string; Info: Info; Customization: Customization; Health: Health; Inventory: Inventory; Skills: Skills; Stats: Stats; - Encyclopedia: any; + Encyclopedia: Record; ConditionCounters: ConditionCounters; BackendCounters: Record; - InsuredItems: any[]; + InsuredItems: InsuredItem[]; Hideout: Hideout; + Quests: Quest[]; + TradersInfo: Record; + RagfairInfo: RagfairInfo; + RepeatableQuests: IPmcDataRepeatableQuest[]; Bonuses: Bonus[]; + Notes: Notes; + CarExtractCounts: CarExtractCounts; + SurvivorClass: SurvivorClass; + WishList: string[]; } export interface Info { + EntryPoint: string; Nickname: string; LowerNickname: string; Side: string; @@ -27,17 +40,19 @@ export interface Info { RegistrationDate: number; GameVersion: string; AccountType: number; - MemberCategory: number; + MemberCategory: MemberCategory; lockedMoveCommands: boolean; SavageLockTime: number; LastTimePlayedAsSavage: number; Settings: Settings; NicknameChangeDate: number; NeedWipeOptions: any[]; - lastCompletedWipe: any; + lastCompletedWipe: LastCompleted; + Bans: IBan[]; BannedState: boolean; BannedUntil: number; IsStreamerModeAvailable: boolean; + lastCompletedEvent?: LastCompleted; } export interface Settings { Role: string; @@ -46,6 +61,19 @@ export interface Settings { StandingForKill: number; AggressorBonus: number; } +export interface IBan { + type: BanType; + dateTime: number; +} +export declare enum BanType { + Chat = 0, + RagFair = 1, + Voip = 2, + Trading = 3, + Online = 4, + Friends = 5, + ChangeNickname = 6 +} export interface Customization { Head: string; Body: string; @@ -53,6 +81,28 @@ export interface Customization { Hands: string; } export interface Health { + Hydration: CurrentMax; + Energy: CurrentMax; + Temperature: CurrentMax; + BodyParts: BodyPartsHealth; + UpdateTime: number; +} +export interface BodyPartsHealth { + Head: BodyPartHealth; + Chest: BodyPartHealth; + Stomach: BodyPartHealth; + LeftArm: BodyPartHealth; + RightArm: BodyPartHealth; + LeftLeg: BodyPartHealth; + RightLeg: BodyPartHealth; +} +export interface BodyPartHealth { + Health: CurrentMax; + Effects?: Record; +} +export interface CurrentMax { + Current: number; + Maximum: number; } export interface Inventory { items: Item[]; @@ -66,36 +116,238 @@ export interface Inventory { export interface FastPanel { } export interface Skills { - Common: any[]; - Mastering: any[]; + Common: Common[]; + Mastering: Mastering[]; + Bonuses?: any[]; Points: number; } +export interface Common { + Id: string; + Progress: number; + PointsEarnedDuringSession?: number; + LastAccess?: number; + max?: number; + min?: number; +} +export interface Mastering { + Id: string; + Progress: number; + max?: number; + min?: number; +} export interface Stats { + CarriedQuestItems: string[]; + Victims: Victim[]; + TotalSessionExperience: number; + LastSessionDate: number; SessionCounters: SessionCounters; OverallCounters: OverallCounters; + SessionExperienceMult?: number; + ExperienceBonusMult?: number; + Aggressor?: Aggressor; + DroppedItems?: IDroppedItem[]; + FoundInRaidItems?: FoundInRaidItem[]; + DamageHistory?: DamageHistory; + DeathCause?: DeathCause; + LastPlayerState?: LastPlayerState; + TotalInGameTime: number; + SurvivorClass?: string; +} +export interface IDroppedItem { + QuestId: string; + ItemId: string; + ZoneId: string; +} +export interface FoundInRaidItem { + QuestId: string; + ItemId: string; +} +export interface Victim { + AccountId: string; + ProfileId: string; + Name: string; + Side: string; + BodyPart: string; + Time: string; + Distance: number; + Level: number; + Weapon: string; + Role: string; } export interface SessionCounters { - Items: any[]; + Items: CounterKeyValue[]; } export interface OverallCounters { - Items: any[]; + Items: CounterKeyValue[]; +} +export interface CounterKeyValue { + Key: string[]; + Value: number; } export interface ConditionCounters { - Counters: any[]; + Counters: Counter[]; +} +export interface Counter { + id: string; + value: number; + qid: string; +} +export interface Aggressor { + AccountId: string; + ProfileId: string; + MainProfileNickname: string; + Name: string; + Side: string; + BodyPart: string; + HeadSegment: string; + WeaponName: string; + Category: string; +} +export interface DamageHistory { + LethalDamagePart: string; + LethalDamage: LethalDamage; + BodyParts: BodyPartsDamageHistory; +} +export interface LethalDamage { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface BodyPartsDamageHistory { + Head: DamageStats[]; + Chest: DamageStats[]; + Stomach: DamageStats[]; + LeftArm: DamageStats[]; + RightArm: DamageStats[]; + LeftLeg: DamageStats[]; + RightLeg: DamageStats[]; + Common: DamageStats[]; +} +export interface DamageStats { + Amount: number; + Type: string; + SourceId: string; + OverDamageFrom: string; + Blunt: boolean; + ImpactsCount: number; +} +export interface DeathCause { + DamageType: string; + Side: string; + Role: string; + WeaponId: string; +} +export interface LastPlayerState { + Info: LastPlayerStateInfo; + Customization: Record; + Equipment: any; +} +export interface LastPlayerStateInfo { + Nickname: string; + Side: string; + Level: number; + MemberCategory: string; +} +export interface BackendCounter { + id: string; + qid?: string; + value: number; +} +export interface InsuredItem { + tid: string; + itemId: string; } export interface Hideout { - Production: Production; - Areas: Area[]; + Production: Record; + Areas: HideoutArea[]; } -export interface Production { +export interface Productive { + Products: Product[]; + Progress?: number; + inProgress?: boolean; + StartTimestamp?: number; } -export interface Area { - type: number; +export interface Production extends Productive { + RecipeId: string; + SkipTime: number; + ProductionTime: number; +} +export interface ScavCase extends Productive { + RecipeId: string; +} +export interface Product { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface HideoutArea { + type: HideoutAreas; level: number; active: boolean; passiveBonusesEnabled: boolean; completeTime: number; constructing: boolean; - slots: any[]; - lastRecipe: any; + slots: HideoutSlot[]; + lastRecipe: string; +} +export interface HideoutSlot { + /** SPT specific value to keep track of what index this slot is (0,1,2,3 etc) */ + locationIndex: number; + item?: HideoutItem[]; +} +export interface HideoutItem { + _id: string; + _tpl: string; + upd?: Upd; +} +export interface LastCompleted { + $oid: string; +} +export interface Notes { + Notes: Note[]; +} +export interface CarExtractCounts { +} +export declare enum SurvivorClass { + Unknown = 0, + Neutralizer = 1, + Marauder = 2, + Paramedic = 3, + Survivor = 4 +} +export interface Quest { + qid: string; + startTime: number; + status: QuestStatus; + statusTimers?: Record; + /** SPT specific property */ + completedConditions?: string[]; +} +export interface TraderInfo { + loyaltyLevel: number; + salesSum: number; + standing: number; + nextResupply: number; + unlocked: boolean; +} +export interface RagfairInfo { + rating: number; + isRatingGrowing: boolean; + offers: IRagfairOffer[]; +} +export interface Bonus { + type: string; + templateId?: string; + passive?: boolean; + production?: boolean; + visible?: boolean; + value?: number; + icon?: string; +} +export interface Note { + Time: number; + Text: string; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotType.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotType.d.ts index 01be0be..c1fe579 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotType.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IBotType.d.ts @@ -1,3 +1,5 @@ +import { MinMax } from "../../../common/MinMax"; +import { Skills } from "./IBotBase"; export interface IBotType { appearance: Appearance; chances: Chances; @@ -121,12 +123,9 @@ export interface BodyPart { RightLeg: MinMax; Stomach: MinMax; } -export interface MinMax { - max: number; - min: number; -} export interface Inventory { equipment: Equipment; + Ammo: Record>; items: Items; mods: Mods; } @@ -154,23 +153,3 @@ export interface Items { TacticalVest: string[]; } export declare type Mods = Record>; -export interface Skills { - Common: Common[]; - Bonuses?: any; - Mastering: Mastering[]; - Points: number; -} -export interface Mastering { - Id: string; - Progress: number; - max?: number; - min?: number; -} -export interface Common { - Id: string; - Progress: number; - PointsEarnedDuringSession?: number; - LastAccess?: number; - max?: number; - min?: number; -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IMatch.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IMatch.d.ts new file mode 100644 index 0000000..c30cb48 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IMatch.d.ts @@ -0,0 +1,10 @@ +export interface IMatch { + metrics: Metrics; +} +export interface Metrics { + Keys: number[]; + NetProcessingBins: number[]; + RenderBins: number[]; + GameUpdateBins: number[]; + MemoryMeasureInterval: number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IProfileTemplate.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IProfileTemplate.d.ts new file mode 100644 index 0000000..fbcd81a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IProfileTemplate.d.ts @@ -0,0 +1,25 @@ +import { Dialogue, WeaponBuild } from "../../profile/IAkiProfile"; +import { IPmcData } from "../IPmcData"; +export interface IProfileTemplates { + Standard: IProfileSides; + "Left Behind": IProfileSides; + "Prepare To Escape": IProfileSides; + "Edge Of Darkness": IProfileSides; +} +export interface IProfileSides { + usec: TemplateSide; + bear: TemplateSide; +} +export interface TemplateSide { + character: IPmcData; + suits: string[]; + dialogues: Record; + weaponbuilds: WeaponBuild[]; + trader: ProfileTraderTemplate; +} +export interface ProfileTraderTemplate { + initialLoyaltyLevel: number; + initialStanding: number; + initialSalesSum: number; + jaegerUnlocked: boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IQuest.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IQuest.d.ts index e1fc888..a349a6d 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IQuest.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/IQuest.d.ts @@ -1,3 +1,4 @@ +import { QuestRewardType } from "../../../enums/QuestRewardType"; import { Item } from "./IItem"; export interface IQuest { QuestName: string; @@ -23,6 +24,7 @@ export interface IQuest { status: string; KeyQuest: boolean; changeQuestMessageText: string; + side: string; } export interface Conditions { Started: AvailableForConditions[]; @@ -56,6 +58,7 @@ export interface AvailableForProps { plantTime?: number; zoneId?: string; type?: boolean; + countInRaid?: boolean; } export interface AvailableForCounter { id: string; @@ -97,9 +100,9 @@ export interface Rewards { Expired: Reward[]; } export interface Reward { - value?: string; + value?: string | number; id: string; - type: string; + type: QuestRewardType; index: number; target?: string; items?: Item[]; diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/ITemplateItem.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/ITemplateItem.d.ts index c2ba762..23a1a14 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/ITemplateItem.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/common/tables/ITemplateItem.d.ts @@ -7,284 +7,362 @@ export interface ITemplateItem { _proto: string; } export interface Props { - Name: string; - ShortName: string; - Description: string; - Weight: number; - BackgroundColor: string; - Width: number; - Height: number; - StackMaxSize: number; + Name?: string; + ShortName?: string; + Description?: string; + Weight?: number; + BackgroundColor?: string; + Width?: number; + Height?: number; + StackMaxSize?: number; Rarity?: string; SpawnChance?: number; CreditsPrice?: number; - ItemSound: string; - Prefab: Prefab; - UsePrefab: Prefab; - StackObjectsCount: number; - NotShownInSlot: boolean; - ExaminedByDefault: boolean; - ExamineTime: number; - IsUndiscardable: boolean; - IsUnsaleable: boolean; - IsUnbuyable: boolean; - IsUngivable: boolean; - IsLockedafterEquip: boolean; - QuestItem: boolean; - LootExperience: number; - ExamineExperience: number; - HideEntrails: boolean; - RepairCost: number; - RepairSpeed: number; - ExtraSizeLeft: number; - ExtraSizeRight: number; - ExtraSizeUp: number; - ExtraSizeDown: number; - ExtraSizeForceAdd: boolean; - MergesWithChildren: boolean; - CanSellOnRagfair: boolean; - CanRequireOnRagfair: boolean; - ConflictingItems: string[]; - DiscardLimit: number; - Unlootable: boolean; - UnlootableFromSlot: string; - UnlootableFromSide: string[]; - AnimationVariantsNumber: number; - DiscardingBlock: boolean; - RagFairCommissionModifier: number; - IsAlwaysAvailableForInsurance: boolean; - Grids: Grid[]; - Slots: Slot[]; - CanPutIntoDuringTheRaid: boolean; - CantRemoveFromSlotsDuringRaid: string[]; - weapClass: string; - weapUseType: string; - ammoCaliber: string; - Durability: number; - MaxDurability: number; - OperatingResource: number; - RepairComplexity: number; - durabSpawnMin: number; - durabSpawnMax: number; - isFastReload: boolean; - RecoilForceUp: number; - RecoilForceBack: number; - Convergence: number; - RecoilAngle: number; - weapFireType: string[]; - RecolDispersion: number; - SingleFireRate: number; - CanQueueSecondShot: boolean; - bFirerate: number; - Ergonomics: number; - Velocity: number; - bEffDist: number; - bHearDist: number; - isChamberLoad: boolean; - chamberAmmoCount: number; - isBoltCatch: boolean; - defMagType: string; - defAmmo: string; - AdjustCollimatorsToTrajectory: boolean; - shotgunDispersion: number; - Chambers: Chamber[]; - CameraRecoil: number; - CameraSnap: number; - ReloadMode: string; - CenterOfImpact: number; - AimPlane: number; - DeviationCurve: number; - DeviationMax: number; - Foldable: boolean; - Retractable: boolean; - TacticalReloadStiffnes: Xyz; - TacticalReloadFixation: number; - RecoilCenter: Xyz; - RotationCenter: Xyz; - RotationCenterNoStock: Xyz; - SizeReduceRight: number; - FoldedSlot: string; - CompactHandling: boolean; - SightingRange: number; - MinRepairDegradation: number; - MaxRepairDegradation: number; - MinRepairKitDegradation: number; - MaxRepairKitDegradation: number; - IronSightRange: number; - MustBoltBeOpennedForExternalReload: boolean; - MustBoltBeOpennedForInternalReload: boolean; - BoltAction: boolean; - HipAccuracyRestorationDelay: number; - HipAccuracyRestorationSpeed: number; - HipInnaccuracyGain: number; - ManualBoltCatch: boolean; - BurstShotsCount: number; - BaseMalfunctionChance: number; - AllowJam: boolean; - AllowFeed: boolean; - AllowMisfire: boolean; - AllowSlide: boolean; - DurabilityBurnRatio: number; - HeatFactorGun: number; - CoolFactorGun: number; - CoolFactorGunMods: number; - HeatFactorByShot: number; - AllowOverheat: boolean; - DoubleActionAccuracyPenalty: number; - RecoilPosZMult: number; - ShotgunDispersion: number; - StackMinRandom: number; - StackMaxRandom: number; - StackSlots: StackSlot[]; - SearchSound: string; - BlocksArmorVest: boolean; - RigLayoutName: string; - armorZone: string[]; - armorClass: number; - speedPenaltyPercent: number; - mousePenalty: number; - weaponErgonomicPenalty: number; - BluntThroughput: number; - ArmorMaterial: string; - medUseTime: number; - medEffectType: string; - MaxHpResource: number; - hpResourceRate: number; - StimulatorBuffs: string; - effects_health: EffectsHealth; - effects_damage: EffectsDamage; - knifeHitDelay: number; - knifeHitSlashRate: number; - knifeHitStabRate: number; - knifeHitRadius: number; - knifeHitSlashDam: number; - knifeHitStabDam: number; - knifeDurab: number; - PrimaryDistance: number; - SecondryDistance: number; - SlashPenetration: number; - StabPenetration: number; - PrimaryConsumption: number; - SecondryConsumption: number; - DeflectionConsumption: number; - MaxResource: number; - AppliedTrunkRotation: Xyz; - AppliedHeadRotation: Xyz; - DisplayOnModel: boolean; - AdditionalAnimationLayer: number; - StaminaBurnRate: number; - ColliderScaleMultiplier: Xyz; - ammoType: string; - InitialSpeed: number; - BallisticCoeficient: number; - BulletMassGram: number; - BulletDiameterMilimeters: number; - Damage: number; - ammoAccr: number; - ammoRec: number; - ammoDist: number; - buckshotBullets: number; - PenetrationPower: number; - PenetrationPowerDiviation: number; - ammoHear: number; - ammoSfx: string; - MisfireChance: number; - MinFragmentsCount: number; - MaxFragmentsCount: number; - ammoShiftChance: number; - casingName: string; - casingEjectPower: number; - casingMass: number; - casingSounds: string; - ProjectileCount: number; - PenetrationChance: number; - RicochetChance: number; - FragmentationChance: number; - Deterioration: number; - SpeedRetardation: number; - Tracer: boolean; - TracerColor: string; - TracerDistance: number; - ArmorDamage: number; - Caliber: string; - StaminaBurnPerDamage: number; - HeavyBleedingDelta: number; - LightBleedingDelta: number; - ShowBullet: boolean; - HasGrenaderComponent: boolean; - FuzeArmTimeSec: number; - ExplosionStrength: number; - MinExplosionDistance: number; - MaxExplosionDistance: number; - FragmentsCount: number; - FragmentType: string; - ShowHitEffectOnExplode: boolean; - ExplosionType: string; - AmmoLifeTimeSec: number; - Contusion: Contusion; - ArmorDistanceDistanceDamage: Xyz; - Blindness: Xyz; - IsLightAndSoundShot: boolean; - LightAndSoundShotAngle: number; - LightAndSoundShotSelfContusionTime: number; - LightAndSoundShotSelfContusionStrength: number; - MalfMisfireChance: number; - DurabilityBurnModificator: number; - HeatFactor: number; - MalfFeedChance: number; - Accuracy: number; - Recoil: number; - Loudness: number; - EffectiveDistance: number; - RaidModdable: boolean; - ToolModdable: boolean; - BlocksFolding: boolean; - BlocksCollapsible: boolean; - IsAnimated: boolean; - HasShoulderContact: boolean; - DoubleActionAccuracyPenaltyMult: number; - magAnimationIndex: number; - Cartridges: Cartridge[]; - CanFast: boolean; - CanHit: boolean; - CanAdmin: boolean; - LoadUnloadModifier: number; - CheckTimeModifier: number; - CheckOverride: number; - ReloadMagType: string; - VisibleAmmoRangesString: string; - MalfunctionChance: number; - TagColor: number; - TagName: string; - MaximumNumberOfUsage: number; - CustomAimPlane: string; - sightModType: string; - aimingSensitivity: number; - SightModesCount: number; - OpticCalibrationDistances: number[]; - ScopesCount: number; - AimSensitivity: number[][]; - ModesCount: number[]; - Zooms: number[][]; - CalibrationDistances: number[][]; - Intensity: number; - Mask: string; - MaskSize: number; - NoiseIntensity: number; - NoiseScale: number; - Color: Color; - DiffuseIntensity: number; - HasHinge: boolean; + ItemSound?: string; + Prefab?: Prefab; + UsePrefab?: Prefab; + StackObjectsCount?: number; + NotShownInSlot?: boolean; + ExaminedByDefault?: boolean; + ExamineTime?: number; + IsUndiscardable?: boolean; + IsUnsaleable?: boolean; + IsUnbuyable?: boolean; + IsUngivable?: boolean; + IsLockedafterEquip?: boolean; + QuestItem?: boolean; + LootExperience?: number; + ExamineExperience?: number; + HideEntrails?: boolean; + RepairCost?: number; + RepairSpeed?: number; + ExtraSizeLeft?: number; + ExtraSizeRight?: number; + ExtraSizeUp?: number; + ExtraSizeDown?: number; + ExtraSizeForceAdd?: boolean; + MergesWithChildren?: boolean; + CanSellOnRagfair?: boolean; + CanRequireOnRagfair?: boolean; + ConflictingItems?: string[]; + Unlootable?: boolean; + UnlootableFromSlot?: string; + UnlootableFromSide?: string[]; + AnimationVariantsNumber?: number; + DiscardingBlock?: boolean; + DropSoundType?: string; + RagFairCommissionModifier?: number; + IsAlwaysAvailableForInsurance?: boolean; + DiscardLimit?: number; + MaxResource?: number; Resource?: number; + DogTagQualities?: boolean; + Grids?: Grid[]; + Slots?: Slot[]; + CanPutIntoDuringTheRaid?: boolean; + CantRemoveFromSlotsDuringRaid?: string[]; + KeyIds?: string[]; + TagColor?: number; + TagName?: string; + Durability?: number; + Accuracy?: number; + Recoil?: number; + Loudness?: number; + EffectiveDistance?: number; + Ergonomics?: number; + Velocity?: number; + RaidModdable?: boolean; + ToolModdable?: boolean; + BlocksFolding?: boolean; + BlocksCollapsible?: boolean; + IsAnimated?: boolean; + HasShoulderContact?: boolean; + SightingRange?: number; + DoubleActionAccuracyPenaltyMult?: number; + ModesCount: any; + DurabilityBurnModificator?: number; + HeatFactor?: number; CoolFactor?: number; + muzzleModType?: string; + CustomAimPlane?: string; + sightModType?: string; + aimingSensitivity?: number; + SightModesCount?: number; + OpticCalibrationDistances?: number[]; + ScopesCount?: number; + AimSensitivity?: number | number[][]; + Zooms?: number[][]; + CalibrationDistances?: number[][]; + Intensity?: number; + Mask?: string; + MaskSize?: number; + NoiseIntensity?: number; + NoiseScale?: number; + Color?: Color; + DiffuseIntensity?: number; + HasHinge?: boolean; + RampPalette?: string; + DepthFade?: number; + RoughnessCoef?: number; + SpecularCoef?: number; + MainTexColorCoef?: number; + MinimumTemperatureValue?: number; + RampShift?: number; + HeatMin?: number; + ColdMax?: number; + IsNoisy?: boolean; + IsFpsStuck?: boolean; + IsGlitch?: boolean; + IsMotionBlurred?: boolean; + IsPixelated?: boolean; + PixelationBlockCount?: number; + ShiftsAimCamera?: number; + magAnimationIndex?: number; + Cartridges?: Slot[]; + CanFast?: boolean; + CanHit?: boolean; + CanAdmin?: boolean; + LoadUnloadModifier?: number; + CheckTimeModifier?: number; + CheckOverride?: number; + ReloadMagType?: string; + VisibleAmmoRangesString?: string; + MalfunctionChance?: number; + IsShoulderContact?: boolean; + Foldable?: boolean; + Retractable?: boolean; + SizeReduceRight?: number; + CenterOfImpact?: number; + ShotgunDispersion?: number; + IsSilencer?: boolean; + DeviationCurve?: number; + DeviationMax?: number; + SearchSound?: string; + BlocksArmorVest?: boolean; + speedPenaltyPercent?: number; + GridLayoutName?: string; + SpawnFilter?: any[]; + containType?: any[]; + sizeWidth?: number; + sizeHeight?: number; + isSecured?: boolean; + spawnTypes?: string; + lootFilter?: any[]; + spawnRarity?: string; + minCountSpawn?: number; + maxCountSpawn?: number; + openedByKeyID?: any[]; + RigLayoutName?: string; + MaxDurability?: number; + armorZone?: string[]; + armorClass: any; + mousePenalty?: number; + weaponErgonomicPenalty?: number; + BluntThroughput?: number; + ArmorMaterial?: string; + weapClass?: string; + weapUseType?: string; + ammoCaliber?: string; + OperatingResource?: number; + RepairComplexity?: number; + durabSpawnMin?: number; + durabSpawnMax?: number; + isFastReload?: boolean; + RecoilForceUp?: number; + RecoilForceBack?: number; + Convergence?: number; + RecoilAngle?: number; + weapFireType?: string[]; + RecolDispersion?: number; + SingleFireRate?: number; + CanQueueSecondShot?: boolean; + bFirerate?: number; + bEffDist?: number; + bHearDist?: number; + isChamberLoad?: boolean; + chamberAmmoCount?: number; + isBoltCatch?: boolean; + defMagType?: string; + defAmmo?: string; + AdjustCollimatorsToTrajectory?: boolean; + shotgunDispersion?: number; + Chambers?: Slot[]; + CameraRecoil?: number; + CameraSnap?: number; + ReloadMode?: string; + AimPlane?: number; + TacticalReloadStiffnes?: Xyz; + TacticalReloadFixation?: number; + RecoilCenter?: Xyz; + RotationCenter?: Xyz; + RotationCenterNoStock?: Xyz; + FoldedSlot?: string; + CompactHandling?: boolean; + MinRepairDegradation?: number; + MaxRepairDegradation?: number; + IronSightRange?: number; + IsFlareGun?: boolean; + IsGrenadeLauncher?: boolean; + IsOneoff?: boolean; + MustBoltBeOpennedForExternalReload?: boolean; + MustBoltBeOpennedForInternalReload?: boolean; + BoltAction?: boolean; + HipAccuracyRestorationDelay?: number; + HipAccuracyRestorationSpeed?: number; + HipInnaccuracyGain?: number; + ManualBoltCatch?: boolean; + BurstShotsCount?: number; + BaseMalfunctionChance?: number; + AllowJam?: boolean; + AllowFeed?: boolean; + AllowMisfire?: boolean; + AllowSlide?: boolean; + DurabilityBurnRatio?: number; + HeatFactorGun?: number; + CoolFactorGun?: number; + CoolFactorGunMods?: number; + HeatFactorByShot?: number; + AllowOverheat?: boolean; + DoubleActionAccuracyPenalty?: number; + RecoilPosZMult?: number; + MinRepairKitDegradation?: number; + MaxRepairKitDegradation?: number; + BlocksEarpiece?: boolean; + BlocksEyewear?: boolean; + BlocksHeadwear?: boolean; + BlocksFaceCover?: boolean; + Indestructibility?: number; + headSegments?: string[]; + FaceShieldComponent?: boolean; + FaceShieldMask?: string; + MaterialType?: string; + RicochetParams?: Xyz; + DeafStrength?: string; + BlindnessProtection?: number; + Distortion?: number; + CompressorTreshold?: number; + CompressorAttack?: number; + CompressorRelease?: number; + CompressorGain?: number; + CutoffFreq?: number; + Resonance?: number; + CompressorVolume?: number; + AmbientVolume?: number; + DryVolume?: number; foodUseTime?: number; foodEffectType?: string; - MaxRepairResource: number; - RepairQuality: number; - RepairType: string; - TargetItemFilter: string[]; - apResource: number; - krResource: number; + StimulatorBuffs?: string; + effects_health: any; + effects_damage: any; + MaximumNumberOfUsage?: number; + knifeHitDelay?: number; + knifeHitSlashRate?: number; + knifeHitStabRate?: number; + knifeHitRadius?: number; + knifeHitSlashDam?: number; + knifeHitStabDam?: number; + knifeDurab?: number; + PrimaryDistance?: number; + SecondryDistance?: number; + SlashPenetration?: number; + StabPenetration?: number; + PrimaryConsumption?: number; + SecondryConsumption?: number; + DeflectionConsumption?: number; + AppliedTrunkRotation?: Xyz; + AppliedHeadRotation?: Xyz; + DisplayOnModel?: boolean; + AdditionalAnimationLayer?: number; + StaminaBurnRate?: number; + ColliderScaleMultiplier?: Xyz; + ConfigPathStr?: string; + MaxMarkersCount?: number; + scaleMin?: number; + scaleMax?: number; + medUseTime?: number; + medEffectType?: string; + MaxHpResource?: number; + hpResourceRate?: number; + apResource?: number; + krResource?: number; + MaxOpticZoom?: number; + MaxRepairResource?: number; + TargetItemFilter?: string[]; + RepairQuality?: number; + RepairType?: string; + StackMinRandom?: number; + StackMaxRandom?: number; + ammoType?: string; + InitialSpeed?: number; + BallisticCoeficient?: number; + BulletMassGram?: number; + BulletDiameterMilimeters?: number; + Damage?: number; + ammoAccr?: number; + ammoRec?: number; + ammoDist?: number; + buckshotBullets?: number; + PenetrationPower?: number; + PenetrationPowerDiviation?: number; + ammoHear?: number; + ammoSfx?: string; + MisfireChance?: number; + MinFragmentsCount?: number; + MaxFragmentsCount?: number; + ammoShiftChance?: number; + casingName?: string; + casingEjectPower?: number; + casingMass?: number; + casingSounds?: string; + ProjectileCount?: number; + PenetrationChance?: number; + RicochetChance?: number; + FragmentationChance?: number; + Deterioration?: number; + SpeedRetardation?: number; + Tracer?: boolean; + TracerColor?: string; + TracerDistance?: number; + ArmorDamage?: number; + Caliber?: string; + StaminaBurnPerDamage?: number; + HeavyBleedingDelta?: number; + LightBleedingDelta?: number; + ShowBullet?: boolean; + HasGrenaderComponent?: boolean; + FuzeArmTimeSec?: number; + ExplosionStrength?: number; + MinExplosionDistance?: number; + MaxExplosionDistance?: number; + FragmentsCount?: number; + FragmentType?: string; + ShowHitEffectOnExplode?: boolean; + ExplosionType?: string; + AmmoLifeTimeSec?: number; + Contusion?: Xyz; + ArmorDistanceDistanceDamage?: Xyz; + Blindness?: Xyz; + IsLightAndSoundShot?: boolean; + LightAndSoundShotAngle?: number; + LightAndSoundShotSelfContusionTime?: number; + LightAndSoundShotSelfContusionStrength?: number; + MalfMisfireChance?: number; + MalfFeedChance?: number; + StackSlots?: StackSlot[]; + type?: string; + eqMin?: number; + eqMax?: number; + rate?: number; + ThrowType?: string; + ExplDelay?: number; + Strength?: number; + ContusionDistance?: number; + throwDamMax?: number; + explDelay?: number; + EmitTime?: number; + CanBeHiddenDuringThrow?: boolean; + MinTimeToContactExplode?: number; + ExplosionEffectType?: string; } export interface Prefab { path: string; @@ -315,27 +393,18 @@ export interface Slot { _id: string; _parent: string; _props: SlotProps; + _max_count?: number; _required: boolean; _mergeSlotWithChildren: boolean; _proto: string; } export interface SlotProps { - filters: Filter[]; + filters: SlotFilter[]; } -export interface Chamber { - _name: string; - _id: string; - _parent: string; - _props: ChamberProps; - _required: boolean; - _mergeSlotWithChildren: boolean; - _proto: string; -} -export interface ChamberProps { - filters: FilterProps[]; -} -export interface FilterProps { +export interface SlotFilter { + Shift?: number; Filter: string[]; + AnimationIndex?: number; } export interface Xyz { x: number; @@ -345,53 +414,38 @@ export interface Xyz { export interface StackSlot { _name?: string; _id: string; - _sptTpl: string; - parent: string; - location: any; - slotId: string; + _parent: string; _max_count: number; - _props?: StackSlotProps; - _proto?: string; + _props: StackSlotProps; + _proto: string; upd: any; } export interface StackSlotProps { - filters: Filter[]; + filters: SlotFilter[]; } export interface EffectsHealth { - Hydration: Hydration; + Energy: EffectsHealthProps; + Hydration: EffectsHealthProps; } -export interface Hydration { +export interface EffectsHealthProps { value: number; } export interface EffectsDamage { - Pain: Pain; - Contusion: Contusion; + Pain: EffectDamageProps; + LightBleeding: EffectDamageProps; + HeavyBleeding: EffectDamageProps; + Contusion: EffectDamageProps; + RadExposure: EffectDamageProps; + Fracture: EffectDamageProps; + DestroyedPart: EffectDamageProps; } -export interface Pain { +export interface EffectDamageProps { delay: number; duration: number; fadeOut: number; -} -export interface Contusion { - delay: number; - duration: number; - fadeOut: number; -} -export interface Cartridge { - _name: string; - _id: string; - _parent: string; - _max_count: number; - _props: CartridgeProps; - _proto: string; -} -export interface CartridgeProps { - filters: Filter[]; -} -export interface Filter { - Shift?: number; - Filter: string[]; - AnimationIndex?: number; + cost?: number; + healthPenaltyMin?: number; + healthPenaltyMax?: number; } export interface Color { r: number; diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/game/IReportNicknameRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/game/IReportNicknameRequestData.d.ts new file mode 100644 index 0000000..087c58b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/game/IReportNicknameRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IReportNicknameRequestData { + uid: string; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/health/Effect.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/health/Effect.d.ts new file mode 100644 index 0000000..2f0adac --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/health/Effect.d.ts @@ -0,0 +1,5 @@ +export declare enum Effect { + Fracture = "Fracture", + LightBleeding = "LightBleeding", + HeavyBleeding = "HeavyBleeding" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/hideout/HideoutAreasEnum.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/hideout/HideoutAreasEnum.d.ts deleted file mode 100644 index 10f851b..0000000 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/hideout/HideoutAreasEnum.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -export declare enum HideoutAreasEnum { - NOTSET = -1, - VENTS = 0, - SECURITY = 1, - LAVATORY = 2, - STASH = 3, - GENERATOR = 4, - HEATING = 5, - WATER_COLLECTOR = 6, - MEDSTATION = 7, - NUTRITION_UNIT = 8, - REST_SPACE = 9, - WORKBENCH = 10, - INTEL_CENTER = 11, - SHOOTING_RANGE = 12, - LIBRARY = 13, - SCAV_CASE = 14, - ILLUMINATION = 15, - PLACE_OF_FAME = 16, - AIR_FILTERING = 17, - SOLAR_POWER = 18, - BOOZE_GENERATOR = 19, - BITCOIN_FARM = 20, - CHRISTMAS_TREE = 21 -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/hideout/IHideoutScavCase.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/hideout/IHideoutScavCase.d.ts index 25abcf3..e0b9a27 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/hideout/IHideoutScavCase.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/hideout/IHideoutScavCase.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; export interface IHideoutScavCase { _id: string; ProductionTime: number; @@ -15,7 +16,3 @@ export interface EndProducts { Rare: MinMax; Superrare: MinMax; } -export interface MinMax { - min: string; - max: string; -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts new file mode 100644 index 0000000..bf209c6 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/insurance/IGetInsuranceCostResponseData.d.ts @@ -0,0 +1 @@ +export declare type IGetInsuranceCostResponseData = Record>; diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts index 31e62fe..4841cfd 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/itemEvent/IItemEventRouterBase.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; import { Item, Upd } from "../common/tables/IItem"; import { IQuest } from "../common/tables/IQuest"; import { IPmcDataRepeatableQuest } from "../common/tables/IRepeatableQuests"; diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/match/ICreateGroupRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/match/ICreateGroupRequestData.d.ts new file mode 100644 index 0000000..7413a8a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/match/ICreateGroupRequestData.d.ts @@ -0,0 +1,6 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface ICreateGroupRequestData { + location: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts new file mode 100644 index 0000000..55d7079 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IGetGroupStatusRequestData.d.ts @@ -0,0 +1,9 @@ +import { RaidMode } from "../../enums/RaidMode"; +export interface IGetGroupStatusRequestData { + location: string; + savage: boolean; + dt: string; + keyId: string; + raidMode: RaidMode; + startInGroup: boolean; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchRequestData.d.ts new file mode 100644 index 0000000..cd34f7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchRequestData.d.ts @@ -0,0 +1,12 @@ +export interface IJoinMatchRequestData { + location: string; + savage: boolean; + dt: string; + servers: Server[]; + keyId: string; +} +export interface Server { + ping: number; + ip: string; + port: string; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchResult.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchResult.d.ts new file mode 100644 index 0000000..df695f4 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IJoinMatchResult.d.ts @@ -0,0 +1,11 @@ +export interface IJoinMatchResult { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; + version: string; + location: string; + gamemode: string; + shortid: string; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/match/IPutMetricsRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IPutMetricsRequestData.d.ts new file mode 100644 index 0000000..d9ed214 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IPutMetricsRequestData.d.ts @@ -0,0 +1,10 @@ +export interface IPutMetricsRequestData { + sid: string; + settings: any; + SharedSettings: any; + HardwareDescription: any; + Location: string; + Metrics: any; + ClientEvents: any; + SpikeSamples: any[]; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts index 84bccc8..af0625e 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IStartOffineRaidRequestData.d.ts @@ -1,6 +1,7 @@ +import { BotAmount } from "../../enums/BotAmount"; +import { BotDifficulty } from "../../enums/BotDifficulty"; export interface IStartOfflineRaidRequestData { locationName: string; - entryPoint: string; startTime: number; dateTime: string; gameSettings: GameSettings; @@ -17,11 +18,11 @@ export interface TimeAndWeatherSettings { export interface BotsSettings { isEnabled: boolean; isScavWars: boolean; - botAmount: string; + botAmount: BotAmount; } export interface WavesSettings { - botDifficulty: string; + botDifficulty: BotDifficulty; isBosses: boolean; isTaggedAndCursed: boolean; - wavesBotAmount: string; + wavesBotAmount: BotAmount; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/match/IUpdatePingRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IUpdatePingRequestData.d.ts new file mode 100644 index 0000000..defbd66 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/match/IUpdatePingRequestData.d.ts @@ -0,0 +1,3 @@ +export interface IUpdatePingRequestData { + servers: any[]; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts index dcd14a2..2f9827c 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts @@ -1,4 +1,4 @@ -import { Skills } from "../common/IPmcData"; +import { Skills } from "../common/tables/IBotBase"; export interface IPlayerIncrementSkillLevelRequestData { _id: string; experience: number; diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts new file mode 100644 index 0000000..eee9b4f --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/profile/GetProfileStatusResponseData.d.ts @@ -0,0 +1,11 @@ +export interface GetProfileStatusResponseData { + maxPveCountExceeded: false; + profiles: ProfileData[]; +} +export interface ProfileData { + profileid: string; + status: string; + sid: string; + ip: string; + port: number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/profile/IAkiProfile.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/profile/IAkiProfile.d.ts index 80dd02d..eaa66c1 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/profile/IAkiProfile.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/profile/IAkiProfile.d.ts @@ -49,16 +49,16 @@ export interface Message { uid: string; type: MessageType; dt: number; - localDateTime: number; UtcDateTime?: number; Member?: IUpdatableChatMember; templateId: string; text?: string; hasRewards: boolean; rewardCollected: boolean; - items: Items; + items: MessageItems; maxStorageTime?: number; systemData?: ISystemData; + profileChangeEvents?: any[]; } export interface MessagePreview { uid: string; @@ -67,7 +67,7 @@ export interface MessagePreview { templateId: string; text?: string; } -export interface Items { +export interface MessageItems { stash?: string; data?: Item[]; } @@ -126,12 +126,16 @@ export interface Chest { export interface Stomach { } export interface LeftArm { + Fracture?: number; } export interface RightArm { + Fracture?: number; } export interface LeftLeg { + Fracture?: number; } export interface RightLeg { + Fracture?: number; } export interface Inraid { location: string; @@ -149,15 +153,11 @@ export interface MessageContent { templateId: string; type: MessageType; maxStorageTime?: number; - systemData?: MessageContentData; + profileChangeEvents?: any[]; + systemData?: ISystemData; } export interface MessageContentRagfair { offerId: string; count: number; handbookId: string; } -export interface MessageContentData { - date: string; - time: string; - location: string; -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts index cc67404..36a6db3 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/quests/ICompleteQuestRequestData.d.ts @@ -1,5 +1,6 @@ export interface ICompleteQuestRequestData { Action: string; + /** Quest Id */ qid: string; removeExcessItems: boolean; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/IGetOffersResult.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/IGetOffersResult.d.ts index 1c11422..fbc631d 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/IGetOffersResult.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/IGetOffersResult.d.ts @@ -1,6 +1,6 @@ import { IRagfairOffer } from "./IRagfairOffer"; export interface IGetOffersResult { - categories: Record; + categories?: Record; offers: IRagfairOffer[]; offersCount: number; selectedCategory: string; diff --git a/Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts new file mode 100644 index 0000000..2d14d20 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/eft/ragfair/ISendRagfairReportRequestData.d.ts @@ -0,0 +1,3 @@ +export interface ISendRagfairReportRequestData { + offerId: number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/AmmoTypes.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/AmmoTypes.d.ts new file mode 100644 index 0000000..b52ddcf --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/AmmoTypes.d.ts @@ -0,0 +1,208 @@ +export declare enum Grenade { + M386_HE_GRENADE = "5ede475b549eed7c6d5c18fb", + M576_MP_APERS_GRENADE = "5ede475339ee016e8c534742", + M433_HEDP_GRENADE = "5f0c892565703e5c461894e9", + M406_HE_GRENADE = "5ede4739e0350d05467f73e8", + M381_HE_GRENADE = "5ede474b0c226a66f5402622", + M441_HE_GRENADE = "5ede47405b097655935d7d16" +} +export declare enum Ammo762x51 { + M62_TRACER = "5a608bf24f39f98ffc77720e", + M80 = "58dd3ad986f77403051cba8f", + M61 = "5a6086ea4f39f99cd479502f", + BCP_FMJ = "5e023e53d4353e3302577c4c", + ULTRA_NOSLER = "5e023e88277cce2b522ff2b1", + TCW_SP = "5e023e6e34d52a55c3304f71", + M993 = "5efb0c1bd79ff02a1f5e68d9" +} +export declare enum Ammo762x54 { + SNB_GZH = "560d61e84bdc2da74d8b4571", + LPS_GZH = "5887431f2459777e1612938f", + PS_GZH = "59e77a2386f7742ee578960a", + T46M_GZH = "5e023cf8186a883be655e54f", + BT_GZH = "5e023d34e8a400319a28ed44", + BS_GZH = "5e023d48186a883be655e551" +} +export declare enum Ammo338Lapua { + TAC_X = "5fc382b6d6fa9c00c571bbc3", + UCW = "5fc382c1016cce60e8341b20", + AP = "5fc382a9d724d907e2077dab", + FMJ = "5fc275cf85fd526b824a571a" +} +export declare enum Ammo46x30 { + AP_SX = "5ba26835d4351e0035628ff5", + ACTION_SX = "5ba26812d4351e003201fef1", + FMJ_SX = "5ba2678ad4351e44f824b344", + SUBSONIC_SX = "5ba26844d4351e00334c9475" +} +export declare enum Ammo57x28 { + SS198LF = "5cc80f79e4a949033c7343b2", + R37_F = "5cc86832d7f00c000d3a6e6c", + SS190 = "5cc80f38e4a949001152b560", + R37_X = "5cc86840d7f00c002412c56c", + L191 = "5cc80f53e4a949000e1ea4f8", + SS197SR = "5cc80f8fe4a949033b0224a2", + SB193 = "5cc80f67e4a949035e43bbba" +} +export declare enum Ammo762x25 { + FMJ43 = "5735ff5c245977640e39ba7e", + LRN = "573601b42459776410737435", + P_GL = "5736026a245977644601dc61", + PST_GZH = "573603562459776430731618", + LRNPC = "573602322459776445391df1", + AKBS = "5735fdcd2459776445391d61", + PT_GZH = "573603c924597764442bd9cb" +} +export declare enum Ammo9x18 { + PM_SP8_GZH = "5737218f245977612125ba51", + P_GZH = "573719762459775a626ccbc1", + PSTM_GZH = "57371aab2459775a77142f22", + RG028_GZH = "573720e02459776143012541", + BZHT_GZH = "573718ba2459775a75491131", + PM_PSV = "5737207f24597760ff7b25f2", + SP7_GZH = "57372140245977611f70ee91", + PBM_GZH = "573719df2459775a626ccbc2", + PSO_GZH = "57371f8d24597761006c6a81", + PST_GZH = "5737201124597760fc4431f1", + PS_GS_PPO = "57371f2b24597761224311f1", + PRS_GS = "57371eb62459776125652ac1", + PPT_GZH = "57371e4124597760ff7b25f1", + PPE_GZH = "57371b192459775a9f58a5e0" +} +export declare enum Ammo9x19 { + PSO_GZH = "58864a4f2459770fcc257101", + PST_GZH = "56d59d3ad2720bdb418b4577", + GREEN_TRACER = "5c3df7d588a4501f290594e5", + RIP = "5c0d56a986f774449d5de529", + AP_63 = "5c925fa22e221601da359b7b", + LUGER_CCI = "5a3c16fe86f77452b62de32a", + PBP_GZH = "5efb0da7a29a85116f6ea05f", + QUAKEMAKER = "5efb0e16aeb21837e749c7ff" +} +export declare enum Ammo9x21 { + P_GZH = "5a26abfac4a28232980eabff", + PS_GZH = "5a269f97c4a282000b151807", + PE_GZH = "5a26ac06c4a282000c5a90a8", + BT_GZH = "5a26ac0ec4a28200741e1e18" +} +export declare enum Ammo357Mag { + FMJ = "62330b3ed4dc74626d570b95", + HOLLOW_POINT = "62330bfadc5883093563729b", + SOFT_POINT = "62330c40bdd19b369e1e53d1", + JACKET_HP = "62330c18744e5e31df12f516" +} +export declare enum Ammo45ACP { + MATCH_FMJ = "5e81f423763d9f754677bf2e", + HYDRA_SHOK = "5efb0fc6aeb21837e749c801", + LASERMATCH_FMJ = "5efb0d4f4bc50b58e81710f3", + AP = "5efb0cabfb3e451d70735af5", + RIP = "5ea2a8e200685063ec28c05a" +} +export declare enum Ammo545x39 { + PS_GS = "56dff3afd2720bba668b4567", + SP = "56dff421d2720b5f5a8b4567", + PPBS_GS_IGOLNIK = "5c0d5e4486f77478390952fe", + BS_7N40 = "61962b617c6c7b169525f168", + PRS_GS = "56dff338d2720bbd668b4569", + BT_GS = "56dff061d2720bb5668b4567", + US_GS = "56dff4ecd2720b5f5a8b4568", + BP_GS = "56dfef82d2720bbd668b4567", + HP = "56dff216d2720bbd668b4568", + BS_GS = "56dff026d2720bb8668b4567", + T_GS = "56dff4a2d2720bbd668b456a", + PP_GS = "56dff2ced2720bb4668b4567", + FMJ = "56dff0bed2720bb0668b4567" +} +export declare enum Ammo556x45 { + M856 = "59e68f6f86f7746c9f75e846", + MK255_MOD_0_RRLP = "59e6918f86f7746c9f75e849", + M995 = "59e690b686f7746c9f75e848", + M855A1 = "54527ac44bdc2d36668b4567", + M856A1 = "59e6906286f7746c9f75e847", + M855 = "54527a984bdc2d4e668b4567", + HP = "59e6927d86f77411da468256", + FMJ = "59e6920f86f77411d82aa167", + WARMAGEDDON = "5c0d5ae286f7741e46554302", + MK_318_MOD_0_SOST = "60194943740c5d77f6705eea", + SSA_AP = "601949593ae8f707c4608daa" +} +export declare enum Ammo300Blackout { + M62_TRACER = "619636be6db0f2477964e710", + BCP_FMJ = "5fbe3ffdf8b6a877a729ea82", + AP = "5fd20ff893a8961fc660a954", + V_MAX = "6196364158ef8c428c287d9f", + WHISPER = "6196365d58ef8c428c287da1" +} +export declare enum Ammo762x39 { + PS_GZH = "5656d7c34bdc2d9d198b4587", + HP = "59e4d3d286f774176a36250a", + US_GZH = "59e4d24686f7741776641ac7", + T45M1_GZH = "59e4cf5286f7741778269d8a", + BP_GZH = "59e0d99486f7744a32234762", + MAI_AP = "601aa3d2b2bcb34913271e6d" +} +export declare enum Ammo9x39 { + SP5_GS = "57a0dfb82459774d3078b56c", + BP_GS = "5c0d688c86f77413ae3407b2", + SP6_GS = "57a0e5022459774d1673f889", + SPP_GS = "5c0d668f86f7747ccb7f13b2", + PAB9_GS = "61962d879bb3d20b0946d385" +} +export declare enum Ammo366TKM { + FMJ = "59e6542b86f77411dc52a77a", + GEKSA = "59e6658b86f77411d949b250", + EKO = "59e655cb86f77411dc52a77b", + APM = "5f0596629e22f464da6bbdd9" +} +export declare enum Ammo127x55 { + PS12 = "5cadf6ddae9215051e1c23b2", + PS12B = "5cadf6eeae921500134b2799", + PS12A = "5cadf6e5ae921500113bb973" +} +export declare enum Ammo12Gauge { + BUCKSHOT_7MM = "560d5e524bdc2d25448b4571", + MAGNUM_85MM = "5d6e6806a4b936088465b17e", + RIP = "5c0d591486f7744c505b416f", + BMG_SLUG_50CAL = "5d6e68c4a4b9361b93413f79", + BUCKSHOT_525MM = "5d6e6772a4b936088465b17c", + EXPRESS_65MM = "5d6e67fba4b9361bc73bc779", + FLECHETTE = "5d6e6911a4b9361bd5780d52", + FTX_CUSTOM_LITE_SLUG = "5d6e68e6a4b9361c140bcfe0", + AP20_ARMOR_PIERCING_SLUG = "5d6e68a8a4b9360b6c0d54e2", + DUAL_SABOT_SLUG = "5d6e68dea4b9361bcc29e659", + POLEVA_6U_SLUG = "5d6e689ca4b9361bc8618956", + POLEVA_3_SLUG = "5d6e6891a4b9361bd473feea", + GRIZZLY_40_SLUG = "5d6e6869a4b9361c140bcfde", + SUPERFORMANCE_HP_SLUG = "5d6e68d1a4b93622fe60e845", + COPPER_SABOT_PREMIER_HP_SLUG = "5d6e68b3a4b9361bca7e50b5", + LEAD_SLUG = "58820d1224597753c90aeb13" +} +export declare enum Ammo20Gauge { + BUCKSHOT_75MM = "5a38ebd9c4a282000d722a5b", + STAR_SLUG = "5d6e6a05a4b93618084f58d0", + BUCKSHOT_73MM = "5d6e69c7a4b9360b6c0d54e4", + DEVASTATOR_SLUG = "5d6e6a5fa4b93614ec501745", + BUCKSHOT_56MM = "5d6e695fa4b936359b35d852", + POLEVA_6U_SLUG = "5d6e6a42a4b9364f07165f52", + POLEVA_3_SLUG = "5d6e6a53a4b9361bd473feec", + BUCKSHOT_62MM = "5d6e69b9a4b9361bc8618958" +} +export declare enum Ammo23x75 { + SHRAPNEL10_BUCKSHOT = "5e85a9a6eacf8c039e4e2ac1", + SHRAPNEL25_BUCKSHOT = "5f647f31b6238e5dd066e196", + ZVEZDA_FLASHBANG = "5e85a9f4add9fe03027d9bf1", + BARRIKADA_SLUG = "5e85aa1a988a8701445df1f5" +} +export declare enum Ammo30x29 { + VOG_30 = "5d70e500a4b9364de70d38ce" +} +export declare enum Ammo127x108 { + B32 = "5cde8864d7f00c0010373be1", + BZT_44M = "5d2f2ab648f03550091993ca" +} +export declare enum Ammo26x75 { + GREEN_FLARE = "62389aaba63f32501b1b444f", + RED_FLARE = "62389ba9a63f32501b1b4451", + WHITE_FLARE = "62389bc9423ed1685422dc57", + YELLOW_FLARE = "62389be94d5d474bf712e709" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/BotAmount.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/BotAmount.d.ts new file mode 100644 index 0000000..d0e1df1 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/BotAmount.d.ts @@ -0,0 +1,7 @@ +export declare enum BotAmount { + AsOnline = "AsOnline", + Low = "Low", + Medium = "Medium", + High = "High", + Horde = "Horde" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/BotDifficulty.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/BotDifficulty.d.ts new file mode 100644 index 0000000..c901bcf --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/BotDifficulty.d.ts @@ -0,0 +1,8 @@ +export declare enum BotDifficulty { + AsOnline = "AsOnline", + Easy = "Easy", + Medium = "Medium", + Hard = "Hard", + Impossible = "Impossible", + Random = "Random" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/ConfigTypes.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/ConfigTypes.d.ts index 6bd31e8..61d6f99 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/enums/ConfigTypes.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/ConfigTypes.d.ts @@ -8,11 +8,14 @@ export declare enum ConfigTypes { IN_RAID = "aki-inraid", INSURANCE = "aki-insurance", INVENTORY = "aki-inventory", + LOCALE = "aki-locale", LOCATION = "aki-location", MATCH = "aki-match", + PLAYERSCAV = "aki-playerscav", QUEST = "aki-quest", RAGFAIR = "aki-ragfair", REPAIR = "aki-repair", + SCAVCASE = "aki-scavcase", TRADER = "aki-trader", WEATHER = "aki-weather" } diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/ContainerTypes.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/ContainerTypes.d.ts new file mode 100644 index 0000000..e6b330a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/ContainerTypes.d.ts @@ -0,0 +1,29 @@ +export declare enum CommonContainers { + AMMO_CASE = "5aafbde786f774389d0cbc0f", + DOCUMENTS_CASE = "590c60fc86f77412b13fddcf", + DOGTAG_CASE = "5c093e3486f77430cb02e593", + GRENADE_CASE = "5e2af55f86f7746d4159f07c", + INJECTOR_CASE = "619cbf7d23893217ec30b689", + ITEM_CASE = "59fb042886f7746c5005a7b2", + KEY_TOOL = "59fafd4b86f7745ca07e1232", + KEYCARD_HOLDER = "619cbf9e0a7c3a1a2731940a", + SCAV_JUNKBOX = "5b7c710788a4506dec015957", + MAGAZINE_CASE = "5c127c4486f7745625356c13", + MEDICINE_CASE = "5aafbcd986f7745e590fff23", + MONEY_CASE = "59fb016586f7746d0d4b423a", + HOLODILNICK_THERMAL_BAG = "5c093db286f7740a1b2617e3", + PISTOL_CASE = "567143bf4bdc2d1a0f8b4567", + SICC_ORGANIZATIONAL_POUCH = "5d235bb686f77443f4331278", + SIMPLE_WALLET = "5783c43d2459774bbe137486", + THICC_ITEM_CASE = "5c0a840b86f7742ffa4f2482", + THICC_WEAPON_CASE = "5b6d9ce188a4501afc1b2b25", + WEAPON_CASE = "59fb023c86f7746d0d4b423c", + WZ_WALLET = "60b0f6c058e0b0481a09ad11" +} +export declare enum SecuredContainers { + ALPHA = "544a11ac4bdc2d470e8b456a", + BETA = "5857a8b324597729ab0a0e7d", + EPSILON = "59db794186f77448bc595262", + GAMMA = "5857a8bc2459772bad15db29", + KAPPA = "5c093ca986f7740a1867ab12" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/QuestRewardType.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/QuestRewardType.d.ts new file mode 100644 index 0000000..1d3db86 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/QuestRewardType.d.ts @@ -0,0 +1,8 @@ +export declare enum QuestRewardType { + Skill = "Skill", + Experience = "Experience", + TraderStanding = "TraderStanding", + TraderUnlock = "TraderUnlock", + Item = "Item", + AssortmentUnlock = "AssortmentUnlock" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/QuestStatus.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/QuestStatus.d.ts new file mode 100644 index 0000000..ba65933 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/QuestStatus.d.ts @@ -0,0 +1,11 @@ +export declare enum QuestStatus { + Locked = 0, + AvailableForStart = 1, + Started = 2, + AvailableForFinish = 3, + Success = 4, + Fail = 5, + FailRestartable = 6, + MarkedAsFailed = 7, + Expired = 8 +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/RaidMode.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/RaidMode.d.ts new file mode 100644 index 0000000..c5a8cff --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/RaidMode.d.ts @@ -0,0 +1,5 @@ +export declare enum RaidMode { + Online = "Online", + Local = "Local", + Coop = "Coop" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/SkillTypes.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/SkillTypes.d.ts new file mode 100644 index 0000000..4eb90af --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/SkillTypes.d.ts @@ -0,0 +1,52 @@ +export declare enum SkillTypes { + HIDEOUT_MANAGEMENT = "HideoutManagement", + CRAFTING = "Crafting", + METABOLISM = "Metabolism", + IMMUNITY = "Immunity", + ENDURANCE = "Endurance", + STRENGTH = "Strength", + VITALITY = "Vitality", + HEALTH = "Health", + STRESS_RESISTANCE = "StressResistance", + THROWING = "Throwing", + RECOIL_CONTROL = "RecoilControl", + COVERT_MOVEMENT = "CovertMovement", + FIELD_MEDICINE = "FieldMedicine", + SEARCH = "Search", + SNIPING = "Sniping", + PERCEPTION = "Perception", + INTELLECT = "Intellect", + ATTENTION = "Attention", + CHARISMA = "Charisma", + MEMORY = "Memory", + SURGERY = "Surgery", + AIM_DRILLS = "AimDrills", + TROUBLESHOOTING = "TroubleShooting", + PRONE_MOVEMENT = "ProneMovement", + FIRST_AID = "FirstAid", + LIGHT_VESTS = "LightVests", + HEAVY_VESTS = "HeavyVests", + WEAPON_MODDING = "WeaponModding", + ADVANCED_MODDING = "AdvancedModding", + NIGHT_OPS = "NightOps", + SILENT_OPS = "SilentOps", + LOCKPICKING = "Lockpicking", + WEAPON_TREATMENT = "WeaponTreatment", + MAG_DRILLS = "MagDrills", + FREE_TRADING = "Freetrading", + AUCTIONS = "Auctions", + CLEAN_OPS = "Cleanoperations", + BARTER = "Barter", + SHADOW_CONNECTIONS = "Shadowconnections", + TASK_PERFORMANCE = "Taskperformance", + BEAR_ASSAULT_OPS = "BearAssaultoperations", + BEAR_AUTHORITY = "BearAuthority", + BEAR_AK_SYSTEMS = "BearAksystems", + BEAR_HEAVY_CAL = "BearHeavycaliber", + BEAR_RAW_POWER = "BearRawpower", + USEC_AR_SYSTEMS = "UsecArsystems", + USEC_DEEP_WEAPON_MOD = "UsecDeepweaponmodding_Settings", + USEC_LONG_RANGE_OPTICS = "UsecLongrangeoptics_Settings", + USEC_NEGOTIATIONS = "UsecNegotiations", + USEC_TACTICS = "UsecTactics" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/enums/WeaponSkillTypes.d.ts b/Live/CWX_WeatherPatcher/server/types/models/enums/WeaponSkillTypes.d.ts new file mode 100644 index 0000000..1e20a2d --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/enums/WeaponSkillTypes.d.ts @@ -0,0 +1,14 @@ +export declare enum WeaponSkillTypes { + PISTOL = "Pistol", + REVOLVER = "Revolver", + SMG = "SMG", + ASSAULT = "Assault", + SHOTGUN = "Shotgun", + SNIPER = "Sniper", + LMG = "LMG", + HMG = "HMG", + DMR = "DMR", + LAUNCHER = "Launcher", + ATTACHED_LAUNCHER = "AttachedLauncher", + MELEE = "Melee" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/external/IPostAkiLoadMod.d.ts b/Live/CWX_WeatherPatcher/server/types/models/external/IPostAkiLoadMod.d.ts new file mode 100644 index 0000000..f6950e8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/external/IPostAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostAkiLoadMod { + postAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/external/IPostDBLoadMod.d.ts b/Live/CWX_WeatherPatcher/server/types/models/external/IPostDBLoadMod.d.ts new file mode 100644 index 0000000..ca7c682 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/external/IPostDBLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPostDBLoadMod { + postDBLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/external/IPreAkiLoadMod.d.ts b/Live/CWX_WeatherPatcher/server/types/models/external/IPreAkiLoadMod.d.ts new file mode 100644 index 0000000..ae7579e --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/external/IPreAkiLoadMod.d.ts @@ -0,0 +1,4 @@ +import { DependencyContainer } from "./tsyringe"; +export interface IPreAkiLoadMod { + preAkiLoad(container: DependencyContainer): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/external/mod.d.ts b/Live/CWX_WeatherPatcher/server/types/models/external/mod.d.ts deleted file mode 100644 index ecef460..0000000 --- a/Live/CWX_WeatherPatcher/server/types/models/external/mod.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { DependencyContainer } from "./tsyringe"; -export interface IMod { - load: (container: DependencyContainer) => void; - delayedLoad: (container: DependencyContainer) => void; -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/bots/BotLootCache.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/bots/BotLootCache.d.ts new file mode 100644 index 0000000..e185315 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/bots/BotLootCache.d.ts @@ -0,0 +1,23 @@ +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class BotLootCache { + backpackLoot: ITemplateItem[]; + pocketLoot: ITemplateItem[]; + vestLoot: ITemplateItem[]; + combinedPoolLoot: ITemplateItem[]; + specialItems: ITemplateItem[]; + healingItems: ITemplateItem[]; + drugItems: ITemplateItem[]; + stimItems: ITemplateItem[]; + grenadeItems: ITemplateItem[]; +} +export declare enum LootCacheType { + Special = "Special", + Backpack = "Backpack", + Pocket = "Pocket", + Vest = "Vest", + Combined = "Combined", + HealingItems = "HealingItems", + DrugItems = "DrugItems", + StimItems = "StimItems", + GrenadeItems = "GrenadeItems" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/bots/GenerateWeaponResult.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/bots/GenerateWeaponResult.d.ts new file mode 100644 index 0000000..f099752 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/bots/GenerateWeaponResult.d.ts @@ -0,0 +1,9 @@ +import { Mods } from "../../eft/common/tables/IBotType"; +import { Item } from "../../eft/common/tables/IItem"; +import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; +export declare class GenerateWeaponResult { + weapon: Item[]; + chosenAmmo: string; + weaponMods: Mods; + weaponTemplate: ITemplateItem; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IBotConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IBotConfig.d.ts index f8ea940..e171087 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IBotConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IBotConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IBotConfig extends IBaseConfig { kind: "aki-bot"; @@ -5,9 +6,13 @@ export interface IBotConfig extends IBaseConfig { bosses: string[]; durability: Durability; lootNValue: LootNvalue; + revenge: Record; pmc: PmcConfig; + itemSpawnLimits: Record>; + equipment: Record; showTypeInNickname: boolean; maxBotCap: number; + secureContainerAmmoStackCount: number; } export interface PresetBatch { assault: number; @@ -17,6 +22,7 @@ export interface PresetBatch { bossKojaniy: number; bossSanitar: number; bossTagilla: number; + bossKnight: number; bossTest: number; cursedAssault: number; followerBully: number; @@ -27,6 +33,8 @@ export interface PresetBatch { followerKojaniy: number; followerSanitar: number; followerTagilla: number; + followerBirdEye: number; + followerBigPipe: number; followerTest: number; marksman: number; pmcBot: number; @@ -86,9 +94,10 @@ export interface LootNvalue { pmc: number; } export interface PmcConfig { - dynamicLoot: DynamicLoot; - cartridgeBlacklist: string[]; + dynamicLoot: PmcDynamicLoot; difficulty: string; + looseWeaponInBackpackChancePercent: number; + looseWeaponInBackpackLootMinMax: MinMax; isUsec: number; chanceSameSideIsHostilePercent: number; usecType: string; @@ -96,17 +105,20 @@ export interface PmcConfig { maxBackpackLootTotalRub: number; maxPocketLootTotalRub: number; maxVestLootTotalRub: number; - types: Types; + convertIntoPmcChance: Record; + enemyTypes: string[]; } -export interface DynamicLoot { +export interface PmcDynamicLoot { whitelist: string[]; blacklist: string[]; - spawnLimits: Record; moneyStackLimits: Record; } -export interface Types { - assault: number; - cursedAssault: number; - pmcBot: number; - exUsec: number; +export interface Equipment { + blacklist: EquipmentFilterDetails[]; + whitelist: EquipmentFilterDetails[]; +} +export interface EquipmentFilterDetails { + levelRange: MinMax; + equipment: Record; + cartridge: Record; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IHideoutConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IHideoutConfig.d.ts index 4658fa6..36d6246 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IHideoutConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IHideoutConfig.d.ts @@ -2,26 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IHideoutConfig extends IBaseConfig { kind: "aki-hideout"; runIntervalSeconds: number; - scavCase: ScavCase; fuelDrainRateMultipler: number; -} -export interface ScavCase { - rewardParentBlacklist: string[]; - rewardItemBlacklist: any[]; - ammoRewards: AmmoRewards; - moneyRewards: MoneyRewards; -} -export interface AmmoRewards { - giveMultipleOfTen: boolean; - minAmount: number; -} -export interface MoneyRewards { - enabled: boolean; - rub: MinMax; - usd: MinMax; - eur: MinMax; -} -export interface MinMax { - min: number; - max: number; + hoursForSkillCrafting: number; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInRaidConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInRaidConfig.d.ts index baaf083..3ae2972 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInRaidConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInRaidConfig.d.ts @@ -14,6 +14,7 @@ export interface RaidMenuSettings { bossEnabled: boolean; scavWars: boolean; taggedAndCursed: boolean; + enablePve: boolean; } export interface Save { loot: boolean; diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInsuranceConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInsuranceConfig.d.ts index 6e9c744..b27e753 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInsuranceConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IInsuranceConfig.d.ts @@ -3,5 +3,7 @@ export interface IInsuranceConfig extends IBaseConfig { kind: "aki-insurance"; insuranceMultiplier: Record; returnChancePercent: Record; + blacklistedEquipment: string[]; + slotIdsWithChanceOfNotReturning: string[]; runIntervalSeconds: number; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/ILocaleConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/ILocaleConfig.d.ts new file mode 100644 index 0000000..fe9abf7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/ILocaleConfig.d.ts @@ -0,0 +1,5 @@ +import { IBaseConfig } from "./IBaseConfig"; +export interface ILocaleConfig extends IBaseConfig { + kind: "aki-locale"; + desiredLocale: string; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IPlayerScavConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IPlayerScavConfig.d.ts new file mode 100644 index 0000000..5ac3966 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IPlayerScavConfig.d.ts @@ -0,0 +1,24 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IPlayerScavConfig extends IBaseConfig { + kind: "aki-playerscav"; + karmaLevel: Record; +} +export interface KarmaLevel { + botTypeForLoot: string; + modifiers: Modifiers; + itemLimits: ItemLimits; + equipmentBlacklist: Record; +} +export interface Modifiers { + equipment: Record; + mod: Record; +} +export interface ItemLimits { + healing: MinMax; + drugs: MinMax; + stims: MinMax; + looseLoot: MinMax; + magazines: MinMax; + grenades: MinMax; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRagfairConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRagfairConfig.d.ts index 2d151ca..c24e617 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRagfairConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRagfairConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IRagfairConfig extends IBaseConfig { kind: "aki-ragfair"; @@ -30,6 +31,7 @@ export interface Dynamic { expiredOfferThreshold: number; offerItemCount: MinMax; price: MinMax; + presetPrice: MinMax; endTimeSeconds: MinMax; condition: Condition; stackablePercent: MinMax; @@ -39,10 +41,6 @@ export interface Dynamic { showAsSingleStack: string[]; blacklist: Blacklist; } -export interface MinMax { - min: number; - max: number; -} export interface Condition { conditionChance: number; min: number; diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRepairConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRepairConfig.d.ts index 4966eb5..23e6838 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRepairConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IRepairConfig.d.ts @@ -2,4 +2,6 @@ import { IBaseConfig } from "./IBaseConfig"; export interface IRepairConfig extends IBaseConfig { kind: "aki-repair"; priceMultiplier: number; + applyRandomizeDurabilityLoss: boolean; + weaponSkillRepairGain: number; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IScavCaseConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IScavCaseConfig.d.ts new file mode 100644 index 0000000..df5dae0 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IScavCaseConfig.d.ts @@ -0,0 +1,27 @@ +import { MinMax } from "../../common/MinMax"; +import { IBaseConfig } from "./IBaseConfig"; +export interface IScavCaseConfig extends IBaseConfig { + kind: "aki-scavcase"; + rewardItemValueRangeRub: Record; + moneyRewards: MoneyRewards; + ammoRewards: AmmoRewards; + rewardItemParentBlacklist: string[]; + rewardItemBlacklist: string[]; +} +export interface MoneyRewards { + moneyRewardChancePercent: number; + rubCount: MoneyLevels; + usdCount: MoneyLevels; + eurCount: MoneyLevels; +} +export interface MoneyLevels { + common: MinMax; + rare: MinMax; + superrare: MinMax; +} +export interface AmmoRewards { + ammoRewardChancePercent: number; + ammoRewardBlacklist: Record; + ammoRewardValueRangeRub: Record; + minStackSize: number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/ITraderConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/ITraderConfig.d.ts index dab73e3..c8e8044 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/ITraderConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/ITraderConfig.d.ts @@ -3,13 +3,17 @@ export interface ITraderConfig extends IBaseConfig { kind: "aki-trader"; updateTime: UpdateTime[]; updateTimeDefault: number; - fenceAssortSize: number; - fenceMaxPresetsCount: number; - fencePresetPriceMult: number; + traderPriceMultipler: number; minDurabilityForSale: number; - fenceItemIgnoreList: string[]; + fence: FenceConfig; } export interface UpdateTime { traderId: string; seconds: number; } +export interface FenceConfig { + assortSize: number; + maxPresetsCount: number; + presetPriceMult: number; + blacklist: string[]; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IWeatherConfig.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IWeatherConfig.d.ts index c52cab3..bbdc43e 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/config/IWeatherConfig.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/config/IWeatherConfig.d.ts @@ -1,3 +1,4 @@ +import { MinMax } from "../../common/MinMax"; import { IBaseConfig } from "./IBaseConfig"; export interface IWeatherConfig extends IBaseConfig { kind: "aki-weather"; @@ -15,7 +16,3 @@ export interface Weather { temp: MinMax; pressure: MinMax; } -export interface MinMax { - min: number; - max: number; -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/generators/IBotGenerator.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/generators/IBotGenerator.d.ts index f3e8586..9043945 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/generators/IBotGenerator.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/generators/IBotGenerator.d.ts @@ -1,4 +1,4 @@ -import { Inventory as PmcInventory } from "../../eft/common/IPmcData"; +import { Inventory as PmcInventory } from "../../eft/common/tables/IBotBase"; import { Inventory, Chances, Generation } from "../../eft/common/tables/IBotType"; export interface IBotGenerator { generateInventory(templateInventory: Inventory, equipmentChances: Chances, generation: Generation, botRole: string, isPmc: boolean): PmcInventory; diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/helpers/Traders.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/helpers/Traders.d.ts deleted file mode 100644 index e935d29..0000000 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/helpers/Traders.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -export declare const enum Traders { - PRAPOR = "54cb50c76803fa8b248b4571", - THERAPIST = "54cb57776803fa99248b456e", - FENCE = "579dc571d53a0658a154fbec", - SKIER = "58330581ace78e27b8b10cee", - PEACEKEEPER = "5935c25fb3acc3127c3d8cd9", - MECHANIC = "5a7c2eca46aef81a7ca2145d", - RAGMAN = "5ac3b934156ae10c4430e83c", - JAEGER = "5c0647fdd443bc2504c2d371" -} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts new file mode 100644 index 0000000..1b5af39 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/hideout/ScavCaseRewardCountsAndPrices.d.ts @@ -0,0 +1,11 @@ +export interface ScavCaseRewardCountsAndPrices { + common: RewardCountAndPriceDetails; + rare: RewardCountAndPriceDetails; + superrare: RewardCountAndPriceDetails; +} +export interface RewardCountAndPriceDetails { + minCount: number; + maxCount: number; + minPriceRub: number; + maxPriceRub: number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogBackgroundColor.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogBackgroundColor.d.ts new file mode 100644 index 0000000..87e08a9 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogBackgroundColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogBackgroundColor { + default = "", + black = "blackBG", + red = "redBG", + green = "greenBG", + yellow = "yellowBG", + blue = "blueBG", + magenta = "magentaBG", + cyan = "cyanBG", + white = "whiteBG" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogTextColor.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogTextColor.d.ts new file mode 100644 index 0000000..7147ae3 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/logging/LogTextColor.d.ts @@ -0,0 +1,11 @@ +export declare enum LogTextColor { + black = "black", + red = "red", + green = "green", + yellow = "yellow", + blue = "blue", + magenta = "magenta", + cyan = "cyan", + white = "white", + gray = "" +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/logging/SptLogger.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/logging/SptLogger.d.ts new file mode 100644 index 0000000..ea1b3d8 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/logging/SptLogger.d.ts @@ -0,0 +1,7 @@ +export interface SptLogger { + error: (msg: string | Record) => void; + warn: (msg: string | Record) => void; + succ?: (msg: string | Record) => void; + info: (msg: string | Record) => void; + debug: (msg: string | Record) => void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IModLoader.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IModLoader.d.ts index 5398c9b..40a5e19 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IModLoader.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IModLoader.d.ts @@ -3,6 +3,5 @@ export interface IModLoader { load(container: DependencyContainer): void; getBundles(local: boolean): string; getBundle(key: string, local: boolean): void; - getImportedModsNames(): string[]; getModPath(mod: string): string; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IPackageJsonData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IPackageJsonData.d.ts index 09472cd..99e4ef9 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IPackageJsonData.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/mod/IPackageJsonData.d.ts @@ -1,6 +1,7 @@ export interface IPackageJsonData { incompatibilities?: string[]; dependencies?: string[]; + modDependencies?: Record; name: string; author: string; version: string; diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/mod/NewItemDetails.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/mod/NewItemDetails.d.ts new file mode 100644 index 0000000..fc69a06 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/mod/NewItemDetails.d.ts @@ -0,0 +1,39 @@ +import { ITemplateItem, Props } from "../../eft/common/tables/ITemplateItem"; +export declare abstract class NewItemDetailsBase { + /** Price of the item on flea market */ + fleaPriceRoubles: number; + /** Price of the item in the handbook */ + handbookPriceRoubles: number; + /** + * A dictionary for locale settings, key = langauge (e.g. en,cn,es-mx,jp,fr) + * If a language is not included, the first item in the array will be used in its place + */ + locales: Record; +} +export declare class NewItemFromCloneDetails extends NewItemDetailsBase { + /** Id of the item to copy and use as a base */ + itemTplToClone: string; + /** Item properties that should be applied over the top of the cloned base */ + overrideProperties: Props; + /** ParentId for the new item (item type) */ + parentId: string; + /** + * the id the new item should have, leave blank to have one generated for you + * This is often known as the TplId, or TemplateId + */ + newId: string; +} +export declare class NewItemDetails extends NewItemDetailsBase { + newItem: ITemplateItem; +} +export declare class LocaleDetails { + name: string; + shortName: string; + description: string; +} +export declare class CreateItemResult { + constructor(); + success: boolean; + itemId: string; + errors: string[]; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/server/IDatabaseTables.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/server/IDatabaseTables.d.ts index dbb71be..9978459 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/server/IDatabaseTables.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/server/IDatabaseTables.d.ts @@ -5,6 +5,8 @@ import { IBotType } from "../../eft/common/tables/IBotType"; import { ICustomizationItem } from "../../eft/common/tables/ICustomizationItem"; import { IHandbookBase } from "../../eft/common/tables/IHandbookBase"; import { ILootBase } from "../../eft/common/tables/ILootBase"; +import { IMatch } from "../../eft/common/tables/IMatch"; +import { IProfileTemplates } from "../../eft/common/tables/IProfileTemplate"; import { IQuest } from "../../eft/common/tables/IQuest"; import { IRepeatableQuestDatabase } from "../../eft/common/tables/IRepeatableQuests"; import { ITemplateItem } from "../../eft/common/tables/ITemplateItem"; @@ -18,34 +20,37 @@ import { ILocations } from "./ILocations"; import { IServerBase } from "./IServerBase"; import { ISettingsBase } from "./ISettingsBase"; export interface IDatabaseTables { - bots: { + bots?: { types: Record; base: IBotBase; core: IBotCore; }; - hideout: { + hideout?: { areas: IHideoutArea[]; production: IHideoutProduction[]; scavcase: IHideoutScavCase[]; settings: IHideoutSettingsBase; }; - locales: ILocaleBase; - locations: ILocations; - loot: ILootBase; - match: any; - templates: { + locales?: ILocaleBase; + locations?: ILocations; + loot?: ILootBase; + match?: IMatch; + templates?: { character: string[]; items: Record; quests: IQuest[]; repeatableQuests: IRepeatableQuestDatabase; + /** DEPRECATED - Items file found in the client, massivly out of date compared to templates.items, try not to use this, remove ASAP*/ clientItems: Record; handbook: IHandbookBase; customization: Record; - profiles: any; + /** The profile templates listed in the launcher on profile creation, split by account type (e.g. Standard) then side (e.g. bear/usec) */ + profiles: IProfileTemplates; + /** Flea prices of items - gathered from online flea market dump */ prices: Record; }; - traders: Record; - globals: IGlobals; - server: IServerBase; - settings: ISettingsBase; + traders?: Record; + globals?: IGlobals; + server?: IServerBase; + settings?: ISettingsBase; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/server/IHttpServer.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/server/IHttpServer.d.ts index 50e5c91..c828399 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/server/IHttpServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/server/IHttpServer.d.ts @@ -1,4 +1,5 @@ /// +/// import http, { ServerResponse } from "http"; import { INotification } from "../../eft/notifier/INotifier"; export interface IHttpServer { diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/server/ILocaleBase.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/server/ILocaleBase.d.ts index a20084d..8887c06 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/server/ILocaleBase.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/server/ILocaleBase.d.ts @@ -1,5 +1,5 @@ export interface ILocaleBase { - global: ILocaleGlobalBase; + global: Record; menu: Record; languages: ILanguageBase[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomPreset.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomPreset.d.ts new file mode 100644 index 0000000..f07382e --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomPreset.d.ts @@ -0,0 +1,5 @@ +import { Preset } from "../../eft/common/IGlobals"; +export interface CustomPreset { + key: string; + preset: Preset; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomTraderAssortData.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomTraderAssortData.d.ts new file mode 100644 index 0000000..265a26a --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/services/CustomTraderAssortData.d.ts @@ -0,0 +1,6 @@ +import { ITraderAssort } from "../../eft/common/tables/ITrader"; +import { Traders } from "../../enums/Traders"; +export interface CustomTraderAssortData { + traderId: Traders; + assorts: ITraderAssort; +} diff --git a/Live/CWX_WeatherPatcher/server/types/models/spt/utils/ILogger.d.ts b/Live/CWX_WeatherPatcher/server/types/models/spt/utils/ILogger.d.ts index c983701..2af3fac 100644 --- a/Live/CWX_WeatherPatcher/server/types/models/spt/utils/ILogger.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/models/spt/utils/ILogger.d.ts @@ -1,7 +1,10 @@ import { Daum } from "../../eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../logging/LogBackgroundColor"; +import { LogTextColor } from "../logging/LogTextColor"; export interface ILogger { writeToLogFile(data: string | Daum): void; - log(data: string | Record | Error, color: string): void; + log(data: string | Record | Error, color: string, backgroundColor?: string): void; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): void; error(data: string): void; warning(data: string): void; success(data: string): void; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/HttpRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/HttpRouter.d.ts index 44edc0b..f75a47d 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/HttpRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/HttpRouter.d.ts @@ -1,11 +1,16 @@ /// import { IncomingMessage } from "http"; -import { DynamicRouter, StaticRouter } from "../di/Router"; +import { DynamicRouter, Router, StaticRouter } from "../di/Router"; export declare class HttpRouter { - private staticRouters; - private dynamicRoutes; + protected staticRouters: StaticRouter[]; + protected dynamicRoutes: DynamicRouter[]; constructor(staticRouters: StaticRouter[], dynamicRoutes: DynamicRouter[]); - private groupBy; + protected groupBy(list: T[], keyGetter: (t: T) => string): Map; getResponse(req: IncomingMessage, info: any, sessionID: string): string; - private handleRoute; + protected handleRoute(url: string, info: any, sessionID: string, wrapper: ResponseWrapper, routers: Router[], dynamic: boolean): boolean; } +declare class ResponseWrapper { + output: string; + constructor(output: string); +} +export {}; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/ImageRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/ImageRouter.d.ts index 97e580d..ab03977 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/ImageRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/ImageRouter.d.ts @@ -4,8 +4,8 @@ import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ImageRouteService } from "../services/mod/image/ImageRouteService"; import { VFS } from "../utils/VFS"; export declare class ImageRouter { - private vfs; - private imageRouteService; + protected vfs: VFS; + protected imageRouteService: ImageRouteService; constructor(vfs: VFS, imageRouteService: ImageRouteService); addRoute(key: string, valueToAdd: string): void; sendImage(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any, httpServer: IHttpServer): void; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/ItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/ItemEventRouter.d.ts index bb20152..b1ac5d9 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/ItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/ItemEventRouter.d.ts @@ -5,13 +5,13 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { ItemEventRouterDefinition } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class ItemEventRouter { - private logger; - private jsonUtil; - private profileHelper; - private itemEventRouters; + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected profileHelper: ProfileHelper; + protected itemEventRouters: ItemEventRouterDefinition[]; constructor(logger: ILogger, jsonUtil: JsonUtil, profileHelper: ProfileHelper, itemEventRouters: ItemEventRouterDefinition[]); - private output; + protected output: IItemEventRouterResponse; handleEvents(info: IItemEventRouterRequest, sessionID: string): IItemEventRouterResponse; getOutput(sessionID: string): IItemEventRouterResponse; - private resetOutput; + protected resetOutput(sessionID: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BotDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BotDynamicRouter.d.ts index dd2f68a..6d0ab4b 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BotDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BotDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BotDynamicRouter extends DynamicRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BundleDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BundleDynamicRouter.d.ts index be27008..a765410 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BundleDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/BundleDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class BundleDynamicRouter extends DynamicRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts index 03a5967..2db7cc5 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/CustomizationDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class CustomizationDynamicRouter extends DynamicRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/DataDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/DataDynamicRouter.d.ts index c30501a..836ed8d 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/DataDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/DataDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class DataDynamicRouter extends DynamicRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/HttpDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/HttpDynamicRouter.d.ts index b2933e9..a152b4d 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/HttpDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/HttpDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { DynamicRouter } from "../../di/Router"; import { ImageRouter } from "../ImageRouter"; export declare class HttpDynamicRouter extends DynamicRouter { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/InraidDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/InraidDynamicRouter.d.ts index ea4a9ae..7c0561f 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/InraidDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/InraidDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class InraidDynamicRouter extends DynamicRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/LocationDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/LocationDynamicRouter.d.ts index 30741db..b8e5cdf 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/LocationDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/LocationDynamicRouter.d.ts @@ -1,7 +1,7 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class LocationDynamicRouter extends DynamicRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); getTopLevelRoute(): string; } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/NotifierDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/NotifierDynamicRouter.d.ts index 4786817..83c60c5 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/NotifierDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/NotifierDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class NotifierDynamicRouter extends DynamicRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/TraderDynamicRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/TraderDynamicRouter.d.ts index a100b4c..5b7cc1b 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/dynamic/TraderDynamicRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/dynamic/TraderDynamicRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { DynamicRouter } from "../../di/Router"; export declare class TraderDynamicRouter extends DynamicRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/CustomizationItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/CustomizationItemEventRouter.d.ts index 3025e2c..e78445e 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/CustomizationItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/CustomizationItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/HealthItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/HealthItemEventRouter.d.ts index bad9af2..99847c6 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/HealthItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/HealthItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HealthItemEventRouter extends ItemEventRouterDefinition { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/HideoutItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/HideoutItemEventRouter.d.ts index 2cec18b..e1e98af 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/HideoutItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/HideoutItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { HideoutCallbacks } from "../../callbacks/HideoutCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class HideoutItemEventRouter extends ItemEventRouterDefinition { - private hideoutCallbacks; + protected hideoutCallbacks: HideoutCallbacks; constructor(hideoutCallbacks: HideoutCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/InsuranceItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/InsuranceItemEventRouter.d.ts index 8efc2c2..a922cc0 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/InsuranceItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/InsuranceItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/InventoryItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/InventoryItemEventRouter.d.ts index 1d93e7b..2619bb9 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/InventoryItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/InventoryItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { InventoryCallbacks } from "../../callbacks/InventoryCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class InventoryItemEventRouter extends ItemEventRouterDefinition { - private inventoryCallbacks; + protected inventoryCallbacks: InventoryCallbacks; constructor(inventoryCallbacks: InventoryCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/NoteItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/NoteItemEventRouter.d.ts index 12af594..59bf598 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/NoteItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/NoteItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { NoteCallbacks } from "../../callbacks/NoteCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class NoteItemEventRouter extends ItemEventRouterDefinition { - private noteCallbacks; + protected noteCallbacks: NoteCallbacks; constructor(noteCallbacks: NoteCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts index 7298c52..277db44 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/PresetBuildItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class PresetBuildItemEventRouter extends ItemEventRouterDefinition { - private presetBuildCallbacks; + protected presetBuildCallbacks: PresetBuildCallbacks; constructor(presetBuildCallbacks: PresetBuildCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/QuestItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/QuestItemEventRouter.d.ts index 9944ae9..a092aa6 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/QuestItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/QuestItemEventRouter.d.ts @@ -1,10 +1,12 @@ -import { IPmcData } from "../../models/eft/common/IPmcData"; -import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; +import { IPmcData } from "../../models/eft/common/IPmcData"; +import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventRouterResponse"; +import { ILogger } from "../../models/spt/utils/ILogger"; export declare class QuestItemEventRouter extends ItemEventRouterDefinition { - private questCallbacks; - constructor(questCallbacks: QuestCallbacks); + protected logger: ILogger; + protected questCallbacks: QuestCallbacks; + constructor(logger: ILogger, questCallbacks: QuestCallbacks); getHandledRoutes(): HandledRoute[]; - handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; + handleItemEvent(eventAction: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/RagfairItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/RagfairItemEventRouter.d.ts index 88e52ba..9216cc5 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/RagfairItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/RagfairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RagfairItemEventRouter extends ItemEventRouterDefinition { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/RepairItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/RepairItemEventRouter.d.ts index b292ded..5196ba9 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/RepairItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/RepairItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { RepairCallbacks } from "../../callbacks/RepairCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class RepairItemEventRouter extends ItemEventRouterDefinition { - private repairCallbacks; + protected repairCallbacks: RepairCallbacks; constructor(repairCallbacks: RepairCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/TradeItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/TradeItemEventRouter.d.ts index 1bca2b8..a43bb0a 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/TradeItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/TradeItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { TradeCallbacks } from "../../callbacks/TradeCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class TradeItemEventRouter extends ItemEventRouterDefinition { - private tradeCallbacks; + protected tradeCallbacks: TradeCallbacks; constructor(tradeCallbacks: TradeCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/item_events/WishlistItemEventRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/item_events/WishlistItemEventRouter.d.ts index 38831f6..38497fb 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/item_events/WishlistItemEventRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/item_events/WishlistItemEventRouter.d.ts @@ -3,7 +3,7 @@ import { IItemEventRouterResponse } from "../../models/eft/itemEvent/IItemEventR import { WishlistCallbacks } from "../../callbacks/WishlistCallbacks"; import { HandledRoute, ItemEventRouterDefinition } from "../../di/Router"; export declare class WishlistItemEventRouter extends ItemEventRouterDefinition { - private wishlistCallbacks; + protected wishlistCallbacks: WishlistCallbacks; constructor(wishlistCallbacks: WishlistCallbacks); getHandledRoutes(): HandledRoute[]; handleItemEvent(url: string, pmcData: IPmcData, body: any, sessionID: string): IItemEventRouterResponse; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/serializers/BundleSerializer.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/serializers/BundleSerializer.d.ts index 7952e9c..912db83 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/serializers/BundleSerializer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/serializers/BundleSerializer.d.ts @@ -3,8 +3,8 @@ import { BundleLoader } from "../../loaders/BundleLoader"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { ILogger } from "../../models/spt/utils/ILogger"; export declare class BundleSerializer extends Serializer { - private logger; - private bundleLoader; + protected logger: ILogger; + protected bundleLoader: BundleLoader; constructor(logger: ILogger, bundleLoader: BundleLoader); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/serializers/ImageSerializer.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/serializers/ImageSerializer.d.ts index 29340d0..0e040d4 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/serializers/ImageSerializer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/serializers/ImageSerializer.d.ts @@ -2,7 +2,7 @@ import { IHttpServer } from "../../models/spt/server/IHttpServer"; import { Serializer } from "../../di/Serializer"; import { ImageRouter } from "../ImageRouter"; export declare class ImageSerializer extends Serializer { - private imageRouter; + protected imageRouter: ImageRouter; constructor(imageRouter: ImageRouter); serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/types/routers/serializers/NotifySerializer.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/serializers/NotifySerializer.d.ts index 8be8ac2..1779ac9 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/serializers/NotifySerializer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/serializers/NotifySerializer.d.ts @@ -3,9 +3,9 @@ import { Serializer } from "../../di/Serializer"; import { HttpServerHelper } from "../../helpers/HttpServerHelper"; import { IHttpServer } from "../../models/spt/server/IHttpServer"; export declare class NotifySerializer extends Serializer { - private notifierController; - private httpServerHelper; + protected notifierController: NotifierController; + protected httpServerHelper: HttpServerHelper; constructor(notifierController: NotifierController, httpServerHelper: HttpServerHelper); - serialize(sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; + serialize(_sessionID: string, req: any, resp: any, body: any, httpServer: IHttpServer): void; canHandle(route: string): boolean; } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/BotStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/BotStaticRouter.d.ts index d8b0bf4..aeea220 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/BotStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/BotStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BotCallbacks } from "../../callbacks/BotCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BotStaticRouter extends StaticRouter { - private botCallbacks; + protected botCallbacks: BotCallbacks; constructor(botCallbacks: BotCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/BundleStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/BundleStaticRouter.d.ts index 3905b82..fb682fc 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/BundleStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/BundleStaticRouter.d.ts @@ -1,6 +1,6 @@ import { BundleCallbacks } from "../../callbacks/BundleCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class BundleStaticRouter extends StaticRouter { - private bundleCallbacks; + protected bundleCallbacks: BundleCallbacks; constructor(bundleCallbacks: BundleCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/CustomizationStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/CustomizationStaticRouter.d.ts index 46c71b8..21bc4bb 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/CustomizationStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/CustomizationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { CustomizationCallbacks } from "../../callbacks/CustomizationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class CustomizationStaticRouter extends StaticRouter { - private customizationCallbacks; + protected customizationCallbacks: CustomizationCallbacks; constructor(customizationCallbacks: CustomizationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/DataStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/DataStaticRouter.d.ts index a493d3a..84ba7fd 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/DataStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/DataStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DataCallbacks } from "../../callbacks/DataCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DataStaticRouter extends StaticRouter { - private dataCallbacks; + protected dataCallbacks: DataCallbacks; constructor(dataCallbacks: DataCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/DialogStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/DialogStaticRouter.d.ts index a59fb14..546cdf1 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/DialogStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/DialogStaticRouter.d.ts @@ -1,6 +1,6 @@ import { DialogueCallbacks } from "../../callbacks/DialogueCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class DialogStaticRouter extends StaticRouter { - private dialogueCallbacks; + protected dialogueCallbacks: DialogueCallbacks; constructor(dialogueCallbacks: DialogueCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/GameStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/GameStaticRouter.d.ts index 988b673..a9a7496 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/GameStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/GameStaticRouter.d.ts @@ -1,6 +1,6 @@ import { GameCallbacks } from "../../callbacks/GameCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class GameStaticRouter extends StaticRouter { - private gameCallbacks; + protected gameCallbacks: GameCallbacks; constructor(gameCallbacks: GameCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/HealthStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/HealthStaticRouter.d.ts index e644861..863fd5e 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/HealthStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/HealthStaticRouter.d.ts @@ -1,6 +1,6 @@ import { HealthCallbacks } from "../../callbacks/HealthCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class HealthStaticRouter extends StaticRouter { - private healthCallbacks; + protected healthCallbacks: HealthCallbacks; constructor(healthCallbacks: HealthCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/InraidStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/InraidStaticRouter.d.ts index 66ed860..b29ad23 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/InraidStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/InraidStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InraidCallbacks } from "../../callbacks/InraidCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InraidStaticRouter extends StaticRouter { - private inraidCallbacks; + protected inraidCallbacks: InraidCallbacks; constructor(inraidCallbacks: InraidCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/InsuranceStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/InsuranceStaticRouter.d.ts index 8da26b3..5676499 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/InsuranceStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/InsuranceStaticRouter.d.ts @@ -1,6 +1,6 @@ import { InsuranceCallbacks } from "../../callbacks/InsuranceCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class InsuranceStaticRouter extends StaticRouter { - private insuranceCallbacks; + protected insuranceCallbacks: InsuranceCallbacks; constructor(insuranceCallbacks: InsuranceCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/ItemEventStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/ItemEventStaticRouter.d.ts index 08ba6bb..c30a7fc 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/ItemEventStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/ItemEventStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ItemEventCallbacks } from "../../callbacks/ItemEventCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ItemEventStaticRouter extends StaticRouter { - private itemEventCallbacks; + protected itemEventCallbacks: ItemEventCallbacks; constructor(itemEventCallbacks: ItemEventCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/LauncherStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/LauncherStaticRouter.d.ts index 9d07f78..0040cbd 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/LauncherStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/LauncherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LauncherCallbacks } from "../../callbacks/LauncherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LauncherStaticRouter extends StaticRouter { - private launcherCallbacks; + protected launcherCallbacks: LauncherCallbacks; constructor(launcherCallbacks: LauncherCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/LocationStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/LocationStaticRouter.d.ts index 9c5c52e..b6de956 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/LocationStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/LocationStaticRouter.d.ts @@ -1,6 +1,6 @@ import { LocationCallbacks } from "../../callbacks/LocationCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class LocationStaticRouter extends StaticRouter { - private locationCallbacks; + protected locationCallbacks: LocationCallbacks; constructor(locationCallbacks: LocationCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/MatchStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/MatchStaticRouter.d.ts index d746381..9920a92 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/MatchStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/MatchStaticRouter.d.ts @@ -1,6 +1,6 @@ import { MatchCallbacks } from "../../callbacks/MatchCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class MatchStaticRouter extends StaticRouter { - private matchCallbacks; + protected matchCallbacks: MatchCallbacks; constructor(matchCallbacks: MatchCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/NotifierStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/NotifierStaticRouter.d.ts index 1c8566d..8f1f5cc 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/NotifierStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/NotifierStaticRouter.d.ts @@ -1,6 +1,6 @@ import { NotifierCallbacks } from "../../callbacks/NotifierCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class NotifierStaticRouter extends StaticRouter { - private notifierCallbacks; + protected notifierCallbacks: NotifierCallbacks; constructor(notifierCallbacks: NotifierCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/PresetStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/PresetStaticRouter.d.ts index 2272f82..a9e7458 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/PresetStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/PresetStaticRouter.d.ts @@ -1,6 +1,6 @@ import { PresetBuildCallbacks } from "../../callbacks/PresetBuildCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class PresetStaticRouter extends StaticRouter { - private presetCallbacks; + protected presetCallbacks: PresetBuildCallbacks; constructor(presetCallbacks: PresetBuildCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/ProfileStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/ProfileStaticRouter.d.ts index fd787f1..83403f2 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/ProfileStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/ProfileStaticRouter.d.ts @@ -1,6 +1,6 @@ import { ProfileCallbacks } from "../../callbacks/ProfileCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class ProfileStaticRouter extends StaticRouter { - private profileCallbacks; + protected profileCallbacks: ProfileCallbacks; constructor(profileCallbacks: ProfileCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/QuestStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/QuestStaticRouter.d.ts index fda3c23..8f7ca0a 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/QuestStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/QuestStaticRouter.d.ts @@ -1,6 +1,6 @@ import { QuestCallbacks } from "../../callbacks/QuestCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class QuestStaticRouter extends StaticRouter { - private questCallbacks; + protected questCallbacks: QuestCallbacks; constructor(questCallbacks: QuestCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/RagfairStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/RagfairStaticRouter.d.ts index 618374f..6c41467 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/RagfairStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/RagfairStaticRouter.d.ts @@ -1,6 +1,6 @@ import { RagfairCallbacks } from "../../callbacks/RagfairCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class RagfairStaticRouter extends StaticRouter { - private ragfairCallbacks; + protected ragfairCallbacks: RagfairCallbacks; constructor(ragfairCallbacks: RagfairCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/TraderStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/TraderStaticRouter.d.ts index 18f0629..41728a1 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/TraderStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/TraderStaticRouter.d.ts @@ -1,6 +1,6 @@ import { TraderCallbacks } from "../../callbacks/TraderCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class TraderStaticRouter extends StaticRouter { - private traderCallbacks; + protected traderCallbacks: TraderCallbacks; constructor(traderCallbacks: TraderCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/routers/static/WeatherStaticRouter.d.ts b/Live/CWX_WeatherPatcher/server/types/routers/static/WeatherStaticRouter.d.ts index 61b904d..72ed851 100644 --- a/Live/CWX_WeatherPatcher/server/types/routers/static/WeatherStaticRouter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/routers/static/WeatherStaticRouter.d.ts @@ -1,6 +1,6 @@ import { WeatherCallbacks } from "../../callbacks/WeatherCallbacks"; import { StaticRouter } from "../../di/Router"; export declare class WeatherStaticRouter extends StaticRouter { - private weatherCallbacks; + protected weatherCallbacks: WeatherCallbacks; constructor(weatherCallbacks: WeatherCallbacks); } diff --git a/Live/CWX_WeatherPatcher/server/types/servers/ConfigServer.d.ts b/Live/CWX_WeatherPatcher/server/types/servers/ConfigServer.d.ts index 83af38d..a079be8 100644 --- a/Live/CWX_WeatherPatcher/server/types/servers/ConfigServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/servers/ConfigServer.d.ts @@ -3,10 +3,10 @@ import { VFS } from "../utils/VFS"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigTypes } from "../models/enums/ConfigTypes"; export declare class ConfigServer { - private logger; - private vfs; - private jsonUtil; - private configs; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected configs: Record; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil); getConfig(configType: ConfigTypes): T; getConfigByString(configType: string): T; diff --git a/Live/CWX_WeatherPatcher/server/types/servers/DatabaseServer.d.ts b/Live/CWX_WeatherPatcher/server/types/servers/DatabaseServer.d.ts index 521bcf9..aa152d0 100644 --- a/Live/CWX_WeatherPatcher/server/types/servers/DatabaseServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/servers/DatabaseServer.d.ts @@ -1,6 +1,6 @@ import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; export declare class DatabaseServer { - private tableData; + protected tableData: IDatabaseTables; getTables(): IDatabaseTables; setTables(any: any): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/servers/HttpServer.d.ts b/Live/CWX_WeatherPatcher/server/types/servers/HttpServer.d.ts index d0db7e4..44d802b 100644 --- a/Live/CWX_WeatherPatcher/server/types/servers/HttpServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/servers/HttpServer.d.ts @@ -1,9 +1,12 @@ /// +/// import http, { ServerResponse } from "http"; +import { ApplicationContext } from "../context/ApplicationContext"; import { Serializer } from "../di/Serializer"; import { HttpServerHelper } from "../helpers/HttpServerHelper"; import { NotifierHelper } from "../helpers/NotifierHelper"; import { INotification } from "../models/eft/notifier/INotifier"; +import { IHttpConfig } from "../models/spt/config/IHttpConfig"; import { IHttpServer } from "../models/spt/server/IHttpServer"; import { ILogger } from "../models/spt/utils/ILogger"; import { HttpRouter } from "../routers/HttpRouter"; @@ -13,24 +16,25 @@ import { RandomUtil } from "../utils/RandomUtil"; import { ConfigServer } from "./ConfigServer"; import { DatabaseServer } from "./DatabaseServer"; export declare class HttpServer implements IHttpServer { - private httpRouter; - private logger; - private randomUtil; - private jsonUtil; - private httpResponse; - private databaseServer; - private notifierHelper; - private httpServerHelper; - private serializers; - private configServer; + protected httpRouter: HttpRouter; + protected logger: ILogger; + protected randomUtil: RandomUtil; + protected jsonUtil: JsonUtil; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected notifierHelper: NotifierHelper; + protected httpServerHelper: HttpServerHelper; + protected serializers: Serializer[]; + protected configServer: ConfigServer; + protected applicationContext: ApplicationContext; constructor(httpRouter: HttpRouter, // TODO: delay required - logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer); - private buffers; - private onReceive; - private onRespond; - private httpConfig; - private webSockets; - private websocketPingHandler; + logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, notifierHelper: NotifierHelper, httpServerHelper: HttpServerHelper, serializers: Serializer[], configServer: ConfigServer, applicationContext: ApplicationContext); + protected buffers: {}; + protected onReceive: {}; + protected onRespond: {}; + protected httpConfig: IHttpConfig; + protected webSockets: {}; + protected websocketPingHandler: any; getCookies(req: http.IncomingMessage): any; resetBuffer(sessionID: string): void; putInBuffer(sessionID: any, data: any, bufLength: number): boolean; @@ -42,6 +46,6 @@ export declare class HttpServer implements IHttpServer { sendResponse(sessionID: string, req: any, resp: any, body: Buffer): void; handleRequest(req: http.IncomingMessage, resp: http.ServerResponse): void; load(): void; - private getRandomisedMessage; + protected getRandomisedMessage(): string; wsOnConnection(ws: any, req: any): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/servers/RagfairServer.d.ts b/Live/CWX_WeatherPatcher/server/types/servers/RagfairServer.d.ts index cf56d64..bc86cdb 100644 --- a/Live/CWX_WeatherPatcher/server/types/servers/RagfairServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/servers/RagfairServer.d.ts @@ -1,22 +1,24 @@ import { RagfairOfferGenerator } from "../generators/RagfairOfferGenerator"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { RagfairCategoriesService } from "../services/RagfairCategoriesService"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { RagfairRequiredItemsService } from "../services/RagfairRequiredItemsService"; import { ConfigServer } from "./ConfigServer"; export declare class RagfairServer { - private logger; - private ragfairOfferGenerator; - private ragfairOfferService; - private ragfairCategoriesService; - private ragfairRequiredItemsService; - private configServer; - private ragfairConfig; + protected logger: ILogger; + protected ragfairOfferGenerator: RagfairOfferGenerator; + protected ragfairOfferService: RagfairOfferService; + protected ragfairCategoriesService: RagfairCategoriesService; + protected ragfairRequiredItemsService: RagfairRequiredItemsService; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; constructor(logger: ILogger, ragfairOfferGenerator: RagfairOfferGenerator, ragfairOfferService: RagfairOfferService, ragfairCategoriesService: RagfairCategoriesService, ragfairRequiredItemsService: RagfairRequiredItemsService, configServer: ConfigServer); load(): void; update(): void; - getCategories(): Record; + getAllCategories(): Record; + getBespokeCategories(offers: IRagfairOffer[]): Record; /** * Disable/Hide an offer from flea * @param offerId diff --git a/Live/CWX_WeatherPatcher/server/types/servers/SaveServer.d.ts b/Live/CWX_WeatherPatcher/server/types/servers/SaveServer.d.ts index fdf92e4..cb28f49 100644 --- a/Live/CWX_WeatherPatcher/server/types/servers/SaveServer.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/servers/SaveServer.d.ts @@ -5,15 +5,15 @@ import { VFS } from "../utils/VFS"; import { SaveLoadRouter } from "../di/Router"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class SaveServer { - private vfs; - private saveLoadRouters; - private jsonUtil; - private hashUtil; - private logger; - private profileFilepath; - private profiles; - private onSave; - private saveMd5; + protected vfs: VFS; + protected saveLoadRouters: SaveLoadRouter[]; + protected jsonUtil: JsonUtil; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected profileFilepath: string; + protected profiles: {}; + protected onSave: {}; + protected saveMd5: {}; constructor(vfs: VFS, saveLoadRouters: SaveLoadRouter[], jsonUtil: JsonUtil, hashUtil: HashUtil, logger: ILogger); load(): void; save(): void; diff --git a/Live/CWX_WeatherPatcher/server/types/services/BotEquipmentFilterService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/BotEquipmentFilterService.d.ts new file mode 100644 index 0000000..e49645b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/services/BotEquipmentFilterService.d.ts @@ -0,0 +1,50 @@ +import { IBotType } from "../models/eft/common/tables/IBotType"; +import { Equipment, EquipmentFilterDetails, IBotConfig } from "../models/spt/config/IBotConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class BotEquipmentFilterService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected botConfig: IBotConfig; + protected botEquipmentFilterlists: Record; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Filter a bots data to exclude equipment and cartridges defines in the botConfig + * @param baseBotNode bots json data to filter + * @param playerLevel Level of the currently playing player + * @param isPmc Is the bot we're filtering a PMC + * @param role Role of the bot we're filtering + */ + filterBotEquipment(baseBotNode: IBotType, playerLevel: number, isPmc: boolean, role: string): void; + /** + * Get an object that contains equipment and cartridge blacklists for a specified bot type + * @param botRole Role of the bot we want the blacklist for + * @param playerLevel Level of the player + * @returns EquipmentBlacklistDetails object + */ + protected getBotEquipmentBlacklist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Get the whitelist for a specific bot type that's within the players level + * @param botRole Bot type + * @param playerLevel Players level + * @returns EquipmentFilterDetails object + */ + protected getBotEquipmentWhitelist(botRole: string, playerLevel: number): EquipmentFilterDetails; + /** + * Filter bot equipment based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment blacklist + * @returns Filtered bot file + */ + protected filterEquipment(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; + /** + * Filter bot cartridges based on blacklist and whitelist from config/bot.json + * Prioritises whitelist first, if one is found blacklist is ignored + * @param baseBotNode bot .json file to update + * @param blacklist equipment on this list should be excluded from the bot + * @param whitelist equipment on this list should be used exclusivly + * @returns Filtered bot file + */ + protected filterCartridges(baseBotNode: IBotType, blacklist: EquipmentFilterDetails, whitelist: EquipmentFilterDetails): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/services/BotLootCacheService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/BotLootCacheService.d.ts new file mode 100644 index 0000000..cc71eee --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/services/BotLootCacheService.d.ts @@ -0,0 +1,82 @@ +import { PMCLootGenerator } from "../generators/PMCLootGenerator"; +import { Items } from "../models/eft/common/tables/IBotType"; +import { ITemplateItem, Props } from "../models/eft/common/tables/ITemplateItem"; +import { BotLootCache, LootCacheType } from "../models/spt/bots/BotLootCache"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "../utils/JsonUtil"; +import { RagfairPriceService } from "./RagfairPriceService"; +export declare class BotLootCacheService { + protected logger: ILogger; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected pmcLootGenerator: PMCLootGenerator; + protected ragfairPriceService: RagfairPriceService; + protected lootCache: Record; + constructor(logger: ILogger, jsonUtil: JsonUtil, databaseServer: DatabaseServer, pmcLootGenerator: PMCLootGenerator, ragfairPriceService: RagfairPriceService); + /** + * Remove all cached bot loot data + */ + clearCache(): void; + /** + * Get the fully created loot array, ordered by price low to high + * @param botRole bot to get loot for + * @param isPmc is the bot a pmc + * @param lootType what type of loot is needed (backpack/pocket/stim/vest etc) + * @param lootPool the full pool of loot (needed when cache is empty) + * @returns ITemplateItem array + */ + getLootFromCache(botRole: string, isPmc: boolean, lootType: LootCacheType, lootPool: Items): ITemplateItem[]; + /** + * Generate loot for a bot and store inside a private class property + * @param botRole bots role (assault / pmcBot etc) + * @param lootPool the full pool of loot we use to create the various sub-categories with + * @param isPmc Is the bot a PMC (alteres what loot is cached) + */ + protected addLootToCache(botRole: string, isPmc: boolean, lootPool: Items): void; + /** + * Ammo/grenades have this property + * @param props + * @returns + */ + protected isBulletOrGrenade(props: Props): boolean; + /** + * Internal and external magazine have this property + * @param props + * @returns + */ + protected isMagazine(props: Props): boolean; + /** + * Medical use items (e.g. morphine/lip balm/grizzly) + * @param props + * @returns + */ + protected isMedicalItem(props: Props): boolean; + /** + * Grenades have this property (e.g. smoke/frag/flash grenades) + * @param props + * @returns + */ + protected isGrenade(props: Props): boolean; + /** + * Check if a bot type exists inside the loot cache + * @param botRole role to check for + * @returns true if they exist + */ + protected botRoleExistsInCache(botRole: string): boolean; + /** + * If lootcache is null, init with empty property arrays + * @param botRole Bot role to hydrate + */ + protected initCacheForBotRole(botRole: string): void; + /** + * Compares two item prices by their flea (or handbook if that doesnt exist) price + * -1 when a < b + * 0 when a === b + * 1 when a > b + * @param itemAPrice + * @param itemBPrice + * @returns + */ + protected compareByValue(itemAPrice: number, itemBPrice: number): number; +} diff --git a/Live/CWX_WeatherPatcher/server/types/services/FenceService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/FenceService.d.ts index 27d14ef..79058c6 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/FenceService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/FenceService.d.ts @@ -4,6 +4,7 @@ import { PresetHelper } from "../helpers/PresetHelper"; import { FenceLevel } from "../models/eft/common/IGlobals"; import { IPmcData } from "../models/eft/common/IPmcData"; import { ITraderAssort } from "../models/eft/common/tables/ITrader"; +import { ITraderConfig } from "../models/spt/config/ITraderConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,25 +12,25 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { RandomUtil } from "../utils/RandomUtil"; export declare class FenceService { - private logger; - private hashUtil; - private jsonUtil; - private randomUtil; - private databaseServer; - private handbookHelper; - private itemHelper; - private presetHelper; - private configServer; - private fenceAssort; - private traderConfig; + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected randomUtil: RandomUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected configServer: ConfigServer; + protected fenceAssort: ITraderAssort; + protected traderConfig: ITraderConfig; constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, randomUtil: RandomUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, itemHelper: ItemHelper, presetHelper: PresetHelper, configServer: ConfigServer); - private setFenceAssort; + protected setFenceAssort(fenceAssort: ITraderAssort): void; getFenceAssorts(): ITraderAssort; hasExpiredCache(refreshAssort: boolean): boolean; generateFenceAssortCache(pmcData: IPmcData): void; /** - * - * @param pmcData Get the fence level the passed in profile has + * Get the fence level the passed in profile has + * @param pmcData Player profile * @returns FenceLevel */ getFenceInfo(pmcData: IPmcData): FenceLevel; diff --git a/Live/CWX_WeatherPatcher/server/types/services/HashCacheService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/HashCacheService.d.ts index c9b0170..5320f28 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/HashCacheService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/HashCacheService.d.ts @@ -3,13 +3,13 @@ import { HashUtil } from "../utils/HashUtil"; import { JsonUtil } from "../utils/JsonUtil"; import { VFS } from "../utils/VFS"; export declare class HashCacheService { - private vfs; - private hashUtil; - private jsonUtil; - private logger; - private jsonHashes; - private modHashes; - private readonly modCachePath; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected logger: ILogger; + protected jsonHashes: any; + protected modHashes: any; + protected readonly modCachePath = "./user/cache/modCache.json"; constructor(vfs: VFS, hashUtil: HashUtil, jsonUtil: JsonUtil, logger: ILogger); getStoredModHash(modName: string): string; modContentMatchesStoredHash(modName: string, modContent: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/types/services/InsuranceService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/InsuranceService.d.ts index 160faba..171bf10 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/InsuranceService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/InsuranceService.d.ts @@ -4,6 +4,7 @@ import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; import { Item } from "../models/eft/common/tables/IItem"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; +import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; @@ -11,18 +12,17 @@ import { SaveServer } from "../servers/SaveServer"; import { RandomUtil } from "../utils/RandomUtil"; import { TimeUtil } from "../utils/TimeUtil"; export declare class InsuranceService { - private logger; - private databaseServer; - private secureContainerHelper; - private randomUtil; - private timeUtil; - private saveServer; - private traderHelper; - private dialogueHelper; - private configServer; - private insured; - private templatesById; - private insuranceConfig; + protected logger: ILogger; + protected databaseServer: DatabaseServer; + protected secureContainerHelper: SecureContainerHelper; + protected randomUtil: RandomUtil; + protected timeUtil: TimeUtil; + protected saveServer: SaveServer; + protected traderHelper: TraderHelper; + protected dialogueHelper: DialogueHelper; + protected configServer: ConfigServer; + protected insured: Record>; + protected insuranceConfig: IInsuranceConfig; constructor(logger: ILogger, databaseServer: DatabaseServer, secureContainerHelper: SecureContainerHelper, randomUtil: RandomUtil, timeUtil: TimeUtil, saveServer: SaveServer, traderHelper: TraderHelper, dialogueHelper: DialogueHelper, configServer: ConfigServer); insuranceExists(sessionId: string): boolean; insuranceTraderArrayExists(sessionId: string, traderId: string): boolean; @@ -31,11 +31,21 @@ export declare class InsuranceService { resetInsurance(sessionId: string): void; resetInsuranceTraderArray(sessionId: string, traderId: string): void; addInsuranceItemToArray(sessionId: string, traderId: string, itemToAdd: any): void; - getItemPrice(_tpl: string): number; - generateTemplatesById(): void; - sendInsuredItems(pmcData: IPmcData, sessionID: string): void; + /** + * Get the rouble price for an item by templateId + * @param itemTpl item tpl to get handbook price for + * @returns handbook price in roubles, Return 0 if not found + */ + getItemPrice(itemTpl: string): number; + /** + * Sends stored insured items as message to player + * @param pmcData profile to modify + * @param sessionID SessionId of current player + * @param mapId Id of the map player died/exited that caused the insurance to be issued on + */ + sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void; storeLostGear(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; storeInsuredItemsForReturn(pmcData: IPmcData, offraidData: ISaveProgressRequestData, preRaidGear: Item[], sessionID: string): void; - private addGearToSend; + protected addGearToSend(pmcData: IPmcData, insuredItem: any, actualItem: any, sessionID: string): any; getPremium(pmcData: IPmcData, inventoryItem: Item, traderId: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/LocaleService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/LocaleService.d.ts new file mode 100644 index 0000000..33bea7b --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/services/LocaleService.d.ts @@ -0,0 +1,14 @@ +import { ILocaleConfig } from "../models/spt/config/ILocaleConfig"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { ConfigServer } from "../servers/ConfigServer"; +export declare class LocaleService { + protected logger: ILogger; + protected configServer: ConfigServer; + protected localeConfig: ILocaleConfig; + constructor(logger: ILogger, configServer: ConfigServer); + /** + * Gets the locale key from the locale.json file + * @returns locale e.g en/ge/cz/cn + */ + getDesiredLocale(): string; +} diff --git a/Live/CWX_WeatherPatcher/server/types/services/MatchLocationService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/MatchLocationService.d.ts index f7b7d3b..c027bec 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/MatchLocationService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/MatchLocationService.d.ts @@ -1,8 +1,9 @@ +import { ICreateGroupRequestData } from "../models/eft/match/ICreateGroupRequestData"; import { TimeUtil } from "../utils/TimeUtil"; export declare class MatchLocationService { - private timeUtil; - private locations; + protected timeUtil: TimeUtil; + protected locations: {}; constructor(timeUtil: TimeUtil); - createGroup(sessionID: string, info: any): any; + createGroup(sessionID: string, info: ICreateGroupRequestData): any; deleteGroup(info: any): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/ModCompilerService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/ModCompilerService.d.ts index cf7cc21..26cb4ac 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/ModCompilerService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/ModCompilerService.d.ts @@ -1,15 +1,20 @@ +import * as ts from "typescript"; import { ILogger } from "../models/spt/utils/ILogger"; import { VFS } from "../utils/VFS"; import { HashCacheService } from "./HashCacheService"; export declare class ModCompilerService { - private logger; - private hashCacheService; - private vfs; + protected logger: ILogger; + protected hashCacheService: HashCacheService; + protected vfs: VFS; constructor(logger: ILogger, hashCacheService: HashCacheService, vfs: VFS); compileMod(modName: string, modPath: string, modTypeScriptFiles: string[]): Promise; - private compile; - private buildDepth; - private calculateDepth; - private areFilesReady; - private delay; + protected compile(fileNames: string[], options: ts.CompilerOptions): Promise; + protected buildDepth(depth: number): string; + protected getNodesModulesPath(depth: number): string; + protected getAkiPath(depth: number): string; + protected getAkiFolder(): string; + protected getNodesModulesFolder(): string; + protected calculateDepth(file: string): number; + protected areFilesReady(fileNames: string[]): boolean; + protected delay(ms: number): Promise; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/NotificationService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/NotificationService.d.ts index 9c6c143..65a84dd 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/NotificationService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/NotificationService.d.ts @@ -1,8 +1,8 @@ import { INotification } from "../models/eft/notifier/INotifier"; export declare class NotificationService { - private messageQueue; - getMessageQueue(): {}; - getMessageFromQueue(sessionId: string): any; + protected messageQueue: Record; + getMessageQueue(): Record; + getMessageFromQueue(sessionId: string): any[]; updateMessageOnQueue(sessionId: string, value: any[]): void; has(sessionID: string): boolean; /** @@ -17,5 +17,5 @@ export declare class NotificationService { * Get message queue for session * @param sessionID */ - get(sessionID: string): any; + get(sessionID: string): any[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/PaymentService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/PaymentService.d.ts index 0a6c4d6..a5e538f 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/PaymentService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/PaymentService.d.ts @@ -4,6 +4,7 @@ import { ItemHelper } from "../helpers/ItemHelper"; import { PaymentHelper } from "../helpers/PaymentHelper"; import { TraderHelper } from "../helpers/TraderHelper"; import { IPmcData } from "../models/eft/common/IPmcData"; +import { Item } from "../models/eft/common/tables/IItem"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IProcessBuyTradeRequestData } from "../models/eft/trade/IProcessBuyTradeRequestData"; import { IProcessSellTradeRequestData } from "../models/eft/trade/IProcessSellTradeRequestData"; @@ -11,14 +12,14 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; export declare class PaymentService { - private logger; - private httpResponse; - private databaseServer; - private handbookHelper; - private traderHelper; - private itemHelper; - private inventoryHelper; - private paymentHelper; + protected logger: ILogger; + protected httpResponse: HttpResponseUtil; + protected databaseServer: DatabaseServer; + protected handbookHelper: HandbookHelper; + protected traderHelper: TraderHelper; + protected itemHelper: ItemHelper; + protected inventoryHelper: InventoryHelper; + protected paymentHelper: PaymentHelper; constructor(logger: ILogger, httpResponse: HttpResponseUtil, databaseServer: DatabaseServer, handbookHelper: HandbookHelper, traderHelper: TraderHelper, itemHelper: ItemHelper, inventoryHelper: InventoryHelper, paymentHelper: PaymentHelper); /** * Take money and insert items into return to server request @@ -43,6 +44,23 @@ export declare class PaymentService { * inside the stash, that is it has the stash as * ancestor with slotId=hideout */ - private isItemInStash; + protected isItemInStash(pmcData: IPmcData, item: Item): boolean; + /** + * Remove currency from player stash/inventory + * @param pmcData Player profile to find and remove currency from + * @param currencyTpl Type of currency to pay + * @param amountToPay money value to pay + * @param sessionID Sessino id + * @param output output object to send to client + * @returns IItemEventRouterResponse + */ addPaymentToOutput(pmcData: IPmcData, currencyTpl: string, amountToPay: number, sessionID: string, output: IItemEventRouterResponse): IItemEventRouterResponse; + /** + * Prioritise player stash first over player inventory + * Post-raid healing would often take money out of the players pockets/secure container + * @param a Firsat money stack item + * @param b Second money stack item + * @returns sorted item + */ + protected moneySort(a: Item, b: Item): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/PlayerService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/PlayerService.d.ts index 99e5986..519b7e5 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/PlayerService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/PlayerService.d.ts @@ -3,8 +3,8 @@ import { IPlayerIncrementSkillLevelRequestData } from "../models/eft/player/IPla import { ILogger } from "../models/spt/utils/ILogger"; import { DatabaseServer } from "../servers/DatabaseServer"; export declare class PlayerService { - private logger; - private databaseServer; + protected logger: ILogger; + protected databaseServer: DatabaseServer; constructor(logger: ILogger, databaseServer: DatabaseServer); /** * increases the profile skill and updates any output diff --git a/Live/CWX_WeatherPatcher/server/types/services/ProfileFixerService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/ProfileFixerService.d.ts new file mode 100644 index 0000000..ed1dec7 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/services/ProfileFixerService.d.ts @@ -0,0 +1,61 @@ +import { IPmcData } from "../models/eft/common/IPmcData"; +import { HideoutSlot } from "../models/eft/common/tables/IBotBase"; +import { IPmcDataRepeatableQuest, IRepeatableQuest } from "../models/eft/common/tables/IRepeatableQuests"; +import { IAkiProfile } from "../models/eft/profile/IAkiProfile"; +import { HideoutAreas } from "../models/enums/HideoutAreas"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { Watermark } from "../utils/Watermark"; +export declare class ProfileFixerService { + protected logger: ILogger; + protected watermark: Watermark; + protected databaseServer: DatabaseServer; + constructor(logger: ILogger, watermark: Watermark, databaseServer: DatabaseServer); + /** + * Find issues in the pmc profile data that may cause issues and fix them + * @param pmcProfile profile to check and fix + */ + checkForAndFixPmcProfileIssues(pmcProfile: IPmcData): void; + /** + * Add tag to profile to indicate when it was made + * @param fullProfile + */ + addMissingAkiVersionTagToProfile(fullProfile: IAkiProfile): void; + /** + * TODO - make this non-public - currently used by RepeatableQuestController + * Remove unused condition counters + * @param pmcProfile profile to remove old counters from + */ + removeDanglingConditionCounters(pmcProfile: IPmcData): void; + protected removeDanglingBackendCounters(pmcProfile: IPmcData): void; + protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[]; + protected fixNullTraderSalesSums(pmcProfile: IPmcData): void; + protected addMissingBonusesProperty(pmcProfile: IPmcData): void; + /** + * Adjust profile quest status and statusTimers object values + * quest.status is numeric e.g. 2 + * quest.statusTimers keys are numeric as strings e.g. "2" + * @param pmcProfile profile to update + */ + protected updateProfileQuestDataValues(pmcProfile: IPmcData): void; + protected addMissingRepeatableQuestsProperty(pmcProfile: IPmcData): void; + protected addMissingWorkbenchWeaponSkills(pmcProfile: IPmcData): void; + /** + * A new property was added to slot items "locationIndex", if this is missing, the hideout slot item must be removed + * @param pmcProfile Profile to find and remove slots from + */ + protected removeResourcesFromSlotsInHideoutWithoutLocationIndexValue(pmcProfile: IPmcData): void; + /** + * add in objects equal to the number of slots + * @param areaType area to check + * @param pmcProfile profile to update + */ + protected addEmptyObjectsToHideoutAreaSlots(areaType: HideoutAreas, emptyItemCount: number, pmcProfile: IPmcData): void; + protected addObjectsToArray(count: number, slots: HideoutSlot[]): HideoutSlot[]; + /** + * In 18876 bsg changed the pockets tplid to be one that has 3 additional special slots + * @param pmcProfile + */ + protected updateProfilePocketsToNewId(pmcProfile: IPmcData): void; + addMissingArmorRepairSkill(pmcProfile: IPmcData): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/services/RagfairCategoriesService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/RagfairCategoriesService.d.ts index fb9efa2..83910e5 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/RagfairCategoriesService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/RagfairCategoriesService.d.ts @@ -1,10 +1,40 @@ import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairCategoriesService { - updateCategories(offers: IRagfairOffer[]): void; - private categories; - getCategories(): Record; - getCategoryByItemId(itemId: string): number; - resetCategories(): void; - setCategoryValue(itemId: string, newValue: number): void; - incrementCategory(itemId: string): void; + protected logger: ILogger; + protected categories: Record; + constructor(logger: ILogger); + /** + * Get all flea categories and their count of offers + * @returns item categories and count + */ + getAllCategories(): Record; + /** + * With the supplied items, get custom categories + * @returns a custom list of categories + */ + getBespokeCategories(offers: IRagfairOffer[]): Record; + /** + * Take an array of ragfair offers and create a dictionary of items with thier corrisponding offer count + * @param offers ragfair offers + * @returns categories and count + */ + protected processOffersIntoCategories(offers: IRagfairOffer[]): Record; + /** + * Increment or decrement a category array + * @param offer offer to process + * @param categories categories to update + * @param increment should item be incremented or decremented + */ + protected addOrIncrementCategory(offer: IRagfairOffer, categories: Record, increment?: boolean): void; + /** + * Increase category count by 1 + * @param offer + */ + incrementCategory(offer: IRagfairOffer): void; + /** + * Reduce category count by 1 + * @param offer + */ + decrementCategory(offer: IRagfairOffer): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/RagfairLinkedItemService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/RagfairLinkedItemService.d.ts index 3dbcf6f..6c34ee0 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/RagfairLinkedItemService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/RagfairLinkedItemService.d.ts @@ -1,9 +1,10 @@ import { DatabaseServer } from "../servers/DatabaseServer"; +import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem"; export declare class RagfairLinkedItemService { - private databaseServer; - private linkedItemsCache; + protected databaseServer: DatabaseServer; + protected linkedItemsCache: Record>; constructor(databaseServer: DatabaseServer); getLinkedItems(linkedSearchId: string): Iterable; - private buildLinkedItemTable; - private getFilters; + protected buildLinkedItemTable(): void; + protected getFilters(item: ITemplateItem, slot: string): string[]; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/RagfairOfferService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/RagfairOfferService.d.ts index 9b1bf8d..7398a8f 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/RagfairOfferService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/RagfairOfferService.d.ts @@ -1,7 +1,9 @@ import { ProfileHelper } from "../helpers/ProfileHelper"; import { RagfairServerHelper } from "../helpers/RagfairServerHelper"; import { Item } from "../models/eft/common/tables/IItem"; +import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; import { IRagfairOffer } from "../models/eft/ragfair/IRagfairOffer"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ItemEventRouter } from "../routers/ItemEventRouter"; import { ConfigServer } from "../servers/ConfigServer"; @@ -9,27 +11,33 @@ import { DatabaseServer } from "../servers/DatabaseServer"; import { SaveServer } from "../servers/SaveServer"; import { HttpResponseUtil } from "../utils/HttpResponseUtil"; import { TimeUtil } from "../utils/TimeUtil"; +import { RagfairCategoriesService } from "./RagfairCategoriesService"; export declare class RagfairOfferService { - private logger; - private timeUtil; - private databaseServer; - private saveServer; - private ragfairServerHelper; - private profileHelper; - private itemEventRouter; - private httpResponse; - private configServer; - private playerOffersLoaded; - private toUpdate; - private expiredOffers; - private offers; - private ragfairConfig; - constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected databaseServer: DatabaseServer; + protected saveServer: SaveServer; + protected ragfairServerHelper: RagfairServerHelper; + protected ragfairCategoriesService: RagfairCategoriesService; + protected profileHelper: ProfileHelper; + protected itemEventRouter: ItemEventRouter; + protected httpResponse: HttpResponseUtil; + protected configServer: ConfigServer; + protected playerOffersLoaded: boolean; + protected toUpdate: Record; + protected expiredOffers: Item[]; + protected offers: IRagfairOffer[]; + protected ragfairConfig: IRagfairConfig; + constructor(logger: ILogger, timeUtil: TimeUtil, databaseServer: DatabaseServer, saveServer: SaveServer, ragfairServerHelper: RagfairServerHelper, ragfairCategoriesService: RagfairCategoriesService, profileHelper: ProfileHelper, itemEventRouter: ItemEventRouter, httpResponse: HttpResponseUtil, configServer: ConfigServer); + /** + * Get all offers + * @returns IRagfairOffer array + */ getOffers(): IRagfairOffer[]; getOfferByOfferId(offerId: string): IRagfairOffer; getOffersOfType(templateId: string): IRagfairOffer[]; addOffer(offer: IRagfairOffer): void; - addOfferToExpired(offer: Item): void; + addOfferToExpired(staleOffer: IRagfairOffer): void; setTraderUpdateStatus(traderId: string, shouldUpdate: boolean): void; shouldTraderBeUpdated(traderID: string): boolean; getExpiredOfferCount(): number; @@ -57,8 +65,8 @@ export declare class RagfairOfferService { * Get an array of stale offers that are still shown to player * @returns IRagfairOffer array */ - private getStaleOffers; - private isStale; - private processStaleOffer; - private returnPlayerOffer; + protected getStaleOffers(): IRagfairOffer[]; + protected isStale(offer: IRagfairOffer, time: number): boolean; + protected processStaleOffer(staleOffer: IRagfairOffer): void; + protected returnPlayerOffer(offer: IRagfairOffer): IItemEventRouterResponse; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/RagfairPriceService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/RagfairPriceService.d.ts index 7cdf854..679fe1d 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/RagfairPriceService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/RagfairPriceService.d.ts @@ -1,22 +1,25 @@ import { HandbookHelper } from "../helpers/HandbookHelper"; import { ItemHelper } from "../helpers/ItemHelper"; import { PresetHelper } from "../helpers/PresetHelper"; +import { Preset } from "../models/eft/common/IGlobals"; import { Item } from "../models/eft/common/tables/IItem"; import { IBarterScheme } from "../models/eft/common/tables/ITrader"; +import { IRagfairConfig } from "../models/spt/config/IRagfairConfig"; +import { IRagfairServerPrices } from "../models/spt/ragfair/IRagfairServerPrices"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; import { DatabaseServer } from "../servers/DatabaseServer"; import { RandomUtil } from "../utils/RandomUtil"; export declare class RagfairPriceService { - private handbookHelper; - private databaseServer; - private logger; - private itemHelper; - private presetHelper; - private randomUtil; - private configServer; - private ragfairConfig; - private prices; + protected handbookHelper: HandbookHelper; + protected databaseServer: DatabaseServer; + protected logger: ILogger; + protected itemHelper: ItemHelper; + protected presetHelper: PresetHelper; + protected randomUtil: RandomUtil; + protected configServer: ConfigServer; + protected ragfairConfig: IRagfairConfig; + protected prices: IRagfairServerPrices; constructor(handbookHelper: HandbookHelper, databaseServer: DatabaseServer, logger: ILogger, itemHelper: ItemHelper, presetHelper: PresetHelper, randomUtil: RandomUtil, configServer: ConfigServer); generateStaticPrices(): void; generateDynamicPrices(): void; @@ -24,7 +27,29 @@ export declare class RagfairPriceService { getDynamicPrice(itemTpl: string): number; getAllFleaPrices(): Record; getFleaPriceForItem(tplId: string): number; + getStaticPriceForItem(tplId: string): number; getBarterPrice(barterScheme: IBarterScheme[]): number; getDynamicOfferPrice(items: Item[], desiredCurrency: string): number; + /** + * Multiply the price by a randomised curve where n = 2, shift = 2 + * @param existingPrice price to alter + * @param isPreset is the item we're multiplying a preset + * @returns multiplied price + */ + protected randomisePrice(existingPrice: number, isPreset: boolean): number; + /** + * Calculate the cost of a weapon preset by adding together the price of its mods + base price of default weapon preset + * @param item base weapon + * @param items weapon plus mods + * @param existingPrice price of existing base weapon + * @returns + */ getWeaponPresetPrice(item: Item, items: Item[], existingPrice: number): number; + /** + * Attempt to get the default preset for a weapon, failing that get the first preset in the array + * (assumes default = has encyclopedia entry) + * @param presets weapon presets to choose from + * @returns Default preset object + */ + protected getDefaultWeaponPreset(presets: Preset[], weapon: Item): Preset; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/RagfairRequiredItemsService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/RagfairRequiredItemsService.d.ts index e4582d0..b05fc65 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/RagfairRequiredItemsService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/RagfairRequiredItemsService.d.ts @@ -2,10 +2,10 @@ import { PaymentHelper } from "../helpers/PaymentHelper"; import { RagfairOfferService } from "../services/RagfairOfferService"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class RagfairRequiredItemsService { - private logger; - private paymentHelper; - private ragfairOfferService; - private requiredItemsCache; + protected logger: ILogger; + protected paymentHelper: PaymentHelper; + protected ragfairOfferService: RagfairOfferService; + protected requiredItemsCache: {}; constructor(logger: ILogger, paymentHelper: PaymentHelper, ragfairOfferService: RagfairOfferService); getRequiredItems(searchId: string): any; buildRequiredItemTable(): void; diff --git a/Live/CWX_WeatherPatcher/server/types/services/TraderAssortService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/TraderAssortService.d.ts index ccb9e45..5ba2d05 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/TraderAssortService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/TraderAssortService.d.ts @@ -1,6 +1,6 @@ import { ITraderAssort } from "../models/eft/common/tables/ITrader"; export declare class TraderAssortService { - private pristineTraderAssorts; + protected pristineTraderAssorts: Record; getPristineTraderAssort(traderId: string): ITraderAssort; setPristineTraderAssort(traderId: string, assort: ITraderAssort): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/mod/CustomItemService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/mod/CustomItemService.d.ts new file mode 100644 index 0000000..87bda40 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/services/mod/CustomItemService.d.ts @@ -0,0 +1,80 @@ +import { ITemplateItem, Props } from "../../models/eft/common/tables/ITemplateItem"; +import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "../../models/spt/mod/NewItemDetails"; +import { IDatabaseTables } from "../../models/spt/server/IDatabaseTables"; +import { ILogger } from "../../models/spt/utils/ILogger"; +import { DatabaseServer } from "../../servers/DatabaseServer"; +import { HashUtil } from "../../utils/HashUtil"; +import { JsonUtil } from "../../utils/JsonUtil"; +export declare class CustomItemService { + protected logger: ILogger; + protected hashUtil: HashUtil; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected tables: IDatabaseTables; + constructor(logger: ILogger, hashUtil: HashUtil, jsonUtil: JsonUtil, databaseServer: DatabaseServer); + /** + * Create a new item from a cloned item base + * WARNING - If no item id is supplied, an id will be generated, this id will be random every time you add an item and will not be the same on each subsequent server start + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Item details for the new item to be created + * @returns tplId of the new item created + */ + createItemFromClone(newItemDetails: NewItemFromCloneDetails): CreateItemResult; + /** + * Create a new item without using an existing item as a template + * Add to the items db + * Add to the flea market + * Add to the handbook + * Add to the locales + * @param newItemDetails Details on what the item to be created + * @returns CreateItemResult containing the completed items Id + */ + createItem(newItemDetails: NewItemDetails): CreateItemResult; + /** + * If the id provided is an empty string, return a randomly generated guid, otherwise return the newId parameter + * @param newId id supplied to code + * @returns item id + */ + protected getOrGenerateIdForItem(newId: string): string; + /** + * Iterates through supplied properties and updates the cloned items properties with them + * Complex objects cannot have overrides, they must be fully hydrated with values if they are to be used + * @param overrideProperties new properties to apply + * @param itemClone item to update + */ + protected updateBaseItemPropertiesWithOverrides(overrideProperties: Props, itemClone: ITemplateItem): void; + /** + * Addd a new item object to the in-memory representation of items.json + * @param newItemId id of the item to add to items.json + * @param itemToAdd Item to add against the new id + */ + protected addToItemsDb(newItemId: string, itemToAdd: ITemplateItem): void; + /** + * Add a handbook price for an item + * @param newItemId id of the item being added + * @param parentId parent id of the item being added + * @param priceRoubles price of the item being added + */ + protected addToHandbookDb(newItemId: string, parentId: string, priceRoubles: number): void; + /** + * Iterate through the passed in locale data and add to each locale in turn + * If data is not provided for each langauge eft uses, the first object will be used in its place + * e.g. + * en[0] + * fr[1] + * + * No jp provided, so english will be used as a substitute + * @param localeDetails key is language, value are the new locale details + * @param newItemId id of the item being created + */ + protected addToLocaleDbs(localeDetails: Record, newItemId: string): void; + /** + * Add a price to the in-memory representation of prices.json, used to inform the flea of an items price on the market + * @param newItemId id of the new item + * @param fleaPriceRoubles Price of the new item + */ + protected addToFleaPriceDb(newItemId: string, fleaPriceRoubles: number): void; +} diff --git a/Live/CWX_WeatherPatcher/server/types/services/mod/image/imageRouteService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/mod/image/imageRouteService.d.ts index 854083c..29569b2 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/mod/image/imageRouteService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/mod/image/imageRouteService.d.ts @@ -1,5 +1,5 @@ export declare class ImageRouteService { - private routes; + protected routes: Record; addRoute(urlKey: string, route: string): void; getByKey(urlKey: string): string; existsByKey(urlKey: string): boolean; diff --git a/Live/CWX_WeatherPatcher/server/types/services/mod/onLoad/OnLoadModService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/mod/onLoad/OnLoadModService.d.ts index 89bad14..f402103 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/mod/onLoad/OnLoadModService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/mod/onLoad/OnLoadModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnLoadModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnLoad(name: string, onLoad: () => void, getRoute: () => string): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/mod/onUpdate/OnUpdateModService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/mod/onUpdate/OnUpdateModService.d.ts index 32419f4..05d735b 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/mod/onUpdate/OnUpdateModService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/mod/onUpdate/OnUpdateModService.d.ts @@ -1,6 +1,6 @@ import { DependencyContainer } from "tsyringe"; export declare class OnUpdateModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerOnUpdate(name: string, onUpdate: (timeSinceLastRun: number) => boolean, getRoute: () => string): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/services/mod/staticRouter/StaticRouterModService.d.ts b/Live/CWX_WeatherPatcher/server/types/services/mod/staticRouter/StaticRouterModService.d.ts index d4c42aa..f28fd45 100644 --- a/Live/CWX_WeatherPatcher/server/types/services/mod/staticRouter/StaticRouterModService.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/services/mod/staticRouter/StaticRouterModService.d.ts @@ -1,7 +1,7 @@ import { DependencyContainer } from "tsyringe"; import { RouteAction } from "../../../di/Router"; export declare class StaticRouterModService { - private container; + protected container: DependencyContainer; constructor(container: DependencyContainer); registerStaticRouter(name: string, routes: RouteAction[], topLevelRoute: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/utils/App.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/App.d.ts index a11f576..dcc2669 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/App.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/App.d.ts @@ -3,12 +3,13 @@ import { OnLoad } from "../di/OnLoad"; import { OnUpdate } from "../di/OnUpdate"; import { ILogger } from "../models/spt/utils/ILogger"; export declare class App { - private logger; - private timeUtil; - private onLoadComponents; - private onUpdateComponents; - private onUpdateLastRun; + protected logger: ILogger; + protected timeUtil: TimeUtil; + protected onLoadComponents: OnLoad[]; + protected onUpdateComponents: OnUpdate[]; + protected onUpdateLastRun: {}; constructor(logger: ILogger, timeUtil: TimeUtil, onLoadComponents: OnLoad[], onUpdateComponents: OnUpdate[]); load(): void; - private update; + protected update(onUpdateComponents: OnUpdate[]): void; + protected logUpdateException(err: any, updateable: OnUpdate): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/utils/AyncQueue.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/AyncQueue.d.ts index a99aa37..da6ab18 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/AyncQueue.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/AyncQueue.d.ts @@ -1,7 +1,7 @@ import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { ICommand } from "../models/spt/utils/ICommand"; export declare class AsyncQueue implements IAsyncQueue { - private commandsQueue; + protected commandsQueue: ICommand[]; constructor(); waitFor(command: ICommand): Promise; } diff --git a/Live/CWX_WeatherPatcher/server/types/utils/DatabaseImporter.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/DatabaseImporter.d.ts index 97dda30..483e135 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/DatabaseImporter.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/DatabaseImporter.d.ts @@ -1,18 +1,24 @@ -import { VFS } from "./VFS"; -import { JsonUtil } from "./JsonUtil"; -import { DatabaseServer } from "../servers/DatabaseServer"; -import { ImageRouter } from "../routers/ImageRouter"; import { OnLoad } from "../di/OnLoad"; +import { IDatabaseTables } from "../models/spt/server/IDatabaseTables"; import { ILogger } from "../models/spt/utils/ILogger"; +import { ImageRouter } from "../routers/ImageRouter"; +import { DatabaseServer } from "../servers/DatabaseServer"; +import { JsonUtil } from "./JsonUtil"; +import { VFS } from "./VFS"; export declare class DatabaseImporter extends OnLoad { - private logger; - private vfs; - private jsonUtil; - private databaseServer; - private imageRouter; + protected logger: ILogger; + protected vfs: VFS; + protected jsonUtil: JsonUtil; + protected databaseServer: DatabaseServer; + protected imageRouter: ImageRouter; constructor(logger: ILogger, vfs: VFS, jsonUtil: JsonUtil, databaseServer: DatabaseServer, imageRouter: ImageRouter); onLoad(): void; + /** + * Read all json files in database folder and map into a json object + * @param filepath path to database folder + */ + protected hydrateDatabase(filepath: string): void; getRoute(): string; - loadRecursive(filepath: string): any; + loadRecursive(filepath: string): IDatabaseTables; loadImages(filepath: string): void; } diff --git a/Live/CWX_WeatherPatcher/server/types/utils/HashUtil.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/HashUtil.d.ts index cf92b47..bacbf2a 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/HashUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/HashUtil.d.ts @@ -2,7 +2,7 @@ import crypto from "crypto"; import { TimeUtil } from "./TimeUtil"; export declare class HashUtil { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); generate(): string; generateMd5ForData(data: string): string; diff --git a/Live/CWX_WeatherPatcher/server/types/utils/HttpResponseUtil.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/HttpResponseUtil.d.ts index 85c28bd..29502be 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/HttpResponseUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/HttpResponseUtil.d.ts @@ -3,9 +3,9 @@ import { IGetBodyResponseData } from "../models/eft/httpResponse/IGetBodyRespons import { INullResponseData } from "../models/eft/httpResponse/INullResponseData"; import { IItemEventRouterResponse } from "../models/eft/itemEvent/IItemEventRouterResponse"; export declare class HttpResponseUtil { - private jsonUtil; + protected jsonUtil: JsonUtil; constructor(jsonUtil: JsonUtil); - private clearString; + protected clearString(s: string): any; noBody(data: any): any; getBody(data: T, err?: number, errmsg?: any): IGetBodyResponseData; getUnclearedBody(data: any, err?: number, errmsg?: any): string; diff --git a/Live/CWX_WeatherPatcher/server/types/utils/JsonUtil.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/JsonUtil.d.ts index 20b7448..71e95f6 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/JsonUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/JsonUtil.d.ts @@ -2,10 +2,10 @@ import { ILogger } from "../models/spt/utils/ILogger"; import { HashUtil } from "./HashUtil"; import { VFS } from "./VFS"; export declare class JsonUtil { - private vfs; - private hashUtil; - private logger; - private fileHashes; + protected vfs: VFS; + protected hashUtil: HashUtil; + protected logger: ILogger; + protected fileHashes: any; constructor(vfs: VFS, hashUtil: HashUtil, logger: ILogger); /** * From object to string diff --git a/Live/CWX_WeatherPatcher/server/types/utils/Logger.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/Logger.d.ts index 9d5b32a..3d9013f 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/Logger.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/Logger.d.ts @@ -1,25 +1,58 @@ /// -import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; -import { ILogger } from "../models/spt/utils/ILogger"; -import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; -import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; import fs from "fs"; +import winston from "winston"; +import { Daum } from "../models/eft/itemEvent/IItemEventRouterRequest"; +import { LogBackgroundColor } from "../models/spt/logging/LogBackgroundColor"; +import { LogTextColor } from "../models/spt/logging/LogTextColor"; +import { SptLogger } from "../models/spt/logging/SptLogger"; +import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; +import { ILogger } from "../models/spt/utils/ILogger"; +import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class WinstonLogger implements ILogger { - private asyncQueue; - private uuidGenerator; - private showDebugInConsole; - private folderPath; - private file; - private filePath; - private logLevels; - private logger; - writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; + protected showDebugInConsole: boolean; + protected folderPath: string; + protected file: string; + protected filePath: string; + protected logLevels: { + levels: { + error: number; + warn: number; + succ: number; + info: number; + custom: number; + debug: number; + }; + colors: { + error: string; + warn: string; + succ: string; + info: string; + custom: string; + debug: string; + }; + bgColors: { + default: string; + blackBG: string; + redBG: string; + greenBG: string; + yellowBG: string; + blueBG: string; + magentaBG: string; + cyanBG: string; + whiteBG: string; + }; + }; + protected logger: winston.Logger & SptLogger; + protected writeFilePromisify: (path: fs.PathLike, data: string, options?: any) => Promise; constructor(asyncQueue: IAsyncQueue, uuidGenerator: IUUidGenerator); writeToLogFile(data: string | Daum): Promise; - log(data: string | Error | Record, color: string): Promise; + log(data: string | Error | Record, color: string, backgroundColor?: string): Promise; error(data: string | Record): Promise; warning(data: string | Record): Promise; success(data: string | Record): Promise; info(data: string | Record): Promise; + logWithColor(data: string | Record, textColor: LogTextColor, backgroundColor?: LogBackgroundColor): Promise; debug(data: string | Record, onlyShowInConsole?: boolean): Promise; } diff --git a/Live/CWX_WeatherPatcher/server/types/utils/ObjectId.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/ObjectId.d.ts index b100572..03aae56 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/ObjectId.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/ObjectId.d.ts @@ -1,13 +1,13 @@ /// import { TimeUtil } from "./TimeUtil"; export declare class ObjectId { - private timeUtil; + protected timeUtil: TimeUtil; constructor(timeUtil: TimeUtil); - private randomBytes; - private constglobalCounter; - private consttime; - private globalCounter; - private time; + protected randomBytes: Buffer; + protected constglobalCounter: number; + protected consttime: number; + protected globalCounter: number; + protected time: number; incGlobalCounter(): number; toHexString(byteArray: string | any[] | Buffer): string; generate(): string; diff --git a/Live/CWX_WeatherPatcher/server/types/utils/RandomUtil.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/RandomUtil.d.ts index 3a3ecb6..c24dd60 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/RandomUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/RandomUtil.d.ts @@ -103,8 +103,8 @@ export declare class ProbabilityObject { constructor(key: K, relativeProbability: number, data?: V); } export declare class RandomUtil { - private jsonUtil; - private logger; + protected jsonUtil: JsonUtil; + protected logger: ILogger; constructor(jsonUtil: JsonUtil, logger: ILogger); getInt(min: number, max: number): number; getIntEx(max: number): number; diff --git a/Live/CWX_WeatherPatcher/server/types/utils/TimeUtil.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/TimeUtil.d.ts index 9733be9..eed4e6d 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/TimeUtil.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/TimeUtil.d.ts @@ -5,4 +5,14 @@ export declare class TimeUtil { getDate(): string; getTime(): string; getTimestamp(): number; + /** + * mail in eft requires time be in a specific format + * @returns current time in format: 00:00 (hh:mm) + */ + getTimeMailFormat(): string; + /** + * Mail in eft requires date be in a specific format + * @returns current date in format: 00.00.0000 (dd.mm.yyyy) + */ + getDateMailFormat(): string; } diff --git a/Live/CWX_WeatherPatcher/server/types/utils/VFS.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/VFS.d.ts index d567615..e5eaf02 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/VFS.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/VFS.d.ts @@ -1,11 +1,12 @@ /// +/// import "reflect-metadata"; import fs from "fs"; import { IAsyncQueue } from "../models/spt/utils/IAsyncQueue"; import { IUUidGenerator } from "../models/spt/utils/IUuidGenerator"; export declare class VFS { - private asyncQueue; - private uuidGenerator; + protected asyncQueue: IAsyncQueue; + protected uuidGenerator: IUUidGenerator; accessFilePromisify: (path: fs.PathLike, mode?: number) => Promise; copyFilePromisify: (src: fs.PathLike, dst: fs.PathLike, flags?: number) => Promise; mkdirPromisify: (path: fs.PathLike, options: fs.MakeDirectoryOptions & { diff --git a/Live/CWX_WeatherPatcher/server/types/utils/Watermark.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/Watermark.d.ts index 3a8cb3a..c6dc120 100644 --- a/Live/CWX_WeatherPatcher/server/types/utils/Watermark.d.ts +++ b/Live/CWX_WeatherPatcher/server/types/utils/Watermark.d.ts @@ -1,22 +1,39 @@ +import { ICoreConfig } from "../models/spt/config/ICoreConfig"; import { ILogger } from "../models/spt/utils/ILogger"; import { ConfigServer } from "../servers/ConfigServer"; export declare class WatermarkLocale { - private locales; + protected locales: { + "en-US": { + description: string[]; + warning: string[]; + modding: string[]; + }; + "zh-CN": { + description: string[]; + warning: string[]; + modding: string[]; + }; + }; getLocale(): string; getDescription(): string[]; getWarning(): string[]; getModding(): string[]; } export declare class Watermark { - private logger; - private configServer; - private watermarkLocale?; - private akiConfig; + protected logger: ILogger; + protected configServer: ConfigServer; + protected watermarkLocale?: WatermarkLocale; + protected akiConfig: ICoreConfig; constructor(logger: ILogger, configServer: ConfigServer, watermarkLocale?: WatermarkLocale); - private text; - private versionLabel; + protected text: string[]; + protected versionLabel: string; initialize(): void; - getVersionTag(): string; + /** + * Get a version string (x.x.x) or (x.x.x-BLEEDINGEDGE) OR (X.X.X (18xxx)) + * @param withEftVersion Include the eft version this spt version was made for + * @returns string + */ + getVersionTag(withEftVersion?: boolean): string; getVersionLabel(): string; /** Set window title */ setTitle(): void; @@ -25,5 +42,5 @@ export declare class Watermark { /** Draw the watermark */ draw(): void; /** Caculate text length */ - private textLength; + protected textLength(s: string): number; } diff --git a/Live/CWX_WeatherPatcher/server/types/utils/collections/lists/LinkedList.d.ts b/Live/CWX_WeatherPatcher/server/types/utils/collections/lists/LinkedList.d.ts new file mode 100644 index 0000000..aca0659 --- /dev/null +++ b/Live/CWX_WeatherPatcher/server/types/utils/collections/lists/LinkedList.d.ts @@ -0,0 +1,30 @@ +export declare class LinkedList { + private head; + private tail; + add(t: T): void; + addRange(list: T[]): void; + getHead(): LinkedListNode; + getTail(): LinkedListNode; + isEmpty(): boolean; + getSize(): number; + removeFirst(): LinkedListNode; + removeLast(): LinkedListNode; + indexOf(func: (t: T) => boolean): number; + contains(func: (t: T) => boolean): boolean; + forEachNode(func: (t: LinkedListNode) => void): void; + forEachValue(func: (t: T) => void): void; + findFirstNode(func: (t: LinkedListNode) => boolean): LinkedListNode; + findFirstValue(func: (t: T) => boolean): T; + toList(): T[]; +} +export declare class LinkedListNode { + private previous; + private value; + private next; + constructor(value: T, previous?: LinkedListNode, next?: LinkedListNode); + getValue(): T; + getNextNode(): LinkedListNode; + setNextNode(node: LinkedListNode): void; + getPreviousNode(): LinkedListNode; + setPreviousNode(node: LinkedListNode): void; +}