From f96172ac60c52ea73dd3d283dabbf8a25f1dbc51 Mon Sep 17 00:00:00 2001 From: Archangel Date: Sun, 17 Aug 2025 16:10:33 +0200 Subject: [PATCH] Always init ExtensionData & fix BaseInteractionRequestData inheritance --- .../Models/Common/IdWithCount.cs | 2 +- .../Models/Common/MinMax.cs | 2 +- .../Models/Eft/Bot/GenerateBotsRequestData.cs | 4 +- .../Eft/Bot/RandomisedBotLevelResult.cs | 2 +- .../Models/Eft/Builds/SetMagazineRequest.cs | 2 +- .../Models/Eft/Common/EmptyRequestData.cs | 2 +- .../Models/Eft/Common/Globals.cs | 388 +++++++++--------- .../Models/Eft/Common/Location.cs | 22 +- .../Models/Eft/Common/LocationBase.cs | 52 +-- .../Models/Eft/Common/LooseLoot.cs | 17 +- .../Models/Eft/Common/MetricsTableData.cs | 2 +- .../Models/Eft/Common/PmcData.cs | 2 +- .../Request/BaseInteractionRequestData.cs | 4 +- .../Eft/Common/Request/UIDRequestData.cs | 2 +- .../Models/Eft/Common/Tables/Achievement.cs | 4 +- .../Models/Eft/Common/Tables/BotBase.cs | 88 ++-- .../Models/Eft/Common/Tables/BotCore.cs | 2 +- .../Models/Eft/Common/Tables/BotType.cs | 28 +- .../Eft/Common/Tables/CustomisationStorage.cs | 8 +- .../Eft/Common/Tables/CustomizationItem.cs | 4 +- .../Models/Eft/Common/Tables/HandbookBase.cs | 6 +- .../Models/Eft/Common/Tables/Item.cs | 52 +-- .../Eft/Common/Tables/LocationServices.cs | 20 +- .../Models/Eft/Common/Tables/LocationsBase.cs | 6 +- .../Tables/LocationsGenerateAllResponse.cs | 2 +- .../Models/Eft/Common/Tables/Match.cs | 4 +- .../Models/Eft/Common/Tables/Prestige.cs | 14 +- .../Eft/Common/Tables/ProfileTemplate.cs | 6 +- .../Models/Eft/Common/Tables/Quest.cs | 22 +- .../Eft/Common/Tables/RepeatableQuests.cs | 24 +- .../Models/Eft/Common/Tables/Reward.cs | 4 +- .../Models/Eft/Common/Tables/TemplateItem.cs | 50 +-- .../Models/Eft/Common/Tables/Trader.cs | 24 +- .../Models/Eft/Common/XY.cs | 2 +- .../Models/Eft/Common/XYZ.cs | 2 +- .../Customization/BuyClothingRequestData.cs | 5 +- .../Customization/CustomizationSetRequest.cs | 5 +- .../Customization/WearClothingRequestData.cs | 2 +- .../Eft/Dialog/AcceptFriendRequestData.cs | 2 +- .../Eft/Dialog/AddUserGroupMailRequest.cs | 2 +- .../Eft/Dialog/ChangeGroupMailOwnerRequest.cs | 2 +- .../Models/Eft/Dialog/ChatServer.cs | 4 +- .../Eft/Dialog/ClearMailMessageRequest.cs | 2 +- .../Eft/Dialog/CreateGroupMailRequest.cs | 2 +- .../Models/Eft/Dialog/DeleteFriendRequest.cs | 2 +- .../Models/Eft/Dialog/FriendRequestData.cs | 2 +- .../Eft/Dialog/FriendRequestSendResponse.cs | 2 +- .../Dialog/GetAllAttachmentsRequestData.cs | 2 +- .../Eft/Dialog/GetAllAttachmentsResponse.cs | 2 +- .../Dialog/GetChatServerListRequestData.cs | 2 +- .../Eft/Dialog/GetFriendListDataResponse.cs | 2 +- .../Dialog/GetMailDialogInfoRequestData.cs | 2 +- .../Dialog/GetMailDialogListRequestData.cs | 2 +- .../Dialog/GetMailDialogViewRequestData.cs | 2 +- .../Dialog/GetMailDialogViewResponseData.cs | 2 +- .../Models/Eft/Dialog/PinDialogRequestData.cs | 2 +- .../Eft/Dialog/RemoveDialogRequestData.cs | 2 +- .../Eft/Dialog/RemoveMailMessageRequest.cs | 2 +- .../Eft/Dialog/RemoveUserGroupMailRequest.cs | 2 +- .../Models/Eft/Dialog/SendMessageRequest.cs | 2 +- .../Eft/Dialog/SetDialogReadRequestData.cs | 2 +- .../Models/Eft/Game/CheckVersionResponse.cs | 2 +- .../Models/Eft/Game/CurrentGroupResponse.cs | 6 +- .../Models/Eft/Game/GameConfigResponse.cs | 6 +- .../Eft/Game/GameEmptyCrcRequestData.cs | 2 +- .../Models/Eft/Game/GameKeepAliveResponse.cs | 2 +- .../Models/Eft/Game/GameLogoutResponseData.cs | 2 +- .../Models/Eft/Game/GameModeRequestData.cs | 2 +- .../Models/Eft/Game/GameModeResponse.cs | 2 +- .../Models/Eft/Game/GameStartResponse.cs | 2 +- .../Models/Eft/Game/GetItemPricesResponse.cs | 2 +- .../Models/Eft/Game/GetRaidTimeRequest.cs | 2 +- .../Models/Eft/Game/GetRaidTimeResponse.cs | 2 +- .../Models/Eft/Game/SendClientModsRequest.cs | 5 +- .../Eft/Game/SendSurveyOpinionRequest.cs | 4 +- .../Models/Eft/Game/ServerDetails.cs | 2 +- .../Models/Eft/Game/SurveyResponseData.cs | 12 +- .../Eft/Game/VersionValidateRequestData.cs | 4 +- .../Eft/Health/HealthTreatmentRequestData.cs | 7 +- .../Eft/Health/OffraidEatRequestData.cs | 3 - .../Eft/Health/OffraidHealRequestData.cs | 3 - .../Eft/Health/SyncHealthRequestData.cs | 6 +- .../Models/Eft/Health/WorkoutData.cs | 4 +- .../Eft/Hideout/HandleQTEEventRequestData.cs | 3 - .../Models/Eft/Hideout/HideoutArea.cs | 14 +- ...rcleOfCultistProductionStartRequestData.cs | 3 - ...outContinuousProductionStartRequestData.cs | 5 +- .../Eft/Hideout/HideoutCustomisation.cs | 6 +- .../HideoutCustomizationApplyRequestData.cs | 3 - ...outCustomizationSetMannequinPoseRequest.cs | 3 - .../HideoutDeleteProductionRequestData.cs | 3 - .../Hideout/HideoutImproveAreaRequestData.cs | 3 - .../Models/Eft/Hideout/HideoutProduction.cs | 12 +- .../Hideout/HideoutPutItemInRequestData.cs | 3 - .../HideoutScavCaseStartRequestData.cs | 3 - .../Models/Eft/Hideout/HideoutSettingsBase.cs | 2 +- ...HideoutSingleProductionStartRequestData.cs | 3 - .../Hideout/HideoutTakeItemOutRequestData.cs | 3 - .../HideoutTakeProductionRequestData.cs | 3 - .../Hideout/HideoutToggleAreaRequestData.cs | 3 - .../HideoutUpgradeCompleteRequestData.cs | 3 - .../Eft/Hideout/HideoutUpgradeRequestData.cs | 3 - .../Models/Eft/Hideout/QteData.cs | 14 +- .../Eft/Hideout/RecordShootingRangePoints.cs | 3 - .../Eft/HttpResponse/GetBodyResponseData.cs | 2 +- .../Eft/HttpResponse/NullResponseData.cs | 2 +- .../Models/Eft/InRaid/InsuredItemsData.cs | 2 +- .../Eft/InRaid/ItemDeliveryRequestData.cs | 2 +- .../Eft/InRaid/RegisterPlayerRequestData.cs | 2 +- .../Insurance/GetInsuranceCostRequestData.cs | 2 +- .../Models/Eft/Insurance/InsureRequestData.cs | 3 - .../Eft/Inventory/AddItemDirectRequest.cs | 2 +- .../Eft/Inventory/AddItemRequestData.cs | 4 +- .../Models/Eft/Inventory/AddItemTempObject.cs | 2 +- .../Eft/Inventory/AddItemsDirectRequest.cs | 2 +- .../Eft/Inventory/InventoryAddRequestData.cs | 3 - .../InventoryBaseActionRequestData.cs | 6 +- .../Eft/Inventory/InventoryBindRequestData.cs | 3 - .../InventoryCreateMarkerRequestData.cs | 3 - .../InventoryDeleteMarkerRequestData.cs | 3 - .../InventoryEditMarkerRequestData.cs | 3 - .../Inventory/InventoryExamineRequestData.cs | 3 - .../Eft/Inventory/InventoryFoldRequestData.cs | 3 - .../Inventory/InventoryMergeRequestData.cs | 3 - .../Eft/Inventory/InventoryMoveRequestData.cs | 3 - .../InventoryReadEncyclopediaRequestData.cs | 3 - .../Inventory/InventoryRemoveRequestData.cs | 3 - .../Eft/Inventory/InventorySortRequestData.cs | 3 - .../Inventory/InventorySplitRequestData.cs | 3 - .../Eft/Inventory/InventorySwapRequestData.cs | 3 - .../Eft/Inventory/InventoryTagRequestData.cs | 3 - .../Inventory/InventoryToggleRequestData.cs | 3 - .../Inventory/InventoryTransferRequestData.cs | 3 - .../OpenRandomLootContainerRequestData.cs | 3 - .../Eft/Inventory/PinOrLockItemRequest.cs | 3 - .../Eft/Inventory/RedeemProfileRequestData.cs | 5 +- .../Models/Eft/Inventory/SetFavoriteItems.cs | 3 - .../ItemEvent/EmptyItemEventRouterResponse.cs | 2 +- .../Eft/ItemEvent/ItemEventRouterBase.cs | 18 +- .../Eft/ItemEvent/ItemEventRouterRequest.cs | 10 +- .../Eft/ItemEvent/ItemEventRouterResponse.cs | 2 +- .../Eft/Launcher/GetMiniProfileRequestData.cs | 2 +- .../Models/Eft/Launcher/LoginRequestData.cs | 2 +- .../Models/Eft/Launcher/MiniProfile.cs | 2 +- .../Models/Eft/Location/AirdropLootResult.cs | 2 +- .../Eft/Location/GetAirdropLootRequest.cs | 2 +- .../Eft/Location/GetAirdropLootResponse.cs | 2 +- .../Eft/Location/GetLocationRequestData.cs | 2 +- .../Eft/Match/EndLocalRaidRequestData.cs | 8 +- .../Eft/Match/EndOfflineRaidRequestData.cs | 2 +- .../Models/Eft/Match/GroupCharacter.cs | 12 +- .../Eft/Match/MatchGroupCurrentResponse.cs | 2 +- .../Eft/Match/MatchGroupInviteSendRequest.cs | 2 +- .../Models/Eft/Match/MatchGroupJoinRequest.cs | 4 +- .../Match/MatchGroupPlayerRemoveRequest.cs | 2 +- .../Eft/Match/MatchGroupStartGameRequest.cs | 2 +- .../Eft/Match/MatchGroupStatusRequest.cs | 2 +- .../Eft/Match/MatchGroupStatusResponse.cs | 2 +- .../Eft/Match/MatchGroupTransferRequest.cs | 2 +- .../Models/Eft/Match/ProfileStatusRequest.cs | 2 +- .../Models/Eft/Match/ProfileStatusResponse.cs | 2 +- .../Models/Eft/Match/PutMetricsRequestData.cs | 8 +- .../Models/Eft/Match/RaidSettings.cs | 8 +- .../Models/Eft/Match/RequestIdRequest.cs | 2 +- .../Models/Eft/Match/Server.cs | 2 +- .../Models/Eft/Match/SessionStatus.cs | 2 +- .../Eft/Match/StartLocalRaidRequestData.cs | 2 +- .../Eft/Match/StartLocalRaidResponseData.cs | 6 +- .../Models/Eft/Match/UpdatePingRequestData.cs | 2 +- .../Models/Eft/Notes/NoteActionRequest.cs | 2 +- .../Models/Eft/Notifier/Notifier.cs | 2 +- .../Eft/Notifier/SelectProfileResponse.cs | 2 +- .../PresetBuildActionRequestData.cs | 2 +- .../Eft/PresetBuild/RemoveBuildRequestData.cs | 2 +- .../Eft/Prestige/GetPrestigeResponse.cs | 2 +- .../Eft/Prestige/ObtainPrestigeRequest.cs | 4 +- .../Profile/CompletedAchievementsResponse.cs | 2 +- .../Models/Eft/Profile/ConnectResponse.cs | 2 +- .../Eft/Profile/CreateProfileResponse.cs | 2 +- .../Eft/Profile/GetAchievementsResponse.cs | 2 +- .../Eft/Profile/GetOtherProfileRequest.cs | 2 +- .../Eft/Profile/GetOtherProfileResponse.cs | 12 +- .../Eft/Profile/GetProfileSettingsRequest.cs | 2 +- .../Profile/GetProfileStatusResponseData.cs | 4 +- .../Eft/Profile/MessageContentRagfair.cs | 2 +- .../ProfileChangeNicknameRequestData.cs | 2 +- .../Profile/ProfileChangeVoiceRequestData.cs | 2 +- .../Eft/Profile/ProfileCreateRequestData.cs | 2 +- .../Eft/Profile/SearchFriendResponse.cs | 2 +- .../Eft/Profile/SearchProfilesRequestData.cs | 2 +- .../Models/Eft/Profile/SptProfile.cs | 44 +- .../Models/Eft/Profile/SystemData.cs | 2 +- .../Models/Eft/Profile/UserDialogInfo.cs | 4 +- .../Profile/ValidateNicknameRequestData.cs | 2 +- .../Eft/Quests/AcceptQuestRequestData.cs | 3 - .../Eft/Quests/CompleteQuestRequestData.cs | 3 - .../Models/Eft/Quests/FailQuestRequestData.cs | 3 - .../Eft/Quests/HandoverQuestRequestData.cs | 3 - .../Eft/Quests/ListQuestsRequestData.cs | 2 +- .../Eft/Quests/RepeatableQuestChangeEvent.cs | 3 - .../Models/Eft/Ragfair/AddOfferRequestData.cs | 5 +- .../Eft/Ragfair/ExtendOfferRequestData.cs | 3 - .../Eft/Ragfair/GetMarketPriceRequestData.cs | 2 +- .../Models/Eft/Ragfair/GetOffersResult.cs | 2 +- .../Eft/Ragfair/GetRagfairOfferByIdRequest.cs | 2 +- .../Models/Eft/Ragfair/RagfairOffer.cs | 8 +- .../Eft/Ragfair/RemoveOfferRequestData.cs | 3 - .../Models/Eft/Ragfair/SearchRequestData.cs | 2 +- .../Ragfair/SendRagfairReportRequestData.cs | 2 +- .../StorePlayerOfferTaxAmountRequestData.cs | 2 +- .../Eft/Repair/BaseRepairActionDataRequest.cs | 2 +- .../Eft/Repair/RepairActionDataRequest.cs | 5 +- .../Repair/TraderRepairActionDataRequest.cs | 5 +- .../Eft/Trade/ProcessBaseTradeRequestData.cs | 3 - .../Trade/ProcessRagfairTradeRequestData.cs | 5 +- .../Eft/Trade/ProcessSellTradeRequestData.cs | 2 +- .../Trade/SellScavItemsToFenceRequestData.cs | 3 - .../Models/Eft/Weather/WeatherData.cs | 4 +- .../Eft/Wishlist/AddToWishlistRequest.cs | 3 - .../ChangeWishlistItemCategoryRequest.cs | 3 - .../Eft/Wishlist/RemoveFromWishlistRequest.cs | 3 - .../Models/Eft/Ws/WsNotificationEvent.cs | 2 +- .../Models/Enums/AccountTypes.cs | 2 +- .../Models/Enums/GameEditions.cs | 2 +- .../Models/Enums/HideoutEventActions.cs | 2 +- .../Models/Enums/ItemEventActions.cs | 2 +- .../Models/Enums/Money.cs | 2 +- .../Spt/Bots/BotDetailsForChatMessages.cs | 2 +- .../Models/Spt/Bots/BotGenerationDetails.cs | 2 +- .../Models/Spt/Bots/BotLootCache.cs | 4 +- .../Models/Spt/Bots/Bots.cs | 2 +- .../Bots/ChooseRandomCompatibleModResult.cs | 2 +- .../FilterPlateModsForSlotByLevelResult.cs | 2 +- .../Spt/Bots/GenerateEquipmentProperties.cs | 2 +- .../Models/Spt/Bots/GenerateWeaponRequest.cs | 10 +- .../Models/Spt/Bots/GenerateWeaponResult.cs | 2 +- .../Models/Spt/Bots/ItemSpawnLimitSettings.cs | 2 +- .../Models/Spt/Bots/ModToSpawnRequest.cs | 2 +- .../Models/Spt/Config/AirdropConfig.cs | 2 +- .../Models/Spt/Config/BackupConfig.cs | 2 +- .../Models/Spt/Config/BaseConfig.cs | 2 +- .../Models/Spt/Config/BotConfig.cs | 24 +- .../Models/Spt/Config/BotDurability.cs | 12 +- .../Models/Spt/Config/CoreConfig.cs | 12 +- .../Models/Spt/Config/GiftsConfig.cs | 2 +- .../Models/Spt/Config/HealthConfig.cs | 4 +- .../Models/Spt/Config/HideoutConfig.cs | 6 +- .../Models/Spt/Config/InRaidConfig.cs | 2 +- .../Models/Spt/Config/InventoryConfig.cs | 4 +- .../Models/Spt/Config/ItemConfig.cs | 2 +- .../Models/Spt/Config/LocationConfig.cs | 18 +- .../Models/Spt/Config/LostOnDeathConfig.cs | 2 +- .../Models/Spt/Config/PlayerScavConfig.cs | 4 +- .../Models/Spt/Config/PmcChatResponse.cs | 2 +- .../Models/Spt/Config/PmcConfig.cs | 13 +- .../Models/Spt/Config/QuestConfig.cs | 20 +- .../Models/Spt/Config/RagfairConfig.cs | 26 +- .../Models/Spt/Config/RepairConfig.cs | 12 +- .../Models/Spt/Config/ScavCaseConfig.cs | 6 +- .../Models/Spt/Config/SeasonalEventConfig.cs | 8 +- .../Models/Spt/Config/TraderConfig.cs | 10 +- .../Models/Spt/Config/WeatherConfig.cs | 10 +- .../Models/Spt/Dialog/SendMessageDetails.cs | 4 +- .../Spt/Fence/CreateFenceAssortsResult.cs | 2 +- .../Spt/Fence/FenceAssortGenerationValues.cs | 4 +- .../Models/Spt/Helper/WeightedRandomResult.cs | 2 +- .../Models/Spt/Hideout/CircleCraftDetails.cs | 2 +- .../Models/Spt/Hideout/Hideout.cs | 2 +- .../Hideout/ScavCaseRewardCountsAndPrices.cs | 4 +- .../Models/Spt/Inventory/FindSlotResult.cs | 2 +- .../Models/Spt/Inventory/ItemSize.cs | 2 +- .../Spt/Inventory/OwnerInventoryItems.cs | 2 +- .../Launcher/LauncherV2CompatibleVersion.cs | 2 +- .../Spt/Launcher/LauncherV2LoginResponse.cs | 2 +- .../Spt/Launcher/LauncherV2ModsResponse.cs | 2 +- .../LauncherV2PasswordChangeResponse.cs | 2 +- .../Spt/Launcher/LauncherV2PingResponse.cs | 2 +- .../Spt/Launcher/LauncherV2ProfileResponse.cs | 2 +- .../Launcher/LauncherV2ProfilesResponse.cs | 2 +- .../Launcher/LauncherV2RegisterResponse.cs | 2 +- .../Spt/Launcher/LauncherV2RemoveResponse.cs | 2 +- .../Spt/Launcher/LauncherV2TypesResponse.cs | 2 +- .../Spt/Launcher/LauncherV2VersionResponse.cs | 2 +- .../Models/Spt/Location/RaidChanges.cs | 4 +- .../Models/Spt/Logging/ClientLogRequest.cs | 2 +- .../Models/Spt/Mod/ModOrder.cs | 2 +- .../Models/Spt/Mod/NewItemDetails.cs | 6 +- .../Models/Spt/Mod/SptMod.cs | 2 +- .../Models/Spt/Presets/PresetCacheDetails.cs | 2 +- .../Spt/Quests/GetRepeatableByIdResult.cs | 2 +- .../Spt/Ragfair/CreateFleaOfferDetails.cs | 6 +- .../Models/Spt/Ragfair/RagfairServerPrices.cs | 2 +- .../Models/Spt/Ragfair/TplWithFleaPrice.cs | 2 +- .../Spt/Repeatable/QuestRewardValues.cs | 2 +- .../Models/Spt/Repeatable/QuestTypePool.cs | 10 +- .../Models/Spt/Server/DatabaseTables.cs | 2 +- .../Models/Spt/Server/LocaleBase.cs | 2 +- .../Models/Spt/Server/Locations.cs | 2 +- .../Models/Spt/Server/ServerBase.cs | 2 +- .../Models/Spt/Server/SettingsBase.cs | 30 +- .../Spt/Services/InsuranceEquipmentPkg.cs | 2 +- .../Models/Spt/Services/LootItem.cs | 2 +- .../Models/Spt/Services/LootRequest.cs | 2 +- .../Spt/Services/ProfileActivityData.cs | 9 + .../Models/Spt/Services/TraderServiceModel.cs | 4 +- .../Models/Spt/Templates/Templates.cs | 2 +- .../Weather/GetLocalWeatherResponseData.cs | 2 +- .../Models/Trader/Traders.cs | 22 +- .../JsonExtensionDataGeneratorLauncher.cs | 27 +- 309 files changed, 924 insertions(+), 1052 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs index 88b2225c..27a2cb5c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Common; public record IdWithCount { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 e346cdb0..96190533 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs @@ -7,7 +7,7 @@ public record MinMax where T : IMinMaxValue { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public MinMax(T min, T max) { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs index 4bb778cb..2643ed5e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Bot; public record GenerateBotsRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("conditions")] public List? Conditions { get; set; } @@ -15,7 +15,7 @@ public record GenerateBotsRequestData : IRequestData public record GenerateCondition { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 97e233ac..e7dd6d8d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Bot; public record RandomisedBotLevelResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("level")] public int? Level { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs index d5469b25..9f65adcc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Builds; public record SetMagazineRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs index 077e091a..93a6670c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs @@ -6,5 +6,5 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record EmptyRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs index 62449acb..4c58b747 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record Globals { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("config")] public Config Configuration { get; set; } @@ -30,7 +30,7 @@ public record Globals public record PlayerSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BaseMaxMovementRolloff")] public double BaseMaxMovementRolloff { get; set; } @@ -60,7 +60,7 @@ public record PlayerSettings public record SearchSoundVolumeSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double FpVolume { get; set; } @@ -70,7 +70,7 @@ public record SearchSoundVolumeSettings public record MovementRolloffMultiplier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MovementState")] public string MovementState { get; set; } @@ -82,7 +82,7 @@ public record MovementRolloffMultiplier public record RadioBroadcastSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("EnabledBroadcast")] public bool EnabledBroadcast { get; set; } @@ -94,7 +94,7 @@ public record RadioBroadcastSettings public record RadioStation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Enabled")] public bool Enabled { get; set; } @@ -106,7 +106,7 @@ public record RadioStation public record LocationInfection { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Interchange")] public double Interchange { get; set; } @@ -142,7 +142,7 @@ public record LocationInfection public record ArtilleryShelling { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ArtilleryMapsConfigs")] public Dictionary ArtilleryMapsConfigs { get; set; } @@ -157,7 +157,7 @@ public record ArtilleryShelling public record ArtilleryMapSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("PlanedShellingOn")] public bool PlanedShellingOn { get; set; } @@ -196,7 +196,7 @@ public record ArtilleryMapSettings public record ShellingZone { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ID")] public double ID { get; set; } @@ -253,7 +253,7 @@ public record ShellingZone public record AlarmStage { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Value")] public Position Value { get; set; } @@ -262,7 +262,7 @@ public record AlarmStage public record Brigade { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ID")] public double Id { get; set; } @@ -274,7 +274,7 @@ public record Brigade public record ArtilleryGun { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Position")] public XYZ Position { get; set; } @@ -283,7 +283,7 @@ public record ArtilleryGun public record ArtilleryShellingAirDropSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("UseAirDrop")] public bool UseAirDrop { get; set; } @@ -301,7 +301,7 @@ public record ArtilleryShellingAirDropSettings public record ProjectileExplosionParams { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Blindness")] public XYZ Blindness { get; set; } @@ -354,7 +354,7 @@ public record ProjectileExplosionParams public record Config { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ArtilleryShelling")] public ArtilleryShelling ArtilleryShelling { get; set; } @@ -680,7 +680,7 @@ public record Config public record GlobalAudioSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("RadioBroadcastSettings")] public RadioBroadcastSettings RadioBroadcastSettings { get; set; } @@ -689,7 +689,7 @@ public record GlobalAudioSettings public record Triggers { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public Dictionary> HandlerDamage { get; set; } } @@ -697,7 +697,7 @@ public record Triggers public record DamageData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public int Amount { get; set; } @@ -708,7 +708,7 @@ public record DamageData public record HandlerDamageObject { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public int Amount { get; set; } @@ -718,7 +718,7 @@ public record HandlerDamageObject public record PveSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public IEnumerable AvailableVersions { get; set; } @@ -728,7 +728,7 @@ public record PveSettings public record CoopSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public IEnumerable AvailableVersions { get; set; } } @@ -736,7 +736,7 @@ public record CoopSettings public record RunddansSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("accessKeys")] public IEnumerable AccessKeys { get; set; } @@ -796,7 +796,7 @@ public record RunddansSettings public record SeasonActivity { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("InfectionHalloween")] public SeasonActivityHalloween InfectionHalloween { get; set; } @@ -805,7 +805,7 @@ public record SeasonActivity public record SeasonActivityHalloween { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DisplayUIEnabled")] public bool DisplayUIEnabled { get; set; } @@ -820,7 +820,7 @@ public record SeasonActivityHalloween public record EnvironmentUISettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public EnvironmentUIData EnvironmentUIData { get; set; } } @@ -828,7 +828,7 @@ public record EnvironmentUISettings public record EnvironmentUIData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required string[] TheUnheardEditionEnvironmentUiType { get; set; } } @@ -836,7 +836,7 @@ public record EnvironmentUIData public record BodyPartColliderSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public BodyPartColliderPart BackHead { get; set; } @@ -894,7 +894,7 @@ public record BodyPartColliderSettings public record BodyPartColliderPart { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("PenetrationChance")] public double PenetrationChance { get; set; } @@ -909,7 +909,7 @@ public record BodyPartColliderPart public record WeaponFastDrawSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HandShakeCurveFrequency")] public double HandShakeCurveFrequency { get; set; } @@ -939,7 +939,7 @@ public record WeaponFastDrawSettings public record EventSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("EventActive")] public bool EventActive { get; set; } @@ -969,7 +969,7 @@ public record EventSettings public record EventWeather { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Cloudness")] public double Cloudness { get; set; } @@ -1002,7 +1002,7 @@ public record EventWeather public record TransitSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BearPriceMod")] public double BearPriceMod { get; set; } @@ -1047,7 +1047,7 @@ public record TransitSettings public record TripwiresSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("CollisionCapsuleCheckCoef")] public double CollisionCapsuleCheckCoef { get; set; } @@ -1095,7 +1095,7 @@ public record TripwiresSettings public record MountingSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MovementSettings")] public MountingMovementSettings MovementSettings { get; set; } @@ -1107,7 +1107,7 @@ public record MountingSettings public record MountingMovementSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ApproachTime")] public double ApproachTime { get; set; } @@ -1158,7 +1158,7 @@ public record MountingMovementSettings public record MountingPointDetectionSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("CheckHorizontalSecondaryOffset")] public double CheckHorizontalSecondaryOffset { get; set; } @@ -1227,7 +1227,7 @@ public record MountingPointDetectionSettings public record GraphicSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ExperimentalFogInCity")] public bool ExperimentalFogInCity { get; set; } @@ -1236,7 +1236,7 @@ public record GraphicSettings public record BufferZone { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("CustomerAccessTime")] public double CustomerAccessTime { get; set; } @@ -1251,7 +1251,7 @@ public record BufferZone public record ItemsCommonSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ItemRemoveAfterInterruptionTime")] public double ItemRemoveAfterInterruptionTime { get; set; } @@ -1263,7 +1263,7 @@ public record ItemsCommonSettings public record TradingSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BuyRestrictionMaxBonus")] public Dictionary BuyRestrictionMaxBonus { get; set; } @@ -1275,7 +1275,7 @@ public record TradingSettings public record BuyRestrictionMaxBonus { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("multiplier")] public double Multiplier { get; set; } @@ -1284,7 +1284,7 @@ public record BuyRestrictionMaxBonus public record BuyoutRestrictions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MinDurability")] public double MinDurability { get; set; } @@ -1299,7 +1299,7 @@ public record BuyoutRestrictions public record Content { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ip")] public string Ip { get; set; } @@ -1314,7 +1314,7 @@ public record Content public record Exp { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("heal")] public Heal Heal { get; set; } @@ -1350,7 +1350,7 @@ public record Exp public record Heal { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("expForHeal")] public double ExpForHeal { get; set; } @@ -1365,7 +1365,7 @@ public record Heal public record MatchEnd { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("README")] public string ReadMe { get; set; } @@ -1414,7 +1414,7 @@ public record MatchEnd public record Kill { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("combo")] public required Combo[] Combos { get; set; } @@ -1453,7 +1453,7 @@ public record Kill public record Combo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("percent")] public double Percentage { get; set; } @@ -1462,7 +1462,7 @@ public record Combo public record Level { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("exp_table")] public required ExpTable[] ExperienceTable { get; set; } @@ -1486,7 +1486,7 @@ public record Level public record ExpTable { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("exp")] public int Experience { get; set; } @@ -1495,7 +1495,7 @@ public record ExpTable public record LootAttempt { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("k_exp")] public double ExperiencePoints { get; set; } @@ -1504,7 +1504,7 @@ public record LootAttempt public record Armor { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("class")] public IEnumerable Classes { get; set; } @@ -1513,7 +1513,7 @@ public record Armor public record Class { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // Checked in client [JsonPropertyName("resistance")] @@ -1523,7 +1523,7 @@ public record Class public record Mastering { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Name")] public string Name { get; set; } @@ -1546,7 +1546,7 @@ public record Mastering public record Customization { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("SavageHead")] public Dictionary Head { get; set; } @@ -1567,7 +1567,7 @@ public record Customization public record WildHead { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("head")] public string Head { get; set; } @@ -1585,7 +1585,7 @@ public record WildHead public record WildBody { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("body")] public MongoId Body { get; set; } @@ -1603,7 +1603,7 @@ public record WildBody public record WildFeet { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("feet")] public string Feet { get; set; } @@ -1621,7 +1621,7 @@ public record WildFeet public record CustomizationVoice { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("voice")] public string Voice { get; set; } @@ -1636,7 +1636,7 @@ public record CustomizationVoice public record BodyParts { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Head { get; set; } @@ -1650,7 +1650,7 @@ public record BodyParts public record AirdropGlobalSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string AirdropViewType { get; set; } @@ -1678,7 +1678,7 @@ public record AirdropGlobalSettings public record KarmaCalculationSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("defaultPveKarmaValue")] public double DefaultPveKarmaValue { get; set; } @@ -1702,7 +1702,7 @@ public record KarmaCalculationSettings public record ArenaEftTransferSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double ArenaManagerReputationTaxMultiplier { get; set; } @@ -1720,7 +1720,7 @@ public record ArenaEftTransferSettings public record ArmorType { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Destructibility")] public double Destructibility { get; set; } @@ -1744,7 +1744,7 @@ public record ArmorType public record Health { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Falling")] public Falling Falling { get; set; } @@ -1762,7 +1762,7 @@ public record Health public record Falling { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DamagePerMeter")] public double DamagePerMeter { get; set; } @@ -1774,7 +1774,7 @@ public record Falling public record Effects { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Existence")] public Existence Existence { get; set; } @@ -1864,7 +1864,7 @@ public record Effects public record ZombieInfection { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Dehydration")] public double Dehydration { get; set; } @@ -1881,7 +1881,7 @@ public record ZombieInfection public record Existence { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("EnergyLoopTime")] public double EnergyLoopTime { get; set; } @@ -1905,7 +1905,7 @@ public record Existence public record Dehydration { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -1932,7 +1932,7 @@ public record Dehydration public record BreakPart { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -1965,7 +1965,7 @@ public record BreakPart public record Contusion { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -1974,7 +1974,7 @@ public record Contusion public record Disorientation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -1983,7 +1983,7 @@ public record Disorientation public record Exhaustion { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2001,7 +2001,7 @@ public record Exhaustion public record LowEdgeHealth { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2016,7 +2016,7 @@ public record LowEdgeHealth public record RadExposure { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Damage")] public double Damage { get; set; } @@ -2028,7 +2028,7 @@ public record RadExposure public record Stun { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -2037,7 +2037,7 @@ public record Stun public record Intoxication { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2070,7 +2070,7 @@ public record Intoxication public record Regeneration { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("LoopTime")] public double LoopTime { get; set; } @@ -2094,7 +2094,7 @@ public record Regeneration public record BodyHealth { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Head")] public BodyHealthValue Head { get; set; } @@ -2121,7 +2121,7 @@ public record BodyHealth public record BodyHealthValue { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Value")] public double Value { get; set; } @@ -2130,7 +2130,7 @@ public record BodyHealthValue public record Influences { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("LightBleeding")] public Influence LightBleeding { get; set; } @@ -2151,7 +2151,7 @@ public record Influences public record Influence { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HealthSlowDownPercentage")] public double HealthSlowDownPercentage { get; set; } @@ -2166,7 +2166,7 @@ public record Influence public record Wound { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("WorkingTime")] public double WorkingTime { get; set; } @@ -2181,7 +2181,7 @@ public record Wound public record Berserk { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2196,7 +2196,7 @@ public record Berserk public record Flash { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -2205,7 +2205,7 @@ public record Flash public record MedEffect { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("LoopTime")] public double LoopTime { get; set; } @@ -2235,7 +2235,7 @@ public record MedEffect public record Pain { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("TremorDelay")] public double TremorDelay { get; set; } @@ -2247,7 +2247,7 @@ public record Pain public record PainKiller { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double Dummy { get; set; } } @@ -2255,7 +2255,7 @@ public record PainKiller public record SandingScreen { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double Dummy { get; set; } } @@ -2263,7 +2263,7 @@ public record SandingScreen public record MusclePainEffect { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double GymEffectivity { get; set; } @@ -2277,7 +2277,7 @@ public record MusclePainEffect public record Stimulator { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double BuffLoopTime { get; set; } @@ -2287,7 +2287,7 @@ public record Stimulator public record Buff { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BuffType")] public string BuffType { get; set; } @@ -2316,7 +2316,7 @@ public record Buff public record Tremor { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2328,7 +2328,7 @@ public record Tremor public record ChronicStaminaFatigue { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("EnergyRate")] public double EnergyRate { get; set; } @@ -2346,7 +2346,7 @@ public record ChronicStaminaFatigue public record Fracture { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2379,7 +2379,7 @@ public record Fracture public record HeavyBleeding { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2433,7 +2433,7 @@ public record HeavyBleeding public record Probability { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("FunctionType")] public string FunctionType { get; set; } @@ -2451,7 +2451,7 @@ public record Probability public record LightBleeding { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2505,7 +2505,7 @@ public record LightBleeding public record BodyTemperature { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DefaultBuildUpTime")] public double DefaultBuildUpTime { get; set; } @@ -2520,7 +2520,7 @@ public record BodyTemperature public record HealPrice { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HealthPointPrice")] public double HealthPointPrice { get; set; } @@ -2541,7 +2541,7 @@ public record HealPrice public record ProfileHealthSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BodyPartsSettings")] public BodyPartsSettings BodyPartsSettings { get; set; } @@ -2556,7 +2556,7 @@ public record ProfileHealthSettings public record BodyPartsSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Head")] public BodyPartsSetting Head { get; set; } @@ -2583,7 +2583,7 @@ public record BodyPartsSettings public record BodyPartsSetting { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Minimum")] public double Minimum { get; set; } @@ -2604,7 +2604,7 @@ public record BodyPartsSetting public record HealthFactorsSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Energy")] public HealthFactorSetting Energy { get; set; } @@ -2625,7 +2625,7 @@ public record HealthFactorsSettings public record HealthFactorSetting { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Minimum")] public double Minimum { get; set; } @@ -2640,7 +2640,7 @@ public record HealthFactorSetting public record Rating { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("levelRequired")] public double LevelRequired { get; set; } @@ -2655,7 +2655,7 @@ public record Rating public record Categories { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("experience")] public bool Experience { get; set; } @@ -2691,7 +2691,7 @@ public record Categories public record Tournament { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("categories")] public TournamentCategories Categories { get; set; } @@ -2706,7 +2706,7 @@ public record Tournament public record TournamentCategories { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dogtags")] public bool Dogtags { get; set; } @@ -2715,7 +2715,7 @@ public record TournamentCategories public record RagFair { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -2834,7 +2834,7 @@ public record RagFair public record ItemGlobalRestrictions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MaxFlea")] public double MaxFlea { get; set; } @@ -2849,7 +2849,7 @@ public record ItemGlobalRestrictions public record MaxActiveOfferCount { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("from")] public double From { get; set; } @@ -2867,7 +2867,7 @@ public record MaxActiveOfferCount public record MaxSumForRarity { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Common")] public RarityMaxSum Common { get; set; } @@ -2885,7 +2885,7 @@ public record MaxSumForRarity public record RarityMaxSum { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("value")] public double Value { get; set; } @@ -2894,7 +2894,7 @@ public record RarityMaxSum public record Handbook { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("defaultCategory")] public string DefaultCategory { get; set; } @@ -2903,7 +2903,7 @@ public record Handbook public record Stamina { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Capacity")] public double Capacity { get; set; } @@ -3066,7 +3066,7 @@ public record Stamina public record StaminaRestoration { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("LowerLeftPoint")] public double LowerLeftPoint { get; set; } @@ -3090,7 +3090,7 @@ public record StaminaRestoration public record StaminaDrain { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("LowerLeftPoint")] public double LowerLeftPoint { get; set; } @@ -3114,7 +3114,7 @@ public record StaminaDrain public record RequirementReferences { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Alpinist")] public IEnumerable Alpinists { get; set; } @@ -3123,7 +3123,7 @@ public record RequirementReferences public record Alpinist { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Requirement")] public string Requirement { get; set; } @@ -3144,7 +3144,7 @@ public record Alpinist public record RestrictionsInRaid { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MaxInLobby")] public double MaxInLobby { get; set; } @@ -3159,7 +3159,7 @@ public record RestrictionsInRaid public record FavoriteItemsSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("WeaponStandMaxItemsCount")] public double WeaponStandMaxItemsCount { get; set; } @@ -3171,7 +3171,7 @@ public record FavoriteItemsSettings public record VaultingSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("IsActive")] public bool IsActive { get; set; } @@ -3189,7 +3189,7 @@ public record VaultingSettings public record VaultingGridSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("GridSizeX")] public double GridSizeX { get; set; } @@ -3225,7 +3225,7 @@ public record VaultingGridSettings public record VaultingMovesSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("VaultSettings")] public VaultingSubMoveSettings VaultSettings { get; set; } @@ -3237,7 +3237,7 @@ public record VaultingMovesSettings public record VaultingSubMoveSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("IsActive")] public bool IsActive { get; set; } @@ -3260,7 +3260,7 @@ public record VaultingSubMoveSettings public record MoveRestrictions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("IsActive")] public bool IsActive { get; set; } @@ -3284,7 +3284,7 @@ public record MoveRestrictions public record BTRSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("LocationsWithBTR")] public IEnumerable LocationsWithBTR { get; set; } @@ -3353,7 +3353,7 @@ public record BTRSettings public record BtrMapConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BtrSkin")] public string BtrSkin { get; set; } @@ -3404,7 +3404,7 @@ public record BtrMapConfig public record PathConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("active")] public bool Active { get; set; } @@ -3440,7 +3440,7 @@ public record PathConfig public record SquadSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("CountOfRequestsToOnePlayer")] public double CountOfRequestsToOnePlayer { get; set; } @@ -3455,7 +3455,7 @@ public record SquadSettings public record Insurance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ChangeForReturnItemsInOfflineRaid")] public double ChangeForReturnItemsInOfflineRaid { get; set; } @@ -3479,7 +3479,7 @@ public record Insurance public record MessageSendTimeMultiplier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("multiplier")] public double Multiplier { get; set; } @@ -3488,7 +3488,7 @@ public record MessageSendTimeMultiplier public record SkillsSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("SkillProgressRate")] public double SkillProgressRate { get; set; } @@ -3701,7 +3701,7 @@ public record SkillsSettings public record MeleeSkill { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public BuffSettings BuffSettings { get; set; } } @@ -3709,7 +3709,7 @@ public record MeleeSkill public record ArmorSkills { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double BluntThroughputDamageHVestsReducePerLevel { get; set; } @@ -3743,7 +3743,7 @@ public record ArmorSkills public record ArmorCounters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("armorDurability")] public SkillCounter ArmorDurability { get; set; } @@ -3752,7 +3752,7 @@ public record ArmorCounters public record HideoutManagement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double SkillPointsPerAreaUpgrade { get; set; } @@ -3772,7 +3772,7 @@ public record HideoutManagement public record SkillPointsRate { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public SkillPointRate Generator { get; set; } @@ -3786,7 +3786,7 @@ public record SkillPointsRate public record SkillPointRate { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double ResourceSpent { get; set; } @@ -3796,7 +3796,7 @@ public record SkillPointRate public record EliteSlots { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public EliteSlot Generator { get; set; } @@ -3810,7 +3810,7 @@ public record EliteSlots public record EliteSlot { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double Slots { get; set; } @@ -3820,7 +3820,7 @@ public record EliteSlot public record Crafting { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DependentSkillRatios")] public IEnumerable DependentSkillRatios { get; set; } @@ -3854,7 +3854,7 @@ public record Crafting public record Metabolism { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HydrationRecoveryRate")] public double HydrationRecoveryRate { get; set; } @@ -3875,7 +3875,7 @@ public record Metabolism public record Immunity { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ImmunityMiscEffects")] public double ImmunityMiscEffects { get; set; } @@ -3896,7 +3896,7 @@ public record Immunity public record Endurance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MovementAction")] public double MovementAction { get; set; } @@ -3917,7 +3917,7 @@ public record Endurance public record Strength { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DependentSkillRatios")] public IEnumerable DependentSkillRatios { get; set; } @@ -3953,7 +3953,7 @@ public record Strength public record DependentSkillRatio { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Ratio")] public double Ratio { get; set; } @@ -3965,7 +3965,7 @@ public record DependentSkillRatio public record QTELevelMultiplier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Level")] public double Level { get; set; } @@ -3977,7 +3977,7 @@ public record QTELevelMultiplier public record Vitality { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DamageTakenAction")] public double DamageTakenAction { get; set; } @@ -3989,7 +3989,7 @@ public record Vitality public record HealthSkillProgress { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("SkillProgress")] public double SkillProgress { get; set; } @@ -3998,7 +3998,7 @@ public record HealthSkillProgress public record StressResistance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HealthNegativeEffect")] public double HealthNegativeEffect { get; set; } @@ -4010,7 +4010,7 @@ public record StressResistance public record Throwing { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ThrowAction")] public double ThrowAction { get; set; } @@ -4019,7 +4019,7 @@ public record Throwing public record RecoilControl { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("RecoilAction")] public double RecoilAction { get; set; } @@ -4031,7 +4031,7 @@ public record RecoilControl public record WeaponSkills { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("WeaponReloadAction")] public double WeaponReloadAction { get; set; } @@ -4049,7 +4049,7 @@ public record WeaponSkills public record CovertMovement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MovementAction")] public double MovementAction { get; set; } @@ -4058,7 +4058,7 @@ public record CovertMovement public record Search { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("SearchAction")] public double SearchAction { get; set; } @@ -4070,7 +4070,7 @@ public record Search public record WeaponTreatment { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BuffMaxCount")] public double BuffMaxCount { get; set; } @@ -4100,7 +4100,7 @@ public record WeaponTreatment public record WeaponTreatmentCounters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("firearmsDurability")] public SkillCounter FirearmsDurability { get; set; } @@ -4109,7 +4109,7 @@ public record WeaponTreatmentCounters public record BuffSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("CommonBuffChanceLevelBonus")] public double CommonBuffChanceLevelBonus { get; set; } @@ -4133,7 +4133,7 @@ public record BuffSettings public record MagDrills { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("RaidLoadedAmmoAction")] public double RaidLoadedAmmoAction { get; set; } @@ -4148,7 +4148,7 @@ public record MagDrills public record Perception { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DependentSkillRatios")] public IEnumerable DependentSkillRatios { get; set; } @@ -4163,7 +4163,7 @@ public record Perception public record SkillRatio { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Ratio")] public double Ratio { get; set; } @@ -4175,7 +4175,7 @@ public record SkillRatio public record Intellect { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required SkillRatio[] DependentSkillRatios { get; set; } @@ -4204,7 +4204,7 @@ public record Intellect public record IntellectCounters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("armorDurability")] public SkillCounter ArmorDurability { get; set; } @@ -4219,7 +4219,7 @@ public record IntellectCounters public record SkillCounter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("divisor")] public double Divisor { get; set; } @@ -4231,7 +4231,7 @@ public record SkillCounter public record Attention { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DependentSkillRatios")] public required SkillRatio[] DependentSkillRatios { get; set; } @@ -4249,7 +4249,7 @@ public record Attention public record Charisma { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BonusSettings")] public BonusSettings BonusSettings { get; set; } @@ -4270,7 +4270,7 @@ public record Charisma public record CharismaSkillCounters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("insuranceCost")] public SkillCounter InsuranceCost { get; set; } @@ -4291,7 +4291,7 @@ public record CharismaSkillCounters public record BonusSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("EliteBonusSettings")] public EliteBonusSettings EliteBonusSettings { get; set; } @@ -4303,7 +4303,7 @@ public record BonusSettings public record EliteBonusSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("FenceStandingLossDiscount")] public double FenceStandingLossDiscount { get; set; } @@ -4318,7 +4318,7 @@ public record EliteBonusSettings public record LevelBonusSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HealthRestoreDiscount")] public double HealthRestoreDiscount { get; set; } @@ -4342,7 +4342,7 @@ public record LevelBonusSettings public record Memory { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AnySkillUp")] public double AnySkillUp { get; set; } @@ -4354,7 +4354,7 @@ public record Memory public record Surgery { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("SurgeryAction")] public double SurgeryAction { get; set; } @@ -4366,7 +4366,7 @@ public record Surgery public record AimDrills { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("WeaponShotAction")] public double WeaponShotAction { get; set; } @@ -4375,7 +4375,7 @@ public record AimDrills public record TroubleShooting { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MalfRepairSpeedBonusPerLevel")] public double MalfRepairSpeedBonusPerLevel { get; set; } @@ -4396,7 +4396,7 @@ public record TroubleShooting public record Aiming { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ProceduralIntensityByPose")] public XYZ ProceduralIntensityByPose { get; set; } @@ -4459,7 +4459,7 @@ public record Aiming public record Malfunction { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AmmoMalfChanceMult")] public double AmmoMalfChanceMult { get; set; } @@ -4540,7 +4540,7 @@ public record Malfunction public record Overheat { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MinOverheat")] public double MinimumOverheat { get; set; } @@ -4630,7 +4630,7 @@ public record Overheat public record FenceSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // MongoId [JsonPropertyName("FenceId")] @@ -4649,7 +4649,7 @@ public record FenceSettings public record FenceLevel { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ReachOnMarkOnUnknowns")] public bool CanReachOnMarkOnUnknowns { get; set; } @@ -4733,7 +4733,7 @@ public record FenceLevel public record Inertia { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("InertiaLimits")] public XYZ InertiaLimits { get; set; } @@ -4855,7 +4855,7 @@ public record Inertia public record Ballistic { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("GlobalDamageDegradationCoefficient")] public double GlobalDamageDegradationCoefficient { get; set; } @@ -4864,7 +4864,7 @@ public record Ballistic public record RepairSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ItemEnhancementSettings")] public ItemEnhancementSettings ItemEnhancementSettings { get; set; } @@ -4888,7 +4888,7 @@ public record RepairSettings public record ItemEnhancementSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("DamageReduction")] public PriceModifier DamageReduction { get; set; } @@ -4903,7 +4903,7 @@ public record ItemEnhancementSettings public record PriceModifier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("PriceModifier")] public double PriceModifierValue { get; set; } @@ -4912,7 +4912,7 @@ public record PriceModifier public record RepairStrategies { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Armor")] public RepairStrategy Armor { get; set; } @@ -4924,7 +4924,7 @@ public record RepairStrategies public record RepairStrategy { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BuffTypes")] public IEnumerable BuffTypes { get; set; } @@ -4936,7 +4936,7 @@ public record RepairStrategy public record BotPreset { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("UseThis")] public bool UseThis { get; set; } @@ -4975,7 +4975,7 @@ public record BotPreset public record BotWeaponScattering { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Name")] public string Name { get; set; } @@ -4993,7 +4993,7 @@ public record BotWeaponScattering public record Preset { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -5023,7 +5023,7 @@ public record Preset public record QuestSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("GlobalRewardRepModifierDailyQuestPvE")] public double GlobalRewardRepModifierDailyQuestPvE { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs index 3000109e..404fcb24 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record Location { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Map meta-data @@ -52,7 +52,7 @@ public record Location public record StaticContainer { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("containersGroups")] public Dictionary? ContainersGroups { get; set; } @@ -64,7 +64,7 @@ public record StaticContainer public record ContainerMinMax { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("minContainers")] public int? MinContainers { get; set; } @@ -82,7 +82,7 @@ public record ContainerMinMax public record ContainerData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("groupId")] public string? GroupId { get; set; } @@ -91,7 +91,7 @@ public record ContainerData public record StaticLootDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("itemcountDistribution")] public ItemCountDistribution[] ItemCountDistribution { get; set; } @@ -103,7 +103,7 @@ public record StaticLootDetails public record ItemCountDistribution { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("count")] public int? Count { get; set; } @@ -115,7 +115,7 @@ public record ItemCountDistribution public record ItemDistribution { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("tpl")] public MongoId Tpl { get; set; } @@ -127,7 +127,7 @@ public record ItemDistribution public record StaticContainerDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("staticWeapons")] public IEnumerable StaticWeapons { get; set; } @@ -142,7 +142,7 @@ public record StaticContainerDetails public record StaticForced { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("containerId")] public string ContainerId { get; set; } @@ -154,7 +154,7 @@ public record StaticForced public record StaticContainerData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("probability")] public float? Probability { get; set; } @@ -166,7 +166,7 @@ public record StaticContainerData public record StaticAmmoDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("tpl")] public MongoId? Tpl { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs index 549ed1af..024837fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record LocationBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AccessKeys")] public IEnumerable? AccessKeys { get; set; } @@ -376,7 +376,7 @@ public record LocationBase public record EventTrapsData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double MaxBarbedWires { get; set; } @@ -390,7 +390,7 @@ public record EventTrapsData public record Transit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("activateAfterSec")] public int? ActivateAfterSeconds { get; set; } @@ -429,7 +429,7 @@ public record Transit public record NonWaveGroupScenario { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Chance")] public double? Chance { get; set; } @@ -453,7 +453,7 @@ public record Limit : MinMax public record AirdropParameter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AirdropPointDeactivateDistance")] public int? AirdropPointDeactivateDistance { get; set; } @@ -489,7 +489,7 @@ public record AirdropParameter public record Banner { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -501,7 +501,7 @@ public record Banner public record Pic { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("file")] public string? File { get; set; } @@ -519,7 +519,7 @@ public record Pic public record BossLocationSpawn { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BossChance")] public double? BossChance { get; set; } @@ -592,7 +592,7 @@ public record BossLocationSpawn public record BossSupport { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BossEscortAmount")] public string? BossEscortAmount { get; set; } @@ -607,7 +607,7 @@ public record BossSupport public record BotLocationModifier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AccuracySpeed")] public double? AccuracySpeed { get; set; } @@ -694,7 +694,7 @@ public record BotLocationModifier public record AdditionalHostilitySettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AlwaysEnemies")] public HashSet? AlwaysEnemies { get; set; } @@ -736,7 +736,7 @@ public record AdditionalHostilitySettings public record ChancedEnemy { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("EnemyChance")] public int? EnemyChance { get; set; } @@ -754,7 +754,7 @@ public record MinMaxBot : MinMax public record MinPlayerWaitTime { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("minPlayers")] public int? MinPlayers { get; set; } @@ -766,7 +766,7 @@ public record MinPlayerWaitTime public record Preview { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("path")] public string? Path { get; set; } @@ -778,7 +778,7 @@ public record Preview public record Scene { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("path")] public string? Path { get; set; } @@ -790,7 +790,7 @@ public record Scene public record SpawnPointParam { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BotZoneName")] public string? BotZoneName { get; set; } @@ -826,7 +826,7 @@ public record SpawnPointParam public record ColliderParams { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _parent; @@ -844,7 +844,7 @@ public record ColliderParams public record ColliderProps { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Center")] public XYZ? Center { get; set; } @@ -859,7 +859,7 @@ public record ColliderProps public record Exit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// % Chance out of 100 exit will appear in raid @@ -955,7 +955,7 @@ public record Exit public record MaxItemCountInLocation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("TemplateId")] public string? TemplateId { get; set; } @@ -967,7 +967,7 @@ public record MaxItemCountInLocation public record Wave { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BotPreset")] public string? BotPreset { get; set; } @@ -1025,7 +1025,7 @@ public record Wave public record LocationEvents { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Halloween2024")] public Halloween2024? Halloween2024 { get; set; } @@ -1036,7 +1036,7 @@ public record LocationEvents public record Khorovod { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double? Chance { get; set; } } @@ -1044,7 +1044,7 @@ public record Khorovod public record Halloween2024 { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("CrowdAttackBlockRadius")] public double? CrowdAttackBlockRadius { get; set; } @@ -1094,7 +1094,7 @@ public record Halloween2024 public record CrowdAttackSpawnParam { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Difficulty")] public string? Difficulty { get; set; } @@ -1109,7 +1109,7 @@ public record CrowdAttackSpawnParam public record Area { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("center")] public XYZ? Center { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs index cb757d97..e711c152 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record LooseLoot { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("spawnpointCount")] public SpawnpointCount? SpawnpointCount { get; set; } @@ -21,7 +21,7 @@ public record LooseLoot public record SpawnpointCount { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("mean")] public required double Mean { get; set; } @@ -33,7 +33,7 @@ public record SpawnpointCount public record SpawnpointTemplate { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _root; @@ -80,6 +80,9 @@ public record SpawnpointTemplate public record SptLootItem : Item { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("composedKey")] public string? ComposedKey { get; set; } } @@ -87,7 +90,7 @@ public record SptLootItem : Item public record GroupPosition { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _name; @@ -111,7 +114,7 @@ public record GroupPosition public record Spawnpoint { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("locationId")] public string? LocationId { get; set; } @@ -129,7 +132,7 @@ public record Spawnpoint public record LooseLootItemDistribution { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("composedKey")] public ComposedKey? ComposedKey { get; set; } @@ -141,7 +144,7 @@ public record LooseLootItemDistribution public record ComposedKey { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _key; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs index bb876bd1..52c3e53d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record MetricsTableData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Keys")] public List? Keys { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs index 97c2c8ef..61e9d945 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs @@ -23,7 +23,7 @@ public record PostRaidPmcData : PmcData { } public record PostRaidStats { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Eft")] public EftStats? Eft { get; set; } 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 7868c76c..2e4d23a9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Request; public record BaseInteractionRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Action")] public string? Action { get; set; } @@ -21,7 +21,7 @@ public record BaseInteractionRequestData public record OwnerInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId? Id { get; set; } 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 7cef4749..f4ade453 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Request; public record UIDRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("uid")] public string? Uid { get; set; } 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 0bd1e549..9313c0bc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Achievement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("index")] public required int Index { get; set; } @@ -54,7 +54,7 @@ public record Achievement public record AchievementQuestConditionTypes { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("started")] public List? Started { get; set; } 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 7575b520..b246ab90 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -10,7 +10,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId? Id { get; set; } @@ -119,7 +119,7 @@ public record BotBase public record MoneyTransferLimits { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // Resets every 24 hours in live /// @@ -143,7 +143,7 @@ public record TaskConditionCounter private string? _type; [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId? Id { get; set; } @@ -168,7 +168,7 @@ public record TaskConditionCounter public record UnlockedInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("unlockedProductionRecipe")] public HashSet? UnlockedProductionRecipe { get; set; } @@ -177,7 +177,7 @@ public record UnlockedInfo public record Info { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _side; @@ -268,7 +268,7 @@ public record Info public record BotInfoSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _botDifficulty; private string? _role; @@ -298,7 +298,7 @@ public record BotInfoSettings public record Ban { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("banType")] public BanType? BanType { get; set; } @@ -321,7 +321,7 @@ public enum BanType public record Customization { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public MongoId? Head { get; set; } @@ -339,7 +339,7 @@ public record Customization public record BotBaseHealth { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public CurrentMinMax? Hydration { get; set; } @@ -361,7 +361,7 @@ public record BotBaseHealth public record BodyPartHealth { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public CurrentMinMax? Health { get; set; } @@ -371,7 +371,7 @@ public record BodyPartHealth public record BodyPartEffectProperties { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // TODO: this was any, what actual type is it? public object? ExtraData { get; set; } @@ -382,7 +382,7 @@ public record BodyPartEffectProperties public record CurrentMinMax { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double? Current { get; set; } @@ -398,7 +398,7 @@ public record CurrentMinMax public record BotBaseInventory { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("items")] public List? Items { get; set; } @@ -446,7 +446,7 @@ public record BotBaseInventory public record Skills { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public IEnumerable Common { get; set; } @@ -458,7 +458,7 @@ public record Skills public record MasterySkill { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Id { get; set; } @@ -468,7 +468,7 @@ public record MasterySkill public record CommonSkill { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double PointsEarnedDuringSession { get; set; } @@ -489,7 +489,7 @@ public record CommonSkill public record Stats { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public EftStats? Eft { get; set; } } @@ -497,7 +497,7 @@ public record Stats public record EftStats { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public IEnumerable? CarriedQuestItems { get; set; } @@ -540,7 +540,7 @@ public record EftStats public record DroppedItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public MongoId QuestId { get; set; } @@ -552,7 +552,7 @@ public record DroppedItem public record FoundInRaidItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public MongoId QuestId { get; set; } @@ -562,7 +562,7 @@ public record FoundInRaidItem public record Victim { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string? AccountId { get; set; } @@ -594,7 +594,7 @@ public record Victim public record SessionCounters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public IEnumerable? Items { get; set; } } @@ -602,7 +602,7 @@ public record SessionCounters public record OverallCounters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public List? Items { get; set; } } @@ -610,7 +610,7 @@ public record OverallCounters public record CounterKeyValue { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public HashSet? Key { get; set; } @@ -620,7 +620,7 @@ public record CounterKeyValue public record Aggressor { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double? PrestigeLevel { get; set; } @@ -653,7 +653,7 @@ public record Aggressor public record DamageHistory { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string? LethalDamagePart { get; set; } @@ -668,7 +668,7 @@ public record DamageHistory public record BodyPartsDamageHistory { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public List? Head { get; set; } @@ -692,7 +692,7 @@ public record DamageStats private string? _type; [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double? Amount { get; set; } @@ -715,7 +715,7 @@ public record DamageStats public record DeathCause { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonConverter(typeof(JsonStringEnumConverter))] public DamageType? DamageType { get; set; } @@ -732,7 +732,7 @@ public record DeathCause public record LastPlayerState { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public LastPlayerStateInfo? Info { get; set; } @@ -745,7 +745,7 @@ public record LastPlayerState public record LastPlayerStateInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string? Nickname { get; set; } @@ -759,7 +759,7 @@ public record LastPlayerStateInfo public record BackendCounter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -774,7 +774,7 @@ public record BackendCounter public record InsuredItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Trader ID item was insured by @@ -789,7 +789,7 @@ public record InsuredItem public record Hideout { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public Dictionary? Production { get; set; } @@ -816,7 +816,7 @@ public record Hideout public record HideoutCounters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("fuelCounter")] public double? FuelCounter { get; set; } @@ -834,7 +834,7 @@ public record HideoutCounters public record HideoutImprovement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("completed")] public bool? Completed { get; set; } @@ -846,7 +846,7 @@ public record HideoutImprovement public record Production // use this instead of productive and scavcase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public List? Products { get; set; } @@ -923,7 +923,7 @@ public record Production // use this instead of productive and scavcase public record BotHideoutArea { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("type")] public HideoutAreas Type { get; set; } @@ -956,7 +956,7 @@ public record BotHideoutArea public record HideoutSlot { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// SPT specific value to keep track of what index this slot is (0,1,2,3 etc.) @@ -971,7 +971,7 @@ public record HideoutSlot public record LastCompleted { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("$oid")] public string? OId { get; set; } @@ -980,7 +980,7 @@ public record LastCompleted public record Notes { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Notes")] public List? DataNotes { get; set; } @@ -998,7 +998,7 @@ public enum SurvivorClass public record TraderInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("loyaltyLevel")] public int? LoyaltyLevel { get; set; } @@ -1022,7 +1022,7 @@ public record TraderInfo public record RagfairInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("rating")] public double? Rating { get; set; } @@ -1043,7 +1043,7 @@ public record RagfairInfo public record Bonus { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } 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 4bbc20ba..a687acd1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotCore { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("SAVAGE_KILL_DIST")] public double? SavageKillDistance { get; set; } 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 1548264b..a8755731 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotType { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("appearance")] public Appearance BotAppearance { get; set; } @@ -44,7 +44,7 @@ public record BotType public record Appearance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("body")] public Dictionary Body { get; set; } @@ -68,7 +68,7 @@ public record Appearance public record Chances { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("equipment")] public Dictionary EquipmentChances { get; set; } @@ -88,7 +88,7 @@ public record Chances public record ModsChances { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("mod_charge")] public double? ModCharge { get; set; } @@ -251,7 +251,7 @@ public double? ModPistol_Grip { get; set; } public record DifficultyCategories { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public Dictionary? Aiming { get; set; } // TODO: string | number | boolean @@ -285,7 +285,7 @@ public record DifficultyCategories public record Experience { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// key = bot difficulty @@ -315,7 +315,7 @@ public record Experience public record Generation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("items")] public GenerationWeightingItems Items { get; set; } @@ -324,7 +324,7 @@ public record Generation public record GenerationData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// key: number of items, value: weighting @@ -343,7 +343,7 @@ public record GenerationData public record GenerationWeightingItems { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("grenades")] public GenerationData Grenades { get; set; } @@ -388,7 +388,7 @@ public record GenerationWeightingItems public record BotTypeHealth { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public IEnumerable BodyParts { get; set; } @@ -402,7 +402,7 @@ public record BotTypeHealth public record BodyPart { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public MinMax Chest { get; set; } @@ -422,7 +422,7 @@ public record BodyPart public record BotTypeInventory { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("equipment")] public Dictionary> Equipment { get; set; } @@ -439,7 +439,7 @@ public record BotTypeInventory public record ItemPools { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public Dictionary Backpack { get; set; } @@ -455,7 +455,7 @@ public record ItemPools public record BotDbSkills { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public Dictionary> Common { get; set; } 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 d1f2c56f..0dd85a2f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record CustomisationStorage { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // Customisation.json/itemId [JsonPropertyName("id")] @@ -22,7 +22,7 @@ public record CustomisationStorage public record CustomisationType { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public const string SUITE = "suite"; public const string DOG_TAG = "dogTag"; @@ -43,7 +43,7 @@ public record CustomisationType public record CustomisationTypeId { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public const string CUSTOMIZATION = "5cbdb4a2e2b501000d352ae2"; public const string BODY_PARTS = "5cd943c31388ce000a659df5"; @@ -72,7 +72,7 @@ public record CustomisationTypeId public record CustomisationSource { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public const string QUEST = "quest"; public const string PRESTIGE = "prestige"; 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 00672da0..1ca5be99 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record CustomizationItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -30,7 +30,7 @@ public record CustomizationItem public class CustomizationProps { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Prefab")] public object? Prefab { get; set; } // Prefab object or string 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 c44df73b..3ab42de6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record HandbookBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Categories")] public List Categories { get; set; } @@ -18,7 +18,7 @@ public record HandbookBase public record HandbookCategory { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Id")] public MongoId Id { get; set; } @@ -41,7 +41,7 @@ public record HandbookCategory public record HandbookItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Id")] public MongoId Id { get; set; } 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 33582834..9de85d8e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Item { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _parentId; @@ -49,7 +49,7 @@ public record Item public record HideoutItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Hideout inventory id that was used by improvement action @@ -87,7 +87,7 @@ public record HideoutItem public record ItemLocation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("x")] public int? X { get; set; } @@ -121,7 +121,7 @@ public enum ItemRotation public record Upd { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public UpdBuff? Buff { get; set; } @@ -188,7 +188,7 @@ public record Upd public record LockableKeyComponent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public float? RelativeValue { get; set; } public int? NumberOfUsages { get; set; } @@ -197,7 +197,7 @@ public record LockableKeyComponent public record LockableComponent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public IEnumerable? KeyIds { get; set; } public bool? Locked { get; set; } @@ -214,7 +214,7 @@ public enum PinLockState public record UpdBuff { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Rarity")] public string? Rarity { get; set; } @@ -233,7 +233,7 @@ public record UpdBuff public record UpdTogglable { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("On")] public bool? On { get; set; } @@ -242,7 +242,7 @@ public record UpdTogglable public record UpdMap { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Markers")] public List? Markers { get; set; } @@ -251,7 +251,7 @@ public record UpdMap public record MapMarker { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Type")] public string? Type { get; set; } @@ -269,7 +269,7 @@ public record MapMarker public record UpdTag { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Color")] public int? Color { get; set; } @@ -281,7 +281,7 @@ public record UpdTag public record UpdFaceShield { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Hits")] public int? Hits { get; set; } @@ -293,7 +293,7 @@ public record UpdFaceShield public record UpdRepairable { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Durability")] public double? Durability { get; set; } @@ -305,7 +305,7 @@ public record UpdRepairable public record UpdRecodableComponent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("IsEncoded")] public bool? IsEncoded { get; set; } @@ -314,7 +314,7 @@ public record UpdRecodableComponent public record UpdMedKit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HpResource")] public double? HpResource { get; set; } @@ -323,7 +323,7 @@ public record UpdMedKit public record UpdSight { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ScopesCurrentCalibPointIndexes")] public IEnumerable? ScopesCurrentCalibPointIndexes { get; set; } @@ -340,7 +340,7 @@ public record UpdSight public record UpdFoldable { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Folded")] public bool? Folded { get; set; } @@ -349,7 +349,7 @@ public record UpdFoldable public record UpdFireMode { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("FireMode")] public string? FireMode { get; set; } @@ -358,7 +358,7 @@ public record UpdFireMode public record UpdFoodDrink { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("HpPercent")] public double? HpPercent { get; set; } @@ -367,7 +367,7 @@ public record UpdFoodDrink public record UpdKey { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // Checked in client [JsonPropertyName("NumberOfUsages")] @@ -377,7 +377,7 @@ public record UpdKey public record UpdResource { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Value")] public double? Value { get; set; } @@ -389,7 +389,7 @@ public record UpdResource public record UpdLight { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("IsActive")] public bool? IsActive { get; set; } @@ -401,7 +401,7 @@ public record UpdLight public record UpdDogtag { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AccountId")] public string? AccountId { get; set; } @@ -452,7 +452,7 @@ public record UpdDogtag public record UpdSideEffect { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Value")] public double? Value { get; set; } @@ -461,7 +461,7 @@ public record UpdSideEffect public record UpdRepairKit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Resource")] public double? Resource { get; set; } @@ -470,7 +470,7 @@ public record UpdRepairKit public record UpdCultistAmulet { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("NumberOfUsages")] public double? NumberOfUsages { get; set; } 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 828678a6..7ab18e5f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationServices { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("TraderServerSettings")] public TraderServerSettings TraderServerSettings { get; set; } @@ -20,7 +20,7 @@ public record LocationServices public record TraderServerSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("TraderServices")] public TraderServices TraderServices { get; set; } @@ -29,7 +29,7 @@ public record TraderServerSettings public record TraderServices { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ExUsecLoyalty")] public TraderService ExUsecLoyalty { get; set; } @@ -56,7 +56,7 @@ public record TraderServices public record TraderService { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("TraderId")] public string TraderId { get; set; } @@ -79,7 +79,7 @@ public record TraderService public record ServiceRequirements { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("CompletedQuests")] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] @@ -94,7 +94,7 @@ public record ServiceRequirements public record CompletedQuest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("QuestId")] public string QuestId { get; set; } @@ -103,7 +103,7 @@ public record CompletedQuest public record StandingRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Value")] public double Value { get; set; } @@ -112,7 +112,7 @@ public record StandingRequirement public record ServiceItemCostDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Count")] public int Count { get; set; } @@ -121,7 +121,7 @@ public record ServiceItemCostDetails public record BtrServerSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ChanceSpawn")] public double ChanceSpawn { get; set; } @@ -172,7 +172,7 @@ public record BtrServerSettings public record ServerMapBtrsettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MapID")] public string MapID { get; set; } 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 9e37453b..c26cbeba 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationsBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("locations")] public Locations? Locations { get; set; } @@ -17,7 +17,7 @@ public record LocationsBase public record Locations { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // Add properties as necessary } @@ -25,7 +25,7 @@ public record Locations public record Path { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Source")] public string? Source { get; set; } 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 dfa7a09e..a58f19bc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationsGenerateAllResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("locations")] public Dictionary Locations { get; set; } 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 a222270a..ab60cd4d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Match { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("metrics")] public Metrics Metrics { get; set; } @@ -14,7 +14,7 @@ public record Match public record Metrics { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Keys")] public List Keys { get; set; } 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 3cd4ed8b..ef744935 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Prestige { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("elements")] public List Elements { get; set; } @@ -15,7 +15,7 @@ public record Prestige public record PrestigeElement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string Id { get; set; } @@ -39,7 +39,7 @@ public record PrestigeElement public record TransferConfigs { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("stashConfig")] public StashPrestigeConfig StashConfig { get; set; } @@ -54,7 +54,7 @@ public record TransferConfigs public record StashPrestigeConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("xCellCount")] public int? XCellCount { get; set; } @@ -69,7 +69,7 @@ public record StashPrestigeConfig public record StashPrestigeFilters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("includedItems")] public List IncludedItems { get; set; } @@ -81,7 +81,7 @@ public record StashPrestigeFilters public record PrestigeSkillConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("transferMultiplier")] public double TransferMultiplier { get; set; } @@ -90,7 +90,7 @@ public record PrestigeSkillConfig public record PrestigeMasteringConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("transferMultiplier")] public double TransferMultiplier { get; set; } 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 edae8d98..430993b8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record ProfileSides { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("descriptionLocaleKey")] public string? DescriptionLocaleKey { get; set; } @@ -22,7 +22,7 @@ public record ProfileSides public record TemplateSide { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("character")] public PmcData? Character { get; set; } @@ -49,7 +49,7 @@ public record TemplateSide public record ProfileTraderTemplate { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("initialLoyaltyLevel")] public Dictionary? InitialLoyaltyLevel { get; set; } 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 911e1539..38a94f1e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Quest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// SPT addition - human readable quest name @@ -130,7 +130,7 @@ public record Quest public record QuestStatus { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("qid")] public required MongoId QId { get; set; } @@ -154,7 +154,7 @@ public record QuestStatus public record QuestConditionTypes { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Started")] public List? Started { get; set; } @@ -177,7 +177,7 @@ public record QuestCondition private string _conditionType; [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public required MongoId Id { get; set; } @@ -325,7 +325,7 @@ public record QuestCondition public record QuestConditionCounter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -337,7 +337,7 @@ public record QuestConditionCounter public record QuestConditionCounterCondition { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -430,7 +430,7 @@ public record QuestConditionCounterCondition public record EnemyHealthEffect { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("bodyParts")] public List? BodyParts { get; set; } @@ -442,7 +442,7 @@ public record EnemyHealthEffect public record ValueCompare { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("compareMethod")] public string? CompareMethod { get; set; } @@ -454,7 +454,7 @@ public record ValueCompare public record CounterConditionDistance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("value")] public double? Value { get; set; } @@ -466,7 +466,7 @@ public record CounterConditionDistance public record DaytimeCounter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("from")] public int? From { get; set; } @@ -478,7 +478,7 @@ public record DaytimeCounter public record VisibilityCondition { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } 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 bc0f63ec..c7c36a26 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs @@ -24,7 +24,7 @@ public record RepeatableQuest : Quest public record RepeatableQuestDatabase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("templates")] public RepeatableTemplates? Templates { get; set; } @@ -42,7 +42,7 @@ public record RepeatableQuestDatabase public record RepeatableQuestStatus { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -66,7 +66,7 @@ public record RepeatableQuestStatus public record RepeatableTemplates { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Elimination")] public RepeatableQuest? Elimination { get; set; } @@ -84,7 +84,7 @@ public record RepeatableTemplates public record PmcDataRepeatableQuest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId? Id { get; set; } @@ -121,7 +121,7 @@ public record PmcDataRepeatableQuest public record ChangeRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("changeCost")] public List? ChangeCost { get; set; } @@ -133,7 +133,7 @@ public record ChangeRequirement public record ChangeCost { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// What item it will take to reset daily @@ -153,7 +153,7 @@ public record ChangeCost public record RewardOptions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("itemsBlacklist")] public List? ItemsBlacklist { get; set; } @@ -162,7 +162,7 @@ public record RewardOptions public record Options { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Completion")] public CompletionFilter? Completion { get; set; } @@ -171,7 +171,7 @@ public record Options public record CompletionFilter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("itemsBlacklist")] public List? ItemsBlacklist { get; set; } @@ -183,7 +183,7 @@ public record CompletionFilter public record ItemsBlacklist { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("minPlayerLevel")] public int? MinPlayerLevel { get; set; } @@ -195,7 +195,7 @@ public record ItemsBlacklist public record ItemsWhitelist { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("minPlayerLevel")] public int? MinPlayerLevel { get; set; } @@ -207,7 +207,7 @@ public record ItemsWhitelist public record SampleQuests { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public string? Id { get; set; } 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 bf5da06c..bf05d421 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Reward { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("value")] [JsonConverter(typeof(StringToNumberFactoryConverter))] @@ -74,7 +74,7 @@ public record Reward public record IllustrationConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Image")] public string image { get; set; } 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 b7ab5de3..a1d2df34 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record TemplateItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private Dictionary? _blocks; @@ -74,7 +74,7 @@ public record TemplateItem public record Props { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _backgroundColor; @@ -1570,7 +1570,7 @@ public record Props public record WeaponRecoilSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Enable")] public bool? Enable { get; set; } @@ -1582,7 +1582,7 @@ public record WeaponRecoilSettings public record WeaponRecoilSettingValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Enable")] public bool? Enable { get; set; } @@ -1597,7 +1597,7 @@ public record WeaponRecoilSettingValues public record WeaponRecoilProcess { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ComponentType")] public string? ComponentType { get; set; } @@ -1618,7 +1618,7 @@ public record WeaponRecoilProcess public record WeaponRecoilTransformationCurve { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Keys")] public IEnumerable? Keys { get; set; } @@ -1627,7 +1627,7 @@ public record WeaponRecoilTransformationCurve public record WeaponRecoilTransformationCurveKey { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("inTangent")] public double? InTangent { get; set; } @@ -1645,7 +1645,7 @@ public record WeaponRecoilTransformationCurveKey public record HealthEffect { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("type")] public string? Type { get; set; } @@ -1657,7 +1657,7 @@ public record HealthEffect public record Prefab { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("path")] public string? Path { get; set; } @@ -1669,7 +1669,7 @@ public record Prefab public record Grid { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_name")] public string? Name { get; set; } @@ -1690,7 +1690,7 @@ public record Grid public record GridProps { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("filters")] public IEnumerable? Filters { get; set; } @@ -1717,7 +1717,7 @@ public record GridProps public record GridFilter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Filter")] public HashSet? Filter { get; set; } @@ -1732,7 +1732,7 @@ public record GridFilter public record Slot { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; private string? _name; @@ -1774,7 +1774,7 @@ public record Slot public record SlotProps { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("filters")] public IEnumerable? Filters { get; set; } @@ -1786,7 +1786,7 @@ public record SlotProps public record SlotFilter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Shift")] public double? Shift { get; set; } @@ -1819,7 +1819,7 @@ public record SlotFilter public record StackSlot { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_name")] public string? Name { get; set; } @@ -1846,7 +1846,7 @@ public record StackSlot public record StackSlotProps { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("filters")] public IEnumerable? Filters { get; set; } @@ -1855,7 +1855,7 @@ public record StackSlotProps public record RandomLootSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("allowToSpawnIdenticalItems")] public bool? AllowToSpawnIdenticalItems { get; set; } @@ -1885,7 +1885,7 @@ public record RandomLootSettings public record RandomLootExcluded { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("categoryTemplates")] public IEnumerable? CategoryTemplates { get; set; } // TODO: object here @@ -1900,7 +1900,7 @@ public record RandomLootExcluded public record EffectsHealth { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Energy")] public EffectsHealthProps? Energy { get; set; } @@ -1912,7 +1912,7 @@ public record EffectsHealth public record EffectsHealthProps { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("value")] public double? Value { get; set; } @@ -1927,7 +1927,7 @@ public record EffectsHealthProps public record EffectsDamage { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Pain")] public EffectDamageProps? Pain { get; set; } @@ -1954,7 +1954,7 @@ public record EffectsDamage public record EffectDamageProps { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("value")] public double? Value { get; set; } @@ -1981,7 +1981,7 @@ public record EffectDamageProps public record Color { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("r")] public double? R { get; set; } @@ -1999,7 +1999,7 @@ public record Color public record ShotsGroupSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("EndShotIndex")] public double? EndShotIndex { get; set; } 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 8e10a4f4..57cc0a59 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Trader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("assort")] public TraderAssort Assort { get; set; } @@ -33,7 +33,7 @@ public record Trader public record TraderBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("refreshTraderRagfairOffers")] public bool? RefreshTraderRagfairOffers { get; set; } @@ -134,7 +134,7 @@ public record TraderBase public record ItemBuyData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // MongoId [JsonPropertyName("category")] @@ -148,7 +148,7 @@ public record ItemBuyData public record ItemSellData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("category")] public required HashSet Category { get; set; } @@ -160,7 +160,7 @@ public record ItemSellData public record TraderInsurance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("availability")] public bool? Availability { get; set; } @@ -188,7 +188,7 @@ public record TraderInsurance public record TraderLoyaltyLevel { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("buy_price_coef")] public double? BuyPriceCoefficient { get; set; } @@ -220,7 +220,7 @@ public record TraderLoyaltyLevel public record TraderRepair { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("availability")] public bool? Availability { get; set; } @@ -251,7 +251,7 @@ public record TraderRepair public record TraderAssort { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("nextResupply")] public double? NextResupply { get; set; } @@ -269,7 +269,7 @@ public record TraderAssort public record BarterScheme { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // Confirmed in client [JsonPropertyName("count")] @@ -295,7 +295,7 @@ public record BarterScheme public record Suit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -328,7 +328,7 @@ public record Suit public record SuitRequirements { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("achievementRequirements")] public List? AchievementRequirements { get; set; } @@ -362,7 +362,7 @@ public record SuitRequirements public record ItemRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("count")] public double? Count { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs index 67b7d7f0..a36cd554 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record XY { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("x")] public double? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs index 1cf72e9b..deab4d94 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record XYZ { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("x")] public double? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs index f766ed7e..c1fc49db 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Customization; public record BuyClothingRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("offer")] public MongoId Offer { get; set; } @@ -19,7 +16,7 @@ public record BuyClothingRequestData : InventoryBaseActionRequestData public record PaymentItemForClothing { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("del")] public bool? Del { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs index 8edb3057..15546de2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Customization; public record CustomizationSetRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("customizations")] public List? Customizations { get; set; } } @@ -16,7 +13,7 @@ public record CustomizationSetRequest : InventoryBaseActionRequestData public record CustomizationSetOption { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs index 2f958187..04425f36 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs @@ -5,5 +5,5 @@ namespace SPTarkov.Server.Core.Models.Eft.Customization; public record WearClothingRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs index 4ed8296c..5ab0fb77 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs @@ -12,7 +12,7 @@ public record DeclineFriendRequestData : BaseFriendRequest { } public record BaseFriendRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("profileId")] public string? ProfileId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs index 47b65282..f4bca1ee 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record AddUserGroupMailRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs index 98bab3cb..4485be91 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ChangeGroupMailOwnerRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs index 51f3a3db..8d487c4a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ChatServer { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -42,7 +42,7 @@ public record ChatServer public record Chat { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs index 2fb9f011..89181b17 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ClearMailMessageRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public required MongoId DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs index 389d8ea9..9bbd1f7b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record CreateGroupMailRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Name")] public string? Name { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs index ff3d00a6..89506008 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record DeleteFriendRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("friend_id")] public MongoId FriendId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs index 1c4e55ce..3b66b3bb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record FriendRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("status")] public int? Status { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs index 24069838..4b4a77b1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record FriendRequestSendResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("status")] public BackendErrorCodes? Status { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs index 195b68c6..3e17df31 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetAllAttachmentsRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public string DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs index b34b9728..58e763a1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetAllAttachmentsResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("messages")] public List? Messages { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs index efc92e5f..8f4e030b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetChatServerListRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("VersionId")] public string? VersionId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs index 1831eb42..11ff0abe 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetFriendListDataResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Friends")] public List? Friends { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs index b000d127..5cae743e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogInfoRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public MongoId? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs index 886e8f05..59f58fb5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogListRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("limit")] public int? Limit { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs index 377930d6..13644f9a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogViewRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("type")] public MessageType? Type { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs index 346e8222..ba8dd208 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogViewResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("messages")] public List? Messages { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs index a91e7289..08b732fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record PinDialogRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public MongoId? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs index 6e60742a..0595f667 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveDialogRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public MongoId? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs index 2dedcf9c..9bbead3a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveMailMessageRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs index b30b8605..52141c09 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveUserGroupMailRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs index 61e61d4e..09bc2704 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record SendMessageRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogId")] public required string DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs index 97b067ac..1f64e6dc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record SetDialogReadRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dialogs")] public List? Dialogs { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs index 38b12ef8..372823b1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record CheckVersionResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("isvalid")] public bool? IsValid { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs index e6c5c60b..1b7bdeb3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record CurrentGroupResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("squad")] public List? Squad { get; set; } @@ -15,7 +15,7 @@ public record CurrentGroupResponse public record CurrentGroupSquadMember { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public string? Id { get; set; } @@ -36,7 +36,7 @@ public record CurrentGroupSquadMember public record CurrentGroupMemberInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs index 218e0c39..478ac2ae 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameConfigResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("aid")] public double? Aid { get; set; } @@ -59,7 +59,7 @@ public record GameConfigResponse public record PurchasedGames { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("eft")] public bool? IsEftPurchased { get; set; } @@ -71,7 +71,7 @@ public record PurchasedGames public record Backend { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Lobby")] public string? Lobby { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs index 99c0e1e1..91da778e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameEmptyCrcRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs index 8c398e03..932868eb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameKeepAliveResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("msg")] public string? Message { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs index ed22d22f..c735aad4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameLogoutResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("status")] public string? Status { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs index 2ffa6f41..59639ba4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameModeRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("sessionMode")] public string? SessionMode { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs index e6bd7581..599e3e3d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs @@ -11,7 +11,7 @@ public enum SessionMode public record GameModeResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("gameMode")] public string? GameMode { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs index 4291c62b..d32d0be6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameStartResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("utc_time")] public double UtcTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs index 2700c82d..a87db5b7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetItemPricesResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("supplyNextTime")] public double? SupplyNextTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs index b8741ef9..8c837bc9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetRaidTimeRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Side")] public string? Side { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs index 481873e1..10f6bfff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetRaidTimeResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("NewSurviveTimeSeconds")] public double? NewSurviveTimeSeconds { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs index cc941809..39d99e0b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs @@ -1,4 +1,4 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Spt.Services; using SPTarkov.Server.Core.Models.Utils; @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record SendClientModsRequest : IRequestData { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("activeClientMods")] public List ActiveClientMods { get; set; } = []; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs index 5f96f906..8d3dc69f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record SendSurveyOpinionRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("resultJson")] public string? ResultJson { get; set; } @@ -21,7 +21,7 @@ public record SendSurveyOpinionRequest : IRequestData public record SurveyOpinionAnswer { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("questionId")] public int? QuestionId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs index b02cbb1d..2a246131 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record ServerDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ip")] public string? Ip { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs index 82086186..3ee0903e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record SurveyResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("locale")] public Dictionary>? Locale { get; set; } @@ -17,7 +17,7 @@ public record SurveyResponseData public record Survey { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public int? Id { get; set; } @@ -41,7 +41,7 @@ public record Survey public record WelcomePageData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("titleLocaleKey")] public string? TitleLocaleKey { get; set; } @@ -56,7 +56,7 @@ public record WelcomePageData public record FarewellPageData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("textLocaleKey")] public string? TextLocaleKey { get; set; } @@ -65,7 +65,7 @@ public record FarewellPageData public record SurveyQuestion { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public int? Id { get; set; } @@ -92,7 +92,7 @@ public record SurveyQuestion public record SurveyAnswer { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public int? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs index 460c1d65..eab12d21 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record VersionValidateRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("version")] public Version? Version { get; set; } @@ -18,7 +18,7 @@ public record VersionValidateRequestData : IRequestData public record Version { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("major")] public string? Major { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs index a3f00e41..3d6aea72 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public record HealthTreatmentRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("trader")] public string? Trader { get; set; } @@ -29,7 +26,7 @@ public record HealthTreatmentRequestData : InventoryBaseActionRequestData public record Difference { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("BodyParts")] public Dictionary? BodyParts { get; set; } @@ -44,7 +41,7 @@ public record Difference public record BodyPartValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double Health { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs index a5f2e255..bd813319 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public record OffraidEatRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs index 8fb42d6f..8ee4f4e2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public record OffraidHealRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs index 3522ba59..ab9a577b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public record SyncHealthRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Health")] public List? Health { get; set; } @@ -26,7 +26,7 @@ public record SyncHealthRequestData public record BodyPartCollection { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Head")] public BodyPartHealth? Head { get; set; } @@ -53,7 +53,7 @@ public record BodyPartCollection public record BodyPartHealth { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Maximum")] public int? Maximum { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs index 952a5319..e889e6fb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public class WorkoutData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("skills")] public WorkoutSkills? Skills { get; set; } @@ -17,7 +17,7 @@ public class WorkoutData : IRequestData public record WorkoutSkills { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Common")] public List Common { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs index 4c18bf35..e0ba1008 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs @@ -5,9 +5,6 @@ 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 27eca3a9..2c2e6759 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutArea { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -47,7 +47,7 @@ public record HideoutArea public record HideoutAreaRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("areaType")] public int? AreaType { get; set; } @@ -62,7 +62,7 @@ public record HideoutAreaRequirement public record Stage { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("autoUpgrade")] public bool? AutoUpgrade { get; set; } @@ -101,7 +101,7 @@ public record Stage public record StageImprovement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -119,7 +119,7 @@ public record StageImprovement public record StageImprovementBonus { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -146,7 +146,7 @@ public record StageImprovementBonus public record StageImprovementRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("count")] public int? Count { get; set; } @@ -170,7 +170,7 @@ public record StageImprovementRequirement public record StageRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("areaType")] public int? AreaType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs index a9cbbca9..3a4e3b35 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCircleOfCultistProductionStartRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("timestamp")] public long? Timestamp { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs index e2bdc090..e25c0497 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutContinuousProductionStartRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("recipeId")] public MongoId? RecipeId { get; set; } @@ -19,7 +16,7 @@ public record HideoutContinuousProductionStartRequestData : InventoryBaseActionR public record HideoutProperties { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public int? BtcFarmGcs { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs index 68de6c8d..2ac1fa33 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCustomisation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("globals")] public List? Globals { get; set; } @@ -19,7 +19,7 @@ public record HideoutCustomisation public record HideoutCustomisationGlobal { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -46,7 +46,7 @@ public record HideoutCustomisationGlobal public record HideoutCustomisationSlot { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs index 2a0f7d0f..50e28a39 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs @@ -5,9 +5,6 @@ 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 cf07f281..4b1e82e9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCustomizationSetMannequinPoseRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("poses")] public Dictionary? Poses { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs index 26bf38b1..f14ee844 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutDeleteProductionRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("recipeId")] public MongoId RecipeId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs index 3e3252e5..86e71e2f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs @@ -8,9 +8,6 @@ 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 2d4ef1fa..515869aa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutProductionData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("recipes")] public List? Recipes { get; set; } @@ -22,7 +22,7 @@ public record HideoutProductionData public record HideoutProduction { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -67,7 +67,7 @@ public record HideoutProduction public record Requirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("templateId")] public MongoId? TemplateId { get; set; } @@ -106,7 +106,7 @@ public record Requirement public record ScavRecipe { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -124,7 +124,7 @@ public record ScavRecipe public record EndProducts { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Common")] public MinMax? Common { get; set; } @@ -139,7 +139,7 @@ public record EndProducts public record CultistRecipe { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs index 14cf93c4..f0bcab68 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs @@ -7,9 +7,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutPutItemInRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("areaType")] public HideoutAreas? AreaType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs index ee753ace..aed485e6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutScavCaseStartRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("recipeId")] public MongoId RecipeId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs index cda90483..6d15bab1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutSettingsBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("generatorSpeedWithoutFuel")] public double? GeneratorSpeedWithoutFuel { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs index ea27b732..9ca5e74f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutSingleProductionStartRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("recipeId")] public MongoId RecipeId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs index 6c003f91..a7fae5b0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutTakeItemOutRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("areaType")] public HideoutAreas? AreaType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs index 1dd64420..1c155b28 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutTakeProductionRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("recipeId")] public MongoId RecipeId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs index 054e8c03..8dd72ee3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutToggleAreaRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("areaType")] public HideoutAreas? AreaType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs index 7bcc7d69..5c909f86 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutUpgradeCompleteRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("areaType")] public HideoutAreas? AreaType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs index 0ba4d079..4e7fb346 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs @@ -7,9 +7,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutUpgradeRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("areaType")] public HideoutAreas? AreaType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs index d8ea1a9b..c61fdc40 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record QteData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -49,7 +49,7 @@ public record QteData public record QuickTimeEvent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] @@ -77,7 +77,7 @@ public record QuickTimeEvent public record QteRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("type")] public RequirementType? RequirementType { get; set; } @@ -86,7 +86,7 @@ public record QteRequirement public record QteResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("energy")] public int? Energy { get; set; } @@ -101,7 +101,7 @@ public record QteResult public record QteEffect { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] @@ -128,7 +128,7 @@ public record QteEffect public record SkillLevelMultiplier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("level")] public int? Level { get; set; } @@ -140,7 +140,7 @@ public record SkillLevelMultiplier public record Position { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("x")] public float? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs index 1d054406..4501724a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/RecordShootingRangePoints.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record RecordShootingRangePoints : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("points")] public int? Points { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs index 2b9dd9c7..47d359d3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.HttpResponse; public record GetBodyResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("err")] public BackendErrorCodes? Err { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs index 0e45b3ac..fb3b2861 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.HttpResponse; public record NullResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("err")] public int? Err { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs index eba79359..760e32db 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record InsuredItemsData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs index d0725965..1ccbda36 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record ItemDeliveryRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("items")] public List? Items { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs index 0cea1f75..5df8cec7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record RegisterPlayerRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs index 68fcde49..dbc12410 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Insurance; public record GetInsuranceCostRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("traders")] public List? Traders { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs index 0af65a52..6baf1aa2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/InsureRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Insurance; public record InsureRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("tid")] public string? TransactionId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs index fd1a8ece..b3f1b126 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemDirectRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 e9e053ad..21202784 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Trader id @@ -21,7 +21,7 @@ public record AddItemRequestData public record ItemToAdd { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("count")] public int? Count { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs index 03e42245..9a744b8a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemTempObject { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("itemRef")] public Item? ItemReference { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs index a4b2c1a9..0193782c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemsDirectRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 77cf35ee..8bcbb129 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryAddRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryAddRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs index 503d1372..8a464cd9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs @@ -8,7 +8,7 @@ public abstract record InventoryBaseActionRequestData : BaseInteractionRequestDa public record To { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -26,7 +26,7 @@ public record To public record Container { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -41,7 +41,7 @@ public record Container public record Location { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("x")] public double? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs index 5619f309..cb469cd9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBindRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryBindRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs index ac0288a7..fba779fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryCreateMarkerRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs index efaf2991..2da861bc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryDeleteMarkerRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs index 5ab0b9bd..b66567e5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryEditMarkerRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs index 5e82913d..e6dbadfc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryExamineRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryExamineRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId ItemId { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs index dd4fe737..bc31f27a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryFoldRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryFoldRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs index dcf1823b..7738a6c6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMergeRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryMergeRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs index fe967fa0..36cfb56c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryMoveRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryMoveRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs index 8f5f38ac..4f9f2ce9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("ids")] public List Ids { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs index 043be873..1f5a0c7d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryRemoveRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId Item { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs index 9b61c864..2a0af075 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySortRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventorySortRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("changedItems")] public List? ChangedItems { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs index cced14ab..81830920 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySplitRequestData.cs @@ -5,9 +5,6 @@ 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 25e3dc73..80d9dfd3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventorySwapRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventorySwapRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs index ad316d99..919bb0e5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTagRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryTagRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs index 5bf1495a..f7fb4d20 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryToggleRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryToggleRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs index af0d717b..e0dada0f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryTransferRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record InventoryTransferRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs index 51069366..6b710e2e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs @@ -5,9 +5,6 @@ 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 71f254ef..73817e80 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/PinOrLockItemRequest.cs @@ -6,9 +6,6 @@ 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 b37e4058..20da1e1c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record RedeemProfileRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("events")] public List? Events { get; set; } } @@ -15,7 +12,7 @@ public record RedeemProfileRequestData : InventoryBaseActionRequestData public record RedeemProfileRequestEvent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MessageId")] public MongoId MessageId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs index b01e7544..ff3c5bd4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/SetFavoriteItems.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record SetFavoriteItems : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("items")] public List? Items { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs index adaecd1f..128643bd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record EmptyItemEventRouterResponse : ItemEventRouterBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("profileChanges")] public new string? ProfileChanges { get; set; } = string.Empty; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs index e9419679..58aeecf6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record ItemEventRouterBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [JsonPropertyName("warnings")] @@ -22,7 +22,7 @@ public record ItemEventRouterBase public record Warning { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("index")] public int? Index { get; set; } @@ -40,7 +40,7 @@ public record Warning public record ProfileChange { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public string? Id { get; set; } @@ -103,7 +103,7 @@ public record ProfileChange public record HideoutStashItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -115,7 +115,7 @@ public record HideoutStashItem public record WeaponBuildChange { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -133,7 +133,7 @@ public record WeaponBuildChange public record EquipmentBuildChange { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -160,7 +160,7 @@ public record EquipmentBuildChange public record ItemChanges { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("new")] public List? NewItems { get; set; } @@ -175,7 +175,7 @@ public record ItemChanges public record DeletedItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -187,7 +187,7 @@ public record DeletedItem public record TraderData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("salesSum")] public double? SalesSum { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs index 0aa1490a..673413a0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record ItemEventRouterRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("data")] public List? Data { get; set; } @@ -24,7 +24,7 @@ public record ItemEventRouterRequest : IRequestData public record Daum { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Action")] public string? Action { get; set; } @@ -54,7 +54,7 @@ public record Daum public record FromOwner { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -66,7 +66,7 @@ public record FromOwner public record To { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } @@ -81,7 +81,7 @@ public record To public record Location { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("x")] public int? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs index 54d36059..43ab550e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs @@ -8,5 +8,5 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record ItemEventRouterResponse : ItemEventRouterBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs index 0497f12c..d41e59d3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record GetMiniProfileRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("username")] public string? Username { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs index 2267a508..d049412c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record LoginRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("username")] public string? Username { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs index 44dda862..9a8cf0e4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record MiniProfile { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("username")] public string? Username { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs index 733e2aa9..c77931fb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record AirdropLootResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("dropType")] public string? DropType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs index fa58243a..255508a5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetAirdropLootRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("containerId")] public MongoId ContainerId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs index d03bf129..3a45bec1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetAirdropLootResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 d959e924..a021f061 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetLocationRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs index f1e809e0..a3fef313 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs @@ -10,7 +10,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record EndLocalRaidRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// ID of server player just left @@ -40,7 +40,7 @@ public record EndLocalRaidRequestData : IRequestData public record EndRaidResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("profile")] public PmcData? Profile { get; set; } @@ -80,7 +80,7 @@ public record EndRaidResult public record LocationTransit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("hash")] public string? Hash { get; set; } @@ -125,7 +125,7 @@ public record LocationTransit public record TransitProfile { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs index 9c121893..928d9579 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record EndOfflineRaidRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs index 17a74fd3..fb820a06 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record GroupCharacter { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public string? Id { get; set; } @@ -37,7 +37,7 @@ public record GroupCharacter public record CharacterInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Nickname")] public string? Nickname { get; set; } @@ -67,7 +67,7 @@ public record CharacterInfo public record PlayerVisualRepresentation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Info")] public VisualInfo? Info { get; set; } @@ -82,7 +82,7 @@ public record PlayerVisualRepresentation public record VisualInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Side")] public string? Side { get; set; } @@ -103,7 +103,7 @@ public record VisualInfo public record Customization { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Head")] public string? Head { get; set; } @@ -121,7 +121,7 @@ public record Customization public record Equipment { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs index 829752cc..7e187825 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupCurrentResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("squad")] public List? Squad { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs index 8830a561..1b90d534 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupInviteSendRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("to")] public string? To { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs index 90e5fa82..6463e49b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupJoinRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("location")] public string? Location { get; set; } @@ -27,7 +27,7 @@ public record MatchGroupJoinRequest : IRequestData public record JoinServer { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ping")] public int? Ping { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs index fa88dac5..7981e573 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupPlayerRemoveRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("aidToKick")] public string? AidToKick { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs index a455bb09..0b9a2437 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStartGameRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("groupId")] public string? GroupId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs index da3216aa..9a245696 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStatusRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("location")] public string? Location { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs index f9602b04..1a5845b8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStatusResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("players")] public List? Players { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs index 6ce97ec5..44711dde 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupTransferRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("aidToChange")] public string? AidToChange { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs index 8a26921e..fb32a319 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record ProfileStatusRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("groupId")] public int? GroupId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs index 74ed6e98..86ace6af 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record ProfileStatusResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("maxPveCountExceeded")] public bool? MaxPveCountExceeded { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs index a2881641..37023513 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record PutMetricsRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("sid")] public string? SessionId { get; set; } @@ -39,7 +39,7 @@ public record PutMetricsRequestData : IRequestData public record SharedSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("StatedFieldOfView")] public double? StatedFieldOfView { get; set; } @@ -48,7 +48,7 @@ public record SharedSettings public record HardwareDescription { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("deviceUniqueIdentifier")] public string? DeviceUniqueIdentifier { get; set; } @@ -105,7 +105,7 @@ public record HardwareDescription public record ClientEvents { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MatchingCompleted")] public double? MatchingCompleted { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs index 7c9760ee..6f5c97ae 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record RaidSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("keyId")] public string? KeyId { get; set; } @@ -56,7 +56,7 @@ public record RaidSettings public record TimeAndWeatherSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("isRandomTime")] public bool? IsRandomTime { get; set; } @@ -91,7 +91,7 @@ public record TimeAndWeatherSettings public record BotSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("isScavWars")] public bool? IsScavWars { get; set; } @@ -104,7 +104,7 @@ public record BotSettings public record WavesSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("botAmount")] [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs index ae1d5b76..dd0ec3c3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record RequestIdRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("requestId")] public string? RequestId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs index e24b4c33..248de7e1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record Server { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ping")] public int? Ping { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs index a64f954a..7550d119 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record SessionStatus { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("profileid")] public string? ProfileId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs index 2b68b02a..ca912f7d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record StartLocalRaidRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("serverId")] public string? ServerId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs index c10d05b9..aa7a7c00 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record StartLocalRaidResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("serverId")] public string? ServerId { get; set; } @@ -36,7 +36,7 @@ public record StartLocalRaidResponseData public record ProfileInsuredItems { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("insuredItems")] public List? InsuredItems { get; set; } @@ -45,7 +45,7 @@ public record ProfileInsuredItems public record Transition { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("transitionType")] public TransitionType? TransitionType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs index ee349bc1..d3840cab 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record UpdatePingRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("servers")] public List? servers { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs index dd5c47f0..980e7121 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs @@ -15,7 +15,7 @@ public record NoteActionRequest : BaseInteractionRequestData public record Note { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Time")] public double? Time { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs index 93ec3300..4c99a299 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier; public record NotifierChannel { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("server")] public string? Server { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs index bf354b2e..643d4bad 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier; public record SelectProfileResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("status")] public string? Status { 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 657776fa..6e0d6d28 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.PresetBuild; public record PresetBuildActionRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Action")] public string? Action { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs index 000346a5..01fb6cb8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.PresetBuild; public record RemoveBuildRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs index f1e2f2aa..28e82aa6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Prestige; public record GetPrestigeResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("elements")] public List? Elements { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs index cfca4240..23c827cb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs @@ -9,7 +9,7 @@ public class ObtainPrestigeRequestList : List, IRequestDa public record ObtainPrestigeRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -21,7 +21,7 @@ public record ObtainPrestigeRequest : IRequestData public record Location { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("x")] public int X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs index caebd6b9..683aa90c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record CompletedAchievementsResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("elements")] public Dictionary? Elements { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs index 706a4c32..38ef6aeb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ConnectResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("backendUrl")] public string? BackendUrl { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs index 932f83fc..bbcbf283 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record CreateProfileResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("uid")] public string? UserId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs index 9a7c9c34..bee70918 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetAchievementsResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("elements")] public List? Elements { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs index 3473252b..290aa56f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetOtherProfileRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("accountId")] public string? AccountId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs index f6680030..c19856e3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetOtherProfileResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId? Id { get; set; } @@ -55,7 +55,7 @@ public record GetOtherProfileResponse public record OtherProfileInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("nickname")] public string? Nickname { get; set; } @@ -82,7 +82,7 @@ public record OtherProfileInfo public record OtherProfileCustomization { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("head")] public string? Head { get; set; } @@ -106,7 +106,7 @@ public record OtherProfileCustomization public record OtherProfileEquipment { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Id")] public string? Id { get; set; } @@ -118,7 +118,7 @@ public record OtherProfileEquipment public record OtherProfileStats { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("eft")] public OtherProfileSubStats? Eft { get; set; } @@ -127,7 +127,7 @@ public record OtherProfileStats public record OtherProfileSubStats { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("totalInGameTime")] public long? TotalInGameTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs index a17c0080..17a58e49 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetProfileSettingsRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 540725f5..feed4a83 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetProfileStatusResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("maxPveCountExceeded")] public bool? MaxPveCountExceeded { get; set; } = false; @@ -17,7 +17,7 @@ public record GetProfileStatusResponseData public record ProfileStatusData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("profileid")] public string? ProfileId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs index b7bf729a..2b12b387 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record MessageContentRagfair { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("offerId")] public string? OfferId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs index ff66beb1..cac14664 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileChangeNicknameRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs index 966895fe..8239f256 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileChangeVoiceRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("voice")] public MongoId Voice { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs index 002cf537..8cd52f5d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileCreateRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("side")] public string? Side { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs index 836d0fd6..971f9711 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SearchFriendResponse { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs index e4b1f79f..1c559a43 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SearchProfilesRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs index a6951af2..f51f28f5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs @@ -11,7 +11,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SptProfile { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("info")] public Info? ProfileInfo { get; set; } @@ -66,7 +66,7 @@ public record SptProfile public record TraderPurchaseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("count")] public double? PurchaseCount { get; set; } @@ -78,7 +78,7 @@ public record TraderPurchaseData public record Info { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// main profile id @@ -112,7 +112,7 @@ public record Info public record Characters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("pmc")] public PmcData? PmcData { get; set; } @@ -127,7 +127,7 @@ public record Characters public record UserBuilds { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("weaponBuilds")] public List? WeaponBuilds { get; set; } @@ -142,7 +142,7 @@ public record UserBuilds public record UserBuild { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Id")] public MongoId Id { get; set; } @@ -191,7 +191,7 @@ public record MagazineBuild : UserBuild public record MagazineTemplateAmmoItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("TemplateId")] public MongoId TemplateId { get; set; } @@ -212,7 +212,7 @@ public record DefaultEquipmentPreset : EquipmentBuild public record Dialogue { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("attachmentsNew")] public int? AttachmentsNew { get; set; } @@ -240,7 +240,7 @@ public record Dialogue public record DialogueInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("attachmentsNew")] public int? AttachmentsNew { get; set; } @@ -267,7 +267,7 @@ public record DialogueInfo public record Message { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -318,7 +318,7 @@ public record Message public record ReplyTo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public string? Id { get; set; } @@ -339,7 +339,7 @@ public record ReplyTo public record MessagePreview { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("uid")] public string? UserId { get; set; } @@ -363,7 +363,7 @@ public record MessagePreview public record MessageItems { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("stash")] public MongoId? Stash { get; set; } @@ -375,7 +375,7 @@ public record MessageItems public record UpdatableChatMember { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Nickname")] public string? Nickname { get; set; } @@ -399,7 +399,7 @@ public record UpdatableChatMember public record Spt { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// What version of SPT was this profile made with @@ -453,7 +453,7 @@ public record Spt public record AcceptedCultistReward { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("timestamp")] public long? Timestamp { get; set; } @@ -468,7 +468,7 @@ public record AcceptedCultistReward public record PendingPrestige { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("prestigeLevel")] public int? PrestigeLevel { get; set; } @@ -480,7 +480,7 @@ public record PendingPrestige public record ModDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("name")] public string? Name { get; set; } @@ -501,7 +501,7 @@ public record ModDetails public record ReceivedGift { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("giftId")] public string? GiftId { get; set; } @@ -516,7 +516,7 @@ public record ReceivedGift public record Inraid { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("location")] public string? Location { get; set; } @@ -528,7 +528,7 @@ public record Inraid public record Insurance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("scheduledTime")] public int? ScheduledTime { get; set; } @@ -555,7 +555,7 @@ public record Insurance public record BtrDelivery { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs index d9072cde..94980f64 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SystemData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("date")] public string? Date { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs index d496b8e5..37af15cb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record UserDialogInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// _id @@ -25,7 +25,7 @@ public record UserDialogInfo public record UserDialogDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs index 578cc8c9..802979be 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ValidateNicknameRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs index 6bf1ef88..dded4a73 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/AcceptQuestRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record AcceptQuestRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("qid")] public MongoId QuestId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs index 95a6e4ca..e425b1f0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/CompleteQuestRequestData.cs @@ -6,9 +6,6 @@ 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 bdc1986c..815ab88e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/FailQuestRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record FailQuestRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("qid")] public MongoId QuestId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs index 526f472d..fb73733a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/HandoverQuestRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record HandoverQuestRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("qid")] public MongoId QuestId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs index 22697643..64426ea5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record ListQuestsRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("completed")] public bool? Completed { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs index e86229f0..c6da4925 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record RepeatableQuestChangeRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("qid")] public MongoId QuestId { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs index e4002154..2a1fd051 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record AddOfferRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("sellInOnePiece")] public bool? SellInOnePiece { get; set; } @@ -22,7 +19,7 @@ public record AddOfferRequestData : InventoryBaseActionRequestData public record Requirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_tpl")] public MongoId Template { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs index 8090cc23..1d9f388f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record ExtendOfferRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("offerId")] public string? OfferId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs index 39724d5a..9d292568 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetMarketPriceRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("templateId")] public MongoId TemplateId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs index 3683bd12..3de044bd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetOffersResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("categories")] public Dictionary? Categories { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs index 6ffeb9d9..fa962f09 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetRagfairOfferByIdRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public int? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs index cdb1d698..1567631d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record RagfairOffer { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("sellResult")] public List? SellResults { get; set; } @@ -96,7 +96,7 @@ public record RagfairOffer public record OfferRequirement { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_tpl")] public required MongoId TemplateId { get; set; } @@ -119,7 +119,7 @@ public record RagfairOfferUser private string? _nickname; [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -153,7 +153,7 @@ public record RagfairOfferUser public record SellResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("sellTime")] public long? SellTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs index 71d237cb..df20df7e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record RemoveOfferRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("offerId")] public string? OfferId { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs index 57f87b0b..22bed181 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record SearchRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("page")] public int? Page { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs index d714d6db..ceee69af 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record SendRagfairReportRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("offerId")] public int? OfferId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs index 939e5ae8..2a8ad619 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record StorePlayerOfferTaxAmountRequestData : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs index 0834a6f5..03f14499 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair; public record BaseRepairActionDataRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Action")] public string? Action { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs index 362662bc..012f7972 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair; public record RepairActionDataRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("repairKitsInfo")] public List? RepairKitsInfo { get; set; } @@ -22,7 +19,7 @@ public record RepairActionDataRequest : InventoryBaseActionRequestData public record RepairKitsInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 a8e930c3..5d07c50d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair; public record TraderRepairActionDataRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("tid")] public MongoId TraderId { get; set; } @@ -19,7 +16,7 @@ public record TraderRepairActionDataRequest : InventoryBaseActionRequestData public record RepairItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs index 64a847dd..1dfecbc5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessBaseTradeRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade; public record ProcessBaseTradeRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("type")] public string? Type { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs index 77dac119..f11097fd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade; public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("offers")] public List? Offers { get; set; } } @@ -16,7 +13,7 @@ public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData public record OfferRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs index 507a33e9..8993d50a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs @@ -15,7 +15,7 @@ public record ProcessSellTradeRequestData : ProcessBaseTradeRequestData public record SoldItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs index 8926d33c..2a4bee5d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/SellScavItemsToFenceRequestData.cs @@ -5,9 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Trade; public record SellScavItemsToFenceRequestData : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("totalValue")] public double? TotalValue { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs index 8bca6030..93abc5a7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Weather; public record WeatherData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("acceleration")] public double? Acceleration { get; set; } @@ -27,7 +27,7 @@ public record WeatherData public record Weather { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("pressure")] public double? Pressure { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs index 34434d97..c2911456 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/AddToWishlistRequest.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist; public record AddToWishlistRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("items")] public Dictionary? Items { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs index 54c8671c..6f9b0308 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/ChangeWishlistItemCategoryRequest.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist; public record ChangeWishlistItemCategoryRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("item")] public MongoId Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs index b86b5c07..df1ca96f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Wishlist/RemoveFromWishlistRequest.cs @@ -6,9 +6,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Wishlist; public record RemoveFromWishlistRequest : InventoryBaseActionRequestData { - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("items")] public List? Items { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs index a024fb72..71f02fbd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ws; public record WsNotificationEvent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs index 2727bfcc..cb8f03be 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record AccountTypes { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; 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 0ad63197..91f640cc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record GameEditions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public const string STANDARD = "standard"; public const string LEFT_BEHIND = "left_behind"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs index db4d8a8b..ec3d24b5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record HideoutEventActions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public const string HIDEOUT_UPGRADE = "HideoutUpgrade"; public const string HIDEOUT_UPGRADE_COMPLETE = "HideoutUpgradeComplete"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs index 2e64e945..815adf85 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record ItemEventActions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public const string MOVE = "Move"; public const string REMOVE = "Remove"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs index 573dd584..5a9fcc7b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record Money { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public static readonly MongoId ROUBLES = new("5449016a4bdc2d6f028b456f"); public static readonly MongoId EUROS = new("569668774bdc2da2298b4568"); diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs index 34237d38..58479226 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotDetailsForChatMessages { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Nickname { get; set; } = string.Empty; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs index af99ef49..20d83e68 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotGenerationDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 be9cf5ea..b51823bf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotLootCache { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("backpackLoot")] public Dictionary BackpackLoot { get; set; } = []; @@ -51,7 +51,7 @@ public record BotLootCache public record LootCacheType { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public const string Special = "Special"; public const string Backpack = "Backpack"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs index 9600af26..69a32dd9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record Bots { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("types")] public Dictionary Types { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs index d9fbebb1..512ac381 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ChooseRandomCompatibleModResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("incompatible")] public bool? Incompatible { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs index 2d43130c..6c3168dc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record FilterPlateModsForSlotByLevelResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("result")] public Result? Result { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs index afbe26e0..13c643ac 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateEquipmentProperties { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public MongoId BotId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs index 7d43315c..b93a5ca0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateWeaponRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Weapon to add mods to / result that is returned @@ -73,7 +73,7 @@ public record GenerateWeaponRequest public record BotData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Role of bot weapon is generated for @@ -97,7 +97,7 @@ public record BotData public record WeaponStats { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("hasOptic")] public bool? HasOptic { get; set; } @@ -112,7 +112,7 @@ public record WeaponStats public record BotModLimits { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("scope")] public ItemCount? Scope { get; set; } @@ -136,7 +136,7 @@ public record BotModLimits public record ItemCount { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("count")] public int? Count { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs index ce4fb44a..d3608b82 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateWeaponResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("weapon")] public List? Weapon { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs index 9be76131..d934be32 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ItemSpawnLimitSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("currentLimits")] public Dictionary? CurrentLimits { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs index 74aa919e..f9f365d8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ModToSpawnRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 52fcf68e..9bf98dd6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs @@ -28,7 +28,7 @@ public record AirdropConfig : BaseConfig public record AirdropLoot { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("icon")] [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs index 45a39c7e..6b51fa93 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs @@ -23,7 +23,7 @@ public record BackupConfig : BaseConfig public record BackupConfigInterval { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enabled")] public bool Enabled { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs index f78d7834..45d6d8ca 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs @@ -11,7 +11,7 @@ public abstract record BaseConfig public record RunIntervalValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("inRaid")] public int InRaid { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs index a0f7fb17..536b7d4b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs @@ -136,7 +136,7 @@ public record BotConfig : BaseConfig public record WeeklyBossSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Should a weekly boss be picked to 100% spawn @@ -161,7 +161,7 @@ public record WeeklyBossSettings public record WalletLootSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Chance wallets have loot in them @@ -188,7 +188,7 @@ public record WalletLootSettings public record EquipmentFilters { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Limits for mod types per weapon .e.g. scopes @@ -293,7 +293,7 @@ public record EquipmentFilters public record ModLimits { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// How many scopes are allowed on a weapon - hard coded to work with OPTIC_SCOPE, ASSAULT_SCOPE, COLLIMATOR, COMPACT_COLLIMATOR @@ -311,7 +311,7 @@ public record ModLimits public record RandomisationDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Between what levels do these randomisation setting apply to @@ -365,7 +365,7 @@ public record RandomisationDetails public record NighttimeChanges { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Applies changes to values stored in equipmentMods @@ -377,7 +377,7 @@ public record NighttimeChanges public record EquipmentFilterDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Between what levels do these equipment filter setting apply to @@ -401,7 +401,7 @@ public record EquipmentFilterDetails public record WeightingAdjustmentDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Between what levels do these weight settings apply to @@ -431,7 +431,7 @@ public record WeightingAdjustmentDetails public record AdjustmentDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("add")] public Dictionary>? Add { get; set; } @@ -443,7 +443,7 @@ public record AdjustmentDetails public class ArmorPlateWeights { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("levelRange")] public required MinMax LevelRange { get; set; } @@ -455,7 +455,7 @@ public class ArmorPlateWeights public record RandomisedResourceDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("food")] public RandomisedResourceValues? Food { get; set; } @@ -467,7 +467,7 @@ public record RandomisedResourceDetails public record RandomisedResourceValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 aadfa093..8d9e3e7e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Config; public record BotDurability { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("default")] public required DefaultDurability Default { get; set; } @@ -23,7 +23,7 @@ public record BotDurability public record DefaultDurability { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("armor")] public required ArmorDurability Armor { get; set; } @@ -35,7 +35,7 @@ public record DefaultDurability public record PmcDurability { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("armor")] public required PmcDurabilityArmor Armor { get; set; } @@ -47,7 +47,7 @@ public record PmcDurability public record PmcDurabilityArmor { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("lowestMaxPercent")] public int LowestMaxPercent { get; set; } @@ -68,7 +68,7 @@ public record PmcDurabilityArmor public record ArmorDurability { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("maxDelta")] public int MaxDelta { get; set; } @@ -89,7 +89,7 @@ public record ArmorDurability public record WeaponDurability { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("lowestMax")] public int LowestMax { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs index 69374d36..81bef520 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs @@ -70,7 +70,7 @@ public record CoreConfig : BaseConfig public record BsgLogging { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// verbosity of what to log, yes I know this is backwards, but its how nlog deals with ordinals.
@@ -97,7 +97,7 @@ public record BsgLogging public record Release { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Disclaimer outlining the intended usage of bleeding edge @@ -181,7 +181,7 @@ public record Release public record GameFixes { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Shotguns use a different value than normal guns causing huge pellet dispersion @@ -211,7 +211,7 @@ public record GameFixes public record ServerFeatures { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("compressProfile")] public bool CompressProfile { get; set; } @@ -235,7 +235,7 @@ public record ServerFeatures public record ChatbotFeatures { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("sptFriendGiftsEnabled")] public bool SptFriendGiftsEnabled { get; set; } @@ -262,7 +262,7 @@ public record ChatbotFeatures public record CommandoFeatures { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("giveCommandEnabled")] public bool GiveCommandEnabled { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs index 3ba9eb55..d003c942 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs @@ -19,7 +19,7 @@ public record GiftsConfig : BaseConfig public record Gift { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 8aaebd5b..591796c9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs @@ -17,7 +17,7 @@ public record HealthConfig : BaseConfig public record HealthMultipliers { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("blacked")] public double Blacked { get; set; } @@ -26,7 +26,7 @@ public record HealthMultipliers public record HealthSave { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("health")] public bool Health { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs index b3322313..2c83e5e2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs @@ -49,7 +49,7 @@ public record HideoutConfig : BaseConfig public record HideoutCraftToAdd { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// The new mongoId for the craft to use @@ -70,7 +70,7 @@ public record HideoutCraftToAdd public record CultistCircleSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("maxRewardItemCount")] public int MaxRewardItemCount { get; set; } @@ -148,7 +148,7 @@ public record CraftTimeThreshold : MinMax public record DirectRewardSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("reward")] public required List Reward { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs index 0bee35de..709555d7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs @@ -65,7 +65,7 @@ public record InRaidConfig : BaseConfig public record RaidMenuSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("aiAmount")] public required string AiAmount { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs index fa8ffd0e..c1b87212 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs @@ -36,7 +36,7 @@ public record InventoryConfig : BaseConfig public record RewardDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_type")] public string? Type { get; set; } @@ -57,7 +57,7 @@ public record RewardDetails public record SealedAirdropContainerSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("weaponRewardWeight")] public required Dictionary WeaponRewardWeight { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs index 897573a1..73e9b253 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs @@ -52,7 +52,7 @@ public record ItemConfig : BaseConfig public record HandbookPriceOverride { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Price in roubles diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs index 4b6452f9..871b5d9c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs @@ -145,7 +145,7 @@ public record LocationConfig : BaseConfig public record TransitSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("effectsToRemove")] public HashSet? EffectsToRemove { get; set; } @@ -160,7 +160,7 @@ public record TransitSettings public record ReserveRaiderSpawnChanceOverrides { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("nonTriggered")] public int NonTriggered { get; set; } @@ -172,7 +172,7 @@ public record ReserveRaiderSpawnChanceOverrides public record EquipmentLootSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Percentage chance item will be added to equipment @@ -184,7 +184,7 @@ public record EquipmentLootSettings public record RogueLighthouseSpawnTimeSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -196,7 +196,7 @@ public record RogueLighthouseSpawnTimeSettings public record CustomWaves { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Bosses spawn on raid start @@ -217,7 +217,7 @@ public record BotTypeLimit : MinMax public record ContainerRandomisationSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -244,7 +244,7 @@ public record ContainerRandomisationSettings public record ScavRaidTimeSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("settings")] public required ScavRaidTimeConfigSettings Settings { get; set; } @@ -256,7 +256,7 @@ public record ScavRaidTimeSettings public record ScavRaidTimeConfigSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("trainArrivalDelayObservedSeconds")] public int TrainArrivalDelayObservedSeconds { get; set; } @@ -265,7 +265,7 @@ public record ScavRaidTimeConfigSettings public record ScavRaidTimeLocationSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 77a188c2..dc5dd321 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs @@ -29,7 +29,7 @@ public record LostOnDeathConfig : BaseConfig public record LostEquipment { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ArmBand")] public bool ArmBand { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs index 9d622de2..5935226e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs @@ -17,7 +17,7 @@ public record PlayerScavConfig : BaseConfig public record KarmaLevel { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("botTypeForLoot")] public required string BotTypeForLoot { get; set; } @@ -38,7 +38,7 @@ public record KarmaLevel public record Modifiers { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("equipment")] public required Dictionary Equipment { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs index efc261ce..ee6e385b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs @@ -17,7 +17,7 @@ public record PmcChatResponse : BaseConfig public record ResponseSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("responseChancePercent")] public double ResponseChancePercent { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs index 9e9d6c19..8e1ef3ca 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs @@ -151,6 +151,9 @@ public record PmcConfig : BaseConfig public record ForceArmbandSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -163,6 +166,9 @@ public record ForceArmbandSettings public record PmcLootSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("pocket")] public LootContainerSettings Pocket { get; set; } @@ -175,6 +181,9 @@ public record PmcLootSettings public record LootContainerSettings { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("totalRubByLevel")] public List TotalRubByLevel { get; set; } @@ -185,7 +194,7 @@ public record LootContainerSettings public record HostilitySettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Bot roles that are 100% an enemy @@ -221,7 +230,7 @@ public record HostilitySettings public record SlotLootSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 47354044..3ce35421 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs @@ -75,7 +75,7 @@ public record QuestConfig : BaseConfig public record RepeatableQuestTemplates { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Pmc repeatable quest template ids keyed by type of quest @@ -95,7 +95,7 @@ public record RepeatableQuestTemplates public record EventQuestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Name of the event quest @@ -132,7 +132,7 @@ public record EventQuestData public record RepeatableQuestConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Id for type of repeatable quest @@ -248,7 +248,7 @@ public record RepeatableQuestConfig public record RewardScaling { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Levels at which to increase to the next level of reward potential @@ -308,7 +308,7 @@ public record RewardScaling public record TraderWhitelist { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Trader Id @@ -350,7 +350,7 @@ public record TraderWhitelist public record RepeatableQuestTypesConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Defines exploration repeatable task generation parameters @@ -401,7 +401,7 @@ public record Exploration : BaseQuestConfig public record SpecificExits { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Chance that an operational task is generated with a specific extract @@ -493,7 +493,7 @@ public record Pickup : BaseQuestConfig public record PickupTypeWithMaxCount { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("itemType")] public string? ItemType { get; set; } @@ -625,7 +625,7 @@ public record EliminationConfig : BaseQuestConfig public record BaseQuestConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Possible skills that can be rewarded expirence points @@ -637,7 +637,7 @@ public record BaseQuestConfig public record BossInfo { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Is this target a boss diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs index d1d5858b..7033b4cf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs @@ -42,7 +42,7 @@ public record RagfairConfig : BaseConfig public record Sell { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Should a fee be deducted from player when listing an item for sale @@ -72,7 +72,7 @@ public record Sell public record Chance { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Base chance percent to sell an item @@ -102,7 +102,7 @@ public record Chance public record Dynamic { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Should a purchased dynamic offers items be flagged as found in raid @@ -241,7 +241,7 @@ public record Dynamic public record PriceRanges { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("default")] public required MinMax Default { get; set; } @@ -256,7 +256,7 @@ public record PriceRanges public record BarterDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Percentage change an offer is listed as a barter @@ -304,7 +304,7 @@ public record BarterDetails public record PackDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Percentage change an offer is listed as a pack @@ -334,7 +334,7 @@ public record PackDetails public record OfferAdjustment { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Shuld offer price be adjusted when below handbook price @@ -364,7 +364,7 @@ public record OfferAdjustment public record Condition { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Percentage change durability is altered @@ -385,7 +385,7 @@ public record Condition public record RagfairBlacklist { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Damaged ammo packs @@ -439,7 +439,7 @@ public record RagfairBlacklist public record ArmorPlateBlacklistSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Max level of plates an armor can have without being removed @@ -457,7 +457,7 @@ public record ArmorPlateBlacklistSettings public record UnreasonableModPrices { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Enable a system that adjusts very high ragfair prices to be below a max multiple of items the handbook values @@ -484,7 +484,7 @@ public record UnreasonableModPrices public record ArmorSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// % chance / 100 that armor plates will be removed from an offer before listing @@ -502,7 +502,7 @@ public record ArmorSettings public record TieredFlea { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enabled")] public bool Enabled { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs index 414af769..9d222e29 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs @@ -39,7 +39,7 @@ public record RepairConfig : BaseConfig public record IntellectGainValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("weapon")] public double Weapon { get; set; } @@ -51,7 +51,7 @@ public record IntellectGainValues public record MaxIntellectGainValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("kit")] public double Kit { get; set; } @@ -63,7 +63,7 @@ public record MaxIntellectGainValues public record WeaponTreatmentRepairValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// The chance to gain more weapon maintenance skill @@ -93,7 +93,7 @@ public record WeaponTreatmentRepairValues public record RepairKit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("armor")] public required BonusSettings Armor { get; set; } @@ -111,7 +111,7 @@ public record RepairKit public record BonusSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("rarityWeight")] public required Dictionary RarityWeight { get; set; } @@ -129,7 +129,7 @@ public record BonusSettings public record BonusValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("valuesMinMax")] public required MinMax ValuesMinMax { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs index 3a08d9f7..a9592ee8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs @@ -36,7 +36,7 @@ public record ScavCaseConfig : BaseConfig public record MoneyRewards { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("moneyRewardChancePercent")] public int MoneyRewardChancePercent { get; set; } @@ -57,7 +57,7 @@ public record MoneyRewards public record MoneyLevels { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("common")] public required MinMax Common { get; set; } @@ -72,7 +72,7 @@ public record MoneyLevels public record AmmoRewards { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ammoRewardChancePercent")] public int AmmoRewardChancePercent { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs index 5ecf5b92..29efffff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs @@ -66,7 +66,7 @@ public record SeasonalEventConfig : BaseConfig public record SeasonalEvent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -106,7 +106,7 @@ public record SeasonalEvent public record SeasonalEventSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enableSummoning")] public bool? EnableSummoning { get; set; } @@ -151,7 +151,7 @@ public record SeasonalEventSettings public record ZombieSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("enabled")] public bool? Enabled { get; set; } @@ -169,7 +169,7 @@ public record ZombieSettings public record GifterSetting { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("map")] public string? Map { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs index 40692ef2..305a95ef 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs @@ -37,7 +37,7 @@ public record TraderConfig : BaseConfig public record UpdateTime { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_name")] public string Name { get; set; } = string.Empty; @@ -55,7 +55,7 @@ public record UpdateTime public record FenceConfig { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("discountOptions")] public required DiscountOptions DiscountOptions { get; set; } @@ -160,7 +160,7 @@ public record FenceConfig public record ItemDurabilityCurrentMax { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("current")] public required MinMax Current { get; set; } @@ -187,7 +187,7 @@ public record CoopExtractReward : LootRequest public record DiscountOptions { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("assortSize")] public int AssortSize { get; set; } @@ -211,7 +211,7 @@ public record DiscountOptions public record ModdedTraders { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 9b9b5acb..ce719e0a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs @@ -26,7 +26,7 @@ public record WeatherConfig : BaseConfig public record SeasonDateTimes { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("seasonType")] public Season? SeasonType { get; set; } @@ -54,7 +54,7 @@ public record SeasonDateTimes public record WeatherValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("seasonValues")] public Dictionary? SeasonValues { get; set; } @@ -75,7 +75,7 @@ public record WeatherValues public record SeasonalValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("clouds")] public WeatherSettings? Clouds { get; set; } @@ -108,7 +108,7 @@ public record SeasonalValues public record TempDayNight { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("day")] public MinMax? Day { get; set; } @@ -120,7 +120,7 @@ public record TempDayNight public record WeatherSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("values")] public List? Values { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs index 8303141d..72b41f81 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Dialog; public record SendMessageDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// Player id @@ -93,7 +93,7 @@ public record SendMessageDetails public record ProfileChangeEvent { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("_id")] public MongoId? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs index b4310cb1..c3bdb0c5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Fence; public record CreateFenceAssortsResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("sptItems")] public List>? SptItems { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs index c9e26446..d64cf178 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Fence; public record FenceAssortGenerationValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("normal")] public GenerationAssortValues? Normal { get; set; } @@ -17,7 +17,7 @@ public record FenceAssortGenerationValues public record GenerationAssortValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("item")] public int? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs index d0d26e23..6b0a800c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Helper; public record WeightedRandomResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required T Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs index c15b416b..ee470614 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record CircleCraftDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("time")] public required long Time { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs index 3d88eef2..96dd0a9d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record Hideout { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("areas")] public List Areas { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs index 236cd46a..5086f66c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record ScavCaseRewardCountsAndPrices { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Common")] public RewardCountAndPriceDetails? Common { get; set; } @@ -20,7 +20,7 @@ public record ScavCaseRewardCountsAndPrices public record RewardCountAndPriceDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("minCount")] public double? MinCount { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs index 21771527..26422fd1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory; public class FindSlotResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public FindSlotResult(bool success) { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs index 46b59120..77e31a1b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory; public record ItemSize { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("width")] public required int Width { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs index 672915ac..0f30c51f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory; public record OwnerInventoryItems { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 75cf6f56..50156fac 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2CompatibleVersion : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required string SptVersion { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs index 4a051a69..0f8d57ff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2LoginResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required bool Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs index 17e6ac85..04c07582 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ModsResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required Dictionary Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs index 69f7d40f..7c0f7e3e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2PasswordChangeResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required bool Response { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs index 0d96d8e3..8ed1916f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2PingResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required string Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs index b8e27290..45cdc20f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ProfileResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public SptProfile Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs index 8c1864bd..e6419612 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ProfilesResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required List Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs index cfa8107b..ad9f82f2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2RegisterResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required bool Response { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs index 1a58bdbe..a826277a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2RemoveResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required bool Response { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs index c7fbfb34..faff239d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2TypesResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required Dictionary Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs index 2b9ec033..93e74d05 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public record LauncherV2VersionResponse : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public required LauncherV2CompatibleVersion Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs index 63e45614..80f9dd94 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Location; public record RaidChanges { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// What percentage of dynamic loot should the map contain @@ -53,7 +53,7 @@ public record RaidChanges public record ExtractChange { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Name")] public string? Name { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs index ec3f9cb2..602637d5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Logging; public record ClientLogRequest : IRequestData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Source")] public string? Source { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs index d2ce8f08..769b19a0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Mod; public class ModOrder { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("order")] public List Order { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs index f775d6e7..f48ae90d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs @@ -41,7 +41,7 @@ public record NewItemFromCloneDetails : NewItemDetailsBase public record NewItemDetailsBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("fleaPriceRoubles")] public double? FleaPriceRoubles { get; set; } @@ -59,7 +59,7 @@ public record NewItemDetailsBase public record LocaleDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("name")] public string? Name { get; set; } @@ -74,7 +74,7 @@ public record LocaleDetails public record CreateItemResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public CreateItemResult() { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs index 2e39e0ff..d0e4a371 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Mod; public class SptMod { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("directory")] public required string Directory { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs index d2650b3c..1856d4fe 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Presets; public record PresetCacheDetails { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // Preset Ids related to the tpl public HashSet PresetIds { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs index 652536c3..6bb2c860 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Quests; public record GetRepeatableByIdResult { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("quest")] public RepeatableQuest? Quest { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs index bb56eac3..466765ce 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs @@ -1,4 +1,5 @@ -using SPTarkov.Server.Core.Models.Common; +using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Models.Enums; @@ -6,6 +7,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record CreateFleaOfferDetails { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + /// /// Owner of the offer /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs index de5f32f8..a5f643d2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record RagfairServerPrices { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("staticPrices")] public Dictionary? StaticPrices { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs index aadd4581..080558f4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record TplWithFleaPrice { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("tpl")] public MongoId Tpl { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs index 682849e4..611a28be 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs @@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable; public record QuestRewardValues { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("skillPointReward")] public required double SkillPointReward { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs index 29f13f46..cd17a539 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable; public record QuestTypePool { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("types")] public required List Types { get; set; } @@ -18,7 +18,7 @@ public record QuestTypePool public record QuestPool { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Exploration")] public required ExplorationPool Exploration { get; set; } @@ -33,7 +33,7 @@ public record QuestPool public record ExplorationPool { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("locations")] public Dictionary>? Locations { get; set; } // TODO: check the type, originally - Partial> @@ -42,7 +42,7 @@ public record ExplorationPool public record EliminationPool { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("targets")] public Dictionary? Targets { get; set; } @@ -51,7 +51,7 @@ public record EliminationPool public record TargetLocation { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("locations")] public List? Locations { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs index 571df254..53472658 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record DatabaseTables { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public Bots.Bots Bots { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs index 5a419c1e..9f29a1e2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record LocaleBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// DO NOT USE THIS PROPERTY DIRECTLY, USE LOCALESERVICE INSTEAD diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs index fd4a01fa..d4ea59a0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record Locations { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; // sometimes we get the key or value given so save changing logic in each place // have it key both diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs index 38db5554..548f1c08 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record ServerBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("ip")] public required string Ip { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs index 2adf2cc5..1a96d6d9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record SettingsBase { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("config")] public Config Configuration { get; set; } @@ -15,7 +15,7 @@ public record SettingsBase public record Config { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AFKTimeoutSeconds")] public int AFKTimeoutSeconds { get; set; } @@ -105,7 +105,7 @@ public record Config public record AudioSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AudioGroupPresets")] public List AudioGroupPresets { get; set; } @@ -129,7 +129,7 @@ public record AudioSettings public record FramerateLimit { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("MaxFramerateGameLimit")] public int MaxFramerateGameLimit { get; set; } @@ -144,7 +144,7 @@ public record FramerateLimit public record MemoryManagementSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AggressiveGC")] public bool AggressiveGC { get; set; } @@ -168,7 +168,7 @@ public record MemoryManagementSettings public record ReleaseProfiler { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("Enabled")] public bool Enabled { get; set; } @@ -183,7 +183,7 @@ public record ReleaseProfiler public record NetworkStateView { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("LossThreshold")] public int LossThreshold { get; set; } @@ -195,7 +195,7 @@ public record NetworkStateView public record AudioGroupPreset { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AngleToAllowBinaural")] public double? AngleToAllowBinaural { get; set; } @@ -231,7 +231,7 @@ public record AudioGroupPreset public record EnvironmentSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("AutumnLateSettings")] public SeasonEnvironmentSettings AutumnLateSettings { get; set; } @@ -261,7 +261,7 @@ public record EnvironmentSettings public record SeasonEnvironmentSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("RainSettings")] public List RainSettings { get; set; } @@ -276,7 +276,7 @@ public record SeasonEnvironmentSettings public record SurfaceMultiplier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string SurfaceType { get; set; } @@ -286,7 +286,7 @@ public record SurfaceMultiplier public record WindMultiplier { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("VolumeMult")] public double VolumeMult { get; set; } @@ -298,7 +298,7 @@ public record WindMultiplier public record RainSetting { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("IndoorVolumeMult")] public int IndoorVolumeMult { get; set; } @@ -313,7 +313,7 @@ public record RainSetting public record HeadphoneSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public double FadeDuration { get; set; } @@ -325,7 +325,7 @@ public record HeadphoneSettings public record MetaXRAudioPluginSettings { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public bool? EnabledPluginErrorChecker { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs index b65e542e..119519ea 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record InsuranceEquipmentPkg { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("sessionID")] public MongoId SessionId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs index 649e6b61..d2c2eb99 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record LootItem { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("id")] public MongoId? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs index ca707507..f69d76be 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs @@ -7,7 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record LootRequest { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; /// /// 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 ddb34a5d..b454312b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs @@ -6,6 +6,9 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public class ProfileActivityData { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + public long ClientStartedTimestamp { get; set; } public long LastActive { get; set; } public ProfileActivityRaidData? RaidData { get; set; } = null; @@ -14,6 +17,9 @@ public class ProfileActivityData public class ProfileActivityRaidData { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + public GetRaidConfigurationRequestData? RaidConfiguration { get; set; } = null; public RaidChanges? RaidAdjustments { get; set; } = null; public LocationTransit? LocationTransit { get; set; } = null; @@ -21,6 +27,9 @@ public class ProfileActivityRaidData public record ProfileActiveClientMods { + [JsonExtensionData] + public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("modName")] public required string Name { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs index 5e0f1587..59780e4f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record TraderServiceModel { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("serviceType")] [JsonConverter(typeof(JsonStringEnumConverter))] @@ -28,7 +28,7 @@ public record TraderServiceModel public record TraderServiceRequirementsModel { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("completedQuests")] public List? CompletedQuests { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs index d9f6af5e..207e8357 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs @@ -8,7 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Templates; public record Templates { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("character")] public List Character { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs index d32c3444..3b933447 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs @@ -6,7 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Weather; public record GetLocalWeatherResponseData { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("season")] public Season? Season { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs index 3cdfeb62..f0a00ebd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs @@ -9,7 +9,7 @@ namespace SPTarkov.Server.Core.Models; public record Prapor : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Prapor"; public MongoId Id { get; } = Traders.PRAPOR; @@ -19,7 +19,7 @@ public record Prapor : ITrader public record Therapist : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Therapist"; public MongoId Id { get; } = Traders.THERAPIST; @@ -29,7 +29,7 @@ public record Therapist : ITrader public record Fence : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Fence"; public MongoId Id { get; } = Traders.FENCE; @@ -39,7 +39,7 @@ public record Fence : ITrader public record Skier : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Skier"; public MongoId Id { get; } = Traders.SKIER; @@ -49,7 +49,7 @@ public record Skier : ITrader public record Peacekeeper : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Peacekeeper"; public MongoId Id { get; } = Traders.PEACEKEEPER; @@ -59,7 +59,7 @@ public record Peacekeeper : ITrader public record Mechanic : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Mechanic"; public MongoId Id { get; } = Traders.MECHANIC; @@ -69,7 +69,7 @@ public record Mechanic : ITrader public record Ragman : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Ragman"; public MongoId Id { get; } = Traders.RAGMAN; @@ -79,7 +79,7 @@ public record Ragman : ITrader public record Jaeger : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Jaeger"; public MongoId Id { get; } = Traders.JAEGER; @@ -89,7 +89,7 @@ public record Jaeger : ITrader public record LighthouseKeeper : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "LighthouseKeeper"; public MongoId Id { get; } = Traders.LIGHTHOUSEKEEPER; @@ -99,7 +99,7 @@ public record LighthouseKeeper : ITrader public record Btr : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Btr"; public MongoId Id { get; } = Traders.BTR; @@ -109,7 +109,7 @@ public record Btr : ITrader public record Ref : ITrader { [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } + public Dictionary ExtensionData { get; init; } = []; public string Name { get; } = "Ref"; public MongoId Id { get; } = Traders.REF; diff --git a/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs b/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs index c3dfe55e..1f55f9f8 100644 --- a/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs +++ b/Tools/JsonExtensionDataGenerator/JsonExtensionDataGeneratorLauncher.cs @@ -18,7 +18,7 @@ public class JsonExtensionDataGeneratorLauncher private static readonly Regex _extensionCleanup = new(",.*"); private const string Insertion = - " [JsonExtensionData]\r\n public Dictionary? ExtensionData { get; set; }\r\n\r\n"; + " [JsonExtensionData]\r\n public Dictionary ExtensionData { get; init; } = [];\r\n\r\n"; private const string Using = "using System.Text.Json.Serialization;\r\n"; @@ -63,9 +63,16 @@ public class JsonExtensionDataGeneratorLauncher if (TryGetExtensions(content, startIndex, endIndex, out var extensions)) { - if (extensions.Any(e => !e.StartsWith("I"))) + if (InheritsFromBaseInteractionRequestData(extensions)) { - Console.WriteLine($"Class index {i} for {fileName} extends a parent class, skipping..."); + Console.WriteLine( + $"Class index {i} for {fileName} inherits from BaseInteractionRequestData hierarchy, skipping..." + ); + continue; + } + else + { + Console.WriteLine($"Class index {i} for {fileName} extends a different parent class, skipping..."); continue; } } @@ -118,6 +125,20 @@ public class JsonExtensionDataGeneratorLauncher return false; } + private static bool InheritsFromBaseInteractionRequestData(IEnumerable extensions) + { + var baseClasses = extensions.Where(e => !e.StartsWith("I")).ToList(); + + if (baseClasses.Contains("BaseInteractionRequestData")) + { + return true; + } + + var knownDescendants = new[] { "InventoryBaseActionRequestData" }; + + return baseClasses.Any(baseClass => knownDescendants.Contains(baseClass)); + } + private static int FindEndClassIndex(string content, int currentIndex) { // we do +3 cause that's the length of what we are searching for