From 30b8a318aeb8afedba3204ef4d37671b16d9db99 Mon Sep 17 00:00:00 2001 From: Chomp Date: Wed, 4 Jun 2025 14:49:37 +0100 Subject: [PATCH] Added `ExtensionData` to DTOs --- .../Models/Common/IdWithCount.cs | 3 + .../Models/Common/MinMax.cs | 3 + .../Models/Eft/Bot/GenerateBotsRequestData.cs | 6 + .../Eft/Bot/RandomisedBotLevelResult.cs | 5 +- .../Models/Eft/Builds/SetMagazineRequest.cs | 5 +- .../Models/Eft/Common/EmptyRequestData.cs | 6 +- .../Models/Eft/Common/Globals.cs | 582 ++++++++++++++++++ .../Models/Eft/Common/Location.cs | 33 + .../Models/Eft/Common/LocationBase.cs | 78 +++ .../Models/Eft/Common/LooseLoot.cs | 21 + .../Models/Eft/Common/MetricsTableData.cs | 5 +- .../Models/Eft/Common/PmcData.cs | 5 +- .../Request/BaseInteractionRequestData.cs | 6 + .../Eft/Common/Request/UIDRequestData.cs | 5 +- .../Models/Eft/Common/Tables/Achievement.cs | 8 +- .../Models/Eft/Common/Tables/BotBase.cs | 135 ++++ .../Models/Eft/Common/Tables/BotCore.cs | 5 +- .../Models/Eft/Common/Tables/BotType.cs | 48 ++ .../Eft/Common/Tables/CustomisationStorage.cs | 12 + .../Eft/Common/Tables/CustomizationItem.cs | 6 + .../Models/Eft/Common/Tables/HandbookBase.cs | 11 +- .../Models/Eft/Common/Tables/Item.cs | 78 +++ .../Eft/Common/Tables/LocationServices.cs | 30 + .../Models/Eft/Common/Tables/LocationsBase.cs | 9 + .../Tables/LocationsGenerateAllResponse.cs | 3 + .../Models/Eft/Common/Tables/Match.cs | 6 + .../Models/Eft/Common/Tables/Prestige.cs | 23 +- .../Eft/Common/Tables/ProfileTemplate.cs | 14 +- .../Models/Eft/Common/Tables/Quest.cs | 36 ++ .../Eft/Common/Tables/RepeatableQuests.cs | 36 ++ .../Models/Eft/Common/Tables/Reward.cs | 3 + .../Models/Eft/Common/Tables/TemplateItem.cs | 75 +++ .../Models/Eft/Common/Tables/Trader.cs | 33 + .../Models/Eft/Common/XY.cs | 5 +- .../Models/Eft/Common/XYZ.cs | 5 +- .../Customization/BuyClothingRequestData.cs | 8 +- .../Customization/CustomizationSetRequest.cs | 8 +- .../Customization/WearClothingRequestData.cs | 6 +- .../Eft/Dialog/AcceptFriendRequestData.cs | 5 +- .../Eft/Dialog/AddUserGroupMailRequest.cs | 5 +- .../Eft/Dialog/ChangeGroupMailOwnerRequest.cs | 5 +- .../Models/Eft/Dialog/ChatServer.cs | 8 +- .../Eft/Dialog/ClearMailMessageRequest.cs | 5 +- .../Eft/Dialog/CreateGroupMailRequest.cs | 5 +- .../Models/Eft/Dialog/DeleteFriendRequest.cs | 5 +- .../Models/Eft/Dialog/FriendRequestData.cs | 5 +- .../Eft/Dialog/FriendRequestSendResponse.cs | 5 +- .../Dialog/GetAllAttachmentsRequestData.cs | 5 +- .../Eft/Dialog/GetAllAttachmentsResponse.cs | 5 +- .../Dialog/GetChatServerListRequestData.cs | 5 +- .../Eft/Dialog/GetFriendListDataResponse.cs | 5 +- .../Dialog/GetMailDialogInfoRequestData.cs | 5 +- .../Dialog/GetMailDialogListRequestData.cs | 5 +- .../Dialog/GetMailDialogViewRequestData.cs | 5 +- .../Dialog/GetMailDialogViewResponseData.cs | 5 +- .../Models/Eft/Dialog/PinDialogRequestData.cs | 5 +- .../Eft/Dialog/RemoveDialogRequestData.cs | 5 +- .../Eft/Dialog/RemoveMailMessageRequest.cs | 5 +- .../Eft/Dialog/RemoveUserGroupMailRequest.cs | 5 +- .../Models/Eft/Dialog/SendMessageRequest.cs | 5 +- .../Eft/Dialog/SetDialogReadRequestData.cs | 5 +- .../Models/Eft/Game/CheckVersionResponse.cs | 5 +- .../Models/Eft/Game/CurrentGroupResponse.cs | 11 +- .../Models/Eft/Game/GameConfigResponse.cs | 9 + .../Eft/Game/GameEmptyCrcRequestData.cs | 5 +- .../Models/Eft/Game/GameKeepAliveResponse.cs | 5 +- .../Models/Eft/Game/GameLogoutResponseData.cs | 5 +- .../Models/Eft/Game/GameModeRequestData.cs | 5 +- .../Models/Eft/Game/GameModeResponse.cs | 5 +- .../Models/Eft/Game/GameStartResponse.cs | 3 + .../Models/Eft/Game/GetItemPricesResponse.cs | 5 +- .../Models/Eft/Game/GetRaidTimeRequest.cs | 5 +- .../Models/Eft/Game/GetRaidTimeResponse.cs | 5 +- .../Eft/Game/SendSurveyOpinionRequest.cs | 8 +- .../Models/Eft/Game/ServerDetails.cs | 5 +- .../Models/Eft/Game/SurveyResponseData.cs | 20 +- .../Eft/Game/VersionValidateRequestData.cs | 8 +- .../Eft/Health/HealthTreatmentRequestData.cs | 12 + .../Eft/Health/OffraidEatRequestData.cs | 5 +- .../Eft/Health/OffraidHealRequestData.cs | 3 + .../Eft/Health/SyncHealthRequestData.cs | 11 +- .../Models/Eft/Health/WorkoutData.cs | 6 + .../Eft/Hideout/HandleQTEEventRequestData.cs | 5 +- .../Models/Eft/Hideout/HideoutArea.cs | 21 + .../HideoutCancelProductionRequestData.cs | 2 +- ...rcleOfCultistProductionStartRequestData.cs | 5 +- ...outContinuousProductionStartRequestData.cs | 8 +- .../Eft/Hideout/HideoutCustomisation.cs | 9 + .../HideoutCustomizationApplyRequestData.cs | 5 +- ...outCustomizationSetMannequinPoseRequest.cs | 3 + .../HideoutDeleteProductionRequestData.cs | 5 +- .../Hideout/HideoutImproveAreaRequestData.cs | 3 + .../Models/Eft/Hideout/HideoutProduction.cs | 18 + .../Hideout/HideoutPutItemInRequestData.cs | 3 + .../HideoutScavCaseStartRequestData.cs | 3 + .../Models/Eft/Hideout/HideoutSettingsBase.cs | 3 + ...HideoutSingleProductionStartRequestData.cs | 3 + .../Hideout/HideoutTakeItemOutRequestData.cs | 5 +- .../HideoutTakeProductionRequestData.cs | 5 +- .../Hideout/HideoutToggleAreaRequestData.cs | 5 +- .../HideoutUpgradeCompleteRequestData.cs | 5 +- .../Eft/Hideout/HideoutUpgradeRequestData.cs | 3 + .../Models/Eft/Hideout/QteData.cs | 21 + .../Eft/Hideout/RecordShootingRangePoints.cs | 5 +- .../Eft/HttpResponse/GetBodyResponseData.cs | 3 + .../Eft/HttpResponse/NullResponseData.cs | 5 +- .../Models/Eft/InRaid/InsuredItemsData.cs | 5 +- .../Eft/InRaid/ItemDeliveryRequestData.cs | 5 +- .../Eft/InRaid/RegisterPlayerRequestData.cs | 5 +- .../Models/Eft/InRaid/ScavSaveRequestData.cs | 2 +- .../Insurance/GetInsuranceCostRequestData.cs | 5 +- .../Insurance/GetInsuranceCostResponseData.cs | 2 +- .../Models/Eft/Insurance/InsureRequestData.cs | 5 +- .../Eft/Inventory/AddItemDirectRequest.cs | 3 + .../Eft/Inventory/AddItemRequestData.cs | 8 +- .../Models/Eft/Inventory/AddItemTempObject.cs | 5 +- .../Eft/Inventory/AddItemsDirectRequest.cs | 3 + .../Eft/Inventory/InventoryAddRequestData.cs | 5 +- .../InventoryBaseActionRequestData.cs | 9 + .../Eft/Inventory/InventoryBindRequestData.cs | 5 +- .../InventoryCreateMarkerRequestData.cs | 5 +- .../InventoryDeleteMarkerRequestData.cs | 5 +- .../InventoryEditMarkerRequestData.cs | 5 +- .../Inventory/InventoryExamineRequestData.cs | 5 +- .../Eft/Inventory/InventoryFoldRequestData.cs | 5 +- .../Inventory/InventoryMergeRequestData.cs | 5 +- .../Eft/Inventory/InventoryMoveRequestData.cs | 5 +- .../InventoryReadEncyclopediaRequestData.cs | 3 + .../Inventory/InventoryRemoveRequestData.cs | 5 +- .../Eft/Inventory/InventorySortRequestData.cs | 5 +- .../Inventory/InventorySplitRequestData.cs | 5 +- .../Eft/Inventory/InventorySwapRequestData.cs | 5 +- .../Eft/Inventory/InventoryTagRequestData.cs | 5 +- .../Inventory/InventoryToggleRequestData.cs | 5 +- .../Inventory/InventoryTransferRequestData.cs | 5 +- .../Inventory/InventoryUnbindRequestData.cs | 5 +- .../OpenRandomLootContainerRequestData.cs | 5 +- .../Eft/Inventory/PinOrLockItemRequest.cs | 5 +- .../Eft/Inventory/RedeemProfileRequestData.cs | 8 +- .../Models/Eft/Inventory/SetFavoriteItems.cs | 3 + .../ItemEvent/EmptyItemEventRouterResponse.cs | 5 +- .../Eft/ItemEvent/ItemEventRouterBase.cs | 24 + .../Eft/ItemEvent/ItemEventRouterRequest.cs | 17 +- .../Eft/ItemEvent/ItemEventRouterResponse.cs | 6 +- .../Models/Eft/Launcher/ChangeRequestData.cs | 2 +- .../Eft/Launcher/GetMiniProfileRequestData.cs | 5 +- .../Models/Eft/Launcher/LoginRequestData.cs | 5 +- .../Models/Eft/Launcher/MiniProfile.cs | 5 +- .../Models/Eft/Launcher/RegisterData.cs | 2 +- .../Models/Eft/Launcher/RemoveProfileData.cs | 2 +- .../Models/Eft/Location/AirdropLootResult.cs | 5 +- .../Eft/Location/GetAirdropLootRequest.cs | 5 +- .../Eft/Location/GetAirdropLootResponse.cs | 5 +- .../Eft/Location/GetLocationRequestData.cs | 5 +- .../Eft/Match/EndLocalRaidRequestData.cs | 14 +- .../Eft/Match/EndOfflineRaidRequestData.cs | 5 +- .../Match/GetRaidConfigurationRequestData.cs | 2 +- .../Models/Eft/Match/GroupCharacter.cs | 20 +- .../Eft/Match/MatchGroupCurrentResponse.cs | 5 +- .../Eft/Match/MatchGroupInviteSendRequest.cs | 5 +- .../Match/MatchGroupPlayerRemoveRequest.cs | 5 +- .../Eft/Match/MatchGroupStartGameRequest.cs | 5 +- .../Eft/Match/MatchGroupStatusRequest.cs | 5 +- .../Eft/Match/MatchGroupStatusResponse.cs | 5 +- .../Eft/Match/MatchGroupTransferRequest.cs | 5 +- .../Models/Eft/Match/ProfileStatusRequest.cs | 5 +- .../Models/Eft/Match/ProfileStatusResponse.cs | 5 +- .../Models/Eft/Match/PutMetricsRequestData.cs | 14 +- .../Models/Eft/Match/RaidSettings.cs | 12 + .../Models/Eft/Match/RequestIdRequest.cs | 5 +- .../Models/Eft/Match/Server.cs | 5 +- .../Models/Eft/Match/SessionStatus.cs | 5 +- .../Eft/Match/StartLocalRaidRequestData.cs | 5 +- .../Eft/Match/StartLocalRaidResponseData.cs | 9 + .../Models/Eft/Match/UpdatePingRequestData.cs | 5 +- .../Models/Eft/Notes/NoteActionRequest.cs | 3 + .../Models/Eft/Notifier/Notifier.cs | 3 + .../Eft/Notifier/SelectProfileResponse.cs | 3 + .../PlayerIncrementSkillLevelRequestData.cs | 12 + .../PresetBuildActionRequestData.cs | 5 +- .../Eft/PresetBuild/RemoveBuildRequestData.cs | 5 +- .../Eft/Prestige/GetPrestigeResponse.cs | 3 + .../Eft/Prestige/ObtainPrestigeRequest.cs | 6 + .../Profile/CompletedAchievementsResponse.cs | 5 +- .../Models/Eft/Profile/ConnectResponse.cs | 3 + .../Eft/Profile/CreateProfileResponse.cs | 3 + .../Eft/Profile/GetAchievementsResponse.cs | 5 +- .../Eft/Profile/GetOtherProfileRequest.cs | 3 + .../Eft/Profile/GetOtherProfileResponse.cs | 18 + .../Eft/Profile/GetProfileSettingsRequest.cs | 3 + .../Profile/GetProfileStatusResponseData.cs | 6 + .../Eft/Profile/MessageContentRagfair.cs | 3 + .../ProfileChangeNicknameRequestData.cs | 3 + .../Profile/ProfileChangeVoiceRequestData.cs | 3 + .../Eft/Profile/ProfileCreateRequestData.cs | 3 + .../Eft/Profile/SearchFriendResponse.cs | 3 + .../Eft/Profile/SearchProfilesRequestData.cs | 3 + .../Models/Eft/Profile/SptProfile.cs | 66 ++ .../Models/Eft/Profile/SystemData.cs | 5 +- .../Models/Eft/Profile/UserDialogInfo.cs | 6 + .../Profile/ValidateNicknameRequestData.cs | 3 + .../Eft/Quests/AcceptQuestRequestData.cs | 3 + .../Eft/Quests/CompleteQuestRequestData.cs | 3 + .../Models/Eft/Quests/FailQuestRequestData.cs | 5 +- .../Eft/Quests/HandoverQuestRequestData.cs | 3 + .../Eft/Quests/ListQuestsRequestData.cs | 3 + .../Eft/Quests/RepeatableQuestChangeEvent.cs | 3 + .../Models/Eft/Ragfair/AddOfferRequestData.cs | 6 + .../Eft/Ragfair/ExtendOfferRequestData.cs | 3 + .../Eft/Ragfair/GetMarketPriceRequestData.cs | 3 + .../Models/Eft/Ragfair/GetOffersResult.cs | 3 + .../Eft/Ragfair/GetRagfairOfferByIdRequest.cs | 3 + .../Models/Eft/Ragfair/RagfairOffer.cs | 12 + .../Eft/Ragfair/RemoveOfferRequestData.cs | 3 + .../Models/Eft/Ragfair/SearchRequestData.cs | 3 + .../Ragfair/SendRagfairReportRequestData.cs | 3 + .../StorePlayerOfferTaxAmountRequestData.cs | 3 + .../Eft/Repair/BaseRepairActionDataRequest.cs | 3 + .../Eft/Repair/RepairActionDataRequest.cs | 6 + .../Repair/TraderRepairActionDataRequest.cs | 6 + .../Eft/Trade/ProcessBaseTradeRequestData.cs | 3 + .../Trade/ProcessRagfairTradeRequestData.cs | 6 + .../Eft/Trade/ProcessSellTradeRequestData.cs | 3 + .../Trade/SellScavItemsToFenceRequestData.cs | 3 + .../Models/Eft/Weather/WeatherData.cs | 6 + .../Eft/Wishlist/AddToWishlistRequest.cs | 3 + .../ChangeWishlistItemCategoryRequest.cs | 3 + .../Eft/Wishlist/RemoveFromWishlistRequest.cs | 3 + .../Models/Eft/Ws/WsNotificationEvent.cs | 3 + .../Models/Enums/AccountTypes.cs | 6 +- .../Models/Enums/GameEditions.cs | 6 +- .../Models/Enums/HideoutEventActions.cs | 4 + .../Models/Enums/ItemEventActions.cs | 6 +- .../Models/Enums/Money.cs | 4 + .../Spt/Bots/BotDetailsForChatMessages.cs | 6 +- .../Models/Spt/Bots/BotGenerationDetails.cs | 3 + .../Models/Spt/Bots/BotLootCache.cs | 6 + .../Models/Spt/Bots/Bots.cs | 5 +- .../Bots/ChooseRandomCompatibleModResult.cs | 3 + .../FilterPlateModsForSlotByLevelResult.cs | 3 + .../Spt/Bots/GenerateEquipmentProperties.cs | 3 + .../Models/Spt/Bots/GenerateWeaponRequest.cs | 15 + .../Models/Spt/Bots/GenerateWeaponResult.cs | 3 + .../Models/Spt/Bots/ItemSpawnLimitSettings.cs | 3 + .../Models/Spt/Bots/ModToSpawnRequest.cs | 3 + .../Models/Spt/Config/AirdropConfig.cs | 5 +- .../Models/Spt/Config/BackupConfig.cs | 5 +- .../Models/Spt/Config/BaseConfig.cs | 5 +- .../Models/Spt/Config/BotConfig.cs | 36 ++ .../Models/Spt/Config/BotDurability.cs | 18 + .../Models/Spt/Config/CoreConfig.cs | 18 + .../Models/Spt/Config/GiftsConfig.cs | 3 + .../Models/Spt/Config/HealthConfig.cs | 8 +- .../Models/Spt/Config/HideoutConfig.cs | 9 + .../Models/Spt/Config/HttpConfig.cs | 2 +- .../Models/Spt/Config/InRaidConfig.cs | 8 +- .../Models/Spt/Config/InsuranceConfig.cs | 2 +- .../Models/Spt/Config/InventoryConfig.cs | 8 +- .../Models/Spt/Config/ItemConfig.cs | 3 + .../Models/Spt/Config/LocaleConfig.cs | 2 +- .../Models/Spt/Config/LocationConfig.cs | 24 + .../Models/Spt/Config/LostOnDeathConfig.cs | 5 +- .../Models/Spt/Config/MatchConfig.cs | 2 +- .../Models/Spt/Config/PlayerScavConfig.cs | 6 + .../Models/Spt/Config/PmcChatResponse.cs | 5 +- .../Models/Spt/Config/PmcConfig.cs | 6 + .../Models/Spt/Config/QuestConfig.cs | 33 + .../Models/Spt/Config/RagfairConfig.cs | 39 ++ .../Models/Spt/Config/RepairConfig.cs | 18 + .../Models/Spt/Config/ScavCaseConfig.cs | 11 +- .../Models/Spt/Config/SeasonalEventConfig.cs | 12 + .../Models/Spt/Config/TraderConfig.cs | 17 +- .../Models/Spt/Config/WeatherConfig.cs | 17 +- .../Models/Spt/Dialog/SendMessageDetails.cs | 6 + .../Spt/Fence/CreateFenceAssortsResult.cs | 5 +- .../Spt/Fence/FenceAssortGenerationValues.cs | 8 +- .../Models/Spt/Helper/WeightedRandomResult.cs | 4 + .../Models/Spt/Hideout/CircleCraftDetails.cs | 5 +- .../Models/Spt/Hideout/Hideout.cs | 5 +- .../Hideout/ScavCaseRewardCountsAndPrices.cs | 8 +- .../Models/Spt/Inventory/ItemSize.cs | 3 + .../Spt/Inventory/OwnerInventoryItems.cs | 5 +- .../Launcher/LauncherV2CompatibleVersion.cs | 6 +- .../Spt/Launcher/LauncherV2LoginResponse.cs | 6 +- .../Spt/Launcher/LauncherV2ModsResponse.cs | 6 +- .../LauncherV2PasswordChangeResponse.cs | 6 +- .../Spt/Launcher/LauncherV2PingResponse.cs | 6 +- .../Spt/Launcher/LauncherV2ProfileResponse.cs | 6 +- .../Launcher/LauncherV2ProfilesResponse.cs | 6 +- .../Launcher/LauncherV2RegisterResponse.cs | 6 +- .../Spt/Launcher/LauncherV2RemoveResponse.cs | 6 +- .../Spt/Launcher/LauncherV2TypesResponse.cs | 6 +- .../Spt/Launcher/LauncherV2VersionResponse.cs | 6 +- .../Models/Spt/Location/RaidChanges.cs | 6 + .../Models/Spt/Logging/ClientLogRequest.cs | 3 + .../Models/Spt/Logging/LogBackgroundColor.cs | 2 +- .../Models/Spt/Logging/LogTextColor.cs | 2 +- .../Models/Spt/Logging/SptLogger.cs | 6 +- .../Models/Spt/Mod/ModOrder.cs | 5 +- .../Models/Spt/Mod/NewItemDetails.cs | 11 +- .../Models/Spt/Mod/SptMod.cs | 5 +- .../Models/Spt/Presets/PresetCacheDetails.cs | 6 +- .../Spt/Quests/GetRepeatableByIdResult.cs | 5 +- .../Models/Spt/Ragfair/RagfairServerPrices.cs | 3 + .../Models/Spt/Ragfair/TplWithFleaPrice.cs | 5 +- .../Spt/Repeatable/QuestRewardValues.cs | 3 + .../Models/Spt/Repeatable/QuestTypePool.cs | 15 + .../Models/Spt/Server/DatabaseTables.cs | 6 +- .../Models/Spt/Server/LocaleBase.cs | 5 +- .../Models/Spt/Server/Locations.cs | 3 + .../Models/Spt/Server/ServerBase.cs | 5 +- .../Models/Spt/Server/SettingsBase.cs | 47 +- .../Spt/Services/InsuranceEquipmentPkg.cs | 3 + .../Models/Spt/Services/LootItem.cs | 3 + .../Models/Spt/Services/LootRequest.cs | 3 + .../Spt/Services/ProfileActivityData.cs | 2 +- .../Models/Spt/Services/TraderServiceModel.cs | 6 + .../Models/Spt/Templates/Templates.cs | 5 +- .../Weather/GetLocalWeatherResponseData.cs | 3 + .../Models/Trader/Traders.cs | 36 +- 320 files changed, 3020 insertions(+), 187 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs index 400c8e84..04c2ecb1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Common; public record IdWithCount { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// ID of stack to take money from /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs index a5feaa06..6a7b2170 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Common; public record MinMax where T : IMinMaxValue { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public MinMax(T min, T max) { Min = min; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs index d51b637d..c701b100 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Bot; public record GenerateBotsRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("conditions")] public List? Conditions { @@ -15,6 +18,9 @@ public record GenerateBotsRequestData : IRequestData public record GenerateCondition { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// e.g. assault/pmcBot/bossKilla /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs index 99b332fd..d73fafde 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Bot; public record RandomisedBotLevelResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("level")] public int? Level { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs index ba8aa8f5..18c02ad6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Utils; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Builds; public record SetMagazineRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs index 86500302..1061bd54 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs @@ -1,7 +1,11 @@ -using SPTarkov.Server.Core.Models.Utils; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Common; public record EmptyRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs index 572ccfbf..d8c8fbdc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record Globals { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("config")] public Config? Configuration { @@ -45,6 +48,9 @@ public record Globals public record PlayerSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BaseMaxMovementRolloff")] public double? BaseMaxMovementRolloff { @@ -104,6 +110,9 @@ public record PlayerSettings public record SearchSoundVolumeSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double FpVolume { get; @@ -119,6 +128,9 @@ public record SearchSoundVolumeSettings public record MovementRolloffMultiplier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MovementState")] public string? MovementState { @@ -136,6 +148,9 @@ public record MovementRolloffMultiplier public record RadioBroadcastSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("EnabledBroadcast")] public bool? EnabledBroadcast { @@ -153,6 +168,9 @@ public record RadioBroadcastSettings public record RadioStation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Enabled")] public bool? Enabled { @@ -170,6 +188,9 @@ public record RadioStation public record LocationInfection { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Interchange")] public double? Interchange { @@ -243,6 +264,9 @@ public record LocationInfection public record ArtilleryShelling { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ArtilleryMapsConfigs")] public Dictionary? ArtilleryMapsConfigs { @@ -267,6 +291,9 @@ public record ArtilleryShelling public record ArtilleryMapSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("PlanedShellingOn")] public bool? PlanedShellingOn { @@ -347,6 +374,9 @@ public record ArtilleryMapSettings public record ShellingZone { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ID")] public double? ID { @@ -469,6 +499,9 @@ public record ShellingZone public record AlarmStage { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Value")] public Position? Value { @@ -479,6 +512,9 @@ public record AlarmStage public record Brigade { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ID")] public double? Id { @@ -496,6 +532,9 @@ public record Brigade public record ArtilleryGun { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Position")] public XYZ? Position { @@ -506,6 +545,9 @@ public record ArtilleryGun public record ArtilleryShellingAirDropSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("UseAirDrop")] public bool? UseAirDrop { @@ -537,6 +579,9 @@ public record ArtilleryShellingAirDropSettings public record ProjectileExplosionParams { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Blindness")] public XYZ? Blindness { @@ -643,6 +688,9 @@ public record ProjectileExplosionParams public record Config { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ArtilleryShelling")] public ArtilleryShelling? ArtilleryShelling { @@ -1394,6 +1442,9 @@ public record Config public record GlobalAudioSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("RadioBroadcastSettings")] public RadioBroadcastSettings? RadioBroadcastSettings { @@ -1404,6 +1455,9 @@ public record GlobalAudioSettings public record Triggers { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public Dictionary>? HandlerDamage { get; @@ -1413,6 +1467,9 @@ public record Triggers public record DamageData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public int? Amount { get; @@ -1429,6 +1486,9 @@ public record DamageData public record HandlerDamageObject { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public int? Amount { get; @@ -1444,6 +1504,9 @@ public record HandlerDamageObject public record PveSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? AvailableVersions { get; @@ -1459,6 +1522,9 @@ public record PveSettings public record CoopSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? AvailableVersions { get; @@ -1468,6 +1534,9 @@ public record CoopSettings public record RunddansSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("accessKeys")] public List? AccessKeys { @@ -1597,6 +1666,9 @@ public record RunddansSettings public record SeasonActivity { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("InfectionHalloween")] public SeasonActivityHalloween? InfectionHalloween { @@ -1607,6 +1679,9 @@ public record SeasonActivity public record SeasonActivityHalloween { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DisplayUIEnabled")] public bool? DisplayUIEnabled { @@ -1631,6 +1706,9 @@ public record SeasonActivityHalloween public record EnvironmentUISettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public EnvironmentUIData? EnvironmentUIData { get; @@ -1640,6 +1718,9 @@ public record EnvironmentUISettings public record EnvironmentUIData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string[] TheUnheardEditionEnvironmentUiType { get; @@ -1649,6 +1730,9 @@ public record EnvironmentUIData public record BodyPartColliderSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public BodyPartColliderPart? BackHead { get; @@ -1808,6 +1892,9 @@ public record BodyPartColliderSettings public record BodyPartColliderPart { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("PenetrationChance")] public double? PenetrationChance { @@ -1832,6 +1919,9 @@ public record BodyPartColliderPart public record WeaponFastDrawSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HandShakeCurveFrequency")] public double? HandShakeCurveFrequency { @@ -1891,6 +1981,9 @@ public record WeaponFastDrawSettings public record EventSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("EventActive")] public bool? EventActive { @@ -1950,6 +2043,9 @@ public record EventSettings public record EventWeather { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Cloudness")] public double? Cloudness { @@ -2016,6 +2112,9 @@ public record EventWeather public record TransitSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BearPriceMod")] public double? BearPriceMod { @@ -2110,6 +2209,9 @@ public record TransitSettings public record TripwiresSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("CollisionCapsuleCheckCoef")] public double? CollisionCapsuleCheckCoef { @@ -2211,6 +2313,9 @@ public record TripwiresSettings public record MountingSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MovementSettings")] public MountingMovementSettings? MovementSettings { @@ -2228,6 +2333,9 @@ public record MountingSettings public record MountingMovementSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ApproachTime")] public double? ApproachTime { @@ -2336,6 +2444,9 @@ public record MountingMovementSettings public record MountingPointDetectionSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("CheckHorizontalSecondaryOffset")] public double? CheckHorizontalSecondaryOffset { @@ -2486,6 +2597,9 @@ public record MountingPointDetectionSettings public record GraphicSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ExperimentalFogInCity")] public bool? ExperimentalFogInCity { @@ -2496,6 +2610,9 @@ public record GraphicSettings public record BufferZone { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("CustomerAccessTime")] public double? CustomerAccessTime { @@ -2520,6 +2637,9 @@ public record BufferZone public record ItemsCommonSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ItemRemoveAfterInterruptionTime")] public double? ItemRemoveAfterInterruptionTime { @@ -2530,6 +2650,9 @@ public record ItemsCommonSettings public record TradingSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BuyRestrictionMaxBonus")] public Dictionary? BuyRestrictionMaxBonus { @@ -2547,6 +2670,9 @@ public record TradingSettings public record BuyRestrictionMaxBonus { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("multiplier")] public double? Multiplier { @@ -2557,6 +2683,9 @@ public record BuyRestrictionMaxBonus public record BuyoutRestrictions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MinDurability")] public double? MinDurability { @@ -2581,6 +2710,9 @@ public record BuyoutRestrictions public record Content { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ip")] public string? Ip { @@ -2605,6 +2737,9 @@ public record Content public record Exp { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("heal")] public Heal? Heal { @@ -2674,6 +2809,9 @@ public record Exp public record Heal { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("expForHeal")] public double? ExpForHeal { @@ -2698,6 +2836,9 @@ public record Heal public record MatchEnd { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("README")] public string? ReadMe { @@ -2796,6 +2937,9 @@ public record MatchEnd public record Kill { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("combo")] public Combo[] Combos { @@ -2876,6 +3020,9 @@ public record Kill public record Combo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("percent")] public double? Percentage { @@ -2886,6 +3033,9 @@ public record Combo public record Level { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("exp_table")] public ExpTable[] ExperienceTable { @@ -2931,6 +3081,9 @@ public record Level public record ExpTable { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("exp")] public int? Experience { @@ -2941,6 +3094,9 @@ public record ExpTable public record LootAttempt { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("k_exp")] public double? ExperiencePoints { @@ -2951,6 +3107,9 @@ public record LootAttempt public record Armor { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("class")] public List? Classes { @@ -2961,6 +3120,9 @@ public record Armor public record Class { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // Checked in client [JsonPropertyName("resistance")] public int? Resistance @@ -2972,6 +3134,9 @@ public record Class public record Mastering { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Id")] public string? Id { @@ -3019,6 +3184,9 @@ public record Mastering public record Customization { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("SavageHead")] public Dictionary? Head { @@ -3057,6 +3225,9 @@ public record Customization public record WildHead { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("head")] public string? Head { @@ -3081,6 +3252,9 @@ public record WildHead public record WildBody { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("body")] public string? Body { @@ -3105,6 +3279,9 @@ public record WildBody public record WildFeet { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("feet")] public string? Feet { @@ -3129,6 +3306,9 @@ public record WildFeet public record CustomizationVoice { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("voice")] public string? Voice { @@ -3153,6 +3333,9 @@ public record CustomizationVoice public record BodyParts { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string? Head { get; @@ -3180,6 +3363,9 @@ public record BodyParts public record AirdropGlobalSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string? AirdropViewType { get; @@ -3249,6 +3435,9 @@ public record AirdropGlobalSettings public record KarmaCalculationSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("defaultPveKarmaValue")] public double? DefaultPveKarmaValue { @@ -3294,6 +3483,9 @@ public record KarmaCalculationSettings public record ArenaEftTransferSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? ArenaManagerReputationTaxMultiplier { get; @@ -3333,6 +3525,9 @@ public record ArenaEftTransferSettings public record ArmorType { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Destructibility")] public double? Destructibility { @@ -3378,6 +3573,9 @@ public record ArmorType public record Health { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Falling")] public Falling? Falling { @@ -3409,6 +3607,9 @@ public record Health public record Falling { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DamagePerMeter")] public double? DamagePerMeter { @@ -3426,6 +3627,9 @@ public record Falling public record Effects { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Existence")] public Existence? Existence { @@ -3625,6 +3829,9 @@ public record Effects public record ZombieInfection { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Dehydration")] public double? Dehydration { @@ -3651,6 +3858,9 @@ public record ZombieInfection public record Existence { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("EnergyLoopTime")] public double? EnergyLoopTime { @@ -3696,6 +3906,9 @@ public record Existence public record Dehydration { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -3748,6 +3961,9 @@ public record Dehydration public record BreakPart { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -3814,6 +4030,9 @@ public record BreakPart public record Contusion { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Dummy")] public double? Dummy { @@ -3824,6 +4043,9 @@ public record Contusion public record Disorientation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Dummy")] public double? Dummy { @@ -3834,6 +4056,9 @@ public record Disorientation public record Exhaustion { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -3865,6 +4090,9 @@ public record Exhaustion public record LowEdgeHealth { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -3889,6 +4117,9 @@ public record LowEdgeHealth public record RadExposure { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Damage")] public double? Damage { @@ -3906,6 +4137,9 @@ public record RadExposure public record Stun { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Dummy")] public double? Dummy { @@ -3916,6 +4150,9 @@ public record Stun public record Intoxication { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -3982,6 +4219,9 @@ public record Intoxication public record Regeneration { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("LoopTime")] public double? LoopTime { @@ -4027,6 +4267,9 @@ public record Regeneration public record BodyHealth { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Head")] public BodyHealthValue? Head { @@ -4079,6 +4322,9 @@ public record BodyHealth public record BodyHealthValue { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Value")] public double? Value { @@ -4089,6 +4335,9 @@ public record BodyHealthValue public record Influences { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("LightBleeding")] public Influence? LightBleeding { @@ -4127,6 +4376,9 @@ public record Influences public record Influence { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HealthSlowDownPercentage")] public double? HealthSlowDownPercentage { @@ -4151,6 +4403,9 @@ public record Influence public record Wound { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("WorkingTime")] public double? WorkingTime { @@ -4175,6 +4430,9 @@ public record Wound public record Berserk { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -4199,6 +4457,9 @@ public record Berserk public record Flash { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Dummy")] public double? Dummy { @@ -4209,6 +4470,9 @@ public record Flash public record MedEffect { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("LoopTime")] public double? LoopTime { @@ -4268,6 +4532,9 @@ public record MedEffect public record Pain { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("TremorDelay")] public double? TremorDelay { @@ -4285,6 +4552,9 @@ public record Pain public record PainKiller { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? Dummy { get; @@ -4294,6 +4564,9 @@ public record PainKiller public record SandingScreen { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? Dummy { get; @@ -4303,6 +4576,9 @@ public record SandingScreen public record MusclePainEffect { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? GymEffectivity { get; @@ -4330,6 +4606,9 @@ public record MusclePainEffect public record Stimulator { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? BuffLoopTime { get; @@ -4345,6 +4624,9 @@ public record Stimulator public record Buff { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BuffType")] public string? BuffType { @@ -4403,6 +4685,9 @@ public record Buff public record Tremor { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -4420,6 +4705,9 @@ public record Tremor public record ChronicStaminaFatigue { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("EnergyRate")] public double? EnergyRate { @@ -4451,6 +4739,9 @@ public record ChronicStaminaFatigue public record Fracture { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -4517,6 +4808,9 @@ public record Fracture public record HeavyBleeding { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -4632,6 +4926,9 @@ public record HeavyBleeding public record Probability { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("FunctionType")] public string? FunctionType { @@ -4663,6 +4960,9 @@ public record Probability public record LightBleeding { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultDelay")] public double? DefaultDelay { @@ -4778,6 +5078,9 @@ public record LightBleeding public record BodyTemperature { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DefaultBuildUpTime")] public double? DefaultBuildUpTime { @@ -4802,6 +5105,9 @@ public record BodyTemperature public record HealPrice { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HealthPointPrice")] public double? HealthPointPrice { @@ -4840,6 +5146,9 @@ public record HealPrice public record ProfileHealthSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BodyPartsSettings")] public BodyPartsSettings? BodyPartsSettings { @@ -4864,6 +5173,9 @@ public record ProfileHealthSettings public record BodyPartsSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Head")] public BodyPartsSetting? Head { @@ -4916,6 +5228,9 @@ public record BodyPartsSettings public record BodyPartsSetting { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Minimum")] public double? Minimum { @@ -4954,6 +5269,9 @@ public record BodyPartsSetting public record HealthFactorsSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Energy")] public HealthFactorSetting? Energy { @@ -4992,6 +5310,9 @@ public record HealthFactorsSettings public record HealthFactorSetting { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Minimum")] public double? Minimum { @@ -5016,6 +5337,9 @@ public record HealthFactorSetting public record Rating { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("levelRequired")] public double? LevelRequired { @@ -5040,6 +5364,9 @@ public record Rating public record Categories { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("experience")] public bool? Experience { @@ -5113,6 +5440,9 @@ public record Categories public record Tournament { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("categories")] public TournamentCategories? Categories { @@ -5137,6 +5467,9 @@ public record Tournament public record TournamentCategories { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dogtags")] public bool? Dogtags { @@ -5147,6 +5480,9 @@ public record TournamentCategories public record RagFair { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enabled")] public bool? Enabled { @@ -5411,6 +5747,9 @@ public record RagFair public record ItemGlobalRestrictions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MaxFlea")] public double? MaxFlea { @@ -5435,6 +5774,9 @@ public record ItemGlobalRestrictions public record MaxActiveOfferCount { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("from")] public double? From { @@ -5466,6 +5808,9 @@ public record MaxActiveOfferCount public record MaxSumForRarity { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Common")] public RarityMaxSum? Common { @@ -5497,6 +5842,9 @@ public record MaxSumForRarity public record RarityMaxSum { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("value")] public double? Value { @@ -5507,6 +5855,9 @@ public record RarityMaxSum public record Handbook { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("defaultCategory")] public string? DefaultCategory { @@ -5517,6 +5868,9 @@ public record Handbook public record Stamina { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Capacity")] public double? Capacity { @@ -5893,6 +6247,9 @@ public record Stamina public record StaminaRestoration { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("LowerLeftPoint")] public double? LowerLeftPoint { @@ -5938,6 +6295,9 @@ public record StaminaRestoration public record StaminaDrain { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("LowerLeftPoint")] public double? LowerLeftPoint { @@ -5983,6 +6343,9 @@ public record StaminaDrain public record RequirementReferences { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Alpinist")] public List? Alpinists { @@ -5993,6 +6356,9 @@ public record RequirementReferences public record Alpinist { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Requirement")] public string? Requirement { @@ -6031,6 +6397,9 @@ public record Alpinist public record RestrictionsInRaid { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MaxInLobby")] public double? MaxInLobby { @@ -6055,6 +6424,9 @@ public record RestrictionsInRaid public record FavoriteItemsSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("WeaponStandMaxItemsCount")] public double? WeaponStandMaxItemsCount { @@ -6072,6 +6444,9 @@ public record FavoriteItemsSettings public record VaultingSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("IsActive")] public bool? IsActive { @@ -6103,6 +6478,9 @@ public record VaultingSettings public record VaultingGridSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("GridSizeX")] public double? GridSizeX { @@ -6176,6 +6554,9 @@ public record VaultingGridSettings public record VaultingMovesSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("VaultSettings")] public VaultingSubMoveSettings? VaultSettings { @@ -6193,6 +6574,9 @@ public record VaultingMovesSettings public record VaultingSubMoveSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("IsActive")] public bool? IsActive { @@ -6237,6 +6621,9 @@ public record VaultingSubMoveSettings public record MoveRestrictions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("IsActive")] public bool? IsActive { @@ -6282,6 +6669,9 @@ public record MoveRestrictions public record BTRSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("LocationsWithBTR")] public List? LocationsWithBTR { @@ -6432,6 +6822,9 @@ public record BTRSettings public record BtrMapConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BtrSkin")] public string? BtrSkin { @@ -6540,6 +6933,9 @@ public record BtrMapConfig public record PathConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("active")] public bool? Active { @@ -6606,6 +7002,9 @@ public record PathConfig public record SquadSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("CountOfRequestsToOnePlayer")] public double? CountOfRequestsToOnePlayer { @@ -6630,6 +7029,9 @@ public record SquadSettings public record Insurance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ChangeForReturnItemsInOfflineRaid")] public double? ChangeForReturnItemsInOfflineRaid { @@ -6675,6 +7077,9 @@ public record Insurance public record MessageSendTimeMultiplier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("multiplier")] public double? Multiplier { @@ -6685,6 +7090,9 @@ public record MessageSendTimeMultiplier public record SkillsSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("SkillProgressRate")] public double? SkillProgressRate { @@ -7171,6 +7579,9 @@ public record SkillsSettings public record MeleeSkill { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public BuffSettings? BuffSettings { get; @@ -7180,6 +7591,9 @@ public record MeleeSkill public record ArmorSkills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? BluntThroughputDamageHVestsReducePerLevel { get; @@ -7267,6 +7681,9 @@ public record ArmorSkills public record ArmorCounters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("armorDurability")] public SkillCounter? ArmorDurability { @@ -7277,6 +7694,9 @@ public record ArmorCounters public record HideoutManagement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? SkillPointsPerAreaUpgrade { get; @@ -7322,6 +7742,9 @@ public record HideoutManagement public record SkillPointsRate { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public SkillPointRate? Generator { get; @@ -7349,6 +7772,9 @@ public record SkillPointsRate public record SkillPointRate { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? ResourceSpent { get; @@ -7364,6 +7790,9 @@ public record SkillPointRate public record EliteSlots { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public EliteSlot? Generator { get; @@ -7391,6 +7820,9 @@ public record EliteSlots public record EliteSlot { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? Slots { get; @@ -7406,6 +7838,9 @@ public record EliteSlot public record Crafting { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DependentSkillRatios")] public List? DependentSkillRatios { @@ -7473,6 +7908,9 @@ public record Crafting public record Metabolism { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HydrationRecoveryRate")] public double? HydrationRecoveryRate { @@ -7511,6 +7949,9 @@ public record Metabolism public record Immunity { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ImmunityMiscEffects")] public double? ImmunityMiscEffects { @@ -7549,6 +7990,9 @@ public record Immunity public record Endurance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MovementAction")] public double? MovementAction { @@ -7587,6 +8031,9 @@ public record Endurance public record Strength { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DependentSkillRatios")] public List? DependentSkillRatios { @@ -7660,6 +8107,9 @@ public record Strength public record DependentSkillRatio { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Ratio")] public double? Ratio { @@ -7677,6 +8127,9 @@ public record DependentSkillRatio public record QTELevelMultiplier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Level")] public double? Level { @@ -7694,6 +8147,9 @@ public record QTELevelMultiplier public record Vitality { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DamageTakenAction")] public double? DamageTakenAction { @@ -7711,6 +8167,9 @@ public record Vitality public record HealthSkillProgress { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("SkillProgress")] public double? SkillProgress { @@ -7721,6 +8180,9 @@ public record HealthSkillProgress public record StressResistance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HealthNegativeEffect")] public double? HealthNegativeEffect { @@ -7738,6 +8200,9 @@ public record StressResistance public record Throwing { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ThrowAction")] public double? ThrowAction { @@ -7748,6 +8213,9 @@ public record Throwing public record RecoilControl { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("RecoilAction")] public double? RecoilAction { @@ -7765,6 +8233,9 @@ public record RecoilControl public record WeaponSkills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("WeaponReloadAction")] public double? WeaponReloadAction { @@ -7796,6 +8267,9 @@ public record WeaponSkills public record CovertMovement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MovementAction")] public double? MovementAction { @@ -7806,6 +8280,9 @@ public record CovertMovement public record Search { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("SearchAction")] public double? SearchAction { @@ -7823,6 +8300,9 @@ public record Search public record WeaponTreatment { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BuffMaxCount")] public double? BuffMaxCount { @@ -7882,6 +8362,9 @@ public record WeaponTreatment public record WeaponTreatmentCounters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("firearmsDurability")] public SkillCounter? FirearmsDurability { @@ -7892,6 +8375,9 @@ public record WeaponTreatmentCounters public record BuffSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("CommonBuffChanceLevelBonus")] public double? CommonBuffChanceLevelBonus { @@ -7937,6 +8423,9 @@ public record BuffSettings public record MagDrills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("RaidLoadedAmmoAction")] public double? RaidLoadedAmmoAction { @@ -7961,6 +8450,9 @@ public record MagDrills public record Perception { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DependentSkillRatios")] public List? DependentSkillRatios { @@ -7985,6 +8477,9 @@ public record Perception public record SkillRatio { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Ratio")] public double? Ratio { @@ -8002,6 +8497,9 @@ public record SkillRatio public record Intellect { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public SkillRatio[] DependentSkillRatios { get; @@ -8060,6 +8558,9 @@ public record Intellect public record IntellectCounters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("armorDurability")] public SkillCounter? ArmorDurability { @@ -8084,6 +8585,9 @@ public record IntellectCounters public record SkillCounter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("divisor")] public double? Divisor { @@ -8101,6 +8605,9 @@ public record SkillCounter public record Attention { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DependentSkillRatios")] public SkillRatio[] DependentSkillRatios { @@ -8132,6 +8639,9 @@ public record Attention public record Charisma { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BonusSettings")] public BonusSettings? BonusSettings { @@ -8170,6 +8680,9 @@ public record Charisma public record CharismaSkillCounters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("insuranceCost")] public SkillCounter? InsuranceCost { @@ -8208,6 +8721,9 @@ public record CharismaSkillCounters public record BonusSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("EliteBonusSettings")] public EliteBonusSettings? EliteBonusSettings { @@ -8225,6 +8741,9 @@ public record BonusSettings public record EliteBonusSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("FenceStandingLossDiscount")] public double? FenceStandingLossDiscount { @@ -8249,6 +8768,9 @@ public record EliteBonusSettings public record LevelBonusSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HealthRestoreDiscount")] public double? HealthRestoreDiscount { @@ -8294,6 +8816,9 @@ public record LevelBonusSettings public record Memory { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AnySkillUp")] public double? AnySkillUp { @@ -8311,6 +8836,9 @@ public record Memory public record Surgery { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("SurgeryAction")] public double? SurgeryAction { @@ -8328,6 +8856,9 @@ public record Surgery public record AimDrills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("WeaponShotAction")] public double? WeaponShotAction { @@ -8338,6 +8869,9 @@ public record AimDrills public record TroubleShooting { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MalfRepairSpeedBonusPerLevel")] public double? MalfRepairSpeedBonusPerLevel { @@ -8376,6 +8910,9 @@ public record TroubleShooting public record Aiming { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ProceduralIntensityByPose")] public XYZ? ProceduralIntensityByPose { @@ -8512,6 +9049,9 @@ public record Aiming public record Malfunction { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AmmoMalfChanceMult")] public double? AmmoMalfChanceMult { @@ -8690,6 +9230,9 @@ public record Malfunction public record Overheat { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MinOverheat")] public double? MinimumOverheat { @@ -8889,6 +9432,9 @@ public record Overheat public record FenceSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // MongoId [JsonPropertyName("FenceId")] public string? FenceIdentifier @@ -8925,6 +9471,9 @@ public record FenceSettings public record FenceLevel { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ReachOnMarkOnUnknowns")] public bool? CanReachOnMarkOnUnknowns { @@ -9110,6 +9659,9 @@ public record FenceLevel public record Inertia { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("InertiaLimits")] public XYZ? InertiaLimits { @@ -9385,6 +9937,9 @@ public record Inertia public record Ballistic { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("GlobalDamageDegradationCoefficient")] public double? GlobalDamageDegradationCoefficient { @@ -9395,6 +9950,9 @@ public record Ballistic public record RepairSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ItemEnhancementSettings")] public ItemEnhancementSettings? ItemEnhancementSettings { @@ -9440,6 +9998,9 @@ public record RepairSettings public record ItemEnhancementSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("DamageReduction")] public PriceModifier? DamageReduction { @@ -9464,6 +10025,9 @@ public record ItemEnhancementSettings public record PriceModifier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("PriceModifier")] public double? PriceModifierValue { @@ -9474,6 +10038,9 @@ public record PriceModifier public record RepairStrategies { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Armor")] public RepairStrategy? Armor { @@ -9491,6 +10058,9 @@ public record RepairStrategies public record RepairStrategy { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BuffTypes")] public List? BuffTypes { @@ -9508,6 +10078,9 @@ public record RepairStrategy public record BotPreset { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("UseThis")] public bool? UseThis { @@ -9588,6 +10161,9 @@ public record BotPreset public record BotWeaponScattering { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Name")] public string? Name { @@ -9619,6 +10195,9 @@ public record BotWeaponScattering public record Preset { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -9674,6 +10253,9 @@ public record Preset public record QuestSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("GlobalRewardRepModifierDailyQuestPvE")] public double? GlobalRewardRepModifierDailyQuestPvE { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs index 6ad7d172..f133b99a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record Location { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Map meta-data /// @@ -76,6 +79,9 @@ public record Location public record StaticContainer { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("containersGroups")] public Dictionary? ContainersGroups { @@ -93,6 +99,9 @@ public record StaticContainer public record ContainerMinMax { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("minContainers")] public int? MinContainers { @@ -124,6 +133,9 @@ public record ContainerMinMax public record ContainerData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("groupId")] public string? GroupId { @@ -134,6 +146,9 @@ public record ContainerData public record StaticLootDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("itemcountDistribution")] public ItemCountDistribution[] ItemCountDistribution { @@ -151,6 +166,9 @@ public record StaticLootDetails public record ItemCountDistribution { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("count")] public int? Count { @@ -168,6 +186,9 @@ public record ItemCountDistribution public record ItemDistribution { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("tpl")] public string? Tpl { @@ -185,6 +206,9 @@ public record ItemDistribution public record StaticContainerDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("staticWeapons")] public List StaticWeapons { @@ -209,6 +233,9 @@ public record StaticContainerDetails public record StaticForced { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("containerId")] public string ContainerId { @@ -226,6 +253,9 @@ public record StaticForced public record StaticContainerData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("probability")] public float? Probability { @@ -243,6 +273,9 @@ public record StaticContainerData public record StaticAmmoDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("tpl")] public string? Tpl { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs index b1ee9056..f8385b78 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs @@ -8,6 +8,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record LocationBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AccessKeys")] public List? AccessKeys { @@ -810,6 +813,9 @@ public record LocationBase public record EventTrapsData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double MaxBarbedWires { get; @@ -837,6 +843,9 @@ public record EventTrapsData public record Transit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("activateAfterSec")] public int? ActivateAfterSeconds { @@ -917,6 +926,9 @@ public record Transit public record NonWaveGroupScenario { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Chance")] public double? Chance { @@ -972,6 +984,9 @@ public record Limit : MinMax public record AirdropParameter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AirdropPointDeactivateDistance")] public int? AirdropPointDeactivateDistance { @@ -1045,6 +1060,9 @@ public record AirdropParameter public record Banner { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -1062,6 +1080,9 @@ public record Banner public record Pic { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("path")] public string? Path { @@ -1079,6 +1100,9 @@ public record Pic public record BossLocationSpawn { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BossChance")] public double? BossChance { @@ -1224,6 +1248,9 @@ public record BossLocationSpawn public record BossSupport { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BossEscortAmount")] public string? BossEscortAmount { @@ -1249,6 +1276,9 @@ public record BossSupport public record BotLocationModifier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AccuracySpeed")] public double? AccuracySpeed { @@ -1441,6 +1471,9 @@ public record BotLocationModifier public record AdditionalHostilitySettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AlwaysEnemies")] public List? AlwaysEnemies { @@ -1528,6 +1561,9 @@ public record AdditionalHostilitySettings public record ChancedEnemy { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("EnemyChance")] public int? EnemyChance { @@ -1555,6 +1591,9 @@ public record MinMaxBot : MinMax public record MinPlayerWaitTime { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("minPlayers")] public int? MinPlayers { @@ -1572,6 +1611,9 @@ public record MinPlayerWaitTime public record Preview { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("path")] public string? Path { @@ -1589,6 +1631,9 @@ public record Preview public record Scene { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("path")] public string? Path { @@ -1606,6 +1651,9 @@ public record Scene public record SpawnPointParam { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BotZoneName")] public string? BotZoneName { @@ -1679,6 +1727,9 @@ public record SpawnPointParam public record ColliderParams { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _parent; [JsonPropertyName("_parent")] @@ -1704,6 +1755,9 @@ public record ColliderParams public record ColliderProps { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Center")] public XYZ? Center { @@ -1728,6 +1782,9 @@ public record ColliderProps public record Exit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// % Chance out of 100 exit will appear in raid /// @@ -1924,6 +1981,9 @@ public record Exit public record MaxItemCountInLocation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("TemplateId")] public string? TemplateId { @@ -1941,6 +2001,9 @@ public record MaxItemCountInLocation public record Wave { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BotPreset")] public string? BotPreset { @@ -2056,6 +2119,9 @@ public record Wave public record LocationEvents { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Halloween2024")] public Halloween2024? Halloween2024 { @@ -2072,6 +2138,9 @@ public record LocationEvents public record Khorovod { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? Chance { get; @@ -2081,6 +2150,9 @@ public record Khorovod public record Halloween2024 { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("CrowdAttackBlockRadius")] public double? CrowdAttackBlockRadius { @@ -2188,6 +2260,9 @@ public record Halloween2024 public record CrowdAttackSpawnParam { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Difficulty")] public string? Difficulty { @@ -2212,6 +2287,9 @@ public record CrowdAttackSpawnParam public record Area { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("center")] public XYZ? Center { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs index 83996d3c..b73de732 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record LooseLoot { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("spawnpointCount")] public SpawnpointCount? SpawnpointCount { @@ -29,6 +32,9 @@ public record LooseLoot public record SpawnpointCount { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("mean")] public double? Mean { @@ -46,6 +52,9 @@ public record SpawnpointCount public record SpawnpointTemplate { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _root; [JsonPropertyName("Id")] @@ -134,6 +143,9 @@ public record SpawnpointTemplate public record GroupPosition { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _name; [JsonPropertyName("Name")] @@ -173,6 +185,9 @@ public record GroupPosition public record Spawnpoint { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("locationId")] public string? LocationId { @@ -204,6 +219,9 @@ public record Spawnpoint public record LooseLootItemDistribution { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("composedKey")] public ComposedKey? ComposedKey { @@ -221,6 +239,9 @@ public record LooseLootItemDistribution public record ComposedKey { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _key; [JsonPropertyName("key")] diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs index a44b16e3..1c192c5e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Common; public record MetricsTableData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Keys")] public List? Keys { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs index 282b8f3b..573b9182 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Utils.Json.Converters; @@ -37,6 +37,9 @@ public record PostRaidPmcData : PmcData public record PostRaidStats { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Eft")] public EftStats? Eft { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs index 770b9e89..e85d5771 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Request; public record BaseInteractionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Action")] public string? Action { @@ -28,6 +31,9 @@ public record BaseInteractionRequestData public record OwnerInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs index 2e06d5ab..ec0d869a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Common.Request; public record UIDRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("uid")] public string? Uid { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs index bfb8d914..c131392a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Achievement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -112,6 +115,9 @@ public record Achievement public record AchievementQuestConditionTypes { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("started")] public List? Started { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs index c839acac..d39dae3f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -9,6 +9,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -231,6 +234,9 @@ public record BotBase public record MoneyTransferLimits { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // Resets every 24 hours in live /// /// TODO: Implement @@ -266,6 +272,9 @@ public record MoneyTransferLimits public record TaskConditionCounter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -300,6 +309,9 @@ public record TaskConditionCounter public record UnlockedInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("unlockedProductionRecipe")] public HashSet? UnlockedProductionRecipe { @@ -310,6 +322,9 @@ public record UnlockedInfo public record Info { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _side; private string? _voice; @@ -546,6 +561,9 @@ public record Info public record BotInfoSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _botDifficulty; private string? _role; @@ -601,6 +619,9 @@ public record BotInfoSettings public record Ban { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("banType")] public BanType? BanType { @@ -630,6 +651,9 @@ public enum BanType public record Customization { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _body; private string? _dogtag; @@ -702,6 +726,9 @@ public record Customization public record BotBaseHealth { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public CurrentMinMax? Hydration { get; @@ -749,6 +776,9 @@ public record BotBaseHealth public record BodyPartHealth { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public CurrentMinMax? Health { get; @@ -764,6 +794,9 @@ public record BodyPartHealth public record BodyPartEffectProperties { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // TODO: this was any, what actual type is it? public object? ExtraData { @@ -780,6 +813,9 @@ public record BodyPartEffectProperties public record CurrentMinMax { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? Current { get; @@ -813,6 +849,9 @@ public record CurrentMinMax public record BotBaseInventory { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("items")] public List? Items { @@ -894,6 +933,9 @@ public record BotBaseInventory public record BaseJsonSkills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? Common { get; @@ -916,6 +958,9 @@ public record BaseJsonSkills public record Skills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? Common { get; @@ -937,6 +982,9 @@ public record Skills public record BaseSkill { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? PointsEarnedDuringSession { get; @@ -986,6 +1034,9 @@ public record Mastering : BaseSkill public record Stats { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public EftStats? Eft { get; @@ -995,6 +1046,9 @@ public record Stats public record EftStats { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? CarriedQuestItems { get; @@ -1104,6 +1158,9 @@ public record EftStats public record DroppedItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string? QuestId { get; @@ -1125,6 +1182,9 @@ public record DroppedItem public record FoundInRaidItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string? QuestId { get; @@ -1140,6 +1200,9 @@ public record FoundInRaidItem public record Victim { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string? AccountId { get; @@ -1221,6 +1284,9 @@ public record Victim public record SessionCounters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? Items { get; @@ -1230,6 +1296,9 @@ public record SessionCounters public record OverallCounters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? Items { get; @@ -1239,6 +1308,9 @@ public record OverallCounters public record CounterKeyValue { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? Key { get; @@ -1254,6 +1326,9 @@ public record CounterKeyValue public record Aggressor { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? PrestigeLevel { get; @@ -1332,6 +1407,9 @@ public record Aggressor public record DamageHistory { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string? LethalDamagePart { get; @@ -1356,6 +1434,9 @@ public record DamageHistory public record BodyPartsDamageHistory { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? Head { get; @@ -1407,6 +1488,9 @@ public record BodyPartsDamageHistory public record DamageStats { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double? Amount { get; @@ -1447,6 +1531,9 @@ public record DamageStats public record DeathCause { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonConverter(typeof(JsonStringEnumConverter))] public DamageType? DamageType { @@ -1477,6 +1564,9 @@ public record DeathCause public record LastPlayerState { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public LastPlayerStateInfo? Info { get; @@ -1499,6 +1589,9 @@ public record LastPlayerState public record LastPlayerStateInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string? Nickname { get; @@ -1526,6 +1619,9 @@ public record LastPlayerStateInfo public record BackendCounter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -1550,6 +1646,9 @@ public record BackendCounter public record InsuredItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Trader ID item was insured by /// @@ -1570,6 +1669,9 @@ public record InsuredItem public record Hideout { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public Dictionary? Production { get; @@ -1626,6 +1728,9 @@ public record Hideout public record HideoutCounters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("fuelCounter")] public double? FuelCounter { @@ -1657,6 +1762,9 @@ public record HideoutCounters public record HideoutImprovement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("completed")] public bool? Completed { @@ -1674,6 +1782,9 @@ public record HideoutImprovement public record Production // use this instead of productive and scavcase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? Products { get; @@ -1824,6 +1935,9 @@ public record Production // use this instead of productive and scavcase public record BotHideoutArea { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] public HideoutAreas? Type { @@ -1886,6 +2000,9 @@ public record BotHideoutArea public record HideoutSlot { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// SPT specific value to keep track of what index this slot is (0,1,2,3 etc.) /// @@ -1906,6 +2023,9 @@ public record HideoutSlot public record LastCompleted { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("$oid")] public string? OId { @@ -1916,6 +2036,9 @@ public record LastCompleted public record Notes { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Notes")] public List? DataNotes { @@ -1935,6 +2058,9 @@ public enum SurvivorClass public record Quests { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("qid")] public string? QId { @@ -1983,6 +2109,9 @@ public record Quests public record TraderInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("loyaltyLevel")] public int? LoyaltyLevel { @@ -2028,6 +2157,9 @@ public record TraderInfo public record RagfairInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("rating")] public double? Rating { @@ -2066,6 +2198,9 @@ public record RagfairInfo public record Bonus { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs index af6e48cc..5b0763ab 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotCore { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("SAVAGE_KILL_DIST")] public double? SavageKillDistance { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs index 0b707f0a..f0864c5e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotType { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("appearance")] public Appearance? BotAppearance { @@ -80,6 +83,9 @@ public record BotType public record Appearance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("body")] public Dictionary? Body { @@ -121,6 +127,9 @@ public record Appearance public record Chances { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("equipment")] public Dictionary? EquipmentChances { @@ -157,6 +166,9 @@ public record Chances GenerateWeaponRequest.ModSpawnChances public record ModsChances { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("mod_charge")] public double? ModCharge { get; set; } @@ -317,6 +329,9 @@ public double? ModPistol_Grip { get; set; } public record Difficulties { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("easy")] public DifficultyCategories? Easy { @@ -348,6 +363,9 @@ public record Difficulties public record DifficultyCategories { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public Dictionary? Aiming { get; @@ -435,6 +453,9 @@ public record DifficultyCategories public record Experience { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// key = bot difficulty /// @@ -482,6 +503,9 @@ public record Experience public record Generation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("items")] public GenerationWeightingItems? Items { @@ -492,6 +516,9 @@ public record Generation public record GenerationData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// key: number of items, value: weighting /// @@ -516,6 +543,9 @@ public record GenerationData public record GenerationWeightingItems { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("grenades")] public GenerationData Grenades { @@ -610,6 +640,9 @@ public record GenerationWeightingItems public record BotTypeHealth { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public List? BodyParts { get; @@ -637,6 +670,9 @@ public record BotTypeHealth public record BodyPart { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public MinMax? Chest { get; @@ -682,6 +718,9 @@ public record BodyPart public record BotTypeInventory { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("equipment")] public Dictionary>? Equipment { @@ -712,6 +751,9 @@ public record BotTypeInventory public record Equipment { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public Dictionary? ArmBand { get; @@ -799,6 +841,9 @@ public record Equipment public record ItemPools { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public Dictionary? Backpack { get; @@ -832,6 +877,9 @@ public record ItemPools public record BotDbSkills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public Dictionary>? Common { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs index 2591680d..bd3268d9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record CustomisationStorage { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // Customisation.json/itemId [JsonPropertyName("id")] public string Id @@ -29,6 +32,9 @@ public record CustomisationStorage public record CustomisationType { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string SUITE = "suite"; public const string DOG_TAG = "dogTag"; public const string HEAD = "head"; @@ -46,6 +52,9 @@ public record CustomisationType public record CustomisationTypeId { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string CUSTOMIZATION = "5cbdb4a2e2b501000d352ae2"; public const string BODY_PARTS = "5cd943c31388ce000a659df5"; public const string BODY = "5cc0868e14c02e000c6bea68"; @@ -72,6 +81,9 @@ public record CustomisationTypeId public record CustomisationSource { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string QUEST = "quest"; public const string PRESTIGE = "prestige"; public const string ACHIEVEMENT = "achievement"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs index 17584a45..99b51c82 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record CustomizationItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -49,6 +52,9 @@ public record CustomizationItem public class CustomizationProps { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Prefab")] public object? Prefab { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs index d1d39062..7532d7e6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record HandbookBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Categories")] public List? Categories { @@ -21,6 +24,9 @@ public record HandbookBase public record HandbookCategory { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Id")] public string? Id { @@ -61,6 +67,9 @@ public record HandbookCategory public record HandbookItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs index c53667df..8d7602e6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Item { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _id; private string? _parentId; @@ -92,6 +95,9 @@ public record Item public record HideoutItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Hideout inventory id that was used by improvement action /// @@ -154,6 +160,9 @@ public record HideoutItem public record ItemLocation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("x")] public int? X { @@ -204,6 +213,9 @@ public enum ItemRotation public record Upd { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public UpdBuff? Buff { get; @@ -380,6 +392,9 @@ public record Upd public record LockableKeyComponent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public float? RelativeValue { get; set; } public int? NumberOfUsages { get; set; } @@ -387,6 +402,9 @@ public record LockableKeyComponent public record LockableComponent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string[]? KeyIds { get; set; } public bool? Locked { get; set; } public LockableKeyComponent? KeyComponent { get; set; } @@ -402,6 +420,9 @@ public enum PinLockState public record UpdBuff { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Rarity")] public string? Rarity { @@ -434,6 +455,9 @@ public record UpdBuff public record UpdTogglable { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("On")] public bool? On { @@ -444,6 +468,9 @@ public record UpdTogglable public record UpdMap { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Markers")] public List? Markers { @@ -454,6 +481,9 @@ public record UpdMap public record MapMarker { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Type")] public string? Type { @@ -485,6 +515,9 @@ public record MapMarker public record UpdTag { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Color")] public int? Color { @@ -502,6 +535,9 @@ public record UpdTag public record UpdFaceShield { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Hits")] public int? Hits { @@ -519,6 +555,9 @@ public record UpdFaceShield public record UpdRepairable { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Durability")] public double? Durability { @@ -536,6 +575,9 @@ public record UpdRepairable public record UpdRecodableComponent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("IsEncoded")] public bool? IsEncoded { @@ -546,6 +588,9 @@ public record UpdRecodableComponent public record UpdMedKit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HpResource")] public double? HpResource { @@ -556,6 +601,9 @@ public record UpdMedKit public record UpdSight { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ScopesCurrentCalibPointIndexes")] public List? ScopesCurrentCalibPointIndexes { @@ -586,6 +634,9 @@ public record UpdSight public record UpdFoldable { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Folded")] public bool? Folded { @@ -596,6 +647,9 @@ public record UpdFoldable public record UpdFireMode { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("FireMode")] public string? FireMode { @@ -606,6 +660,9 @@ public record UpdFireMode public record UpdFoodDrink { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("HpPercent")] public double? HpPercent { @@ -616,6 +673,9 @@ public record UpdFoodDrink public record UpdKey { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // Checked in client [JsonPropertyName("NumberOfUsages")] public int? NumberOfUsages @@ -627,6 +687,9 @@ public record UpdKey public record UpdResource { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Value")] public double? Value { @@ -644,6 +707,9 @@ public record UpdResource public record UpdLight { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("IsActive")] public bool? IsActive { @@ -661,6 +727,9 @@ public record UpdLight public record UpdDogtag { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AccountId")] public string? AccountId { @@ -748,6 +817,9 @@ public record UpdDogtag public record UpdSideEffect { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Value")] public double? Value { @@ -758,6 +830,9 @@ public record UpdSideEffect public record UpdRepairKit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Resource")] public double? Resource { @@ -768,6 +843,9 @@ public record UpdRepairKit public record UpdCultistAmulet { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("NumberOfUsages")] public double? NumberOfUsages { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs index 0440f8f8..7bd945ed 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationServices { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("TraderServerSettings")] public TraderServerSettings? TraderServerSettings { @@ -23,6 +26,9 @@ public record LocationServices public record TraderServerSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("TraderServices")] public TraderServices? TraderServices { @@ -33,6 +39,9 @@ public record TraderServerSettings public record TraderServices { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ExUsecLoyalty")] public TraderService? ExUsecLoyalty { @@ -85,6 +94,9 @@ public record TraderServices public record TraderService { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("TraderId")] public string? TraderId { @@ -125,6 +137,9 @@ public record TraderService public record ServiceRequirements { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("CompletedQuests")] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public List? CompletedQuests @@ -145,6 +160,9 @@ public record ServiceRequirements public record CompletedQuest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("QuestId")] public string? QuestId { @@ -155,6 +173,9 @@ public record CompletedQuest public record StandingRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Value")] public double? Value { @@ -165,6 +186,9 @@ public record StandingRequirement public record ServiceItemCostDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Count")] public int? Count { @@ -175,6 +199,9 @@ public record ServiceItemCostDetails public record BtrServerSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ChanceSpawn")] public double? ChanceSpawn { @@ -283,6 +310,9 @@ public record BtrServerSettings public record ServerMapBtrsettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MapID")] public string? MapID { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs index 8f2a5e7d..6a86b4ca 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationsBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("locations")] public Locations? Locations { @@ -21,11 +24,17 @@ public record LocationsBase public record Locations { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // Add properties as necessary } public record Path { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Source")] public string? Source { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs index 0c543da1..851c12f2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationsGenerateAllResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("locations")] public Dictionary Locations { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs index e54b8ac6..9d5f862f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Match { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("metrics")] public Metrics? Metrics { @@ -14,6 +17,9 @@ public record Match public record Metrics { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Keys")] public List? Keys { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs index 889a2b2b..b0a9e02d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Prestige { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("elements")] public List? Elements { @@ -14,6 +17,9 @@ public record Prestige public record PrestigeElement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -59,6 +65,9 @@ public record PrestigeElement public record TransferConfigs { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("stashConfig")] public StashPrestigeConfig? StashConfig { @@ -83,6 +92,9 @@ public record TransferConfigs public record StashPrestigeConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("xCellCount")] public int? XCellCount { @@ -107,6 +119,9 @@ public record StashPrestigeConfig public record StashPrestigeFilters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("includedItems")] public List? IncludedItems { @@ -124,6 +139,9 @@ public record StashPrestigeFilters public record PrestigeSkillConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("transferMultiplier")] public double? TransferMultiplier { @@ -134,6 +152,9 @@ public record PrestigeSkillConfig public record PrestigeMasteringConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("transferMultiplier")] public double? TransferMultiplier { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs index 106ae991..39e5b498 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record ProfileTemplates { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Standard")] public ProfileSides? Standard { @@ -71,6 +74,9 @@ public record ProfileTemplates public record ProfileSides { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("descriptionLocaleKey")] public string? DescriptionLocaleKey { @@ -95,6 +101,9 @@ public record ProfileSides public record TemplateSide { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("character")] public PmcData? Character { @@ -147,6 +156,9 @@ public record TemplateSide public record ProfileTraderTemplate { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("initialLoyaltyLevel")] public Dictionary? InitialLoyaltyLevel { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs index 6244b47b..6a19ff33 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Quest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// SPT addition - human readable quest name /// @@ -281,6 +284,9 @@ public record Quest /// public record QuestStatus { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -340,6 +346,9 @@ public record QuestStatus public record QuestConditionTypes { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Started")] public List? Started { @@ -378,6 +387,9 @@ public record QuestConditionTypes public record QuestCondition { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -688,6 +700,9 @@ public record QuestCondition public record QuestConditionCounter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -705,6 +720,9 @@ public record QuestConditionCounter public record QuestConditionCounterCondition { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -912,6 +930,9 @@ public record QuestConditionCounterCondition public record EnemyHealthEffect { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("bodyParts")] public List? BodyParts { @@ -929,6 +950,9 @@ public record EnemyHealthEffect public record ValueCompare { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("compareMethod")] public string? CompareMethod { @@ -946,6 +970,9 @@ public record ValueCompare public record CounterConditionDistance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("value")] public double? Value { @@ -963,6 +990,9 @@ public record CounterConditionDistance public record DaytimeCounter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("from")] public int? From { @@ -980,6 +1010,9 @@ public record DaytimeCounter public record VisibilityCondition { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -1025,6 +1058,9 @@ public record VisibilityCondition public record QuestRewards { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AvailableForStart")] public List? AvailableForStart { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs index dc66508f..f55a1663 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs @@ -70,6 +70,9 @@ public record RepeatableQuest : Quest public record RepeatableQuestDatabase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("templates")] public RepeatableTemplates? Templates { @@ -101,6 +104,9 @@ public record RepeatableQuestDatabase public record RepeatableQuestStatus { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -146,6 +152,9 @@ public record RepeatableQuestStatus public record RepeatableTemplates { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Elimination")] public RepeatableQuest? Elimination { @@ -177,6 +186,9 @@ public record RepeatableTemplates public record PmcDataRepeatableQuest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -247,6 +259,9 @@ public record PmcDataRepeatableQuest public record ChangeRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("changeCost")] public List? ChangeCost { @@ -264,6 +279,9 @@ public record ChangeRequirement public record ChangeCost { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// What item it will take to reset daily /// @@ -289,6 +307,9 @@ public record ChangeCost public record RewardOptions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("itemsBlacklist")] public List? ItemsBlacklist { @@ -299,6 +320,9 @@ public record RewardOptions public record Options { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Completion")] public CompletionFilter? Completion { @@ -309,6 +333,9 @@ public record Options public record CompletionFilter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("itemsBlacklist")] public List? ItemsBlacklist { @@ -326,6 +353,9 @@ public record CompletionFilter public record ItemsBlacklist { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("minPlayerLevel")] public int? MinPlayerLevel { @@ -343,6 +373,9 @@ public record ItemsBlacklist public record ItemsWhitelist { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("minPlayerLevel")] public int? MinPlayerLevel { @@ -360,6 +393,9 @@ public record ItemsWhitelist public record SampleQuests { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs index 624b781e..6a12ae06 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Reward { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("value")] [JsonConverter(typeof(StringToNumberFactoryConverter))] public double? Value diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs index 6320e85c..175271ba 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record TemplateItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private Dictionary? _blocks; private string? _id; @@ -115,6 +118,9 @@ public record TemplateItem public record Props { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string _backgroundColor; private string _itemSound; @@ -3521,6 +3527,9 @@ public record Props public record WeaponRecoilSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Enable")] public bool? Enable { @@ -3538,6 +3547,9 @@ public record WeaponRecoilSettings public record WeaponRecoilSettingValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Enable")] public bool? Enable { @@ -3562,6 +3574,9 @@ public record WeaponRecoilSettingValues public record WeaponRecoilProcess { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ComponentType")] public string? ComponentType { @@ -3600,6 +3615,9 @@ public record WeaponRecoilProcess public record WeaponRecoilTransformationCurve { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Keys")] public List? Keys { @@ -3610,6 +3628,9 @@ public record WeaponRecoilTransformationCurve public record WeaponRecoilTransformationCurveKey { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("inTangent")] public double? InTangent { @@ -3641,6 +3662,9 @@ public record WeaponRecoilTransformationCurveKey public record HealthEffect { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] public string? Type { @@ -3658,6 +3682,9 @@ public record HealthEffect public record Prefab { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("path")] public string? Path { @@ -3675,6 +3702,9 @@ public record Prefab public record Grid { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_name")] public string? Name { @@ -3713,6 +3743,9 @@ public record Grid public record GridProps { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("filters")] public List? Filters { @@ -3765,6 +3798,9 @@ public record GridProps public record GridFilter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Filter")] public HashSet? Filter { @@ -3789,6 +3825,9 @@ public record GridFilter public record Slot { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _name; private string? _proto; @@ -3864,6 +3903,9 @@ public record Slot public record SlotProps { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("filters")] public List? Filters { @@ -3881,6 +3923,9 @@ public record SlotProps public record SlotFilter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Shift")] public double? Shift { @@ -3947,6 +3992,9 @@ public record SlotFilter public record StackSlot { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_name")] public string? Name { @@ -3999,6 +4047,9 @@ public record StackSlot public record StackSlotProps { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("filters")] public List? Filters { @@ -4009,6 +4060,9 @@ public record StackSlotProps public record RandomLootSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("allowToSpawnIdenticalItems")] public bool? AllowToSpawnIdenticalItems { @@ -4068,6 +4122,9 @@ public record RandomLootSettings public record RandomLootExcluded { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("categoryTemplates")] public List? CategoryTemplates { @@ -4092,6 +4149,9 @@ public record RandomLootExcluded public record EffectsHealth { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Energy")] public EffectsHealthProps? Energy { @@ -4109,6 +4169,9 @@ public record EffectsHealth public record EffectsHealthProps { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("value")] public double? Value { @@ -4133,6 +4196,9 @@ public record EffectsHealthProps public record EffectsDamage { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Pain")] public EffectDamageProps? Pain { @@ -4185,6 +4251,9 @@ public record EffectsDamage public record EffectDamageProps { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("value")] public double? Value { @@ -4237,6 +4306,9 @@ public record EffectDamageProps public record Color { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("r")] public double? R { @@ -4268,6 +4340,9 @@ public record Color public record ShotsGroupSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("EndShotIndex")] public double? EndShotIndex { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs index 9c69b49f..00446fbd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Trader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("assort")] public TraderAssort? Assort { @@ -52,6 +55,9 @@ public record Trader public record TraderBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("refreshTraderRagfairOffers")] public bool? RefreshTraderRagfairOffers { @@ -266,6 +272,9 @@ public record TraderBase public record ItemBuyData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // MongoId [JsonPropertyName("category")] public List? Category @@ -285,6 +294,9 @@ public record ItemBuyData public record TraderInsurance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("availability")] public bool? Availability { @@ -334,6 +346,9 @@ public record TraderInsurance public record TraderLoyaltyLevel { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("buy_price_coef")] public double? BuyPriceCoefficient { @@ -395,6 +410,9 @@ public record TraderLoyaltyLevel public record TraderRepair { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("availability")] public bool? Availability { @@ -451,6 +469,9 @@ public record TraderRepair public record TraderAssort { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("nextResupply")] public double? NextResupply { @@ -482,6 +503,9 @@ public record TraderAssort public record BarterScheme { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // Confirmed in client [JsonPropertyName("count")] public double? Count @@ -529,6 +553,9 @@ public record BarterScheme public record Suit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -595,6 +622,9 @@ public record Suit public record SuitRequirements { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("achievementRequirements")] public List? AchievementRequirements { @@ -655,6 +685,9 @@ public record SuitRequirements public record ItemRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("count")] public double? Count { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs index 9181854e..7a3d8f07 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Common; public record XY { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("x")] public double? X { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs index d01a60bf..4b5e12b0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Common; public record XYZ { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("x")] public double? X { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs index c3dd4a70..b1185789 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Customization; public record BuyClothingRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("offer")] public string? Offer { @@ -22,6 +25,9 @@ public record BuyClothingRequestData : InventoryBaseActionRequestData public record PaymentItemForClothing { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("del")] public bool? Del { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs index 1f738dcf..d2b355b5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Customization; public record CustomizationSetRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("customizations")] public List? Customizations { @@ -15,6 +18,9 @@ public record CustomizationSetRequest : InventoryBaseActionRequestData public record CustomizationSetOption { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs index 4a572f28..1c688844 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs @@ -1,5 +1,9 @@ -namespace SPTarkov.Server.Core.Models.Eft.Customization; +using System.Text.Json.Serialization; +namespace SPTarkov.Server.Core.Models.Eft.Customization; public record WearClothingRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs index bf8305b5..be9e42d6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; @@ -17,6 +17,9 @@ public record DeclineFriendRequestData : BaseFriendRequest public record BaseFriendRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("profileId")] public string? ProfileId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs index e986bd62..cd0719e7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record AddUserGroupMailRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs index af7558a2..4216d3b4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ChangeGroupMailOwnerRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs index 77e2ad5a..169728bf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ChatServer { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -73,6 +76,9 @@ public record ChatServer public record Chat { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs index 581c2266..ec941036 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ClearMailMessageRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs index 534e7135..7120ff6e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record CreateGroupMailRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Name")] public string? Name { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs index 19366197..3de7b686 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record DeleteFriendRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("friend_id")] public string? FriendId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs index 9ad583b1..948fed41 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record FriendRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("status")] public int? Status { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs index 33ce9f07..b07cbe5b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record FriendRequestSendResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("status")] public BackendErrorCodes? Status { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs index eb895758..a7ea469f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetAllAttachmentsRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs index f358c120..297b3b09 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetAllAttachmentsResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("messages")] public List? Messages { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs index 0adfccd7..0150eb7f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetChatServerListRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("VersionId")] public string? VersionId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs index bf3dc4b6..867f23dd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetFriendListDataResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Friends")] public List? Friends { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs index 1ee73d27..6cd7adfb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogInfoRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs index 26fe7fb8..8972acdd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogListRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("limit")] public int? Limit { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs index 972d29a3..07e84a98 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Utils; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogViewRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] public MessageType? Type { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs index cee3bd1b..24148bd7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Profile; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogViewResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("messages")] public List? Messages { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs index 0bee88e3..e8ac34b2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record PinDialogRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs index 3f450232..041d282b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveDialogRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs index 02ee835e..7ba1768c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveMailMessageRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs index af074954..9681e7f0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveUserGroupMailRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs index 2d9aaf17..2f523234 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Utils; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record SendMessageRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogId")] public string? DialogId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs index 6e9a73da..21ff8d08 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record SetDialogReadRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dialogs")] public List? Dialogs { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs index 869be752..c801c1e4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; public record CheckVersionResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("isvalid")] public bool? IsValid { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs index dda034c8..65a5fc75 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Models.Eft.Game; public record CurrentGroupResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("squad")] public List? Squad { @@ -15,6 +18,9 @@ public record CurrentGroupResponse public record CurrentGroupSquadMember { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -53,6 +59,9 @@ public record CurrentGroupSquadMember public record CurrentGroupMemberInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Nickname")] public string? Nickname { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs index 5c9ec5d0..fa25631d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameConfigResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("aid")] public double? Aid { @@ -115,6 +118,9 @@ public record GameConfigResponse public record PurchasedGames { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("eft")] public bool? IsEftPurchased { @@ -132,6 +138,9 @@ public record PurchasedGames public record Backend { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Lobby")] public string? Lobby { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs index e86be86c..c51a6359 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameEmptyCrcRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("crc")] public int? Crc { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs index 9aa4692c..7fd44835 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameKeepAliveResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("msg")] public string? Message { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs index f5f9746d..fdea02e5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameLogoutResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("status")] public string? Status { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs index 7b6631c5..a5c36968 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameModeRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("sessionMode")] public string? SessionMode { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs index 85942769..29b55f92 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; @@ -10,6 +10,9 @@ public enum SessionMode public record GameModeResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("gameMode")] public string? GameMode { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs index 4c00a70d..ce84b837 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameStartResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("utc_time")] public double UtcTime { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs index 9d4cba4e..65f649aa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetItemPricesResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("supplyNextTime")] public double? SupplyNextTime { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs index 8141d794..0318b81e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetRaidTimeRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Side")] public string? Side { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs index 85f1900f..3b84d42a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetRaidTimeResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("NewSurviveTimeSeconds")] public double? NewSurviveTimeSeconds { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs index 2376830c..e04a94d7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Game; public record SendSurveyOpinionRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("resultJson")] public string? ResultJson { @@ -29,6 +32,9 @@ public record SendSurveyOpinionRequest : IRequestData public record SurveyOpinionAnswer { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("questionId")] public int? QuestionId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs index 2218a999..63fe2b0e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; public record ServerDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ip")] public string? Ip { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs index 11c14a48..ae4870bb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Game; public record SurveyResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("locale")] public Dictionary>? Locale { @@ -21,6 +24,9 @@ public record SurveyResponseData public record Survey { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public int? Id { @@ -66,6 +72,9 @@ public record Survey public record WelcomePageData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("titleLocaleKey")] public string? TitleLocaleKey { @@ -90,6 +99,9 @@ public record WelcomePageData public record FarewellPageData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("textLocaleKey")] public string? TextLocaleKey { @@ -100,6 +112,9 @@ public record FarewellPageData public record SurveyQuestion { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public int? Id { @@ -152,6 +167,9 @@ public record SurveyQuestion public record SurveyAnswer { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public int? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs index 4eb6a8e2..eed922b5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Game; public record VersionValidateRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("version")] public Version? Version { @@ -22,6 +25,9 @@ public record VersionValidateRequestData : IRequestData public record Version { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("major")] public string? Major { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs index 29af252b..16623936 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public record HealthTreatmentRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("trader")] public string? Trader { @@ -41,6 +44,9 @@ public record HealthTreatmentRequestData : InventoryBaseActionRequestData public record Difference { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("BodyParts")] public BodyParts? BodyParts { @@ -65,6 +71,9 @@ public record Difference public record BodyParts { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Head")] public BodyPartEffects? Head { @@ -117,6 +126,9 @@ public record BodyParts public record BodyPartEffects { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double Health { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs index 728ecea5..8911deb8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Health; public record OffraidEatRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs index 5785d960..b4cd0dca 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public record OffraidHealRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs index 0de8414d..a342aa7b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Health; public record SyncHealthRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Health")] public List? Health { @@ -42,6 +45,9 @@ public record SyncHealthRequestData public record BodyPartCollection { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Head")] public BodyPartHealth? Head { @@ -94,6 +100,9 @@ public record BodyPartCollection public record BodyPartHealth { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Maximum")] public int? Maximum { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs index a857fdcf..9b9c9a7f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public class WorkoutData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("skills")] public WorkoutSkills? Skills { @@ -17,6 +20,9 @@ public class WorkoutData : IRequestData public record WorkoutSkills { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Common")] public List Common { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs index 479e5497..e6b3c60c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HandleQTEEventRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// true if QTE was successful, otherwise false /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs index fdd1e838..2a881901 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutArea { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -86,6 +89,9 @@ public record HideoutArea public record HideoutAreaRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areaType")] public int? AreaType { @@ -110,6 +116,9 @@ public record HideoutAreaRequirement public record Stage { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("autoUpgrade")] public bool? AutoUpgrade { @@ -186,6 +195,9 @@ public record Stage public record StageImprovement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -217,6 +229,9 @@ public record StageImprovement public record StageImprovementBonus { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -270,6 +285,9 @@ public record StageImprovementBonus public record StageImprovementRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("count")] public int? Count { @@ -315,6 +333,9 @@ public record StageImprovementRequirement public record StageRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areaType")] public int? AreaType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs index 601396ed..15b8a049 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Request; namespace SPTarkov.Server.Core.Models.Eft.Hideout; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs index a56f0187..b28fa4ee 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCircleOfCultistProductionStartRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("timestamp")] public long? Timestamp { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs index 6cada336..dbe748a2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutContinuousProductionStartRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("recipeId")] public string? RecipeId { @@ -22,6 +25,9 @@ public record HideoutContinuousProductionStartRequestData : InventoryBaseActionR public record HideoutProperties { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public int? BtcFarmGcs { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs index 90bdbb98..6fb75b75 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCustomisation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("globals")] public List? Globals { @@ -22,6 +25,9 @@ public record HideoutCustomisation public record HideoutCustomisationGlobal { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -74,6 +80,9 @@ public record HideoutCustomisationGlobal public record HideoutCustomisationSlot { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs index 34c176da..bf54c40e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCustomizationApplyRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Id of the newly picked item to apply to hideout /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs index 75b24770..ee3c3f71 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCustomizationSetMannequinPoseRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("poses")] public Dictionary? Poses { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs index 7be7f9b1..7fdb55fd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutDeleteProductionRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("recipeId")] public string? RecipeId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs index 5edbddd0..e9f69b2d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutImproveAreaRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Hideout area id from areas.json /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs index 59ad946f..a35ed26a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutProductionData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("recipes")] public List? Recipes { @@ -30,6 +33,9 @@ public record HideoutProductionData public record HideoutProduction { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -120,6 +126,9 @@ public record HideoutProduction public record Requirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("templateId")] public string? TemplateId { @@ -200,6 +209,9 @@ public record Requirement public record ScavRecipe { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -231,6 +243,9 @@ public record ScavRecipe public record EndProducts { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Common")] public MinMax? Common { @@ -255,6 +270,9 @@ public record EndProducts public record CultistRecipe { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs index 02d79eae..69da7af6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutPutItemInRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areaType")] public HideoutAreas? AreaType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs index 9e4f6a59..b41f18cb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutScavCaseStartRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("recipeId")] public string? RecipeId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs index e1cc79c7..d8b84344 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutSettingsBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("generatorSpeedWithoutFuel")] public double? GeneratorSpeedWithoutFuel { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs index 0fe61279..5033171b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutSingleProductionStartRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("recipeId")] public string? RecipeId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs index 19477ac2..9ee2ed63 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; using SPTarkov.Server.Core.Models.Enums; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutTakeItemOutRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areaType")] public HideoutAreas? AreaType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs index fdc38b36..38127a2c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutTakeProductionRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("recipeId")] public string? RecipeId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs index 0f5f43dc..9f6489ba 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; using SPTarkov.Server.Core.Models.Enums; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutToggleAreaRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areaType")] public HideoutAreas? AreaType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs index 949bde47..d8413c86 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; using SPTarkov.Server.Core.Models.Enums; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutUpgradeCompleteRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areaType")] public HideoutAreas? AreaType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs index f92ad6e6..ae531e2b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutUpgradeRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areaType")] public HideoutAreas? AreaType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs index a48df035..482c53fc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record QteData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -72,6 +75,9 @@ public record QteData public record QuickTimeEvent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] public QteType? EventType @@ -125,6 +131,9 @@ public record QuickTimeEvent public record QteRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] public RequirementType? RequirementType { @@ -135,6 +144,9 @@ public record QteRequirement public record QteResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("energy")] public int? Energy { @@ -159,6 +171,9 @@ public record QteResult public record QteEffect { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] public QteRewardType? Type @@ -207,6 +222,9 @@ public record QteEffect public record SkillLevelMultiplier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("level")] public int? Level { @@ -224,6 +242,9 @@ public record SkillLevelMultiplier public record Position { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("x")] public float? X { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs index d0b76187..f3c8bc30 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record RecordShootingRangePoints : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("points")] public int? Points { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs index 6070e5e0..16c10fbb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.HttpResponse; public record GetBodyResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("err")] public BackendErrorCodes? Err { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs index 8ba61c6e..f12f1220 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.HttpResponse; public record NullResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("err")] public int? Err { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs index f5380673..aeb1f7a4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record InsuredItemsData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs index 763a5474..01e2d60b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record ItemDeliveryRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("items")] public List? Items { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs index 6fedab44..93f82ab6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record RegisterPlayerRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("crc")] public int? Crc { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ScavSaveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ScavSaveRequestData.cs index 9b6a39fc..1d3592de 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ScavSaveRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ScavSaveRequestData.cs @@ -1,4 +1,4 @@ -using SPTarkov.Server.Core.Models.Eft.Common; +using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.InRaid; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs index 23f94505..a84437df 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Insurance; public record GetInsuranceCostRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("traders")] public List? Traders { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs index 933c34d9..ab0a4ef3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostResponseData.cs @@ -1,4 +1,4 @@ -namespace SPTarkov.Server.Core.Models.Eft.Insurance; +namespace SPTarkov.Server.Core.Models.Eft.Insurance; public class GetInsuranceCostResponseData : Dictionary> { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs index 47e66650..41dcdcb1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Insurance; public record InsureRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("tid")] public string? TransactionId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs index 40bc9dc5..7bdb47ff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemDirectRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Item and child mods to add to player inventory /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs index 55f320ce..b830393c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Trader id /// @@ -24,6 +27,9 @@ public record AddItemRequestData public record ItemToAdd { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("count")] public int? Count { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs index 706963d7..c7bd5074 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemTempObject { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("itemRef")] public Item? ItemReference { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs index 90a8360f..fdebe9df 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemsDirectRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Item and child mods to add to player inventory /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs index 088587fc..a3b870c5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryAddRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs index 15106419..13b2a650 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs @@ -9,6 +9,9 @@ public abstract record InventoryBaseActionRequestData : BaseInteractionRequestDa public record To { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -40,6 +43,9 @@ public record To public record Container { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -64,6 +70,9 @@ public record Container public record Location { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("x")] public double? X { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs index edac6228..4fce8041 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryBindRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs index b0a13221..5fcdc305 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryCreateMarkerRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs index a3f36a5e..4d668c32 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryDeleteMarkerRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs index 687c9ed4..c2cd0d4a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryEditMarkerRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs index fac5409f..69f1ddc7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryExamineRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs index b3ae4949..721680b9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryFoldRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs index 61f677cb..a15af410 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryMergeRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs index 43c7c6cb..577ac6d6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryMoveRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs index 512d7ee9..76d56503 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ids")] public List Ids { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs index 19f99b69..cf2be023 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryRemoveRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs index 7b2e9b7d..dd592ee2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventorySortRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("changedItems")] public List? ChangedItems { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs index 9bdf1451..db617573 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventorySplitRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Id of item to split /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs index 06f8517b..aa720a3a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Request; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventorySwapRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs index 1af1260a..010f3a64 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryTagRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs index ebc0b53a..3d1d9fb9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryToggleRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs index 220d594e..b3bd40f5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryTransferRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs index 485c4b3c..7f887f5c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryUnbindRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryUnbindRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs index 8c464a65..a543658f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record OpenRandomLootContainerRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Container item id being opened /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs index 76eb25aa..a98d136f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record PinOrLockItemRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Id of item being pinned /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs index 73fbc9f1..12305442 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record RedeemProfileRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("events")] public List? Events { @@ -14,6 +17,9 @@ public record RedeemProfileRequestData : InventoryBaseActionRequestData public record RedeemProfileRequestEvent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MessageId")] public string? MessageId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs index d94bd70d..26abca57 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record SetFavoriteItems : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("items")] public List? Items { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs index 8b54e7e4..e761f06e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record EmptyItemEventRouterResponse : ItemEventRouterBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("profileChanges")] public string? ProfileChanges { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs index 8ffded38..c6953451 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record ItemEventRouterBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [JsonPropertyName("warnings")] public List? Warnings @@ -25,6 +28,9 @@ public record ItemEventRouterBase public record Warning { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("index")] public int? Index { @@ -56,6 +62,9 @@ public record Warning public record ProfileChange { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -184,6 +193,9 @@ public record ProfileChange public record HideoutStashItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -201,6 +213,9 @@ public record HideoutStashItem public record WeaponBuildChange { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -232,6 +247,9 @@ public record WeaponBuildChange public record EquipmentBuildChange { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -284,6 +302,9 @@ public record EquipmentBuildChange public record ItemChanges { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("new")] public List? NewItems { @@ -311,6 +332,9 @@ public record ItemChanges /// public record TraderData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("salesSum")] public double? SalesSum { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs index 0afaa3f9..d5a2bf04 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Request; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Utils; @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record ItemEventRouterRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("data")] public List? Data { @@ -31,6 +34,9 @@ public record ItemEventRouterRequest : IRequestData public record Daum { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Action")] public string? Action { @@ -90,6 +96,9 @@ public record Daum public record FromOwner { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -107,6 +116,9 @@ public record FromOwner public record To { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -131,6 +143,9 @@ public record To public record Location { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("x")] public int? X { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs index d174f6f7..a181be98 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs @@ -1,8 +1,12 @@ -namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; +using System.Text.Json.Serialization; +namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; /// /// An object sent back to the game client that contains alterations the client must make to ensure server/client are in sync /// public record ItemEventRouterResponse : ItemEventRouterBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/ChangeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/ChangeRequestData.cs index eb454b71..e2f6bb4d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/ChangeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/ChangeRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Launcher; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs index 1b60fae8..acc507ba 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record GetMiniProfileRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("username")] public string? Username { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs index e03ba980..125321dc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record LoginRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("username")] public string? Username { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs index 14411ba5..9dbaa094 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record MiniProfile { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("username")] public string? Username { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RegisterData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RegisterData.cs index 92bb7045..3a1ab4ab 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RegisterData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RegisterData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Launcher; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RemoveProfileData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RemoveProfileData.cs index 92f3828c..a42d8d41 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RemoveProfileData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/RemoveProfileData.cs @@ -1,4 +1,4 @@ -namespace SPTarkov.Server.Core.Models.Eft.Launcher; +namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record RemoveProfileData : LoginRequestData { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs index 6c105d79..73221ae8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Spt.Services; namespace SPTarkov.Server.Core.Models.Eft.Location; public record AirdropLootResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("dropType")] public string? DropType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs index 0586f2df..ab1e58ab 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetAirdropLootRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("containerId")] public string? ContainerId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs index 7d0f48be..707b5ec8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetAirdropLootResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// The type of airdrop /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs index de4c0524..bdf2a3b5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetLocationRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("crc")] public int? Crc { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs index 3fcd7681..ee1307a5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; @@ -8,6 +8,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record EndLocalRaidRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// ID of server player just left /// @@ -55,6 +58,9 @@ public record EndLocalRaidRequestData : IRequestData public record EndRaidResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("profile")] public PmcData? Profile { @@ -124,6 +130,9 @@ public record EndRaidResult public record LocationTransit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("hash")] public string? Hash { @@ -210,6 +219,9 @@ public record LocationTransit public record TransitProfile { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs index a181856f..1dc80be6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Match; public record EndOfflineRaidRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("crc")] public int? Crc { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs index cfb51848..0241b42c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Utils; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs index cbb14071..0b7e4f7f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record GroupCharacter { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -65,6 +68,9 @@ public record GroupCharacter public record CharacterInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Nickname")] public string? Nickname { @@ -124,6 +130,9 @@ public record CharacterInfo public record PlayerVisualRepresentation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Info")] public VisualInfo? Info { @@ -148,6 +157,9 @@ public record PlayerVisualRepresentation public record VisualInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Side")] public string? Side { @@ -186,6 +198,9 @@ public record VisualInfo public record Customization { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Head")] public string? Head { @@ -217,6 +232,9 @@ public record Customization public record Equipment { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs index da40a67e..f9bc5f67 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupCurrentResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("squad")] public List? Squad { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs index ce00641e..49e8c14d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupInviteSendRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("to")] public string? To { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs index cdc2f299..9a33b06e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupPlayerRemoveRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("aidToKick")] public string? AidToKick { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs index 3a33d19c..3b00e0dc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStartGameRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("groupId")] public string? GroupId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs index 3056ba2a..f614d805 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Utils; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStatusRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("location")] public string? Location { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs index 090e2650..84c99fe1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStatusResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("players")] public List? Players { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs index b76f3f0b..d4c8da91 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupTransferRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("aidToChange")] public string? AidToChange { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs index ee7e0d38..ffe8a382 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Match; public record ProfileStatusRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("groupId")] public int? GroupId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs index 8a1c56e4..c4d151ed 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Match; public record ProfileStatusResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("maxPveCountExceeded")] public bool? MaxPveCountExceeded { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs index 3c0a8804..c6252262 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Match; public record PutMetricsRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("sid")] public string? SessionId { @@ -71,6 +74,9 @@ public record PutMetricsRequestData : IRequestData public record SharedSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("StatedFieldOfView")] public double? StatedFieldOfView { @@ -81,6 +87,9 @@ public record SharedSettings public record HardwareDescription { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("deviceUniqueIdentifier")] public string? DeviceUniqueIdentifier { @@ -203,6 +212,9 @@ public record HardwareDescription public record ClientEvents { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MatchingCompleted")] public double? MatchingCompleted { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs index 30809e33..b14dd0b3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record RaidSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("keyId")] public string? KeyId { @@ -104,6 +107,9 @@ public record RaidSettings public record TimeAndWeatherSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("isRandomTime")] public bool? IsRandomTime { @@ -168,6 +174,9 @@ public record TimeAndWeatherSettings public record BotSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("isScavWars")] public bool? IsScavWars { @@ -186,6 +195,9 @@ public record BotSettings public record WavesSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("botAmount")] [JsonConverter(typeof(JsonStringEnumConverter))] public BotAmount? BotAmount diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs index 0f3d61e7..a3acb481 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Match; public record RequestIdRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("requestId")] public string? RequestId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs index ff658ece..1f26a21f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Match; public record Server { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ping")] public int? Ping { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs index b1e8d8fc..0e7c11e0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Match; public record SessionStatus { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("profileid")] public string? ProfileId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs index 5d1a8165..2fd8b4e8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Models.Utils; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record StartLocalRaidRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("serverId")] public string? ServerId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs index 1549749f..cb4fa85f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record StartLocalRaidResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("serverId")] public string? ServerId { @@ -53,6 +56,9 @@ public record StartLocalRaidResponseData public record ProfileInsuredItems { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("insuredItems")] public List? InsuredItems { @@ -63,6 +69,9 @@ public record ProfileInsuredItems public record Transition { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("transitionType")] public TransitionType? TransitionType { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs index fbd1172e..db739aa5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.Match; public record UpdatePingRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("servers")] public List? servers { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs index 809505fe..fdd3f5f6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs @@ -22,6 +22,9 @@ public record NoteActionRequest : BaseInteractionRequestData public record Note { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Time")] public double? Time { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs index 48514bf2..25331cd9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier; public record NotifierChannel { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("server")] public string? Server { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs index 075a7ac4..dd51bfde 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier; public record SelectProfileResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("status")] public string? Status { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs index f6792407..3117dc69 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Player; public record PlayerIncrementSkillLevelRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -72,6 +75,9 @@ public record PlayerIncrementSkillLevelRequestData // TODO: These are all lists of objects. public record Items { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("new")] public List? NewItems { @@ -96,8 +102,14 @@ public record Items public record Production { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + } public record TraderRelations { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs index a8b255f8..28e3e104 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Utils; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.PresetBuild; public record PresetBuildActionRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Action")] public string? Action { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs index c907cc2c..1276eff8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Eft.PresetBuild; public record RemoveBuildRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs index 3dc20f83..f66bf6a7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Prestige; public record GetPrestigeResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("elements")] public List? Elements { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs index 3f832220..b1347179 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs @@ -9,6 +9,9 @@ public class ObtainPrestigeRequestList : List, IRequestDa public record ObtainPrestigeRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string Id { @@ -26,6 +29,9 @@ public record ObtainPrestigeRequest : IRequestData public record Location { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("x")] public int X { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs index 16a4e6eb..cfcb05d5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Profile; public record CompletedAchievementsResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("elements")] public Dictionary? Elements { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs index c6130dcd..5a34975e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ConnectResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("backendUrl")] public string? BackendUrl { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs index bcebde66..f035961b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record CreateProfileResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("uid")] public string? UserId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs index 72327510..adfc6b0c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetAchievementsResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("elements")] public List? Elements { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs index 0725f323..eb42a564 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetOtherProfileRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("accountId")] public string? AccountId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs index 5e969c7e..d7c3e15a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetOtherProfileResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -106,6 +109,9 @@ public record GetOtherProfileResponse public record OtherProfileInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("nickname")] public string? Nickname { @@ -158,6 +164,9 @@ public record OtherProfileInfo public record OtherProfileCustomization { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("head")] public string? Head { @@ -196,6 +205,9 @@ public record OtherProfileCustomization public record OtherProfileEquipment { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Id")] public string? Id { @@ -213,6 +225,9 @@ public record OtherProfileEquipment public record OtherProfileStats { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("eft")] public OtherProfileSubStats? Eft { @@ -223,6 +238,9 @@ public record OtherProfileStats public record OtherProfileSubStats { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("totalInGameTime")] public long? TotalInGameTime { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs index 570ec75d..20ff3c3e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetProfileSettingsRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Chosen value for profile.Info.SelectedMemberCategory /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs index fed2b92c..235725a3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetProfileStatusResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("maxPveCountExceeded")] public bool? MaxPveCountExceeded { @@ -21,6 +24,9 @@ public record GetProfileStatusResponseData public record ProfileStatusData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("profileid")] public string? ProfileId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs index eaa29948..db40cfcf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record MessageContentRagfair { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("offerId")] public string? OfferId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs index 1937981d..e9dcb690 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileChangeNicknameRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("nickname")] public string? Nickname { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs index 970acab4..0b70df52 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileChangeVoiceRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("voice")] public string? Voice { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs index 00c400ac..55ddb174 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileCreateRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("side")] public string? Side { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs index 349cf9fc..dd2c1363 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; /// public record SearchFriendResponse { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs index a8d6dfce..86e6ea1b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SearchProfilesRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("nickname")] public string? Nickname { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs index 9a12fbd9..eee14c77 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs @@ -9,6 +9,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SptProfile { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("info")] public Info? ProfileInfo { @@ -109,6 +112,9 @@ public record SptProfile public record TraderPurchaseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("count")] public double? PurchaseCount { @@ -126,6 +132,9 @@ public record TraderPurchaseData public record Info { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// main profile id /// @@ -181,6 +190,9 @@ public record Info public record Characters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("pmc")] public PmcData? PmcData { @@ -201,6 +213,9 @@ public record Characters /// public record UserBuilds { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("weaponBuilds")] public List? WeaponBuilds { @@ -225,6 +240,9 @@ public record UserBuilds public record UserBuild { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Id")] public string? Id { @@ -315,6 +333,9 @@ public record MagazineBuild : UserBuild public record MagazineTemplateAmmoItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("TemplateId")] public string? TemplateId { @@ -345,6 +366,9 @@ public record DefaultEquipmentPreset : EquipmentBuild public record Dialogue { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("attachmentsNew")] public int? AttachmentsNew { @@ -398,6 +422,9 @@ public record Dialogue //TODO: @Cleanup: Maybe the same as Dialogue? public record DialogueInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("attachmentsNew")] public int? AttachmentsNew { @@ -450,6 +477,9 @@ public record DialogueInfo public record Message { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -558,6 +588,9 @@ public record Message public record ReplyTo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { @@ -596,6 +629,9 @@ public record ReplyTo public record MessagePreview { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("uid")] public string? UserId { @@ -641,6 +677,9 @@ public record MessagePreview public record MessageItems { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("stash")] public string? Stash { @@ -658,6 +697,9 @@ public record MessageItems public record UpdatableChatMember { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Nickname")] public string? Nickname { @@ -703,6 +745,9 @@ public record UpdatableChatMember public record Spt { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// What version of SPT was this profile made with /// @@ -790,6 +835,9 @@ public record Spt public record AcceptedCultistReward { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("timestamp")] public long? Timestamp { @@ -814,6 +862,9 @@ public record AcceptedCultistReward public record PendingPrestige { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("prestigeLevel")] public int? PrestigeLevel { @@ -831,6 +882,9 @@ public record PendingPrestige public record ModDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("name")] public string? Name { @@ -869,6 +923,9 @@ public record ModDetails public record ReceivedGift { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("giftId")] public string? GiftId { @@ -893,6 +950,9 @@ public record ReceivedGift public record Vitality { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Hydration")] public double? Hydration { @@ -924,6 +984,9 @@ public record Vitality public record Inraid { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("location")] public string? Location { @@ -941,6 +1004,9 @@ public record Inraid public record Insurance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("scheduledTime")] public int? ScheduledTime { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs index 9790f24e..cd92bf58 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SystemData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("date")] public string? Date { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs index 7c9793a6..374c0438 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record UserDialogInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// _id /// @@ -32,6 +35,9 @@ public record UserDialogInfo public record UserDialogDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Nickname")] public string? Nickname { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs index 8d9a3110..fb982e33 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ValidateNicknameRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("nickname")] public string? Nickname { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs index 7735108d..b7853a77 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record AcceptQuestRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("qid")] public string? QuestId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs index 69acb336..e18155af 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record CompleteQuestRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Quest Id /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs index 1c9ed3fa..65f5e8ef 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Inventory; namespace SPTarkov.Server.Core.Models.Eft.Quests; public record FailQuestRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("qid")] public string? QuestId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs index 6d28e657..6d8075b3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record HandoverQuestRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("qid")] public string? QuestId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs index 6c08ecaf..e38b77d5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record ListQuestsRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("completed")] public bool? Completed { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs index 11c5e475..4cbfa8c8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record RepeatableQuestChangeRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("qid")] public string? QuestId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs index 4de4ec5f..9210d5d7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record AddOfferRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("sellInOnePiece")] public bool? SellInOnePiece { @@ -29,6 +32,9 @@ public record AddOfferRequestData : InventoryBaseActionRequestData public record Requirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_tpl")] public string? Template { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs index 98367090..03e78f41 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record ExtendOfferRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("offerId")] public string? OfferId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs index 42ccc838..ac8e6f2b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetMarketPriceRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("templateId")] public string? TemplateId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs index d5b1aa00..8d6aa064 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetOffersResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("categories")] public Dictionary? Categories { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs index bdfb9ee6..cf4b4740 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetRagfairOfferByIdRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public int? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs index e9c1ebb6..feddc6ba 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record RagfairOffer { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _id; private string? _root; @@ -177,6 +180,9 @@ public record RagfairOffer public record OfferRequirement { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _tpl; [JsonPropertyName("_tpl")] @@ -223,6 +229,9 @@ public record OfferRequirement public record RagfairOfferUser { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + private string? _id; [JsonPropertyName("id")] @@ -290,6 +299,9 @@ public record RagfairOfferUser public record SellResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("sellTime")] public long? SellTime { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs index db18b414..06cf4b35 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record RemoveOfferRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("offerId")] public string? OfferId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs index 3b17d22d..63e3beb2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record SearchRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("page")] public int? Page { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs index 94967364..71342cda 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record SendRagfairReportRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("offerId")] public int? OfferId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs index a6b7a6f0..a0761e0a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record StorePlayerOfferTaxAmountRequestData : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs index cc66815f..9e364867 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair; public record BaseRepairActionDataRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Action")] public string? Action { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs index ad3e62f6..5a491e8e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair; public record RepairActionDataRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("repairKitsInfo")] public List? RepairKitsInfo { @@ -25,6 +28,9 @@ public record RepairActionDataRequest : InventoryBaseActionRequestData public record RepairKitsInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// id of repair kit to use /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs index b465b1a9..8edc05f8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair; public record TraderRepairActionDataRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("tid")] public string? TId { @@ -22,6 +25,9 @@ public record TraderRepairActionDataRequest : InventoryBaseActionRequestData public record RepairItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs index ae513176..b57366bd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade; public record ProcessBaseTradeRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] public string? Type { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs index e82d883e..67d3e20d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade; public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("offers")] public List? Offers { @@ -16,6 +19,9 @@ public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData public record OfferRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs index 5c2eea00..13bc59ac 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs @@ -21,6 +21,9 @@ public record ProcessSellTradeRequestData : ProcessBaseTradeRequestData public record SoldItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs index 8a5a15e8..19a18f3e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade; public record SellScavItemsToFenceRequestData : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("totalValue")] public double? TotalValue { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs index 4faccd92..5d49a9fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Weather; public record WeatherData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("acceleration")] public double? Acceleration { @@ -43,6 +46,9 @@ public record WeatherData public record Weather { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("pressure")] public double? Pressure { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs index 4c116ad3..9ecfbffc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist; public record AddToWishlistRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("items")] public Dictionary? Items { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs index 5d2aae44..ad843550 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist; public record ChangeWishlistItemCategoryRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public string? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs index 8aa923f4..d1c04fc3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist; public record RemoveFromWishlistRequest : InventoryBaseActionRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("items")] public List? Items { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs index dda7ed42..326c905a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Ws; public record WsNotificationEvent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] public NotificationEventType? EventType diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs index c04580e0..4dbdd596 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs @@ -1,6 +1,10 @@ -namespace SPTarkov.Server.Core.Models.Enums; +using System.Text.Json.Serialization; +namespace SPTarkov.Server.Core.Models.Enums; public record AccountTypes { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string SPT_DEVELOPER = "spt developer"; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs index 8ea68e08..0e0d93ab 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs @@ -1,7 +1,11 @@ -namespace SPTarkov.Server.Core.Models.Enums; +using System.Text.Json.Serialization; +namespace SPTarkov.Server.Core.Models.Enums; public record GameEditions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string STANDARD = "standard"; public const string LEFT_BEHIND = "left_behind"; public const string PREPARE_FOR_ESCAPE = "prepare_for_escape"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs index a5ed9683..7b2912fd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs @@ -1,7 +1,11 @@ +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Enums; public record HideoutEventActions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string HIDEOUT_UPGRADE = "HideoutUpgrade"; public const string HIDEOUT_UPGRADE_COMPLETE = "HideoutUpgradeComplete"; public const string HIDEOUT_PUT_ITEMS_IN_AREA_SLOTS = "HideoutPutItemsInAreaSlots"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs index 95b9dde1..f89f8170 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs @@ -1,7 +1,11 @@ -namespace SPTarkov.Server.Core.Models.Enums; +using System.Text.Json.Serialization; +namespace SPTarkov.Server.Core.Models.Enums; public record ItemEventActions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string MOVE = "Move"; public const string REMOVE = "Remove"; public const string SPLIT = "Split"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs index 1e872634..3d48c871 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs @@ -1,7 +1,11 @@ +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Enums; public record Money { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string ROUBLES = "5449016a4bdc2d6f028b456f"; public const string EUROS = "569668774bdc2da2298b4568"; public const string DOLLARS = "5696686a4bdc2da3298b456a"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs index 7ed3ffa0..22ffc299 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs @@ -1,9 +1,13 @@ -using SPTarkov.Server.Core.Models.Enums; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotDetailsForChatMessages { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Nickname { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs index aff8a7cd..2543ac8c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotGenerationDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Should the bot be generated as a PMC /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs index 7e577ecc..01dfa99e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotLootCache { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("backpackLoot")] public Dictionary BackpackLoot { @@ -98,6 +101,9 @@ public record BotLootCache public record LootCacheType { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public const string Special = "Special"; public const string Backpack = "Backpack"; public const string Pocket = "Pocket"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs index cf191e1b..0416c1af 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Spt.Bots; public record Bots { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("types")] public Dictionary? Types { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs index 904b3b73..9b0715a7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ChooseRandomCompatibleModResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("incompatible")] public bool? Incompatible { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs index 9d9fc060..bf88ae54 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record FilterPlateModsForSlotByLevelResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("result")] public Result? Result { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs index 67820444..1fa30122 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateEquipmentProperties { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Root Slot being generated /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs index 5a12d24a..801ecf45 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateWeaponRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Weapon to add mods to / result that is returned /// @@ -108,6 +111,9 @@ public record GenerateWeaponRequest public record BotData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Role of bot weapon is generated for /// @@ -141,6 +147,9 @@ public record BotData public record WeaponStats { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("hasOptic")] public bool? HasOptic { @@ -165,6 +174,9 @@ public record WeaponStats public record BotModLimits { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("scope")] public ItemCount? Scope { @@ -210,6 +222,9 @@ public record BotModLimits public record ItemCount { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("count")] public int? Count { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs index bae6697f..e6638a82 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateWeaponResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("weapon")] public List? Weapon { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs index e1d1fc69..7fca75b2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ItemSpawnLimitSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("currentLimits")] public Dictionary? CurrentLimits { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs index 7a846ba9..644b3e6a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ModToSpawnRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Slot mod will fit into /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs index 51670c02..8a48e3ae 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Enums; @@ -43,6 +43,9 @@ public record AirdropConfig : BaseConfig /// public record AirdropLoot { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("icon")] [JsonConverter(typeof(JsonStringEnumConverter))] public required AirdropTypeEnum Icon diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs index d67f6d28..a7b8912a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -42,6 +42,9 @@ public record BackupConfig : BaseConfig public record BackupConfigInterval { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enabled")] public bool Enabled { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs index 003b8aad..fe172622 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -14,6 +14,9 @@ public abstract record BaseConfig public record RunIntervalValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("inRaid")] public int InRaid { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs index 5bfff3a0..09bc6576 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs @@ -223,6 +223,9 @@ public record BotConfig : BaseConfig /// public record PresetBatch { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("assault")] public int Assault { @@ -541,6 +544,9 @@ public record PresetBatch public record WalletLootSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Chance wallets have loot in them /// @@ -585,6 +591,9 @@ public record WalletLootSettings public record EquipmentFilters { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Limits for mod types per weapon .e.g. scopes /// @@ -769,6 +778,9 @@ public record EquipmentFilters public record ModLimits { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// How many scopes are allowed on a weapon - hard coded to work with OPTIC_SCOPE, ASSAULT_SCOPE, COLLIMATOR, COMPACT_COLLIMATOR /// @@ -792,6 +804,9 @@ public record ModLimits public record RandomisationDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Between what levels do these randomisation setting apply to /// @@ -879,6 +894,9 @@ public record RandomisationDetails public record NighttimeChanges { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Applies changes to values stored in equipmentMods /// @@ -899,6 +917,9 @@ public record NighttimeChanges public record EquipmentFilterDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Between what levels do these equipment filter setting apply to /// @@ -942,6 +963,9 @@ public record EquipmentFilterDetails public record WeightingAdjustmentDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Between what levels do these weight settings apply to /// @@ -985,6 +1009,9 @@ public record WeightingAdjustmentDetails public record AdjustmentDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("add")] public Dictionary> Add { @@ -1002,6 +1029,9 @@ public record AdjustmentDetails public class ArmorPlateWeights { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("levelRange")] public MinMax LevelRange { @@ -1019,6 +1049,9 @@ public class ArmorPlateWeights public record RandomisedResourceDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("food")] public RandomisedResourceValues Food { @@ -1036,6 +1069,9 @@ public record RandomisedResourceDetails public record RandomisedResourceValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Minimum percent of item to randomized between min and max resource /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs index 0ca0c93a..a89dd926 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Config; public record BotDurability { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("default")] public required DefaultDurability Default { @@ -31,6 +34,9 @@ public record BotDurability /// public record DefaultDurability { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("armor")] public required ArmorDurability Armor { @@ -48,6 +54,9 @@ public record DefaultDurability public record PmcDurability { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("armor")] public required PmcDurabilityArmor Armor { @@ -65,6 +74,9 @@ public record PmcDurability public record PmcDurabilityArmor { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("lowestMaxPercent")] public int LowestMaxPercent { @@ -103,6 +115,9 @@ public record PmcDurabilityArmor public record ArmorDurability { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("maxDelta")] public int MaxDelta { @@ -141,6 +156,9 @@ public record ArmorDurability public record WeaponDurability { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("lowestMax")] public int LowestMax { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs index 6f8fc57a..f92ef6ff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs @@ -129,6 +129,9 @@ public record CoreConfig : BaseConfig public record BsgLogging { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// verbosity of what to log, yes I know this is backwards, but its how nlog deals with ordinals.
/// complain to them about it! In all cases, better exceptions will be logged.
@@ -161,6 +164,9 @@ public record BsgLogging public record Release { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Disclaimer outlining the intended usage of bleeding edge /// @@ -294,6 +300,9 @@ public record Release public record GameFixes { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Shotguns use a different value than normal guns causing huge pellet dispersion /// @@ -337,6 +346,9 @@ public record GameFixes public record ServerFeatures { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("compressProfile")] public bool CompressProfile { @@ -374,6 +386,9 @@ public record ServerFeatures public record ChatbotFeatures { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("sptFriendGiftsEnabled")] public bool SptFriendGiftsEnabled { @@ -418,6 +433,9 @@ public record ChatbotFeatures public record CommandoFeatures { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("giveCommandEnabled")] public bool GiveCommandEnabled { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs index e8f684d4..5a9e79d4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs @@ -25,6 +25,9 @@ public record GiftsConfig : BaseConfig public record Gift { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Items to send to player /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs index d505694b..12cfef69 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -28,6 +28,9 @@ public record HealthConfig : BaseConfig public record HealthMultipliers { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("death")] public double Death { @@ -45,6 +48,9 @@ public record HealthMultipliers public record HealthSave { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("health")] public bool Health { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs index d271569b..fee4da38 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs @@ -88,6 +88,9 @@ public record HideoutConfig : BaseConfig public record HideoutCraftToAdd { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// The new mongoId for the craft to use /// @@ -122,6 +125,9 @@ public record HideoutCraftToAdd public record CultistCircleSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("maxRewardItemCount")] public int MaxRewardItemCount { @@ -267,6 +273,9 @@ public record CraftTimeThreshold : MinMax public record DirectRewardSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("reward")] public required List Reward { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs index 3f08e199..a7a2459f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs index e7895c17..72e0edff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -124,6 +124,9 @@ public record InRaidConfig : BaseConfig public record RaidMenuSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("aiAmount")] public required string AiAmount { @@ -183,6 +186,9 @@ public record RaidMenuSettings public record RaidSave { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Should loot gained from raid be saved /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs index 7dd2f1ef..7501712d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs index 353a738a..560bca0b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Common; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -69,6 +69,9 @@ public record InventoryConfig : BaseConfig public record RewardDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_type")] public string? Type { @@ -107,6 +110,9 @@ public record RewardDetails public record SealedAirdropContainerSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("weaponRewardWeight")] public required Dictionary WeaponRewardWeight { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs index c2e37a1c..8500b082 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs @@ -82,6 +82,9 @@ public record ItemConfig : BaseConfig public record HandbookPriceOverride { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Price in roubles /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocaleConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocaleConfig.cs index d131ed0f..04753619 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocaleConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocaleConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs index 9cb978fb..b28ca7ca 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs @@ -237,6 +237,9 @@ public record LocationConfig : BaseConfig public record ReserveRaiderSpawnChanceOverrides { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("nonTriggered")] public int NonTriggered { @@ -254,6 +257,9 @@ public record ReserveRaiderSpawnChanceOverrides public record EquipmentLootSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Percentage chance item will be added to equipment /// @@ -267,6 +273,9 @@ public record EquipmentLootSettings public record RogueLighthouseSpawnTimeSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enabled")] public bool Enabled { @@ -284,6 +293,9 @@ public record RogueLighthouseSpawnTimeSettings public record CustomWaves { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Bosses spawn on raid start /// @@ -314,6 +326,9 @@ public record BotTypeLimit : MinMax public record ContainerRandomisationSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enabled")] public bool Enabled { @@ -358,6 +373,9 @@ public record ContainerRandomisationSettings public record ScavRaidTimeSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("settings")] public required ScavRaidTimeConfigSettings Settings { @@ -375,6 +393,9 @@ public record ScavRaidTimeSettings public record ScavRaidTimeConfigSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("trainArrivalDelayObservedSeconds")] public int TrainArrivalDelayObservedSeconds { @@ -385,6 +406,9 @@ public record ScavRaidTimeConfigSettings public record ScavRaidTimeLocationSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Should loot be reduced by same percent length of raid is reduced by /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs index 7880fad8..284e73d1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -44,6 +44,9 @@ public record LostOnDeathConfig : BaseConfig public record LostEquipment { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ArmBand")] public bool ArmBand { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs index 14d6e038..be22dd99 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs index 8d2888c4..ff1dca7e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs @@ -23,6 +23,9 @@ public record PlayerScavConfig : BaseConfig public record KarmaLevel { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("botTypeForLoot")] public required string BotTypeForLoot { @@ -68,6 +71,9 @@ public record KarmaLevel public record Modifiers { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("equipment")] public required Dictionary Equipment { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs index efef626e..c14eeb18 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -28,6 +28,9 @@ public record PmcChatResponse : BaseConfig public record ResponseSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("responseChancePercent")] public double ResponseChancePercent { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs index 98358451..270f3e37 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs @@ -288,6 +288,9 @@ public record PmcConfig : BaseConfig public record HostilitySettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Bot roles that are 100% an enemy /// @@ -349,6 +352,9 @@ public record HostilitySettings public record SlotLootSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Item Type whitelist /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs index 782940d6..a39a57fd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs @@ -100,6 +100,9 @@ public record QuestConfig : BaseConfig public record PlayerTypeQuestIds { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("pmc")] public QuestTypeIds? Pmc { @@ -117,6 +120,9 @@ public record PlayerTypeQuestIds public record QuestTypeIds { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("elimination")] public string? Elimination { @@ -148,6 +154,9 @@ public record QuestTypeIds public record EventQuestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("name")] public string? Name { @@ -187,6 +196,9 @@ public record EventQuestData public record RepeatableQuestConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { @@ -325,6 +337,9 @@ public record RepeatableQuestConfig public record RewardScaling { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("levels")] public List? Levels { @@ -391,6 +406,9 @@ public record RewardScaling public record TraderWhitelist { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("name")] public string? Name { @@ -436,6 +454,9 @@ public record TraderWhitelist public record RepeatableQuestTypesConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Exploration")] public Exploration? Exploration { @@ -491,6 +512,9 @@ public record Exploration : BaseQuestConfig public record SpecificExits { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("probability")] public double? Probability { @@ -603,6 +627,9 @@ public record Pickup : BaseQuestConfig public record PickupTypeWithMaxCount { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("itemType")] public string? ItemType { @@ -763,6 +790,9 @@ public record EliminationConfig : BaseQuestConfig public record BaseQuestConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("possibleSkillRewards")] public List? PossibleSkillRewards { @@ -773,6 +803,9 @@ public record BaseQuestConfig public record BossInfo { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("isBoss")] public bool? IsBoss { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs index 6f5b8680..ad64e61c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs @@ -69,6 +69,9 @@ public record RagfairConfig : BaseConfig public record Sell { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Should a fee be deducted from player when listing an item for sale /// @@ -112,6 +115,9 @@ public record Sell public record Chance { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Base chance percent to sell an item /// @@ -155,6 +161,9 @@ public record Chance public record Dynamic { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Should a purchased dynamic offers items be flagged as found in raid /// @@ -389,6 +398,9 @@ public record Dynamic public record PriceRanges { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("default")] public MinMax Default { @@ -413,6 +425,9 @@ public record PriceRanges public record BarterDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Percentage change an offer is listed as a barter /// @@ -486,6 +501,9 @@ public record BarterDetails public record PackDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Percentage change an offer is listed as a pack /// @@ -529,6 +547,9 @@ public record PackDetails public record OfferAdjustment { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Shuld offer price be adjusted when below handbook price /// @@ -572,6 +593,9 @@ public record OfferAdjustment public record Condition { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Percentage change durability is altered /// @@ -606,6 +630,9 @@ public record Condition public record RagfairBlacklist { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Damaged ammo packs /// @@ -689,6 +716,9 @@ public record RagfairBlacklist public record ArmorPlateBlacklistSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Max level of plates an armor can have without being removed /// @@ -712,6 +742,9 @@ public record ArmorPlateBlacklistSettings public record UnreasonableModPrices { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Enable a system that adjusts very high ragfair prices to be below a max multiple of items the handbook values /// @@ -752,6 +785,9 @@ public record UnreasonableModPrices public record ArmorSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// % chance / 100 that armor plates will be removed from an offer before listing /// @@ -775,6 +811,9 @@ public record ArmorSettings public record TieredFlea { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enabled")] public bool Enabled { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs index fa3e78d0..3f8df3ea 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs @@ -77,6 +77,9 @@ public record RepairConfig : BaseConfig public record IntellectGainValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("weapon")] public double Weapon { @@ -94,6 +97,9 @@ public record IntellectGainValues public record MaxIntellectGainValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("kit")] public double Kit { @@ -111,6 +117,9 @@ public record MaxIntellectGainValues public record WeaponTreatmentRepairValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// The chance to gain more weapon maintenance skill /// @@ -158,6 +167,9 @@ public record WeaponTreatmentRepairValues public record RepairKit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("armor")] public required BonusSettings Armor { @@ -189,6 +201,9 @@ public record RepairKit public record BonusSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("rarityWeight")] public required Dictionary RarityWeight { @@ -220,6 +235,9 @@ public record BonusSettings public record BonusValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("valuesMinMax")] public required MinMax ValuesMinMax { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs index 96a0e4bd..2a3aa204 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Common; namespace SPTarkov.Server.Core.Models.Spt.Config; @@ -71,6 +71,9 @@ public record ScavCaseConfig : BaseConfig public record MoneyRewards { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("moneyRewardChancePercent")] public int MoneyRewardChancePercent { @@ -109,6 +112,9 @@ public record MoneyRewards public record MoneyLevels { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("common")] public required MinMax Common { @@ -133,6 +139,9 @@ public record MoneyLevels public record AmmoRewards { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ammoRewardChancePercent")] public int AmmoRewardChancePercent { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs index a9d74581..7bf23a3e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs @@ -109,6 +109,9 @@ public record SeasonalEventConfig : BaseConfig public record SeasonalEvent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enabled")] public bool Enabled { @@ -181,6 +184,9 @@ public record SeasonalEvent public record SeasonalEventSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enableSummoning")] public bool? EnableSummoning { @@ -275,6 +281,9 @@ public record SeasonalEventSettings public record ZombieSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("enabled")] public bool? Enabled { @@ -306,6 +315,9 @@ public record ZombieSettings public record GifterSetting { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("map")] public string? Map { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs index 3e14e7fd..f982f614 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Spt.Services; @@ -68,6 +68,9 @@ public record TraderConfig : BaseConfig public record UpdateTime { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_name")] public string Name { @@ -95,6 +98,9 @@ public record UpdateTime public record FenceConfig { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("discountOptions")] public required DiscountOptions DiscountOptions { @@ -293,6 +299,9 @@ public record FenceConfig public record ItemDurabilityCurrentMax { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("current")] public required MinMax Current { @@ -341,6 +350,9 @@ public record CoopExtractReward : LootRequest public record DiscountOptions { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("assortSize")] public int AssortSize { @@ -382,6 +394,9 @@ public record DiscountOptions /// public record ModdedTraders { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Trader Ids to enable the clothing service for /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs index 9baebccb..0666a136 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Enums; using SPTarkov.Server.Core.Utils.Json.Converters; @@ -45,6 +45,9 @@ public record WeatherConfig : BaseConfig public record SeasonDateTimes { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("seasonType")] public Season? SeasonType { @@ -94,6 +97,9 @@ public record SeasonDateTimes public record WeatherValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("seasonValues")] public Dictionary? SeasonValues { @@ -124,6 +130,9 @@ public record WeatherValues public record SeasonalValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("clouds")] public WeatherSettings? Clouds { @@ -190,6 +199,9 @@ public record SeasonalValues public record TempDayNight { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("day")] public MinMax? Day { @@ -207,6 +219,9 @@ public record TempDayNight public record WeatherSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("values")] public List? Values { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs index b7de12c7..887e1af6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs @@ -8,6 +8,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Dialog; public record SendMessageDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Player id /// @@ -141,6 +144,9 @@ public record SendMessageDetails public record ProfileChangeEvent { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("_id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs index 69f9c429..303b27e4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Spt.Fence; public record CreateFenceAssortsResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("sptItems")] public List>? SptItems { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs index e0389391..20b0c491 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Fence; public record FenceAssortGenerationValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("normal")] public GenerationAssortValues? Normal { @@ -21,6 +24,9 @@ public record FenceAssortGenerationValues public record GenerationAssortValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("item")] public int? Item { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs index 8f25a023..3f4f7ece 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs @@ -1,7 +1,11 @@ +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Helper; public record WeightedRandomResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required T Item { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs index 46af0ada..faf541fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Enums.Hideout; using SPTarkov.Server.Core.Models.Spt.Config; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record CircleCraftDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("time")] public required long Time { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs index 95432bbc..9f477c31 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Hideout; namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record Hideout { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("areas")] public List? Areas { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs index feb67c16..7ca943fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record ScavCaseRewardCountsAndPrices { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Common")] public RewardCountAndPriceDetails? Common { @@ -28,6 +31,9 @@ public record ScavCaseRewardCountsAndPrices public record RewardCountAndPriceDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("minCount")] public double? MinCount { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs index d4559aa8..03a48037 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory; public record ItemSize { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("width")] public required int Width { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs index e7a1f7da..9b950c72 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Spt.Inventory; public record OwnerInventoryItems { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Inventory items from source /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs index fba801e2..2e505c3b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs @@ -1,9 +1,13 @@ -using SPTarkov.Server.Core.Models.Utils; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2CompatibleVersion : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required string SptVersion { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs index f4daae4a..f988529a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs @@ -1,9 +1,13 @@ -using SPTarkov.Server.Core.Models.Utils; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2LoginResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required bool Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs index b71d91fc..59bd86ea 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs @@ -1,10 +1,14 @@ -using SPTarkov.Server.Core.Models.Spt.Mod; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Spt.Mod; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ModsResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required Dictionary Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs index 4902c3e4..aa6b5fc2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs @@ -1,10 +1,14 @@ -using SPTarkov.Server.Core.Models.Eft.Launcher; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2PasswordChangeResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required bool Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs index aedbf1c0..6727d384 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs @@ -1,9 +1,13 @@ -using SPTarkov.Server.Core.Models.Utils; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2PingResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required string Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs index c3244069..630fda69 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs @@ -1,10 +1,14 @@ -using SPTarkov.Server.Core.Models.Eft.Profile; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Profile; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ProfileResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public SptProfile Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs index 68aa449a..e5710ab1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs @@ -1,10 +1,14 @@ -using SPTarkov.Server.Core.Models.Eft.Launcher; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ProfilesResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required List Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs index c1651bf9..5cbf8249 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs @@ -1,10 +1,14 @@ -using SPTarkov.Server.Core.Models.Eft.Launcher; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2RegisterResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required bool Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs index 055b9bdd..aa6c92a0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs @@ -1,10 +1,14 @@ -using SPTarkov.Server.Core.Models.Eft.Launcher; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Launcher; using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2RemoveResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required bool Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs index 5a73c43a..0ea0e505 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs @@ -1,9 +1,13 @@ -using SPTarkov.Server.Core.Models.Utils; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2TypesResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required Dictionary Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs index 9976e944..e1b43157 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs @@ -1,9 +1,13 @@ -using SPTarkov.Server.Core.Models.Utils; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Utils; namespace SPTarkov.Server.Core.Models.Spt.Launcher; public record LauncherV2VersionResponse : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public required LauncherV2CompatibleVersion Response { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs index 2cfbb6d7..82575868 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Location; public record RaidChanges { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// What percentage of dynamic loot should the map contain /// @@ -77,6 +80,9 @@ public record RaidChanges public record ExtractChange { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Name")] public string? Name { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs index d7810c6d..f2c80952 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Logging; public record ClientLogRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Source")] public string? Source { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogBackgroundColor.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogBackgroundColor.cs index 56950580..974bd71b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogBackgroundColor.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogBackgroundColor.cs @@ -1,4 +1,4 @@ -// namespace SPTarkov.Server.Core.Models.Spt.Logging; +// namespace SPTarkov.Server.Core.Models.Spt.Logging; // // public record LogBackgroundColor // { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogTextColor.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogTextColor.cs index 47986014..96857388 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogTextColor.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/LogTextColor.cs @@ -1,4 +1,4 @@ -// namespace SPTarkov.Server.Core.Models.Spt.Logging; +// namespace SPTarkov.Server.Core.Models.Spt.Logging; // // public record LogTextColor // { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs index f0d66bfe..2854b828 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/SptLogger.cs @@ -1,7 +1,11 @@ -namespace SPTarkov.Server.Core.Models.Spt.Logging; +using System.Text.Json.Serialization; +namespace SPTarkov.Server.Core.Models.Spt.Logging; public record SptLogger { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public object Error { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs index 62538646..1c13963f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Mod; public class ModOrder { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("order")] public List Order { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs index 9f83567f..ca6f0156 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Spt.Mod; @@ -59,6 +59,9 @@ public record NewItemFromCloneDetails : NewItemDetailsBase public record NewItemDetailsBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("fleaPriceRoubles")] public double? FleaPriceRoubles { @@ -90,6 +93,9 @@ public record NewItemDetailsBase public record LocaleDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("name")] public string? Name { @@ -114,6 +120,9 @@ public record LocaleDetails public record CreateItemResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public CreateItemResult() { Success = false; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs index b5556fbb..d41dd624 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs @@ -1,10 +1,13 @@ -using System.Reflection; +using System.Reflection; using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Mod; public class SptMod { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("directory")] public string Directory { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs index 20ecef9c..95670aa7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs @@ -1,7 +1,11 @@ -namespace SPTarkov.Server.Core.Models.Spt.Presets; +using System.Text.Json.Serialization; +namespace SPTarkov.Server.Core.Models.Spt.Presets; public record PresetCacheDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // Preset Ids related to the tpl public HashSet PresetIds { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs index 029a9dcc..327f1457 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Spt.Quests; public record GetRepeatableByIdResult { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("quest")] public RepeatableQuest? Quest { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs index 8591cab9..07898786 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record RagfairServerPrices { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("staticPrices")] public Dictionary? StaticPrices { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs index 7a8266de..ee13d7ae 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs @@ -1,9 +1,12 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record TplWithFleaPrice { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("tpl")] public string? Tpl { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs index 1de0483e..6ceb45d9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable; public record QuestRewardValues { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("skillPointReward")] public double? SkillPointReward { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs index 33dc7da0..4ca43df1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable; public record QuestTypePool { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("types")] public List? Types { @@ -22,6 +25,9 @@ public record QuestTypePool public record QuestPool { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Exploration")] public ExplorationPool? Exploration { @@ -46,6 +52,9 @@ public record QuestPool public record ExplorationPool { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("locations")] public Dictionary>? Locations { @@ -56,6 +65,9 @@ public record ExplorationPool public record EliminationPool { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("targets")] public Dictionary? Targets { @@ -66,6 +78,9 @@ public record EliminationPool public record TargetLocation { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("locations")] public List? Locations { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs index e1fc558d..a3b7cbbc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs @@ -1,10 +1,14 @@ -using SPTarkov.Server.Core.Models.Eft.Common; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; namespace SPTarkov.Server.Core.Models.Spt.Server; public record DatabaseTables { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public Bots.Bots? Bots { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs index 104b8691..6c44082d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Utils.Json; namespace SPTarkov.Server.Core.Models.Spt.Server; public record LocaleBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("global")] /// DO NOT USE THIS PROPERTY DIRECTLY, USE LOCALESERVICE INSTEAD /// THIS IS LAZY LOADED AND YOUR CHANGES WILL NOT BE SAVED diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs index 0ea64eb0..dcb97bff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record Locations { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + // sometimes we get the key or value given so save changing logic in each place // have it key both private readonly FrozenDictionary _locationMappings = new Dictionary diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs index e6e4cd02..52bfea3f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; namespace SPTarkov.Server.Core.Models.Spt.Server; @@ -7,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; /// public record ServerBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("ip")] public required string Ip { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs index 2eddd37c..9f59eaee 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs @@ -1,10 +1,13 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common; namespace SPTarkov.Server.Core.Models.Spt.Server; public record SettingsBase { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("config")] public Config? Configuration { @@ -15,6 +18,9 @@ public record SettingsBase public record Config { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AFKTimeoutSeconds")] public int? AFKTimeoutSeconds { @@ -214,6 +220,9 @@ public record Config public record AudioSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AudioGroupPresets")] public List? AudioGroupPresets { @@ -259,6 +268,9 @@ public record AudioSettings public record FramerateLimit { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("MaxFramerateGameLimit")] public int? MaxFramerateGameLimit { @@ -283,6 +295,9 @@ public record FramerateLimit public record MemoryManagementSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AggressiveGC")] public bool? AggressiveGC { @@ -328,6 +343,9 @@ public record MemoryManagementSettings public record ReleaseProfiler { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("Enabled")] public bool? Enabled { @@ -352,6 +370,9 @@ public record ReleaseProfiler public record NetworkStateView { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("LossThreshold")] public int? LossThreshold { @@ -369,6 +390,9 @@ public record NetworkStateView public record AudioGroupPreset { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AngleToAllowBinaural")] public double? AngleToAllowBinaural { @@ -442,6 +466,9 @@ public record AudioGroupPreset public record EnvironmentSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("AutumnLateSettings")] public SeasonEnvironmentSettings AutumnLateSettings { @@ -501,6 +528,9 @@ public record EnvironmentSettings public record SeasonEnvironmentSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("RainSettings")] public List RainSettings { @@ -525,6 +555,9 @@ public record SeasonEnvironmentSettings public record SurfaceMultiplier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string SurfaceType { get; @@ -540,6 +573,9 @@ public record SurfaceMultiplier public record WindMultiplier { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("VolumeMult")] public double VolumeMult { @@ -557,6 +593,9 @@ public record WindMultiplier public record RainSetting { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("IndoorVolumeMult")] public int IndoorVolumeMult { @@ -581,6 +620,9 @@ public record RainSetting public record HeadphoneSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public double FadeDuration { get; @@ -602,6 +644,9 @@ public record HeadphoneSettings public record MetaXRAudioPluginSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public bool? EnabledPluginErrorChecker { get; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs index 3bebc2bb..e471f1bc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record InsuranceEquipmentPkg { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("sessionID")] public string? SessionId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs index 896f69c6..47beb847 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs @@ -4,6 +4,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record LootItem { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("id")] public string? Id { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs index e7431d53..2326351d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record LootRequest { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + /// /// Count of weapons to generate /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs index 9b527c3a..007990f1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs @@ -1,4 +1,4 @@ -using SPTarkov.Server.Core.Models.Eft.Match; +using SPTarkov.Server.Core.Models.Eft.Match; using SPTarkov.Server.Core.Models.Spt.Location; namespace SPTarkov.Server.Core.Models.Spt.Services diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs index 4e7fffb1..6e8009be 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record TraderServiceModel { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("serviceType")] [JsonConverter(typeof(JsonStringEnumConverter))] public TraderServiceType? ServiceType @@ -44,6 +47,9 @@ public record TraderServiceModel public record TraderServiceRequirementsModel { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("completedQuests")] public List? CompletedQuests { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs index ab0442df..c984ebd1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Eft.Profile; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Templates; public record Templates { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("character")] public List? Character { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs index 6985eeb2..e5c18da4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs @@ -5,6 +5,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Weather; public record GetLocalWeatherResponseData { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + [JsonPropertyName("season")] public Season? Season { diff --git a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs index 4a0ce1d2..f1e15039 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs @@ -1,4 +1,5 @@ -using SPTarkov.DI.Annotations; +using System.Text.Json.Serialization; +using SPTarkov.DI.Annotations; using SPTarkov.Server.Core.Models.Enums; namespace SPTarkov.Server.Core.Models; @@ -6,6 +7,9 @@ namespace SPTarkov.Server.Core.Models; [Injectable] public record Prapor() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Prapor"; public string Id { get; } = Traders.PRAPOR; } @@ -13,6 +17,9 @@ public record Prapor() : ITrader [Injectable] public record Therapist() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Therapist"; public string Id { get; } = Traders.THERAPIST; } @@ -20,6 +27,9 @@ public record Therapist() : ITrader [Injectable] public record Fence() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Fence"; public string Id { get; } = Traders.FENCE; } @@ -27,6 +37,9 @@ public record Fence() : ITrader [Injectable] public record Skier() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Skier"; public string Id { get; } = Traders.SKIER; } @@ -34,6 +47,9 @@ public record Skier() : ITrader [Injectable] public record Peacekeeper() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Peacekeeper"; public string Id { get; } = Traders.PEACEKEEPER; } @@ -41,6 +57,9 @@ public record Peacekeeper() : ITrader [Injectable] public record Mechanic() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Mechanic"; public string Id { get; } = Traders.MECHANIC; } @@ -48,6 +67,9 @@ public record Mechanic() : ITrader [Injectable] public record Ragman() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Ragman"; public string Id { get; } = Traders.RAGMAN; } @@ -55,6 +77,9 @@ public record Ragman() : ITrader [Injectable] public record Jaeger() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Jaeger"; public string Id { get; } = Traders.JAEGER; } @@ -62,6 +87,9 @@ public record Jaeger() : ITrader [Injectable] public record LighthouseKeeper() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "LighthouseKeeper"; public string Id { get; } = Traders.LIGHTHOUSEKEEPER; } @@ -69,6 +97,9 @@ public record LighthouseKeeper() : ITrader [Injectable] public record Btr() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Btr"; public string Id { get; } = Traders.BTR; } @@ -76,6 +107,9 @@ public record Btr() : ITrader [Injectable] public record Ref() : ITrader { + [JsonExtensionData] + public Dictionary ExtensionData { get; set; } + public string Name { get; } = "Ref"; public string Id { get; } = Traders.REF; }