From 3ca974de8a22818996fbcf2103a926c5b6baff27 Mon Sep 17 00:00:00 2001 From: CWX Date: Wed, 8 Jan 2025 13:16:38 +0000 Subject: [PATCH 1/4] initial change of nullables and few more generators --- .../{WeaponGen => }/BotInventoryGenerator.cs | 2 +- .../Implementations/BarrelInvetoryMagGen.cs | 24 ++ .../ExternalInventoryMagGen.cs | 31 +++ .../InternalMagazineInventoryMagGen.cs | 24 ++ .../Implementations/UbglExternalMagGen.cs | 24 ++ .../{Implementations => }/InventoryMagGen.cs | 2 +- Core/Models/Eft/Game/CheckVersionResponse.cs | 4 +- Core/Models/Eft/Game/CurrentGroupResponse.cs | 34 +-- Core/Models/Eft/Game/GameConfigResponse.cs | 42 ++-- .../Eft/Game/GameEmptyCrcRequestData.cs | 2 +- Core/Models/Eft/Game/GameKeepAliveResponse.cs | 4 +- .../Models/Eft/Game/GameLogoutResponseData.cs | 2 +- Core/Models/Eft/Game/GameModeResponse.cs | 4 +- Core/Models/Eft/Game/GameStartResponse.cs | 4 +- Core/Models/Eft/Game/GetItemPricesResponse.cs | 6 +- Core/Models/Eft/Game/GetRaidTimeRequest.cs | 4 +- Core/Models/Eft/Game/GetRaidTimeResponse.cs | 8 +- .../Eft/Game/SendSurveyOpinionRequest.cs | 16 +- Core/Models/Eft/Game/ServerDetails.cs | 4 +- Core/Models/Eft/Game/SurveyResponseData.cs | 46 ++-- .../Eft/Game/VersionValidateRequestData.cs | 14 +- .../Eft/Health/HealthTreatmentRequestData.cs | 58 ++--- .../Eft/Health/OffraidEatRequestData.cs | 8 +- .../Eft/Health/OffraidHealRequestData.cs | 10 +- Core/Models/Eft/Health/WorkoutData.cs | 80 +++--- .../Eft/Hideout/HandleQTEEventRequestData.cs | 8 +- ...rcleOfCultistProductionStartRequestData.cs | 4 +- ...outContinuousProductionStartRequestData.cs | 6 +- .../Eft/Hideout/HideoutCustomisation.cs | 34 +-- .../HideoutCustomizationApplyRequestData.cs | 6 +- .../HideoutDeleteProductionRequestData.cs | 6 +- .../Hideout/HideoutImproveAreaRequestData.cs | 10 +- .../Hideout/HideoutPutItemInRequestData.cs | 12 +- .../HideoutScavCaseStartRequestData.cs | 18 +- .../Models/Eft/Hideout/HideoutSettingsBase.cs | 10 +- ...HideoutSingleProductionStartRequestData.cs | 14 +- .../Hideout/HideoutTakeItemOutRequestData.cs | 8 +- .../HideoutTakeProductionRequestData.cs | 6 +- .../Hideout/HideoutToggleAreaRequestData.cs | 8 +- .../HideoutUpgradeCompleteRequestData.cs | 6 +- .../Eft/Hideout/HideoutUpgradeRequestData.cs | 8 +- .../Eft/Hideout/RecordShootingRangePoints.cs | 4 +- .../Eft/HttpResponse/GetBodyResponseData.cs | 6 +- .../Eft/HttpResponse/NullResponseData.cs | 6 +- .../Eft/InRaid/RegisterPlayerRequestData.cs | 6 +- .../Insurance/GetInsuranceCostRequestData.cs | 4 +- .../Models/Eft/Insurance/InsureRequestData.cs | 6 +- .../InventoryBaseActionRequestData.cs | 22 +- .../Eft/Inventory/InventoryBindRequestData.cs | 6 +- .../InventoryCreateMarkerRequestData.cs | 14 +- .../InventoryDeleteMarkerRequestData.cs | 8 +- .../InventoryEditMarkerRequestData.cs | 10 +- .../Inventory/InventoryExamineRequestData.cs | 6 +- .../Eft/Inventory/InventoryFoldRequestData.cs | 6 +- .../Inventory/InventoryMergeRequestData.cs | 6 +- .../Eft/Inventory/InventoryMoveRequestData.cs | 6 +- .../InventoryReadEncyclopediaRequestData.cs | 4 +- .../Inventory/InventoryRemoveRequestData.cs | 4 +- .../Eft/Inventory/InventorySortRequestData.cs | 4 +- .../Inventory/InventorySplitRequestData.cs | 10 +- .../Eft/Inventory/InventorySwapRequestData.cs | 14 +- .../Eft/Inventory/InventoryTagRequestData.cs | 8 +- .../Inventory/InventoryToggleRequestData.cs | 6 +- .../Inventory/InventoryTransferRequestData.cs | 8 +- .../OpenRandomLootContainerRequestData.cs | 6 +- .../Eft/Inventory/PinOrLockItemRequest.cs | 6 +- .../Eft/Inventory/RedeemProfileRequestData.cs | 8 +- Core/Models/Eft/Inventory/SetFavoriteItems.cs | 6 +- .../ItemEvent/EmptyItemEventRouterResponse.cs | 2 +- .../Eft/ItemEvent/ItemEventRouterBase.cs | 94 +++---- .../Eft/ItemEvent/ItemEventRouterRequest.cs | 44 ++-- Core/Models/Eft/Launcher/ChangeRequestData.cs | 2 +- .../Eft/Launcher/GetMiniProfileRequestData.cs | 4 +- Core/Models/Eft/Launcher/LoginRequestData.cs | 4 +- Core/Models/Eft/Launcher/RegisterData.cs | 2 +- .../Eft/Location/GetAirdropLootRequest.cs | 2 +- .../Eft/Location/GetAirdropLootResponse.cs | 4 +- .../Eft/Match/EndLocalRaidRequestData.cs | 52 ++-- .../Match/GetRaidConfigurationRequestData.cs | 4 +- Core/Models/Eft/Match/GroupCharacter.cs | 44 ++-- .../Eft/Match/MatchGroupCurrentResponse.cs | 2 +- .../Eft/Match/MatchGroupInviteSendRequest.cs | 4 +- .../Match/MatchGroupPlayerRemoveRequest.cs | 2 +- .../Eft/Match/MatchGroupStartGameRequest.cs | 4 +- .../Eft/Match/MatchGroupStatusRequest.cs | 12 +- .../Eft/Match/MatchGroupStatusResponse.cs | 4 +- .../Eft/Match/MatchGroupTransferRequest.cs | 2 +- .../Models/Eft/Match/ProfileStatusResponse.cs | 4 +- .../Models/Eft/Match/PutMetricsRequestData.cs | 98 ++++---- Core/Models/Eft/Match/RaidSettings.cs | 96 +++---- Core/Models/Eft/Match/RequestIdRequest.cs | 2 +- Core/Models/Eft/Match/Server.cs | 6 +- Core/Models/Eft/Match/SessionStatus.cs | 12 +- .../Eft/Match/StartLocalRaidRequestData.cs | 28 +-- .../Eft/Match/StartLocalRaidResponseData.cs | 38 +-- Core/Models/Eft/Notes/NoteActionData.cs | 10 +- Core/Models/Eft/Notifier/Notifier.cs | 10 +- .../Eft/Notifier/SelectProfileResponse.cs | 2 +- .../PlayerIncrementSkillLevelRequestData.cs | 48 ++-- .../PresetBuildActionRequestData.cs | 10 +- .../Eft/PresetBuild/RemoveBuildRequestData.cs | 2 +- .../Eft/Prestige/GetPrestigeResponse.cs | 4 +- .../Profile/CompletedAchievementsResponse.cs | 2 +- Core/Models/Eft/Profile/ConnectResponse.cs | 16 +- .../Eft/Profile/CreateProfileResponse.cs | 4 +- .../Eft/Profile/GetAchievementsResponse.cs | 2 +- .../Eft/Profile/GetOtherProfileRequest.cs | 6 +- .../Eft/Profile/GetOtherProfileResponse.cs | 96 +++---- .../Eft/Profile/GetProfileSettingsRequest.cs | 14 +- .../Profile/GetProfileStatusResponseData.cs | 56 ++--- .../ProfileChangeNicknameRequestData.cs | 2 +- .../Profile/ProfileChangeVoiceRequestData.cs | 2 +- .../Eft/Profile/ProfileCreateRequestData.cs | 16 +- .../Eft/Profile/SearchFriendRequestData.cs | 2 +- .../Eft/Profile/SearchFriendResponse.cs | 32 +-- Core/Models/Eft/Profile/SptProfile.cs | 238 +++++++++--------- Core/Models/Eft/Profile/UserDialogInfo.cs | 28 +-- .../Profile/ValidateNicknameRequestData.cs | 2 +- 118 files changed, 1050 insertions(+), 947 deletions(-) rename Core/Generators/{WeaponGen => }/BotInventoryGenerator.cs (99%) create mode 100644 Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs create mode 100644 Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs create mode 100644 Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs create mode 100644 Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs rename Core/Generators/WeaponGen/{Implementations => }/InventoryMagGen.cs (93%) diff --git a/Core/Generators/WeaponGen/BotInventoryGenerator.cs b/Core/Generators/BotInventoryGenerator.cs similarity index 99% rename from Core/Generators/WeaponGen/BotInventoryGenerator.cs rename to Core/Generators/BotInventoryGenerator.cs index 7884a6de..9baa42f8 100644 --- a/Core/Generators/WeaponGen/BotInventoryGenerator.cs +++ b/Core/Generators/BotInventoryGenerator.cs @@ -4,7 +4,7 @@ using Core.Models.Spt.Bots; using Core.Models.Spt.Config; using Equipment = Core.Models.Eft.Common.Tables.Equipment; -namespace Core.Generators.WeaponGen; +namespace Core.Generators; public class BotInventoryGenerator { diff --git a/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs b/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs new file mode 100644 index 00000000..d5ea7d62 --- /dev/null +++ b/Core/Generators/WeaponGen/Implementations/BarrelInvetoryMagGen.cs @@ -0,0 +1,24 @@ +namespace Core.Generators.WeaponGen.Implementations; + +public class BarrelInvetoryMagGen : InventoryMagGen +{ + public BarrelInvetoryMagGen() + { + + } + + public int GetPriority() + { + return 50; + } + + public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } + + public void Process(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs new file mode 100644 index 00000000..af3b6e6d --- /dev/null +++ b/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs @@ -0,0 +1,31 @@ +using Core.Models.Eft.Common.Tables; + +namespace Core.Generators.WeaponGen.Implementations; + +public class ExternalInventoryMagGen : InventoryMagGen +{ + public ExternalInventoryMagGen() + { + + } + + public int GetPriority() + { + return 99; + } + + public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } + + public void Process(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } + + public TemplateItem? GetRandomExternalMagazineForInternalMagazineGun(string weaponTpl, List magazineBlacklist) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs b/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs new file mode 100644 index 00000000..d1709cff --- /dev/null +++ b/Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs @@ -0,0 +1,24 @@ +namespace Core.Generators.WeaponGen.Implementations; + +public class InternalMagazineInventoryMagGen : InventoryMagGen +{ + public InternalMagazineInventoryMagGen() + { + + } + + public int GetPriority() + { + return 0; + } + + public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } + + public void Process(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs b/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs new file mode 100644 index 00000000..5efefae5 --- /dev/null +++ b/Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs @@ -0,0 +1,24 @@ +namespace Core.Generators.WeaponGen.Implementations; + +public class UbglExternalMagGen : InventoryMagGen +{ + public UbglExternalMagGen() + { + + } + + public int GetPriority() + { + return 1; + } + + public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } + + public void Process(InventoryMagGen inventoryMagGen) + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/Core/Generators/WeaponGen/Implementations/InventoryMagGen.cs b/Core/Generators/WeaponGen/InventoryMagGen.cs similarity index 93% rename from Core/Generators/WeaponGen/Implementations/InventoryMagGen.cs rename to Core/Generators/WeaponGen/InventoryMagGen.cs index 5866e62b..3629f88f 100644 --- a/Core/Generators/WeaponGen/Implementations/InventoryMagGen.cs +++ b/Core/Generators/WeaponGen/InventoryMagGen.cs @@ -1,6 +1,6 @@ using Core.Models.Eft.Common.Tables; -namespace Core.Generators.WeaponGen.Implementations; +namespace Core.Generators.WeaponGen; public class InventoryMagGen { diff --git a/Core/Models/Eft/Game/CheckVersionResponse.cs b/Core/Models/Eft/Game/CheckVersionResponse.cs index bcf70dfa..6f41bd2c 100644 --- a/Core/Models/Eft/Game/CheckVersionResponse.cs +++ b/Core/Models/Eft/Game/CheckVersionResponse.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game; public class CheckVersionResponse { [JsonPropertyName("isvalid")] - public bool IsValid { get; set; } + public bool? IsValid { get; set; } [JsonPropertyName("latestVersion")] - public string LatestVersion { get; set; } + public string? LatestVersion { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/CurrentGroupResponse.cs b/Core/Models/Eft/Game/CurrentGroupResponse.cs index eebfd67c..f1d26a0d 100644 --- a/Core/Models/Eft/Game/CurrentGroupResponse.cs +++ b/Core/Models/Eft/Game/CurrentGroupResponse.cs @@ -6,38 +6,38 @@ namespace Core.Models.Eft.Game; public class CurrentGroupResponse { [JsonPropertyName("squad")] - public List Squad { get; set; } + public List? Squad { get; set; } } public class CurrentGroupSquadMember { [JsonPropertyName("_id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("aid")] - public string Aid { get; set; } - + public string? Aid { get; set; } + [JsonPropertyName("info")] - public CurrentGroupMemberInfo Info { get; set; } - + public CurrentGroupMemberInfo? Info { get; set; } + [JsonPropertyName("isLeader")] - public bool IsLeader { get; set; } - + public bool? IsLeader { get; set; } + [JsonPropertyName("isReady")] - public bool IsReady { get; set; } + public bool? IsReady { get; set; } } public class CurrentGroupMemberInfo { [JsonPropertyName("Nickname")] - public string Nickname { get; set; } - + public string? Nickname { get; set; } + [JsonPropertyName("Side")] - public string Side { get; set; } - + public string? Side { get; set; } + [JsonPropertyName("Level")] - public string Level { get; set; } - + public string? Level { get; set; } + [JsonPropertyName("MemberCategory")] - public MemberCategory MemberCategory { get; set; } + public MemberCategory? MemberCategory { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GameConfigResponse.cs b/Core/Models/Eft/Game/GameConfigResponse.cs index fff5fadb..d70b8b56 100644 --- a/Core/Models/Eft/Game/GameConfigResponse.cs +++ b/Core/Models/Eft/Game/GameConfigResponse.cs @@ -5,72 +5,72 @@ namespace Core.Models.Eft.Game; public class GameConfigResponse { [JsonPropertyName("aid")] - public int Aid { get; set; } + public int? Aid { get; set; } [JsonPropertyName("lang")] - public string Language { get; set; } + public string? Language { get; set; } [JsonPropertyName("languages")] - public Dictionary Languages { get; set; } + public Dictionary? Languages { get; set; } [JsonPropertyName("ndaFree")] - public bool IsNdaFree { get; set; } + public bool? IsNdaFree { get; set; } [JsonPropertyName("taxonomy")] - public int Taxonomy { get; set; } + public int? Taxonomy { get; set; } [JsonPropertyName("activeProfileId")] - public string ActiveProfileId { get; set; } + public string? ActiveProfileId { get; set; } [JsonPropertyName("backend")] - public Backend Backend { get; set; } + public Backend? Backend { get; set; } [JsonPropertyName("useProtobuf")] - public bool UseProtobuf { get; set; } + public bool? UseProtobuf { get; set; } [JsonPropertyName("utc_time")] - public long UtcTime { get; set; } + public long? UtcTime { get; set; } /** Total in game time */ [JsonPropertyName("totalInGame")] - public int TotalInGame { get; set; } + public int? TotalInGame { get; set; } [JsonPropertyName("reportAvailable")] - public bool IsReportAvailable { get; set; } + public bool? IsReportAvailable { get; set; } [JsonPropertyName("twitchEventMember")] - public bool IsTwitchEventMember { get; set; } + public bool? IsTwitchEventMember { get; set; } [JsonPropertyName("sessionMode")] - public string SessionMode { get; set; } + public string? SessionMode { get; set; } [JsonPropertyName("purchasedGames")] - public PurchasedGames PurchasedGames { get; set; } + public PurchasedGames? PurchasedGames { get; set; } } public class PurchasedGames { [JsonPropertyName("eft")] - public bool IsEftPurchased { get; set; } + public bool? IsEftPurchased { get; set; } [JsonPropertyName("arena")] - public bool IsArenaPurchased { get; set; } + public bool? IsArenaPurchased { get; set; } } public class Backend { [JsonPropertyName("Lobby")] - public string Lobby { get; set; } + public string? Lobby { get; set; } [JsonPropertyName("Trading")] - public string Trading { get; set; } + public string? Trading { get; set; } [JsonPropertyName("Messaging")] - public string Messaging { get; set; } + public string? Messaging { get; set; } [JsonPropertyName("Main")] - public string Main { get; set; } + public string? Main { get; set; } [JsonPropertyName("RagFair")] - public string RagFair { get; set; } + public string? RagFair { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs b/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs index d06653b2..0b16bdcd 100644 --- a/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs +++ b/Core/Models/Eft/Game/GameEmptyCrcRequestData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Game; public class GameEmptyCrcRequestData { [JsonPropertyName("crc")] - public int Crc { get; set; } + public int? Crc { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GameKeepAliveResponse.cs b/Core/Models/Eft/Game/GameKeepAliveResponse.cs index 23b44449..7020fb68 100644 --- a/Core/Models/Eft/Game/GameKeepAliveResponse.cs +++ b/Core/Models/Eft/Game/GameKeepAliveResponse.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game; public class GameKeepAliveResponse { [JsonPropertyName("msg")] - public string Message { get; set; } + public string? Message { get; set; } [JsonPropertyName("utc_time")] - public double UtcTime { get; set; } + public double? UtcTime { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GameLogoutResponseData.cs b/Core/Models/Eft/Game/GameLogoutResponseData.cs index 74772b66..52e6b891 100644 --- a/Core/Models/Eft/Game/GameLogoutResponseData.cs +++ b/Core/Models/Eft/Game/GameLogoutResponseData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Game; public class GameLogoutResponseData { [JsonPropertyName("status")] - public string Status { get; set; } + public string? Status { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GameModeResponse.cs b/Core/Models/Eft/Game/GameModeResponse.cs index 298e8134..281913f9 100644 --- a/Core/Models/Eft/Game/GameModeResponse.cs +++ b/Core/Models/Eft/Game/GameModeResponse.cs @@ -11,8 +11,8 @@ public enum SessionMode public class GameModeResponse { [JsonPropertyName("gameMode")] - public SessionMode GameMode { get; set; } + public SessionMode? GameMode { get; set; } [JsonPropertyName("backendUrl")] - public string BackendUrl { get; set; } + public string? BackendUrl { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GameStartResponse.cs b/Core/Models/Eft/Game/GameStartResponse.cs index c5718bcd..c3b10c11 100644 --- a/Core/Models/Eft/Game/GameStartResponse.cs +++ b/Core/Models/Eft/Game/GameStartResponse.cs @@ -2,8 +2,8 @@ namespace Core.Models.Eft.Game; -public class GameStartResponse +public class GameStartResponse { [JsonPropertyName("utc_time")] - public double UtcTime { get; set; } + public double? UtcTime { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GetItemPricesResponse.cs b/Core/Models/Eft/Game/GetItemPricesResponse.cs index 00744a82..3dcf90d6 100644 --- a/Core/Models/Eft/Game/GetItemPricesResponse.cs +++ b/Core/Models/Eft/Game/GetItemPricesResponse.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Game; public class GetItemPricesResponse { [JsonPropertyName("supplyNextTime")] - public double SupplyNextTime { get; set; } + public double? SupplyNextTime { get; set; } [JsonPropertyName("prices")] - public Dictionary Prices { get; set; } + public Dictionary? Prices { get; set; } [JsonPropertyName("currencyCourses")] - public Dictionary CurrencyCourses { get; set; } + public Dictionary? CurrencyCourses { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GetRaidTimeRequest.cs b/Core/Models/Eft/Game/GetRaidTimeRequest.cs index 953a6285..20dfe67a 100644 --- a/Core/Models/Eft/Game/GetRaidTimeRequest.cs +++ b/Core/Models/Eft/Game/GetRaidTimeRequest.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game; public class GetRaidTimeRequest { [JsonPropertyName("Side")] - public string Side { get; set; } + public string? Side { get; set; } [JsonPropertyName("Location")] - public string Location { get; set; } + public string? Location { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/GetRaidTimeResponse.cs b/Core/Models/Eft/Game/GetRaidTimeResponse.cs index a1a99c68..2f06aba5 100644 --- a/Core/Models/Eft/Game/GetRaidTimeResponse.cs +++ b/Core/Models/Eft/Game/GetRaidTimeResponse.cs @@ -5,22 +5,22 @@ namespace Core.Models.Eft.Game; public class GetRaidTimeResponse { [JsonPropertyName("RaidTimeMinutes")] - public int RaidTimeMinutes { get; set; } + public int? RaidTimeMinutes { get; set; } [JsonPropertyName("NewSurviveTimeSeconds")] public int? NewSurviveTimeSeconds { get; set; } [JsonPropertyName("OriginalSurvivalTimeSeconds")] - public int OriginalSurvivalTimeSeconds { get; set; } + public int? OriginalSurvivalTimeSeconds { get; set; } [JsonPropertyName("ExitChanges")] - public List ExitChanges { get; set; } + public List? ExitChanges { get; set; } } public class ExtractChange { [JsonPropertyName("Name")] - public string Name { get; set; } + public string? Name { get; set; } [JsonPropertyName("MinTime")] public int? MinTime { get; set; } diff --git a/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs b/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs index 0d3337af..2684302a 100644 --- a/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs +++ b/Core/Models/Eft/Game/SendSurveyOpinionRequest.cs @@ -5,20 +5,20 @@ namespace Core.Models.Eft.Game; public class SendSurveyOpinionRequest { [JsonPropertyName("surveyId")] - public int SurveyId { get; set; } - + public int? SurveyId { get; set; } + [JsonPropertyName("answers")] - public List Answers { get; set; } + public List? Answers { get; set; } } public class SurveyOpinionAnswer { [JsonPropertyName("questionId")] - public int QuestionId { get; set; } - + public int? QuestionId { get; set; } + [JsonPropertyName("answerType")] - public string AnswerType { get; set; } - + public string? AnswerType { get; set; } + [JsonPropertyName("answers")] - public object Answers { get; set; } + public object? Answers { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/ServerDetails.cs b/Core/Models/Eft/Game/ServerDetails.cs index 2b0448b9..1f7f2bff 100644 --- a/Core/Models/Eft/Game/ServerDetails.cs +++ b/Core/Models/Eft/Game/ServerDetails.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Game; public class ServerDetails { [JsonPropertyName("ip")] - public string Ip { get; set; } + public string? Ip { get; set; } [JsonPropertyName("port")] - public int Port { get; set; } + public int? Port { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/SurveyResponseData.cs b/Core/Models/Eft/Game/SurveyResponseData.cs index 91dfae4b..439e49a5 100644 --- a/Core/Models/Eft/Game/SurveyResponseData.cs +++ b/Core/Models/Eft/Game/SurveyResponseData.cs @@ -5,86 +5,86 @@ namespace Core.Models.Eft.Game; public class SurveyResponseData { [JsonPropertyName("locale")] - public Dictionary> Locale { get; set; } + public Dictionary>? Locale { get; set; } [JsonPropertyName("survey")] - public Survey Survey { get; set; } + public Survey? Survey { get; set; } } public class Survey { [JsonPropertyName("id")] - public int Id { get; set; } + public int? Id { get; set; } [JsonPropertyName("welcomePageData")] - public WelcomePageData WelcomePageData { get; set; } + public WelcomePageData? WelcomePageData { get; set; } [JsonPropertyName("farewellPageData")] - public FarewellPageData FarewellPageData { get; set; } + public FarewellPageData? FarewellPageData { get; set; } [JsonPropertyName("pages")] - public List> Pages { get; set; } + public List>? Pages { get; set; } [JsonPropertyName("questions")] - public List Questions { get; set; } + public List? Questions { get; set; } [JsonPropertyName("isNew")] - public bool IsNew { get; set; } + public bool? IsNew { get; set; } } public class WelcomePageData { [JsonPropertyName("titleLocaleKey")] - public string TitleLocaleKey { get; set; } + public string? TitleLocaleKey { get; set; } [JsonPropertyName("timeLocaleKey")] - public string TimeLocaleKey { get; set; } + public string? TimeLocaleKey { get; set; } [JsonPropertyName("descriptionLocaleKey")] - public string DescriptionLocaleKey { get; set; } + public string? DescriptionLocaleKey { get; set; } } public class FarewellPageData { [JsonPropertyName("textLocaleKey")] - public string TextLocaleKey { get; set; } + public string? TextLocaleKey { get; set; } } public class SurveyQuestion { [JsonPropertyName("id")] - public int Id { get; set; } + public int? Id { get; set; } [JsonPropertyName("sortIndex")] - public int SortIndex { get; set; } + public int? SortIndex { get; set; } [JsonPropertyName("titleLocaleKey")] - public string TitleLocaleKey { get; set; } + public string? TitleLocaleKey { get; set; } [JsonPropertyName("hintLocaleKey")] - public string HintLocaleKey { get; set; } + public string? HintLocaleKey { get; set; } [JsonPropertyName("answerLimit")] - public int AnswerLimit { get; set; } + public int? AnswerLimit { get; set; } [JsonPropertyName("answerType")] - public string AnswerType { get; set; } + public string? AnswerType { get; set; } [JsonPropertyName("answers")] - public List Answers { get; set; } + public List? Answers { get; set; } } public class SurveyAnswer { [JsonPropertyName("id")] - public int Id { get; set; } + public int? Id { get; set; } [JsonPropertyName("questionId")] - public int QuestionId { get; set; } + public int? QuestionId { get; set; } [JsonPropertyName("sortIndex")] - public int SortIndex { get; set; } + public int? SortIndex { get; set; } [JsonPropertyName("localeKey")] - public string LocaleKey { get; set; } + public string? LocaleKey { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Game/VersionValidateRequestData.cs b/Core/Models/Eft/Game/VersionValidateRequestData.cs index 8470f201..81aba684 100644 --- a/Core/Models/Eft/Game/VersionValidateRequestData.cs +++ b/Core/Models/Eft/Game/VersionValidateRequestData.cs @@ -5,26 +5,26 @@ namespace Core.Models.Eft.Game; public class VersionValidateRequestData { [JsonPropertyName("version")] - public Version Version { get; set; } + public Version? Version { get; set; } [JsonPropertyName("develop")] - public bool Develop { get; set; } + public bool? Develop { get; set; } } public class Version { [JsonPropertyName("major")] - public string Major { get; set; } + public string? Major { get; set; } [JsonPropertyName("minor")] - public string Minor { get; set; } + public string? Minor { get; set; } [JsonPropertyName("game")] - public string Game { get; set; } + public string? Game { get; set; } [JsonPropertyName("backend")] - public string Backend { get; set; } + public string? Backend { get; set; } [JsonPropertyName("taxonomy")] - public string Taxonomy { get; set; } + public string? Taxonomy { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Core/Models/Eft/Health/HealthTreatmentRequestData.cs index 6c2131a0..ad4e81d8 100644 --- a/Core/Models/Eft/Health/HealthTreatmentRequestData.cs +++ b/Core/Models/Eft/Health/HealthTreatmentRequestData.cs @@ -6,63 +6,63 @@ public class HealthTreatmentRequestData { [JsonPropertyName("Action")] public string Action { get; set; } = "RestoreHealth"; - + [JsonPropertyName("trader")] - public string Trader { get; set; } - + public string? Trader { get; set; } + [JsonPropertyName("items")] - public List Items { get; set; } - + public List? Items { get; set; } + [JsonPropertyName("difference")] - public Difference Difference { get; set; } - + public Difference? Difference { get; set; } + [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } public class ItemCost { /** Id of stack to take money from */ [JsonPropertyName("id")] - public string Id { get; set; } - + public string? Id { get; set; } + /** Amount of money to take off player for treatment */ [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } } public class Difference { [JsonPropertyName("BodyParts")] - public BodyParts BodyParts { get; set; } - + public BodyParts? BodyParts { get; set; } + [JsonPropertyName("Energy")] - public int Energy { get; set; } - + public int? Energy { get; set; } + [JsonPropertyName("Hydration")] - public int Hydration { get; set; } + public int? Hydration { get; set; } } public class BodyParts { [JsonPropertyName("Head")] - public BodyPart Head { get; set; } - + public BodyPart? Head { get; set; } + [JsonPropertyName("Chest")] - public BodyPart Chest { get; set; } - + public BodyPart? Chest { get; set; } + [JsonPropertyName("Stomach")] - public BodyPart Stomach { get; set; } - + public BodyPart? Stomach { get; set; } + [JsonPropertyName("LeftArm")] - public BodyPart LeftArm { get; set; } - + public BodyPart? LeftArm { get; set; } + [JsonPropertyName("RightArm")] - public BodyPart RightArm { get; set; } - + public BodyPart? RightArm { get; set; } + [JsonPropertyName("LeftLeg")] - public BodyPart LeftLeg { get; set; } - + public BodyPart? LeftLeg { get; set; } + [JsonPropertyName("RightLeg")] - public BodyPart RightLeg { get; set; } + public BodyPart? RightLeg { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Health/OffraidEatRequestData.cs b/Core/Models/Eft/Health/OffraidEatRequestData.cs index 0fb7dcc9..76f880dc 100644 --- a/Core/Models/Eft/Health/OffraidEatRequestData.cs +++ b/Core/Models/Eft/Health/OffraidEatRequestData.cs @@ -6,14 +6,14 @@ namespace Core.Models.Eft.Health; public class OffraidEatRequestData : BaseInteractionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Eat"; + public string? Action { get; set; } = "Eat"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } [JsonPropertyName("time")] - public int Time { get; set; } + public int? Time { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Health/OffraidHealRequestData.cs b/Core/Models/Eft/Health/OffraidHealRequestData.cs index 011926c9..ee600e00 100644 --- a/Core/Models/Eft/Health/OffraidHealRequestData.cs +++ b/Core/Models/Eft/Health/OffraidHealRequestData.cs @@ -4,11 +4,11 @@ namespace Core.Models.Eft.Health; public class OffraidHealRequestData : BaseInteractionRequestData { - public override string Action { get; set; } = "Heal"; - public string Item { get; set; } - public BodyPart Part { get; set; } - public int Count { get; set; } - public int Time { get; set; } + public override string? Action { get; set; } = "Heal"; + public string? Item { get; set; } + public BodyPart? Part { get; set; } + public int? Count { get; set; } + public int? Time { get; set; } } public enum BodyPart diff --git a/Core/Models/Eft/Health/WorkoutData.cs b/Core/Models/Eft/Health/WorkoutData.cs index 97b1d511..40936109 100644 --- a/Core/Models/Eft/Health/WorkoutData.cs +++ b/Core/Models/Eft/Health/WorkoutData.cs @@ -5,86 +5,86 @@ using System.Text.Json.Serialization; public class WorkoutData : Dictionary { [JsonPropertyName("skills")] - public WorkoutSkills Skills { get; set; } + public WorkoutSkills? Skills { get; set; } } public class WorkoutSkills { [JsonPropertyName("Common")] - public List Common { get; set; } - + public List? Common { get; set; } + [JsonPropertyName("Mastering")] - public List Mastering { get; set; } - + public List? Mastering { get; set; } + [JsonPropertyName("Bonuses")] - public object Bonuses { get; set; } - + public object? Bonuses { get; set; } + [JsonPropertyName("Points")] - public int Points { get; set; } + public int? Points { get; set; } } public class WorkoutSkillCommon { [JsonPropertyName("Id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("Progress")] - public int Progress { get; set; } - + public int? Progress { get; set; } + [JsonPropertyName("PointsEarnedDuringSession")] - public int PointsEarnedDuringSession { get; set; } - + public int? PointsEarnedDuringSession { get; set; } + [JsonPropertyName("LastAccess")] - public long LastAccess { get; set; } + public long? LastAccess { get; set; } } public class WorkoutEffects { [JsonPropertyName("Effects")] - public WorkoutEffectsParts Effects { get; set; } - + public WorkoutEffectsParts? Effects { get; set; } + [JsonPropertyName("Hydration")] - public int Hydration { get; set; } - + public int? Hydration { get; set; } + [JsonPropertyName("Energy")] - public int Energy { get; set; } + public int? Energy { get; set; } } public class WorkoutEffectsParts { [JsonPropertyName("Head")] - public WorkoutBodyPart Head { get; set; } - + public WorkoutBodyPart? Head { get; set; } + [JsonPropertyName("Chest")] - public WorkoutBodyPart Chest { get; set; } - + public WorkoutBodyPart? Chest { get; set; } + [JsonPropertyName("Stomach")] - public WorkoutBodyPart Stomach { get; set; } - + public WorkoutBodyPart? Stomach { get; set; } + [JsonPropertyName("LeftArm")] - public WorkoutBodyPart LeftArm { get; set; } - + public WorkoutBodyPart? LeftArm { get; set; } + [JsonPropertyName("RightArm")] - public WorkoutBodyPart RightArm { get; set; } - + public WorkoutBodyPart? RightArm { get; set; } + [JsonPropertyName("LeftLeg")] - public WorkoutBodyPart LeftLeg { get; set; } - + public WorkoutBodyPart? LeftLeg { get; set; } + [JsonPropertyName("RightLeg")] - public WorkoutBodyPart RightLeg { get; set; } - + public WorkoutBodyPart? RightLeg { get; set; } + [JsonPropertyName("Common")] - public WorkoutBodyPart Common { get; set; } + public WorkoutBodyPart? Common { get; set; } } public class WorkoutBodyPart { [JsonPropertyName("Regeneration")] - public int Regeneration { get; set; } - + public int? Regeneration { get; set; } + [JsonPropertyName("Fracture")] - public int Fracture { get; set; } - + public int? Fracture { get; set; } + [JsonPropertyName("MildMusclePain")] - public int MildMusclePain { get; set; } + public int? MildMusclePain { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs b/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs index 7871e265..103e79bc 100644 --- a/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs +++ b/Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs @@ -5,16 +5,16 @@ namespace Core.Models.Eft.Hideout; public class HandleQTEEventRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } + public string? Action { get; set; } /** true if QTE was successful, otherwise false */ [JsonPropertyName("results")] - public List Results { get; set; } + public List? Results { get; set; } /** Id of the QTE object used from db/hideout/qte.json */ [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs b/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs index 84eb0ec2..fa09cb7c 100644 --- a/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Hideout; public class HideoutCircleOfCultistProductionStartRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutCircleOfCultistProductionStart"; + public string? Action { get; set; } = "HideoutCircleOfCultistProductionStart"; [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs index e7fd3ed5..da692a80 100644 --- a/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Hideout; public class HideoutContinuousProductionStartRequestData { [JsonPropertyName("Action")] - public string Action { get; } = "HideoutContinuousProductionStart"; + public string? Action { get; } = "HideoutContinuousProductionStart"; [JsonPropertyName("recipeId")] - public string RecipeId { get; set; } + public string? RecipeId { get; set; } [JsonPropertyName("timestamp")] - public double Timestamp { get; set; } + public double? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutCustomisation.cs b/Core/Models/Eft/Hideout/HideoutCustomisation.cs index 65d47a16..6ba53c6e 100644 --- a/Core/Models/Eft/Hideout/HideoutCustomisation.cs +++ b/Core/Models/Eft/Hideout/HideoutCustomisation.cs @@ -6,59 +6,59 @@ namespace Core.Models.Eft.Hideout; public class HideoutCustomisation { [JsonPropertyName("globals")] - public List Globals { get; set; } + public List? Globals { get; set; } [JsonPropertyName("slots")] - public List Slots { get; set; } + public List? Slots { get; set; } } public class HideoutCustomisationGlobal { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("conditions")] - public List Conditions { get; set; } + public List? Conditions { get; set; } [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } [JsonPropertyName("index")] - public int Index { get; set; } + public int? Index { get; set; } [JsonPropertyName("systemName")] - public string SystemName { get; set; } + public string? SystemName { get; set; } [JsonPropertyName("isEnabled")] - public bool IsEnabled { get; set; } + public bool? IsEnabled { get; set; } [JsonPropertyName("itemId")] - public string ItemId { get; set; } + public string? ItemId { get; set; } } public class HideoutCustomisationSlot { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("conditions")] - public List Conditions { get; set; } + public List? Conditions { get; set; } [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } [JsonPropertyName("index")] - public int Index { get; set; } + public int? Index { get; set; } [JsonPropertyName("systemName")] - public string SystemName { get; set; } + public string? SystemName { get; set; } [JsonPropertyName("isEnabled")] - public bool IsEnabled { get; set; } + public bool? IsEnabled { get; set; } [JsonPropertyName("slotId")] - public string SlotId { get; set; } + public string? SlotId { get; set; } [JsonPropertyName("areaTypeId")] - public int AreaTypeId { get; set; } + public int? AreaTypeId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs b/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs index dd7cae4c..77feda87 100644 --- a/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs @@ -5,14 +5,14 @@ namespace Core.Models.Eft.Hideout; public class HideoutCustomizationApplyRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutCustomizationApply"; + public string? Action { get; set; } = "HideoutCustomizationApply"; /// /// Id of the newly picked item to apply to hideout /// [JsonPropertyName("offerId")] - public string OfferId { get; set; } + public string? OfferId { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs b/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs index bbcbf12c..7ea2ba32 100644 --- a/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Hideout; public class HideoutDeleteProductionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutDeleteProductionCommand"; + public string? Action { get; set; } = "HideoutDeleteProductionCommand"; [JsonPropertyName("recipeId")] - public string RecipeId { get; set; } + public string? RecipeId { get; set; } [JsonPropertyName("timestamp")] - public double Timestamp { get; set; } + public double? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs index 44c48c7c..8eace11d 100644 --- a/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs @@ -5,18 +5,18 @@ namespace Core.Models.Eft.Hideout; public class HideoutImproveAreaRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutImproveArea"; + public string? Action { get; set; } = "HideoutImproveArea"; /** Hideout area id from areas.json */ [JsonPropertyName("id")] - public string AreaId { get; set; } + public string? AreaId { get; set; } [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs index ed71dd50..8784058d 100644 --- a/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs @@ -5,23 +5,23 @@ namespace Core.Models.Eft.Hideout; public class HideoutPutItemInRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutPutItemsInAreaSlots"; + public string? Action { get; set; } = "HideoutPutItemsInAreaSlots"; [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("items")] - public Dictionary Items { get; set; } + public Dictionary? Items { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } public class ItemDetails { [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs index 7a8fb45f..8c077492 100644 --- a/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs @@ -5,35 +5,35 @@ namespace Core.Models.Eft.Hideout; public class HideoutScavCaseStartRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutScavCaseProductionStart"; + public string? Action { get; set; } = "HideoutScavCaseProductionStart"; [JsonPropertyName("recipeId")] - public string RecipeId { get; set; } + public string? RecipeId { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } [JsonPropertyName("tools")] - public List Tools { get; set; } + public List? Tools { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } public class HideoutItem { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } } public class Tool { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutSettingsBase.cs b/Core/Models/Eft/Hideout/HideoutSettingsBase.cs index f73d9b75..a490b406 100644 --- a/Core/Models/Eft/Hideout/HideoutSettingsBase.cs +++ b/Core/Models/Eft/Hideout/HideoutSettingsBase.cs @@ -5,17 +5,17 @@ namespace Core.Models.Eft.Hideout; public class HideoutSettingsBase { [JsonPropertyName("generatorSpeedWithoutFuel")] - public double GeneratorSpeedWithoutFuel { get; set; } + public double? GeneratorSpeedWithoutFuel { get; set; } [JsonPropertyName("generatorFuelFlowRate")] - public double GeneratorFuelFlowRate { get; set; } + public double? GeneratorFuelFlowRate { get; set; } [JsonPropertyName("airFilterUnitFlowRate")] - public double AirFilterUnitFlowRate { get; set; } + public double? AirFilterUnitFlowRate { get; set; } [JsonPropertyName("cultistAmuletBonusPercent")] - public double CultistAmuletBonusPercent { get; set; } + public double? CultistAmuletBonusPercent { get; set; } [JsonPropertyName("gpuBoostRate")] - public double GpuBoostRate { get; set; } + public double? GpuBoostRate { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs index 4e4e609e..dc0590cd 100644 --- a/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs @@ -5,26 +5,26 @@ namespace Core.Models.Eft.Hideout; public class HideoutSingleProductionStartRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutSingleProductionStart"; + public string? Action { get; set; } = "HideoutSingleProductionStart"; [JsonPropertyName("recipeId")] - public string RecipeId { get; set; } + public string? RecipeId { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } [JsonPropertyName("tools")] - public List Tools { get; set; } + public List? Tools { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } public class HandoverItem { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs index 883e994f..d30fc432 100644 --- a/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs @@ -5,14 +5,14 @@ namespace Core.Models.Eft.Hideout; public class HideoutTakeItemOutRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutTakeItemsFromAreaSlots"; + public string? Action { get; set; } = "HideoutTakeItemsFromAreaSlots"; [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("slots")] - public int[] Slots { get; set; } + public List? Slots { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs b/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs index ad7b0fc3..5e478595 100644 --- a/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs @@ -4,11 +4,11 @@ namespace Core.Models.Eft.Hideout; public class HideoutTakeProductionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutTakeProduction"; + public string? Action { get; set; } = "HideoutTakeProduction"; [JsonPropertyName("recipeId")] - public string RecipeId { get; set; } + public string? RecipeId { get; set; } [JsonPropertyName("timestamp")] - public int Timestamp { get; set; } + public int? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs index dd001bbe..64127f85 100644 --- a/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs @@ -5,14 +5,14 @@ namespace Core.Models.Eft.Hideout; public class HideoutToggleAreaRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutToggleArea"; + public string? Action { get; set; } = "HideoutToggleArea"; [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("enabled")] - public bool Enabled { get; set; } + public bool? Enabled { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs b/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs index 045176b3..5c5a604e 100644 --- a/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Hideout; public class HideoutUpgradeCompleteRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutUpgradeComplete"; + public string? Action { get; set; } = "HideoutUpgradeComplete"; [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs index a86af346..2440b26d 100644 --- a/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs +++ b/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs @@ -6,14 +6,14 @@ namespace Core.Models.Eft.Hideout; public class HideoutUpgradeRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "HideoutUpgrade"; + public string? Action { get; set; } = "HideoutUpgrade"; [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs b/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs index 7ba857ab..f8c24b20 100644 --- a/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs +++ b/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Hideout; public class RecordShootingRangePoints { [JsonPropertyName("Action")] - public string Action { get; set; } = "RecordShootingRangePoints"; + public string? Action { get; set; } = "RecordShootingRangePoints"; [JsonPropertyName("points")] - public int Points { get; set; } + public int? Points { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs b/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs index 14dc6f2b..7d0227ff 100644 --- a/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs +++ b/Core/Models/Eft/HttpResponse/GetBodyResponseData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.HttpResponse; public class GetBodyResponseData { [JsonPropertyName("err")] - public int Err { get; set; } + public int? Err { get; set; } [JsonPropertyName("errmsg")] - public string ErrMsg { get; set; } + public string? ErrMsg { get; set; } [JsonPropertyName("data")] - public T Data { get; set; } + public T? Data { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/HttpResponse/NullResponseData.cs b/Core/Models/Eft/HttpResponse/NullResponseData.cs index 9656a444..f82b5af1 100644 --- a/Core/Models/Eft/HttpResponse/NullResponseData.cs +++ b/Core/Models/Eft/HttpResponse/NullResponseData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.HttpResponse; public class NullResponseData { [JsonPropertyName("err")] - public int Err { get; set; } + public int? Err { get; set; } [JsonPropertyName("errmsg")] - public object ErrMsg { get; set; } + public object? ErrMsg { get; set; } [JsonPropertyName("data")] - public object Data { get; set; } + public object? Data { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs b/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs index 8024b21c..aad92907 100644 --- a/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs +++ b/Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.InRaid; public class RegisterPlayerRequestData { [JsonPropertyName("crc")] - public int Crc { get; set; } + public int? Crc { get; set; } [JsonPropertyName("locationId")] - public string LocationId { get; set; } + public string? LocationId { get; set; } [JsonPropertyName("variantId")] - public int VariantId { get; set; } + public int? VariantId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs b/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs index f479dde4..f84f87b5 100644 --- a/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs +++ b/Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Insurance; public class GetInsuranceCostRequestData { [JsonPropertyName("traders")] - public List Traders { get; set; } + public List? Traders { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Insurance/InsureRequestData.cs b/Core/Models/Eft/Insurance/InsureRequestData.cs index e92a3f92..fd6cc992 100644 --- a/Core/Models/Eft/Insurance/InsureRequestData.cs +++ b/Core/Models/Eft/Insurance/InsureRequestData.cs @@ -6,11 +6,11 @@ namespace Core.Models.Eft.Insurance; public class InsureRequestData : BaseInteractionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Insure"; + public string? Action { get; set; } = "Insure"; [JsonPropertyName("tid")] - public string TransactionId { get; set; } + public string? TransactionId { get; set; } [JsonPropertyName("items")] - public string[] Items { get; set; } + public List? Items { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs b/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs index b3672354..e1ac0323 100644 --- a/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs @@ -10,13 +10,13 @@ public class InventoryBaseActionRequestData : BaseInteractionRequestData public class To { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("container")] - public string Container { get; set; } + public string? Container { get; set; } [JsonPropertyName("location")] - public object Location { get; set; } // TODO: types given IItemLocation or number + public object? Location { get; set; } // TODO: types given IItemLocation or number [JsonPropertyName("isSearched")] public bool? IsSearched { get; set; } @@ -25,29 +25,29 @@ public class To public class Container { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("container")] - public string ContainerName { get; set; } + public string? ContainerName { get; set; } [JsonPropertyName("location")] - public object Location { get; set; } // TODO: types given: ILocation or number + public object? Location { get; set; } // TODO: types given: ILocation or number } public class Location { [JsonPropertyName("x")] - public double X { get; set; } + public double? X { get; set; } [JsonPropertyName("y")] - public double Y { get; set; } + public double? Y { get; set; } [JsonPropertyName("r")] - public string R { get; set; } + public string? R { get; set; } [JsonPropertyName("rotation")] - public string Rotation { get; set; } + public string? Rotation { get; set; } [JsonPropertyName("isSearched")] - public bool IsSearched { get; set; } + public bool? IsSearched { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryBindRequestData.cs b/Core/Models/Eft/Inventory/InventoryBindRequestData.cs index a0f2467b..aaeb1c2b 100644 --- a/Core/Models/Eft/Inventory/InventoryBindRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryBindRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory; public class InventoryBindRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Bind"; + public string? Action { get; set; } = "Bind"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("index")] - public int Index { get; set; } + public int? Index { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs b/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs index 0073b550..efbf4119 100644 --- a/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryCreateMarkerRequestData.cs @@ -5,26 +5,26 @@ namespace Core.Models.Eft.Inventory; public class InventoryCreateMarkerRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "CreateMapMarker"; + public string? Action { get; set; } = "CreateMapMarker"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("mapMarker")] - public MapMarker MapMarker { get; set; } + public MapMarker? MapMarker { get; set; } } public class MapMarker { [JsonPropertyName("Type")] - public string Type { get; set; } + public string? Type { get; set; } [JsonPropertyName("X")] - public double X { get; set; } + public double? X { get; set; } [JsonPropertyName("Y")] - public double Y { get; set; } + public double? Y { get; set; } [JsonPropertyName("Note")] - public string Note { get; set; } + public string? Note { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs b/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs index 8dd0e580..f8c79fa5 100644 --- a/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryDeleteMarkerRequestData.cs @@ -5,14 +5,14 @@ namespace Core.Models.Eft.Inventory; public class InventoryDeleteMarkerRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "DeleteMapMarker"; + public string? Action { get; set; } = "DeleteMapMarker"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("X")] - public int X { get; set; } + public int? X { get; set; } [JsonPropertyName("Y")] - public int Y { get; set; } + public int? Y { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs b/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs index d163544d..62719cbf 100644 --- a/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryEditMarkerRequestData.cs @@ -5,17 +5,17 @@ namespace Core.Models.Eft.Inventory; public class InventoryEditMarkerRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "EditMapMarker"; + public string? Action { get; set; } = "EditMapMarker"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("X")] - public double X { get; set; } + public double? X { get; set; } [JsonPropertyName("Y")] - public double Y { get; set; } + public double? Y { get; set; } [JsonPropertyName("mapMarker")] - public MapMarker MapMarker { get; set; } + public MapMarker? MapMarker { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs b/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs index 51615573..d645d010 100644 --- a/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryExamineRequestData.cs @@ -6,11 +6,11 @@ namespace Core.Models.Eft.Inventory; public class InventoryExamineRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Examine"; + public string? Action { get; set; } = "Examine"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("fromOwner")] - public OwnerInfo FromOwner { get; set; } + public OwnerInfo? FromOwner { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs b/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs index 15980217..95059f5c 100644 --- a/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryFoldRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory; public class InventoryFoldRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Fold"; + public string? Action { get; set; } = "Fold"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("value")] - public bool Value { get; set; } + public bool? Value { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs b/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs index a7ab3ac8..6d318566 100644 --- a/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryMergeRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory; public class InventoryMergeRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Merge"; + public string? Action { get; set; } = "Merge"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("with")] - public string With { get; set; } + public string? With { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs b/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs index 5f9fa3d3..9262be25 100644 --- a/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryMoveRequestData.cs @@ -6,11 +6,11 @@ namespace Core.Models.Eft.Inventory; public class InventoryMoveRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Move"; + public string? Action { get; set; } = "Move"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("to")] - public To To { get; set; } + public To? To { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs b/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs index d26fe661..944b5739 100644 --- a/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryReadEncyclopediaRequestData.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Inventory; public class InventoryReadEncyclopediaRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "ReadEncyclopedia"; + public string? Action { get; set; } = "ReadEncyclopedia"; [JsonPropertyName("ids")] - public List Ids { get; set; } + public List? Ids { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs b/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs index 7c5d6f4f..6f126f00 100644 --- a/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryRemoveRequestData.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Inventory; public class InventoryRemoveRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Remove"; + public string? Action { get; set; } = "Remove"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventorySortRequestData.cs b/Core/Models/Eft/Inventory/InventorySortRequestData.cs index 814ed23c..2957e125 100644 --- a/Core/Models/Eft/Inventory/InventorySortRequestData.cs +++ b/Core/Models/Eft/Inventory/InventorySortRequestData.cs @@ -6,8 +6,8 @@ namespace Core.Models.Eft.Inventory; public class InventorySortRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "ApplyInventoryChanges"; + public string? Action { get; set; } = "ApplyInventoryChanges"; [JsonPropertyName("changedItems")] - public List ChangedItems { get; set; } + public List? ChangedItems { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventorySplitRequestData.cs b/Core/Models/Eft/Inventory/InventorySplitRequestData.cs index 53379947..039201d0 100644 --- a/Core/Models/Eft/Inventory/InventorySplitRequestData.cs +++ b/Core/Models/Eft/Inventory/InventorySplitRequestData.cs @@ -5,19 +5,19 @@ namespace Core.Models.Eft.Inventory; public class InventorySplitRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; } = "Split"; + public string? Action { get; } = "Split"; /** Id of item to split */ [JsonPropertyName("splitItem")] - public string SplitItem { get; set; } + public string? SplitItem { get; set; } /** Id of new item stack */ [JsonPropertyName("newItem")] - public string NewItem { get; set; } + public string? NewItem { get; set; } /** Destination new item will be placed in */ [JsonPropertyName("container")] - public Container Container { get; set; } + public Container? Container { get; set; } - public int Count { get; set; } + public int? Count { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventorySwapRequestData.cs b/Core/Models/Eft/Inventory/InventorySwapRequestData.cs index 4b346ee0..1d77127f 100644 --- a/Core/Models/Eft/Inventory/InventorySwapRequestData.cs +++ b/Core/Models/Eft/Inventory/InventorySwapRequestData.cs @@ -6,23 +6,23 @@ namespace Core.Models.Eft.Inventory; public class InventorySwapRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Swap"; + public string? Action { get; set; } = "Swap"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("to")] - public To To { get; set; } + public To? To { get; set; } [JsonPropertyName("item2")] - public string Item2 { get; set; } + public string? Item2 { get; set; } [JsonPropertyName("to2")] - public To To2 { get; set; } + public To? To2 { get; set; } [JsonPropertyName("fromOwner2")] - public OwnerInfo FromOwner2 { get; set; } + public OwnerInfo? FromOwner2 { get; set; } [JsonPropertyName("toOwner2")] - public OwnerInfo ToOwner2 { get; set; } + public OwnerInfo? ToOwner2 { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryTagRequestData.cs b/Core/Models/Eft/Inventory/InventoryTagRequestData.cs index 272ef643..8efd2ebb 100644 --- a/Core/Models/Eft/Inventory/InventoryTagRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryTagRequestData.cs @@ -5,14 +5,14 @@ namespace Core.Models.Eft.Inventory; public class InventoryTagRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Tag"; + public string? Action { get; set; } = "Tag"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("TagName")] - public string TagName { get; set; } + public string? TagName { get; set; } [JsonPropertyName("TagColor")] - public int TagColor { get; set; } + public int? TagColor { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs b/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs index 9cd4c89e..7c863b32 100644 --- a/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryToggleRequestData.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory; public class InventoryToggleRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Toggle"; + public string? Action { get; set; } = "Toggle"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("value")] - public bool Value { get; set; } + public bool? Value { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs b/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs index 313532d5..d67ac043 100644 --- a/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs +++ b/Core/Models/Eft/Inventory/InventoryTransferRequestData.cs @@ -5,14 +5,14 @@ namespace Core.Models.Eft.Inventory; public class InventoryTransferRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "Transfer"; + public string? Action { get; set; } = "Transfer"; [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("with")] - public string With { get; set; } + public string? With { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs b/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs index 831e104a..e6e44e39 100644 --- a/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs +++ b/Core/Models/Eft/Inventory/OpenRandomLootContainerRequestData.cs @@ -4,14 +4,14 @@ namespace Core.Models.Eft.Inventory; public class OpenRandomLootContainerRequestData { - public string Action { get; set; } = "OpenRandomLootContainer"; + public string? Action { get; set; } = "OpenRandomLootContainer"; /// /// Container item id being opened /// [JsonPropertyName("item")] - public string Item { get; set; } + public string? Item { get; set; } [JsonPropertyName("to")] - public List To { get; set; } + public List? To { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs b/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs index 863cc918..042b511e 100644 --- a/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs +++ b/Core/Models/Eft/Inventory/PinOrLockItemRequest.cs @@ -6,13 +6,13 @@ namespace Core.Models.Eft.Inventory; public class PinOrLockItemRequest { [JsonPropertyName("Action")] - public string Action { get; set; } = "PinLock"; + public string? Action { get; set; } = "PinLock"; /** Id of item being pinned */ [JsonPropertyName("Item")] - public string Item { get; set; } + public string? Item { get; set; } /** "Pinned"/"Locked"/"Free" */ [JsonPropertyName("State")] - public PinLockState State { get; set; } + public PinLockState? State { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs b/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs index f9d08f0c..54706400 100644 --- a/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs +++ b/Core/Models/Eft/Inventory/RedeemProfileRequestData.cs @@ -5,17 +5,17 @@ namespace Core.Models.Eft.Inventory; public class RedeemProfileRequestData : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "RedeemProfileReward"; + public string? Action { get; set; } = "RedeemProfileReward"; [JsonPropertyName("events")] - public List Events { get; set; } + public List? Events { get; set; } } public class RedeemProfileRequestEvent { [JsonPropertyName("MessageId")] - public string MessageId { get; set; } + public string? MessageId { get; set; } [JsonPropertyName("EventId")] - public string EventId { get; set; } + public string? EventId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Inventory/SetFavoriteItems.cs b/Core/Models/Eft/Inventory/SetFavoriteItems.cs index ed5031e5..9cdce640 100644 --- a/Core/Models/Eft/Inventory/SetFavoriteItems.cs +++ b/Core/Models/Eft/Inventory/SetFavoriteItems.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Inventory; public class SetFavoriteItems : InventoryBaseActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "SetFavoriteItems"; + public string? Action { get; set; } = "SetFavoriteItems"; [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs b/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs index 52cc74ce..944dd1a2 100644 --- a/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs +++ b/Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.ItemEvent; public class EmptyItemEventRouterResponse : ItemEventRouterBase { [JsonPropertyName("profileChanges")] - public string ProfileChanges { get; set; } = ""; + public string? ProfileChanges { get; set; } = ""; } \ No newline at end of file diff --git a/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs index c2a0bf81..cee473fb 100644 --- a/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs +++ b/Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs @@ -9,7 +9,7 @@ using System.Text.Json.Serialization; public class ItemEventRouterBase { [JsonPropertyName("warnings")] - public List Warnings { get; set; } + public List? Warnings { get; set; } [JsonPropertyName("profileChanges")] public object ProfileChanges { get; set; } // TODO: Types given TProfileChanges | "" @@ -22,128 +22,128 @@ public class TProfileChanges : Dictionary public class Warning { [JsonPropertyName("index")] - public int Index { get; set; } + public int? Index { get; set; } [JsonPropertyName("errmsg")] - public string ErrorMessage { get; set; } + public string? ErrorMessage { get; set; } [JsonPropertyName("code")] - public string Code { get; set; } + public string? Code { get; set; } [JsonPropertyName("data")] - public object Data { get; set; } + public object? Data { get; set; } } public class ProfileChange { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("experience")] - public int Experience { get; set; } + public int? Experience { get; set; } [JsonPropertyName("quests")] - public List Quests { get; set; } + public List? Quests { get; set; } [JsonPropertyName("ragFairOffers")] - public List RagFairOffers { get; set; } + public List? RagFairOffers { get; set; } [JsonPropertyName("weaponBuilds")] - public List WeaponBuilds { get; set; } + public List? WeaponBuilds { get; set; } [JsonPropertyName("equipmentBuilds")] - public List EquipmentBuilds { get; set; } + public List? EquipmentBuilds { get; set; } [JsonPropertyName("items")] - public ItemChanges Items { get; set; } + public ItemChanges? Items { get; set; } [JsonPropertyName("production")] - public Dictionary Production { get; set; } + public Dictionary? Production { get; set; } /** Hideout area improvement id */ [JsonPropertyName("improvements")] - public Dictionary Improvements { get; set; } + public Dictionary? Improvements { get; set; } [JsonPropertyName("skills")] - public Skills Skills { get; set; } + public Skills? Skills { get; set; } [JsonPropertyName("health")] public Common.Health Health { get; set; } [JsonPropertyName("traderRelations")] - public Dictionary TraderRelations { get; set; } + public Dictionary? TraderRelations { get; set; } [JsonPropertyName("moneyTransferLimitData")] - public MoneyTransferLimits MoneyTransferLimitData { get; set; } + public MoneyTransferLimits? MoneyTransferLimitData { get; set; } [JsonPropertyName("repeatableQuests")] - public List RepeatableQuests { get; set; } + public List? RepeatableQuests { get; set; } [JsonPropertyName("recipeUnlocked")] - public Dictionary RecipeUnlocked { get; set; } + public Dictionary? RecipeUnlocked { get; set; } [JsonPropertyName("changedHideoutStashes")] - public Dictionary ChangedHideoutStashes { get; set; } + public Dictionary? ChangedHideoutStashes { get; set; } [JsonPropertyName("questsStatus")] - public List QuestsStatus { get; set; } + public List? QuestsStatus { get; set; } } public class HideoutStashItem { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("tpl")] - public string Template { get; set; } + public string? Template { get; set; } } public class WeaponBuildChange { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("name")] - public string Name { get; set; } + public string? Name { get; set; } [JsonPropertyName("root")] - public string Root { get; set; } + public string? Root { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } } public class EquipmentBuildChange { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("name")] - public string Name { get; set; } + public string? Name { get; set; } [JsonPropertyName("root")] - public string Root { get; set; } + public string? Root { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } [JsonPropertyName("fastpanel")] - public List FastPanel { get; set; } + public List? FastPanel { get; set; } [JsonPropertyName("buildType")] - public EquipmentBuildType BuildType { get; set; } + public EquipmentBuildType? BuildType { get; set; } } public class ItemChanges { [JsonPropertyName("new")] - public List NewItems { get; set; } + public List? NewItems { get; set; } [JsonPropertyName("change")] - public List ChangedItems { get; set; } + public List? ChangedItems { get; set; } [JsonPropertyName("del")] public List DeletedItems { get; set; } // Only needs _id property @@ -153,38 +153,38 @@ public class ItemChanges public class TraderData { [JsonPropertyName("salesSum")] - public double SalesSum { get; set; } + public double? SalesSum { get; set; } [JsonPropertyName("standing")] - public double Standing { get; set; } + public double? Standing { get; set; } [JsonPropertyName("loyalty")] - public double Loyalty { get; set; } + public double? Loyalty { get; set; } [JsonPropertyName("unlocked")] - public bool Unlocked { get; set; } + public bool? Unlocked { get; set; } [JsonPropertyName("disabled")] - public bool Disabled { get; set; } + public bool? Disabled { get; set; } } public class Product { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("_tpl")] - public string Template { get; set; } + public string? Template { get; set; } [JsonPropertyName("parentId")] - public string ParentId { get; set; } + public string? ParentId { get; set; } [JsonPropertyName("slotId")] - public string SlotId { get; set; } + public string? SlotId { get; set; } [JsonPropertyName("location")] - public ItemLocation Location { get; set; } + public ItemLocation? Location { get; set; } [JsonPropertyName("upd")] - public Upd Upd { get; set; } + public Upd? Upd { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs index d0d855e9..ad4a91c5 100644 --- a/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs +++ b/Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs @@ -5,50 +5,50 @@ namespace Core.Models.Eft.ItemEvent; public class ItemEventRouterRequest { [JsonPropertyName("data")] - public List Data { get; set; } - + public List? Data { get; set; } + [JsonPropertyName("tm")] - public int Time { get; set; } - + public int? Time { get; set; } + [JsonPropertyName("reload")] - public int Reload { get; set; } + public int? Reload { get; set; } } public class Daum { [JsonPropertyName("Action")] - public string Action { get; set; } - + public string? Action { get; set; } + [JsonPropertyName("item")] - public string Item { get; set; } - + public string? Item { get; set; } + [JsonPropertyName("to")] - public To To { get; set; } + public To? To { get; set; } } public class To { [JsonPropertyName("id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("container")] - public string Container { get; set; } - + public string? Container { get; set; } + [JsonPropertyName("location")] - public Location Location { get; set; } + public Location? Location { get; set; } } public class Location { [JsonPropertyName("x")] - public int X { get; set; } - + public int? X { get; set; } + [JsonPropertyName("y")] - public int Y { get; set; } - + public int? Y { get; set; } + [JsonPropertyName("r")] - public string R { get; set; } - + public string? R { get; set; } + [JsonPropertyName("isSearched")] - public bool IsSearched { get; set; } + public bool? IsSearched { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Launcher/ChangeRequestData.cs b/Core/Models/Eft/Launcher/ChangeRequestData.cs index c2ccc0a4..57b29ed8 100644 --- a/Core/Models/Eft/Launcher/ChangeRequestData.cs +++ b/Core/Models/Eft/Launcher/ChangeRequestData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Launcher; public class ChangeRequestData : LoginRequestData { [JsonPropertyName("change")] - public string Change { get; set; } + public string? Change { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs index 5b08e548..2493218b 100644 --- a/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs +++ b/Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Launcher; public class GetMiniProfileRequestData { [JsonPropertyName("username")] - public string Username { get; set; } + public string? Username { get; set; } [JsonPropertyName("password")] - public string Password { get; set; } + public string? Password { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Launcher/LoginRequestData.cs b/Core/Models/Eft/Launcher/LoginRequestData.cs index ca39527c..f5441fdf 100644 --- a/Core/Models/Eft/Launcher/LoginRequestData.cs +++ b/Core/Models/Eft/Launcher/LoginRequestData.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Launcher; public class LoginRequestData { [JsonPropertyName("username")] - public string Username { get; set; } + public string? Username { get; set; } [JsonPropertyName("password")] - public string Password { get; set; } + public string? Password { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Launcher/RegisterData.cs b/Core/Models/Eft/Launcher/RegisterData.cs index 6bc847ef..e961c5ef 100644 --- a/Core/Models/Eft/Launcher/RegisterData.cs +++ b/Core/Models/Eft/Launcher/RegisterData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Launcher; public class RegisterData : LoginRequestData { [JsonPropertyName("edition")] - public string Edition { get; set; } + public string? Edition { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Location/GetAirdropLootRequest.cs b/Core/Models/Eft/Location/GetAirdropLootRequest.cs index 867866fb..ce809319 100644 --- a/Core/Models/Eft/Location/GetAirdropLootRequest.cs +++ b/Core/Models/Eft/Location/GetAirdropLootRequest.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Location; public class GetAirdropLootRequest { [JsonPropertyName("containerId")] - public string ContainerId { get; set; } + public string? ContainerId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Location/GetAirdropLootResponse.cs b/Core/Models/Eft/Location/GetAirdropLootResponse.cs index 1aef8a79..023fcccd 100644 --- a/Core/Models/Eft/Location/GetAirdropLootResponse.cs +++ b/Core/Models/Eft/Location/GetAirdropLootResponse.cs @@ -8,8 +8,8 @@ public class GetAirdropLootResponse { // The type of airdrop [JsonPropertyName("icon")] - public AirdropTypeEnum Icon { get; set; } + public AirdropTypeEnum? Icon { get; set; } [JsonPropertyName("container")] - public List Container { get; set; } + public List? Container { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Core/Models/Eft/Match/EndLocalRaidRequestData.cs index 0a5d7632..a9f128c6 100644 --- a/Core/Models/Eft/Match/EndLocalRaidRequestData.cs +++ b/Core/Models/Eft/Match/EndLocalRaidRequestData.cs @@ -11,96 +11,96 @@ public class EndLocalRaidRequestData /// ID of server player just left /// [JsonPropertyName("serverId")] - public string ServerId { get; set; } + public string? ServerId { get; set; } [JsonPropertyName("results")] - public EndRaidResult Results { get; set; } + public EndRaidResult? Results { get; set; } /// /// Insured items left in raid by player /// [JsonPropertyName("lostInsuredItems")] - public List LostInsuredItems { get; set; } + public List? LostInsuredItems { get; set; } /// /// Items sent via traders to player, keyed to service e.g. BTRTransferStash /// [JsonPropertyName("transferItems")] - public Dictionary> TransferItems { get; set; } + public Dictionary>? TransferItems { get; set; } [JsonPropertyName("locationTransit")] - public LocationTransit LocationTransit { get; set; } + public LocationTransit? LocationTransit { get; set; } } public class EndRaidResult { - public PmcData Profile { get; set; } + public PmcData? Profile { get; set; } /// /// "Survived/Transit" etc /// [JsonPropertyName("result")] - public ExitStatus Result { get; set; } + public ExitStatus? Result { get; set; } [JsonPropertyName("killerId")] - public string KillerId { get; set; } + public string? KillerId { get; set; } [JsonPropertyName("killerAid")] - public string KillerAid { get; set; } + public string? KillerAid { get; set; } /// /// "Gate 3" etc /// [JsonPropertyName("exitName")] - public string ExitName { get; set; } + public string? ExitName { get; set; } [JsonPropertyName("inSession")] - public bool InSession { get; set; } + public bool? InSession { get; set; } [JsonPropertyName("favorite")] - public bool Favorite { get; set; } + public bool? Favorite { get; set; } /// /// Seconds in raid /// [JsonPropertyName("playTime")] - public int PlayTime { get; set; } + public int? PlayTime { get; set; } } public class LocationTransit { [JsonPropertyName("hash")] - public string Hash { get; set; } + public string? Hash { get; set; } [JsonPropertyName("playersCount")] - public int PlayersCount { get; set; } + public int? PlayersCount { get; set; } [JsonPropertyName("ip")] - public string Ip { get; set; } + public string? Ip { get; set; } [JsonPropertyName("location")] - public string Location { get; set; } + public string? Location { get; set; } [JsonPropertyName("profiles")] - public Dictionary Profiles { get; set; } + public Dictionary? Profiles { get; set; } [JsonPropertyName("transitionRaidId")] - public string TransitionRaidId { get; set; } + public string? TransitionRaidId { get; set; } [JsonPropertyName("raidMode")] - public string RaidMode { get; set; } + public string? RaidMode { get; set; } [JsonPropertyName("side")] - public string Side { get; set; } + public string? Side { get; set; } [JsonPropertyName("dayTime")] - public string DayTime { get; set; } + public string? DayTime { get; set; } /// /// The location player last visited /// [JsonPropertyName("sptLastVisitedLocation")] - public string SptLastVisitedLocation { get; set; } + public string? SptLastVisitedLocation { get; set; } /// /// Name of exit taken @@ -112,11 +112,11 @@ public class LocationTransit public class TransitProfile { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("keyId")] - public string KeyId { get; set; } + public string? KeyId { get; set; } [JsonPropertyName("isSolo")] - public bool IsSolo { get; set; } + public bool? IsSolo { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs b/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs index 1f9081f4..59b7ed41 100644 --- a/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs +++ b/Core/Models/Eft/Match/GetRaidConfigurationRequestData.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match; public class GetRaidConfigurationRequestData : RaidSettings { [JsonPropertyName("keyId")] - public string KeyId { get; set; } + public string? KeyId { get; set; } [JsonPropertyName("MaxGroupCount")] - public int MaxGroupCount { get; set; } + public int? MaxGroupCount { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/GroupCharacter.cs b/Core/Models/Eft/Match/GroupCharacter.cs index 96cdcf8b..1e36e298 100644 --- a/Core/Models/Eft/Match/GroupCharacter.cs +++ b/Core/Models/Eft/Match/GroupCharacter.cs @@ -7,19 +7,19 @@ namespace Core.Models.Eft.Match; public class GroupCharacter { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("aid")] - public int Aid { get; set; } + public int? Aid { get; set; } [JsonPropertyName("Info")] - public CharacterInfo Info { get; set; } + public CharacterInfo? Info { get; set; } [JsonPropertyName("PlayerVisualRepresentation")] public PlayerVisualRepresentation? VisualRepresentation { get; set; } [JsonPropertyName("isLeader")] - public bool IsLeader { get; set; } + public bool? IsLeader { get; set; } [JsonPropertyName("isReady")] public bool? IsReady { get; set; } @@ -34,16 +34,16 @@ public class GroupCharacter public class CharacterInfo { [JsonPropertyName("Nickname")] - public string Nickname { get; set; } + public string? Nickname { get; set; } [JsonPropertyName("Side")] - public string Side { get; set; } + public string? Side { get; set; } [JsonPropertyName("Level")] - public int Level { get; set; } + public int? Level { get; set; } [JsonPropertyName("MemberCategory")] - public MemberCategory MemberCategory { get; set; } + public MemberCategory? MemberCategory { get; set; } [JsonPropertyName("GameVersion")] public string? GameVersion { get; set; } @@ -61,53 +61,53 @@ public class CharacterInfo public class PlayerVisualRepresentation { [JsonPropertyName("Info")] - public VisualInfo Info { get; set; } + public VisualInfo? Info { get; set; } [JsonPropertyName("Customization")] - public Customization Customization { get; set; } + public Customization? Customization { get; set; } [JsonPropertyName("Equipment")] - public Equipment Equipment { get; set; } + public Equipment? Equipment { get; set; } } public class VisualInfo { [JsonPropertyName("Side")] - public string Side { get; set; } + public string? Side { get; set; } [JsonPropertyName("Level")] - public int Level { get; set; } + public int? Level { get; set; } [JsonPropertyName("Nickname")] - public string Nickname { get; set; } + public string? Nickname { get; set; } [JsonPropertyName("MemberCategory")] - public MemberCategory MemberCategory { get; set; } + public MemberCategory? MemberCategory { get; set; } [JsonPropertyName("GameVersion")] - public string GameVersion { get; set; } + public string? GameVersion { get; set; } } public class Customization { [JsonPropertyName("Head")] - public string Head { get; set; } + public string? Head { get; set; } [JsonPropertyName("Body")] - public string Body { get; set; } + public string? Body { get; set; } [JsonPropertyName("Feet")] - public string Feet { get; set; } + public string? Feet { get; set; } [JsonPropertyName("Hands")] - public string Hands { get; set; } + public string? Hands { get; set; } } public class Equipment { [JsonPropertyName("Id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("Items")] - public List Items { get; set; } + public List? Items { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs b/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs index f186ff10..7b22899e 100644 --- a/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs +++ b/Core/Models/Eft/Match/MatchGroupCurrentResponse.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match; public class MatchGroupCurrentResponse { [JsonPropertyName("squad")] - public List Squad { get; set; } + public List? Squad { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs b/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs index d02eccdd..3f140263 100644 --- a/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs +++ b/Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match; public class MatchGroupInviteSendRequest { [JsonPropertyName("to")] - public string To { get; set; } + public string? To { get; set; } [JsonPropertyName("inLobby")] - public bool InLobby { get; set; } + public bool? InLobby { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs b/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs index fc848c55..4bc1eaba 100644 --- a/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs +++ b/Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match; public class MatchGroupPlayerRemoveRequest { [JsonPropertyName("aidToKick")] - public string AidToKick { get; set; } + public string? AidToKick { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs b/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs index 1fabafe6..29d36073 100644 --- a/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs +++ b/Core/Models/Eft/Match/MatchGroupStartGameRequest.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match; public class MatchGroupStartGameRequest { [JsonPropertyName("groupId")] - public string GroupId { get; set; } + public string? GroupId { get; set; } [JsonPropertyName("servers")] - public List Servers { get; set; } + public List? Servers { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/MatchGroupStatusRequest.cs b/Core/Models/Eft/Match/MatchGroupStatusRequest.cs index ea9de1f5..24432ac0 100644 --- a/Core/Models/Eft/Match/MatchGroupStatusRequest.cs +++ b/Core/Models/Eft/Match/MatchGroupStatusRequest.cs @@ -6,20 +6,20 @@ namespace Core.Models.Eft.Match; public class MatchGroupStatusRequest { [JsonPropertyName("location")] - public string Location { get; set; } + public string? Location { get; set; } [JsonPropertyName("savage")] - public bool IsSavage { get; set; } + public bool? IsSavage { get; set; } [JsonPropertyName("dt")] - public string DateTime { get; set; } + public string? DateTime { get; set; } [JsonPropertyName("keyId")] - public string KeyId { get; set; } + public string? KeyId { get; set; } [JsonPropertyName("raidMode")] - public RaidMode RaidMode { get; set; } + public RaidMode? RaidMode { get; set; } [JsonPropertyName("spawnPlace")] - public string SpawnPlace { get; set; } + public string? SpawnPlace { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/MatchGroupStatusResponse.cs b/Core/Models/Eft/Match/MatchGroupStatusResponse.cs index e3c6aca8..494fef42 100644 --- a/Core/Models/Eft/Match/MatchGroupStatusResponse.cs +++ b/Core/Models/Eft/Match/MatchGroupStatusResponse.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match; public class MatchGroupStatusResponse { [JsonPropertyName("players")] - public List Players { get; set; } + public List? Players { get; set; } [JsonPropertyName("maxPveCountExceeded")] - public bool MaxPveCountExceeded { get; set; } + public bool? MaxPveCountExceeded { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/MatchGroupTransferRequest.cs b/Core/Models/Eft/Match/MatchGroupTransferRequest.cs index 46bb8eaf..e4656cd0 100644 --- a/Core/Models/Eft/Match/MatchGroupTransferRequest.cs +++ b/Core/Models/Eft/Match/MatchGroupTransferRequest.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match; public class MatchGroupTransferRequest { [JsonPropertyName("aidToChange")] - public string AidToChange { get; set; } + public string? AidToChange { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/ProfileStatusResponse.cs b/Core/Models/Eft/Match/ProfileStatusResponse.cs index 9aebb616..b4cf0b7c 100644 --- a/Core/Models/Eft/Match/ProfileStatusResponse.cs +++ b/Core/Models/Eft/Match/ProfileStatusResponse.cs @@ -5,8 +5,8 @@ namespace Core.Models.Eft.Match; public class ProfileStatusResponse { [JsonPropertyName("maxPveCountExceeded")] - public bool MaxPveCountExceeded { get; set; } + public bool? MaxPveCountExceeded { get; set; } [JsonPropertyName("profiles")] - public List Profiles { get; set; } + public List? Profiles { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/PutMetricsRequestData.cs b/Core/Models/Eft/Match/PutMetricsRequestData.cs index 637b8677..ed0ffc95 100644 --- a/Core/Models/Eft/Match/PutMetricsRequestData.cs +++ b/Core/Models/Eft/Match/PutMetricsRequestData.cs @@ -5,158 +5,158 @@ namespace Core.Models.Eft.Match; public class PutMetricsRequestData { [JsonPropertyName("sid")] - public string SessionId { get; set; } + public string? SessionId { get; set; } [JsonPropertyName("settings")] - public object Settings { get; set; } + public object? Settings { get; set; } [JsonPropertyName("SharedSettings")] - public SharedSettings SharedSettings { get; set; } + public SharedSettings? SharedSettings { get; set; } [JsonPropertyName("HardwareDescription")] - public HardwareDescription HardwareDescription { get; set; } + public HardwareDescription? HardwareDescription { get; set; } [JsonPropertyName("Location")] - public string Location { get; set; } + public string? Location { get; set; } [JsonPropertyName("Metrics")] - public object Metrics { get; set; } + public object? Metrics { get; set; } [JsonPropertyName("ClientEvents")] - public ClientEvents ClientEvents { get; set; } + public ClientEvents? ClientEvents { get; set; } [JsonPropertyName("SpikeSamples")] - public List SpikeSamples { get; set; } + public List? SpikeSamples { get; set; } [JsonPropertyName("mode")] - public string Mode { get; set; } + public string? Mode { get; set; } } public class SharedSettings { [JsonPropertyName("StatedFieldOfView")] - public double StatedFieldOfView { get; set; } + public double? StatedFieldOfView { get; set; } } public class HardwareDescription { [JsonPropertyName("deviceUniqueIdentifier")] - public string DeviceUniqueIdentifier { get; set; } + public string? DeviceUniqueIdentifier { get; set; } [JsonPropertyName("systemMemorySize")] - public double SystemMemorySize { get; set; } + public double? SystemMemorySize { get; set; } [JsonPropertyName("graphicsDeviceID")] - public double GraphicsDeviceId { get; set; } + public double? GraphicsDeviceId { get; set; } [JsonPropertyName("graphicsDeviceName")] - public string GraphicsDeviceName { get; set; } + public string? GraphicsDeviceName { get; set; } [JsonPropertyName("graphicsDeviceType")] - public string GraphicsDeviceType { get; set; } + public string? GraphicsDeviceType { get; set; } [JsonPropertyName("graphicsDeviceVendor")] - public string GraphicsDeviceVendor { get; set; } + public string? GraphicsDeviceVendor { get; set; } [JsonPropertyName("graphicsDeviceVendorID")] - public double GraphicsDeviceVendorId { get; set; } + public double? GraphicsDeviceVendorId { get; set; } [JsonPropertyName("graphicsDeviceVersion")] - public string GraphicsDeviceVersion { get; set; } + public string? GraphicsDeviceVersion { get; set; } [JsonPropertyName("graphicsMemorySize")] - public double GraphicsMemorySize { get; set; } + public double? GraphicsMemorySize { get; set; } [JsonPropertyName("graphicsMultiThreaded")] - public bool GraphicsMultiThreaded { get; set; } + public bool? GraphicsMultiThreaded { get; set; } [JsonPropertyName("graphicsShaderLevel")] - public double GraphicsShaderLevel { get; set; } + public double? GraphicsShaderLevel { get; set; } [JsonPropertyName("operatingSystem")] - public string OperatingSystem { get; set; } + public string? OperatingSystem { get; set; } [JsonPropertyName("processorCount")] - public double ProcessorCount { get; set; } + public double? ProcessorCount { get; set; } [JsonPropertyName("processorFrequency")] - public double ProcessorFrequency { get; set; } + public double? ProcessorFrequency { get; set; } [JsonPropertyName("processorType")] - public string ProcessorType { get; set; } + public string? ProcessorType { get; set; } [JsonPropertyName("driveType")] - public string DriveType { get; set; } + public string? DriveType { get; set; } [JsonPropertyName("swapDriveType")] - public string SwapDriveType { get; set; } + public string? SwapDriveType { get; set; } } public class ClientEvents { [JsonPropertyName("MatchingCompleted")] - public double MatchingCompleted { get; set; } + public double? MatchingCompleted { get; set; } [JsonPropertyName("MatchingCompletedReal")] - public double MatchingCompletedReal { get; set; } + public double? MatchingCompletedReal { get; set; } [JsonPropertyName("LocationLoaded")] - public double LocationLoaded { get; set; } + public double? LocationLoaded { get; set; } [JsonPropertyName("LocationLoadedReal")] - public double LocationLoadedReal { get; set; } + public double? LocationLoadedReal { get; set; } [JsonPropertyName("GamePrepared")] - public double GamePrepared { get; set; } + public double? GamePrepared { get; set; } [JsonPropertyName("GamePreparedReal")] - public double GamePreparedReal { get; set; } + public double? GamePreparedReal { get; set; } [JsonPropertyName("GameCreated")] - public double GameCreated { get; set; } + public double? GameCreated { get; set; } [JsonPropertyName("GameCreatedReal")] - public double GameCreatedReal { get; set; } + public double? GameCreatedReal { get; set; } [JsonPropertyName("GamePooled")] - public double GamePooled { get; set; } + public double? GamePooled { get; set; } [JsonPropertyName("GamePooledReal")] - public double GamePooledReal { get; set; } + public double? GamePooledReal { get; set; } [JsonPropertyName("GameRunned")] - public double GameRunned { get; set; } + public double? GameRunned { get; set; } [JsonPropertyName("GameRunnedReal")] - public double GameRunnedReal { get; set; } + public double? GameRunnedReal { get; set; } [JsonPropertyName("GameSpawn")] - public double GameSpawn { get; set; } + public double? GameSpawn { get; set; } [JsonPropertyName("GameSpawnReal")] - public double GameSpawnReal { get; set; } + public double? GameSpawnReal { get; set; } [JsonPropertyName("PlayerSpawnEvent")] - public double PlayerSpawnEvent { get; set; } + public double? PlayerSpawnEvent { get; set; } [JsonPropertyName("PlayerSpawnEventReal")] - public double PlayerSpawnEventReal { get; set; } + public double? PlayerSpawnEventReal { get; set; } [JsonPropertyName("GameSpawned")] - public double GameSpawned { get; set; } + public double? GameSpawned { get; set; } [JsonPropertyName("GameSpawnedReal")] - public double GameSpawnedReal { get; set; } + public double? GameSpawnedReal { get; set; } [JsonPropertyName("GameStarting")] - public double GameStarting { get; set; } + public double? GameStarting { get; set; } [JsonPropertyName("GameStartingReal")] - public double GameStartingReal { get; set; } + public double? GameStartingReal { get; set; } [JsonPropertyName("GameStarted")] - public double GameStarted { get; set; } + public double? GameStarted { get; set; } [JsonPropertyName("GameStartedReal")] - public double GameStartedReal { get; set; } + public double? GameStartedReal { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/RaidSettings.cs b/Core/Models/Eft/Match/RaidSettings.cs index f733ba56..b5ef7e56 100644 --- a/Core/Models/Eft/Match/RaidSettings.cs +++ b/Core/Models/Eft/Match/RaidSettings.cs @@ -8,89 +8,89 @@ namespace Core.Models.Eft.Match; public class RaidSettings { [JsonPropertyName("keyId")] - public string KeyId { get; set; } - + public string? KeyId { get; set; } + [JsonPropertyName("location")] - public string Location { get; set; } - + public string? Location { get; set; } + [JsonPropertyName("isLocationTransition")] - public bool IsLocationTransition { get; set; } - + public bool? IsLocationTransition { get; set; } + [JsonPropertyName("timeVariant")] - public DateTime TimeVariant { get; set; } - + public DateTime? TimeVariant { get; set; } + [JsonPropertyName("metabolismDisabled")] - public bool MetabolismDisabled { get; set; } - + public bool? MetabolismDisabled { get; set; } + [JsonPropertyName("timeAndWeatherSettings")] - public TimeAndWeatherSettings TimeAndWeatherSettings { get; set; } - + public TimeAndWeatherSettings? TimeAndWeatherSettings { get; set; } + [JsonPropertyName("botSettings")] - public BotSettings BotSettings { get; set; } - + public BotSettings? BotSettings { get; set; } + [JsonPropertyName("wavesSettings")] - public WavesSettings WavesSettings { get; set; } - + public WavesSettings? WavesSettings { get; set; } + [JsonPropertyName("side")] - public SideType Side { get; set; } - + public SideType? Side { get; set; } + [JsonPropertyName("raidMode")] - public RaidMode RaidMode { get; set; } - + public RaidMode? RaidMode { get; set; } + [JsonPropertyName("playersSpawnPlace")] - public PlayersSpawnPlace PlayersSpawnPlace { get; set; } - + public PlayersSpawnPlace? PlayersSpawnPlace { get; set; } + [JsonPropertyName("canShowGroupPreview")] - public bool CanShowGroupPreview { get; set; } + public bool? CanShowGroupPreview { get; set; } } public class TimeAndWeatherSettings { [JsonPropertyName("isRandomTime")] - public bool IsRandomTime { get; set; } - + public bool? IsRandomTime { get; set; } + [JsonPropertyName("isRandomWeather")] - public bool IsRandomWeather { get; set; } - + public bool? IsRandomWeather { get; set; } + [JsonPropertyName("cloudinessType")] - public CloudinessType CloudinessType { get; set; } - + public CloudinessType? CloudinessType { get; set; } + [JsonPropertyName("rainType")] - public RainType RainType { get; set; } - + public RainType? RainType { get; set; } + [JsonPropertyName("fogType")] - public FogType FogType { get; set; } - + public FogType? FogType { get; set; } + [JsonPropertyName("windType")] - public WindSpeed WindType { get; set; } - + public WindSpeed? WindType { get; set; } + [JsonPropertyName("timeFlowType")] - public TimeFlowType TimeFlowType { get; set; } - + public TimeFlowType? TimeFlowType { get; set; } + [JsonPropertyName("hourOfDay")] - public int HourOfDay { get; set; } + public int? HourOfDay { get; set; } } public class BotSettings { [JsonPropertyName("isScavWars")] - public bool IsScavWars { get; set; } - + public bool? IsScavWars { get; set; } + [JsonPropertyName("botAmount")] - public BotAmount BotAmount { get; set; } + public BotAmount? BotAmount { get; set; } } public class WavesSettings { [JsonPropertyName("botAmount")] - public BotAmount BotAmount { get; set; } - + public BotAmount? BotAmount { get; set; } + [JsonPropertyName("botDifficulty")] - public BotDifficulty BotDifficulty { get; set; } - + public BotDifficulty? BotDifficulty { get; set; } + [JsonPropertyName("isBosses")] - public bool IsBosses { get; set; } - + public bool? IsBosses { get; set; } + [JsonPropertyName("isTaggedAndCursed")] - public bool IsTaggedAndCursed { get; set; } + public bool? IsTaggedAndCursed { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/RequestIdRequest.cs b/Core/Models/Eft/Match/RequestIdRequest.cs index d5f2622d..705870bd 100644 --- a/Core/Models/Eft/Match/RequestIdRequest.cs +++ b/Core/Models/Eft/Match/RequestIdRequest.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Match; public class RequestIdRequest { [JsonPropertyName("requestId")] - public string RequestId { get; set; } + public string? RequestId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/Server.cs b/Core/Models/Eft/Match/Server.cs index 64a01fdb..be625f85 100644 --- a/Core/Models/Eft/Match/Server.cs +++ b/Core/Models/Eft/Match/Server.cs @@ -5,11 +5,11 @@ namespace Core.Models.Eft.Match; public class Server { [JsonPropertyName("ping")] - public int Ping { get; set; } + public int? Ping { get; set; } [JsonPropertyName("ip")] - public string Ip { get; set; } + public string? Ip { get; set; } [JsonPropertyName("port")] - public int Port { get; set; } + public int? Port { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Match/SessionStatus.cs b/Core/Models/Eft/Match/SessionStatus.cs index 773224f5..869df3d8 100644 --- a/Core/Models/Eft/Match/SessionStatus.cs +++ b/Core/Models/Eft/Match/SessionStatus.cs @@ -5,22 +5,22 @@ namespace Core.Models.Eft.Match; public class SessionStatus { [JsonPropertyName("profileid")] - public string ProfileId { get; set; } + public string? ProfileId { get; set; } [JsonPropertyName("profileToken")] - public string ProfileToken { get; set; } + public string? ProfileToken { get; set; } [JsonPropertyName("status")] - public string Status { get; set; } + public string? Status { get; set; } [JsonPropertyName("ip")] - public string Ip { get; set; } + public string? Ip { get; set; } [JsonPropertyName("port")] - public int Port { get; set; } + public int? Port { get; set; } [JsonPropertyName("sid")] - public string Sid { get; set; } + public string? Sid { get; set; } [JsonPropertyName("version")] public string? Version { get; set; } diff --git a/Core/Models/Eft/Match/StartLocalRaidRequestData.cs b/Core/Models/Eft/Match/StartLocalRaidRequestData.cs index d09d5c1a..b1e7f539 100644 --- a/Core/Models/Eft/Match/StartLocalRaidRequestData.cs +++ b/Core/Models/Eft/Match/StartLocalRaidRequestData.cs @@ -6,26 +6,26 @@ namespace Core.Models.Eft.Match; public class StartLocalRaidRequestData { [JsonPropertyName("serverId")] - public string ServerId { get; set; } - + public string? ServerId { get; set; } + [JsonPropertyName("location")] - public string Location { get; set; } - + public string? Location { get; set; } + [JsonPropertyName("timeVariant")] - public string TimeVariant { get; set; } - + public string? TimeVariant { get; set; } + [JsonPropertyName("mode")] - public string Mode { get; set; } - + public string? Mode { get; set; } + [JsonPropertyName("playerSide")] - public string PlayerSide { get; set; } - + public string? PlayerSide { get; set; } + [JsonPropertyName("transitionType")] - public TransitionType TransitionType { get; set; } - + public TransitionType? TransitionType { get; set; } + [JsonPropertyName("transition")] - public Transition Transition { get; set; } - + public Transition? Transition { get; set; } + /** Should loot generation be skipped, default false */ [JsonPropertyName("sptSkipLootGeneration")] public bool? ShouldSkipLootGeneration { get; set; } diff --git a/Core/Models/Eft/Match/StartLocalRaidResponseData.cs b/Core/Models/Eft/Match/StartLocalRaidResponseData.cs index a489e511..7b39d028 100644 --- a/Core/Models/Eft/Match/StartLocalRaidResponseData.cs +++ b/Core/Models/Eft/Match/StartLocalRaidResponseData.cs @@ -8,41 +8,41 @@ namespace Core.Models.Eft.Match; public class StartLocalRaidResponseData { [JsonPropertyName("serverId")] - public string ServerId { get; set; } - + public string? ServerId { get; set; } + [JsonPropertyName("serverSettings")] - public LocationServices ServerSettings { get; set; } - + public LocationServices? ServerSettings { get; set; } + [JsonPropertyName("profile")] - public ProfileInsuredItems Profile { get; set; } - + public ProfileInsuredItems? Profile { get; set; } + [JsonPropertyName("locationLoot")] - public LocationBase LocationLoot { get; set; } - + public LocationBase? LocationLoot { get; set; } + [JsonPropertyName("transitionType")] - public TransitionType TransitionType { get; set; } - + public TransitionType? TransitionType { get; set; } + [JsonPropertyName("transition")] - public Transition Transition { get; set; } + public Transition? Transition { get; set; } } public class ProfileInsuredItems { [JsonPropertyName("insuredItems")] - public List InsuredItems { get; set; } + public List? InsuredItems { get; set; } } public class Transition { [JsonPropertyName("transitionType")] - public TransitionType TransitionType { get; set; } - + public TransitionType? TransitionType { get; set; } + [JsonPropertyName("transitionRaidId")] - public string TransitionRaidId { get; set; } - + public string? TransitionRaidId { get; set; } + [JsonPropertyName("transitionCount")] - public int TransitionCount { get; set; } - + public int? TransitionCount { get; set; } + [JsonPropertyName("visitedLocations")] - public List VisitedLocations { get; set; } + public List? VisitedLocations { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Notes/NoteActionData.cs b/Core/Models/Eft/Notes/NoteActionData.cs index f20a6f2f..a0ecb4ac 100644 --- a/Core/Models/Eft/Notes/NoteActionData.cs +++ b/Core/Models/Eft/Notes/NoteActionData.cs @@ -6,20 +6,20 @@ namespace Core.Models.Eft.Notes; public class NoteActionData : BaseInteractionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } + public string? Action { get; set; } [JsonPropertyName("index")] - public int Index { get; set; } + public int? Index { get; set; } [JsonPropertyName("note")] - public Note Note { get; set; } + public Note? Note { get; set; } } public class Note { [JsonPropertyName("Time")] - public int Time { get; set; } + public int? Time { get; set; } [JsonPropertyName("Text")] - public string Text { get; set; } + public string? Text { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Notifier/Notifier.cs b/Core/Models/Eft/Notifier/Notifier.cs index 8955aa42..0f8b6039 100644 --- a/Core/Models/Eft/Notifier/Notifier.cs +++ b/Core/Models/Eft/Notifier/Notifier.cs @@ -5,17 +5,17 @@ namespace Core.Models.Eft.Notifier; public class NotifierChannel { [JsonPropertyName("server")] - public string Server { get; set; } + public string? Server { get; set; } [JsonPropertyName("channel_id")] - public string ChannelId { get; set; } + public string? ChannelId { get; set; } [JsonPropertyName("url")] - public string Url { get; set; } + public string? Url { get; set; } [JsonPropertyName("notifierServer")] - public string NotifierServer { get; set; } + public string? NotifierServer { get; set; } [JsonPropertyName("ws")] - public string WebSocket { get; set; } + public string? WebSocket { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Notifier/SelectProfileResponse.cs b/Core/Models/Eft/Notifier/SelectProfileResponse.cs index d256aa5b..e6fe4d5e 100644 --- a/Core/Models/Eft/Notifier/SelectProfileResponse.cs +++ b/Core/Models/Eft/Notifier/SelectProfileResponse.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Notifier; public class SelectProfileResponse { [JsonPropertyName("status")] - public string Status { get; set; } + public string? Status { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs b/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs index f7dccb27..3c4ac344 100644 --- a/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs +++ b/Core/Models/Eft/Player/PlayerIncrementSkillLevelRequestData.cs @@ -5,45 +5,45 @@ namespace Core.Models.Eft.Player; public class PlayerIncrementSkillLevelRequestData { - [JsonPropertyName("_id")] - public string Id { get; set; } + [JsonPropertyName("_id")] + public string? Id { get; set; } - [JsonPropertyName("experience")] - public int Experience { get; set; } + [JsonPropertyName("experience")] + public int? Experience { get; set; } - [JsonPropertyName("quests")] - public List Quests { get; set; } + [JsonPropertyName("quests")] + public List? Quests { get; set; } - [JsonPropertyName("ragFairOffers")] - public List RagFairOffers { get; set; } + [JsonPropertyName("ragFairOffers")] + public List? RagFairOffers { get; set; } - [JsonPropertyName("builds")] - public List Builds { get; set; } + [JsonPropertyName("builds")] + public List? Builds { get; set; } - [JsonPropertyName("items")] - public Items Items { get; set; } + [JsonPropertyName("items")] + public Items? Items { get; set; } - [JsonPropertyName("production")] - public Production Production { get; set; } + [JsonPropertyName("production")] + public Production? Production { get; set; } - [JsonPropertyName("skills")] - public Skills Skills { get; set; } + [JsonPropertyName("skills")] + public Skills? Skills { get; set; } - [JsonPropertyName("traderRelations")] - public TraderRelations TraderRelations { get; set; } + [JsonPropertyName("traderRelations")] + public TraderRelations? TraderRelations { get; set; } } // TODO: These are all lists of objects. public class Items { - [JsonPropertyName("new")] - public List NewItems { get; set; } + [JsonPropertyName("new")] + public List? NewItems { get; set; } - [JsonPropertyName("change")] - public List ChangedItems { get; set; } + [JsonPropertyName("change")] + public List? ChangedItems { get; set; } - [JsonPropertyName("del")] - public List DeletedItems { get; set; } + [JsonPropertyName("del")] + public List? DeletedItems { get; set; } } public class Production diff --git a/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs b/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs index cfdeae9e..fd6ab042 100644 --- a/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs +++ b/Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs @@ -6,18 +6,18 @@ namespace Core.Models.Eft.PresetBuild; public class PresetBuildActionRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } + public string? Action { get; set; } [JsonPropertyName("Id")] - public string Id { get; set; } + public string? Id { get; set; } /** name of preset given by player */ [JsonPropertyName("Name")] - public string Name { get; set; } + public string? Name { get; set; } [JsonPropertyName("Root")] - public string Root { get; set; } + public string? Root { get; set; } [JsonPropertyName("Items")] - public List Items { get; set; } + public List? Items { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs b/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs index 0ae98fac..58413a85 100644 --- a/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs +++ b/Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.PresetBuild; public class RemoveBuildRequestData { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Prestige/GetPrestigeResponse.cs b/Core/Models/Eft/Prestige/GetPrestigeResponse.cs index ddff03bb..e324108a 100644 --- a/Core/Models/Eft/Prestige/GetPrestigeResponse.cs +++ b/Core/Models/Eft/Prestige/GetPrestigeResponse.cs @@ -4,6 +4,6 @@ namespace Core.Models.Eft.Prestige; public class GetPrestigeResponse { - [JsonPropertyName("elements")] - public List Elements { get; set; } + [JsonPropertyName("elements")] + public List? Elements { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs b/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs index b23c4d2a..10b0ada8 100644 --- a/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs +++ b/Core/Models/Eft/Profile/CompletedAchievementsResponse.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Profile; public class CompletedAchievementsResponse { [JsonPropertyName("elements")] - public Dictionary Elements { get; set; } + public Dictionary? Elements { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/ConnectResponse.cs b/Core/Models/Eft/Profile/ConnectResponse.cs index d1ec9e2d..b8bf583f 100644 --- a/Core/Models/Eft/Profile/ConnectResponse.cs +++ b/Core/Models/Eft/Profile/ConnectResponse.cs @@ -4,15 +4,15 @@ namespace Core.Models.Eft.Profile; public class ConnectResponse { - [JsonPropertyName("backendUrl")] - public string BackendUrl { get; set; } + [JsonPropertyName("backendUrl")] + public string? BackendUrl { get; set; } - [JsonPropertyName("name")] - public string Name { get; set; } + [JsonPropertyName("name")] + public string? Name { get; set; } - [JsonPropertyName("editions")] - public List Editions { get; set; } + [JsonPropertyName("editions")] + public List? Editions { get; set; } - [JsonPropertyName("profileDescriptions")] - public Dictionary ProfileDescriptions { get; set; } + [JsonPropertyName("profileDescriptions")] + public Dictionary? ProfileDescriptions { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/CreateProfileResponse.cs b/Core/Models/Eft/Profile/CreateProfileResponse.cs index 464bbb2b..bd129f94 100644 --- a/Core/Models/Eft/Profile/CreateProfileResponse.cs +++ b/Core/Models/Eft/Profile/CreateProfileResponse.cs @@ -4,6 +4,6 @@ namespace Core.Models.Eft.Profile; public class CreateProfileResponse { - [JsonPropertyName("uid")] - public string UserId { get; set; } + [JsonPropertyName("uid")] + public string? UserId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/GetAchievementsResponse.cs b/Core/Models/Eft/Profile/GetAchievementsResponse.cs index ce6063f9..a0fa0224 100644 --- a/Core/Models/Eft/Profile/GetAchievementsResponse.cs +++ b/Core/Models/Eft/Profile/GetAchievementsResponse.cs @@ -4,5 +4,5 @@ namespace Core.Models.Eft.Profile; public class GetAchievementsResponse { - public List Achievements { get; set; } + public List? Achievements { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/GetOtherProfileRequest.cs b/Core/Models/Eft/Profile/GetOtherProfileRequest.cs index abb60be3..52ae7d75 100644 --- a/Core/Models/Eft/Profile/GetOtherProfileRequest.cs +++ b/Core/Models/Eft/Profile/GetOtherProfileRequest.cs @@ -2,8 +2,8 @@ using System.Text.Json.Serialization; namespace Core.Models.Eft.Profile; -public class GetOtherProfileRequest +public class GetOtherProfileRequest { - [JsonPropertyName("accountId")] - public string AccountId { get; set; } + [JsonPropertyName("accountId")] +public string? AccountId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/GetOtherProfileResponse.cs b/Core/Models/Eft/Profile/GetOtherProfileResponse.cs index 41992ab5..b7921c89 100644 --- a/Core/Models/Eft/Profile/GetOtherProfileResponse.cs +++ b/Core/Models/Eft/Profile/GetOtherProfileResponse.cs @@ -6,98 +6,98 @@ namespace Core.Models.Eft.Profile; public class GetOtherProfileResponse { [JsonPropertyName("id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("aid")] - public int Aid { get; set; } - + public int? Aid { get; set; } + [JsonPropertyName("info")] - public OtherProfileInfo Info { get; set; } - + public OtherProfileInfo? Info { get; set; } + [JsonPropertyName("customization")] - public OtherProfileCustomization Customization { get; set; } - + public OtherProfileCustomization? Customization { get; set; } + [JsonPropertyName("skills")] - public Skills Skills { get; set; } - + public Skills? Skills { get; set; } + [JsonPropertyName("equipment")] - public OtherProfileEquipment Equipment { get; set; } - + public OtherProfileEquipment? Equipment { get; set; } + [JsonPropertyName("achievements")] - public Dictionary Achievements { get; set; } - + public Dictionary? Achievements { get; set; } + [JsonPropertyName("favoriteItems")] - public List FavoriteItems { get; set; } - + public List? FavoriteItems { get; set; } + [JsonPropertyName("pmcStats")] - public OtherProfileStats PmcStats { get; set; } - + public OtherProfileStats? PmcStats { get; set; } + [JsonPropertyName("scavStats")] - public OtherProfileStats ScavStats { get; set; } + public OtherProfileStats? ScavStats { get; set; } } public class OtherProfileInfo { [JsonPropertyName("nickname")] - public string Nickname { get; set; } - + public string? Nickname { get; set; } + [JsonPropertyName("side")] - public string Side { get; set; } - + public string? Side { get; set; } + [JsonPropertyName("experience")] - public int Experience { get; set; } - + public int? Experience { get; set; } + [JsonPropertyName("memberCategory")] - public int MemberCategory { get; set; } - + public int? MemberCategory { get; set; } + [JsonPropertyName("bannedState")] - public bool BannedState { get; set; } - + public bool? BannedState { get; set; } + [JsonPropertyName("bannedUntil")] - public long BannedUntil { get; set; } - + public long? BannedUntil { get; set; } + [JsonPropertyName("registrationDate")] - public long RegistrationDate { get; set; } + public long? RegistrationDate { get; set; } } public class OtherProfileCustomization { [JsonPropertyName("head")] - public string Head { get; set; } - + public string? Head { get; set; } + [JsonPropertyName("body")] - public string Body { get; set; } - + public string? Body { get; set; } + [JsonPropertyName("feet")] - public string Feet { get; set; } - + public string? Feet { get; set; } + [JsonPropertyName("hands")] - public string Hands { get; set; } - + public string? Hands { get; set; } + [JsonPropertyName("dogtag")] - public string Dogtag { get; set; } + public string? Dogtag { get; set; } } public class OtherProfileEquipment { [JsonPropertyName("Id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("Items")] - public List Items { get; set; } + public List? Items { get; set; } } public class OtherProfileStats { [JsonPropertyName("eft")] - public OtherProfileSubStats Eft { get; set; } + public OtherProfileSubStats? Eft { get; set; } } public class OtherProfileSubStats { [JsonPropertyName("totalInGameTime")] - public int TotalInGameTime { get; set; } - + public int? TotalInGameTime { get; set; } + [JsonPropertyName("overAllCounters")] - public OverallCounters OverAllCounters { get; set; } + public OverallCounters? OverAllCounters { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs b/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs index 1af5db10..67eb1793 100644 --- a/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs +++ b/Core/Models/Eft/Profile/GetProfileSettingsRequest.cs @@ -4,12 +4,12 @@ namespace Core.Models.Eft.Profile; public class GetProfileSettingsRequest { - /// - /// Chosen value for profile.Info.SelectedMemberCategory - /// - [JsonPropertyName("memberCategory")] - public int MemberCategory { get; set; } + /// + /// Chosen value for profile.Info.SelectedMemberCategory + /// + [JsonPropertyName("memberCategory")] + public int? MemberCategory { get; set; } - [JsonPropertyName("squadInviteRestriction")] - public bool SquadInviteRestriction { get; set; } + [JsonPropertyName("squadInviteRestriction")] + public bool? SquadInviteRestriction { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs b/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs index 647d3b76..8804e251 100644 --- a/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs +++ b/Core/Models/Eft/Profile/GetProfileStatusResponseData.cs @@ -4,48 +4,48 @@ namespace Core.Models.Eft.Profile; public class GetProfileStatusResponseData { - [JsonPropertyName("maxPveCountExceeded")] - public bool MaxPveCountExceeded { get; set; } = false; + [JsonPropertyName("maxPveCountExceeded")] + public bool? MaxPveCountExceeded { get; set; } = false; - [JsonPropertyName("profiles")] - public List Profiles { get; set; } + [JsonPropertyName("profiles")] + public List? Profiles { get; set; } } public class ProfileStatusData { - [JsonPropertyName("profileid")] - public string ProfileId { get; set; } + [JsonPropertyName("profileid")] + public string? ProfileId { get; set; } - [JsonPropertyName("profileToken")] - public string ProfileToken { get; set; } + [JsonPropertyName("profileToken")] + public string? ProfileToken { get; set; } - [JsonPropertyName("status")] - public string Status { get; set; } + [JsonPropertyName("status")] + public string? Status { get; set; } - [JsonPropertyName("ip")] - public string Ip { get; set; } + [JsonPropertyName("ip")] + public string? Ip { get; set; } - [JsonPropertyName("port")] - public int Port { get; set; } + [JsonPropertyName("port")] + public int? Port { get; set; } - [JsonPropertyName("sid")] - public string Sid { get; set; } + [JsonPropertyName("sid")] + public string? Sid { get; set; } - [JsonPropertyName("version")] - public string? Version { get; set; } + [JsonPropertyName("version")] + public string? Version { get; set; } - [JsonPropertyName("location")] - public string? Location { get; set; } + [JsonPropertyName("location")] + public string? Location { get; set; } - [JsonPropertyName("raidMode")] - public string? RaidMode { get; set; } + [JsonPropertyName("raidMode")] + public string? RaidMode { get; set; } - [JsonPropertyName("mode")] - public string? Mode { get; set; } + [JsonPropertyName("mode")] + public string? Mode { get; set; } - [JsonPropertyName("shortId")] - public string? ShortId { get; set; } + [JsonPropertyName("shortId")] + public string? ShortId { get; set; } - [JsonPropertyName("additional_info")] - public List? AdditionalInfo { get; set; } // TODO: Was `any` in the node server + [JsonPropertyName("additional_info")] + public List? AdditionalInfo { get; set; } // TODO: Was `any` in the node server } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs b/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs index c2381846..caa75f31 100644 --- a/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs +++ b/Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Profile; public class ProfileChangeNicknameRequestData { [JsonPropertyName("nickname")] - public string Nickname { get; set; } + public string? Nickname { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs b/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs index b8b7ba20..454f32e8 100644 --- a/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs +++ b/Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Profile; public class ProfileChangeVoiceRequestData { [JsonPropertyName("voice")] - public string Voice { get; set; } + public string? Voice { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/ProfileCreateRequestData.cs b/Core/Models/Eft/Profile/ProfileCreateRequestData.cs index 79fd8d7a..693cfc6b 100644 --- a/Core/Models/Eft/Profile/ProfileCreateRequestData.cs +++ b/Core/Models/Eft/Profile/ProfileCreateRequestData.cs @@ -4,15 +4,15 @@ namespace Core.Models.Eft.Profile; public class ProfileCreateRequestData { - [JsonPropertyName("side")] - public string Side { get; set; } + [JsonPropertyName("side")] + public string? Side { get; set; } - [JsonPropertyName("nickname")] - public string Nickname { get; set; } + [JsonPropertyName("nickname")] + public string? Nickname { get; set; } - [JsonPropertyName("headId")] - public string HeadId { get; set; } + [JsonPropertyName("headId")] + public string? HeadId { get; set; } - [JsonPropertyName("voiceId")] - public string VoiceId { get; set; } + [JsonPropertyName("voiceId")] + public string? VoiceId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/SearchFriendRequestData.cs b/Core/Models/Eft/Profile/SearchFriendRequestData.cs index 0cae43b9..03af1fb4 100644 --- a/Core/Models/Eft/Profile/SearchFriendRequestData.cs +++ b/Core/Models/Eft/Profile/SearchFriendRequestData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Profile; public class SearchFriendRequestData { [JsonPropertyName("nickname")] - public string Nickname { get; set; } + public string? Nickname { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/SearchFriendResponse.cs b/Core/Models/Eft/Profile/SearchFriendResponse.cs index cc54fd5a..a0d0d949 100644 --- a/Core/Models/Eft/Profile/SearchFriendResponse.cs +++ b/Core/Models/Eft/Profile/SearchFriendResponse.cs @@ -4,31 +4,31 @@ namespace Core.Models.Eft.Profile; public class SearchFriendResponse { - [JsonPropertyName("_id")] - public string Id { get; set; } + [JsonPropertyName("_id")] + public string? Id { get; set; } - [JsonPropertyName("aid")] - public int Aid { get; set; } + [JsonPropertyName("aid")] + public int? Aid { get; set; } - [JsonPropertyName("Info")] - public FriendInfo Info { get; set; } + [JsonPropertyName("Info")] + public FriendInfo? Info { get; set; } } // NOTE: Renamed from `Info` because of a name collision. public class FriendInfo { - [JsonPropertyName("Nickname")] - public string Nickname { get; set; } + [JsonPropertyName("Nickname")] + public string? Nickname { get; set; } - [JsonPropertyName("Side")] - public string Side { get; set; } + [JsonPropertyName("Side")] + public string? Side { get; set; } - [JsonPropertyName("Level")] - public int Level { get; set; } + [JsonPropertyName("Level")] + public int? Level { get; set; } - [JsonPropertyName("MemberCategory")] - public int MemberCategory { get; set; } + [JsonPropertyName("MemberCategory")] + public int? MemberCategory { get; set; } - [JsonPropertyName("SelectedMemberCategory")] - public int SelectedMemberCategory { get; set; } + [JsonPropertyName("SelectedMemberCategory")] + public int? SelectedMemberCategory { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/SptProfile.cs b/Core/Models/Eft/Profile/SptProfile.cs index 9ea32525..c3541599 100644 --- a/Core/Models/Eft/Profile/SptProfile.cs +++ b/Core/Models/Eft/Profile/SptProfile.cs @@ -9,234 +9,234 @@ namespace Core.Models.Eft.Profile; public class SptProfile { [JsonPropertyName("info")] - public Info ProfileInfo { get; set; } + public Info? ProfileInfo { get; set; } [JsonPropertyName("characters")] - public Characters CharacterData { get; set; } + public Characters? CharacterData { get; set; } /** Clothing purchases */ [JsonPropertyName("suits")] - public List ClothingPurchases { get; set; } + public List? ClothingPurchases { get; set; } [JsonPropertyName("userbuilds")] - public UserBuilds UserBuildData { get; set; } + public UserBuilds? UserBuildData { get; set; } [JsonPropertyName("dialogues")] - public Dictionary DialogueRecords { get; set; } + public Dictionary? DialogueRecords { get; set; } [JsonPropertyName("spt")] - public Spt SptData { get; set; } + public Spt? SptData { get; set; } [JsonPropertyName("vitality")] - public Vitality VitalityData { get; set; } + public Vitality? VitalityData { get; set; } [JsonPropertyName("inraid")] - public Inraid InraidData { get; set; } + public Inraid? InraidData { get; set; } [JsonPropertyName("insurance")] - public List InsuranceList { get; set; } + public List? InsuranceList { get; set; } /** Assort purchases made by player since last trader refresh */ [JsonPropertyName("traderPurchases")] - public Dictionary> TraderPurchases { get; set; } + public Dictionary>? TraderPurchases { get; set; } /** Achievements earned by player */ [JsonPropertyName("achievements")] - public Dictionary PlayerAchievements { get; set; } + public Dictionary? PlayerAchievements { get; set; } /** List of friend profile IDs */ [JsonPropertyName("friends")] - public List FriendProfileIds { get; set; } + public List? FriendProfileIds { get; set; } } public class TraderPurchaseData { [JsonPropertyName("count")] - public int PurchaseCount { get; set; } + public int? PurchaseCount { get; set; } [JsonPropertyName("purchaseTimestamp")] - public long PurchaseTimestamp { get; set; } + public long? PurchaseTimestamp { get; set; } } public class Info { /** main profile id */ [JsonPropertyName("id")] - public string ProfileId { get; set; } + public string? ProfileId { get; set; } [JsonPropertyName("scavId")] - public string ScavengerId { get; set; } + public string? ScavengerId { get; set; } [JsonPropertyName("aid")] - public int Aid { get; set; } + public int? Aid { get; set; } [JsonPropertyName("username")] - public string UserName { get; set; } + public string? UserName { get; set; } [JsonPropertyName("password")] - public string Password { get; set; } + public string? Password { get; set; } [JsonPropertyName("wipe")] - public bool IsWiped { get; set; } + public bool? IsWiped { get; set; } [JsonPropertyName("edition")] - public string Edition { get; set; } + public string? Edition { get; set; } } public class Characters { [JsonPropertyName("pmc")] - public PmcData PmcData { get; set; } + public PmcData? PmcData { get; set; } [JsonPropertyName("scav")] - public PmcData ScavData { get; set; } + public PmcData? ScavData { get; set; } } /** used by profile.userbuilds */ public class UserBuilds { [JsonPropertyName("weaponBuilds")] - public List WeaponBuilds { get; set; } + public List? WeaponBuilds { get; set; } [JsonPropertyName("equipmentBuilds")] - public List EquipmentBuilds { get; set; } + public List? EquipmentBuilds { get; set; } [JsonPropertyName("magazineBuilds")] - public List MagazineBuilds { get; set; } + public List? MagazineBuilds { get; set; } } public class UserBuild { [JsonPropertyName("Id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("Name")] - public string Name { get; set; } + public string? Name { get; set; } } public class WeaponBuild : UserBuild { [JsonPropertyName("Root")] - public string Root { get; set; } + public string? Root { get; set; } [JsonPropertyName("Items")] - public List Items { get; set; } // Same as PMC inventory items + public List? Items { get; set; } // Same as PMC inventory items } public class EquipmentBuild : UserBuild { [JsonPropertyName("Root")] - public string Root { get; set; } + public string? Root { get; set; } [JsonPropertyName("Items")] - public List Items { get; set; } // Same as PMC inventory items + public List? Items { get; set; } // Same as PMC inventory items [JsonPropertyName("BuildType")] - public EquipmentBuildType BuildType { get; set; } + public EquipmentBuildType? BuildType { get; set; } } public class MagazineBuild : UserBuild { [JsonPropertyName("Caliber")] - public string Caliber { get; set; } + public string? Caliber { get; set; } [JsonPropertyName("TopCount")] - public int TopCount { get; set; } + public int? TopCount { get; set; } [JsonPropertyName("BottomCount")] - public int BottomCount { get; set; } + public int? BottomCount { get; set; } [JsonPropertyName("Items")] - public List Items { get; set; } + public List? Items { get; set; } } public class MagazineTemplateAmmoItem { [JsonPropertyName("TemplateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } [JsonPropertyName("Count")] - public int Count { get; set; } + public int? Count { get; set; } } /** Used by defaultEquipmentPresets.json */ public class DefaultEquipmentPreset : UserBuild { [JsonPropertyName("Items")] - public List Items { get; set; } + public List? Items { get; set; } [JsonPropertyName("Root")] - public string Root { get; set; } + public string? Root { get; set; } [JsonPropertyName("BuildType")] - public EquipmentBuildType BuildType { get; set; } + public EquipmentBuildType? BuildType { get; set; } [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } } public class Dialogue { [JsonPropertyName("attachmentsNew")] - public int AttachmentsNew { get; set; } + public int? AttachmentsNew { get; set; } [JsonPropertyName("new")] - public int New { get; set; } + public int? New { get; set; } [JsonPropertyName("type")] - public MessageType Type { get; set; } + public MessageType? Type { get; set; } [JsonPropertyName("Users")] - public List Users { get; set; } + public List? Users { get; set; } [JsonPropertyName("pinned")] - public bool Pinned { get; set; } + public bool? Pinned { get; set; } [JsonPropertyName("messages")] - public List Messages { get; set; } + public List? Messages { get; set; } [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } } // @Cleanup: Maybe the same as Dialogue? public class DialogueInfo { [JsonPropertyName("attachmentsNew")] - public int AttachmentsNew { get; set; } + public int? AttachmentsNew { get; set; } [JsonPropertyName("new")] - public int New { get; set; } + public int? New { get; set; } [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("type")] - public MessageType Type { get; set; } + public MessageType? Type { get; set; } [JsonPropertyName("pinned")] - public bool Pinned { get; set; } + public bool? Pinned { get; set; } [JsonPropertyName("Users")] - public List Users { get; set; } + public List? Users { get; set; } [JsonPropertyName("message")] - public MessagePreview Message { get; set; } + public MessagePreview? Message { get; set; } } public class Message { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("uid")] - public string UserId { get; set; } + public string? UserId { get; set; } [JsonPropertyName("type")] - public MessageType MessageType { get; set; } + public MessageType? MessageType { get; set; } [JsonPropertyName("dt")] - public long DateTime { get; set; } + public long? DateTime { get; set; } [JsonPropertyName("UtcDateTime")] public long? UtcDateTime { get; set; } @@ -257,7 +257,7 @@ public class Message public bool? HasRewards { get; set; } [JsonPropertyName("rewardCollected")] - public bool RewardCollected { get; set; } + public bool? RewardCollected { get; set; } [JsonPropertyName("items")] public MessageItems? Items { get; set; } @@ -275,16 +275,16 @@ public class Message public class ReplyTo { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("uid")] - public string UserId { get; set; } + public string? UserId { get; set; } [JsonPropertyName("type")] - public MessageType MessageType { get; set; } + public MessageType? MessageType { get; set; } [JsonPropertyName("dt")] - public long DateTime { get; set; } + public long? DateTime { get; set; } [JsonPropertyName("text")] public string? Text { get; set; } @@ -293,16 +293,16 @@ public class ReplyTo public class MessagePreview { [JsonPropertyName("uid")] - public string UserId { get; set; } + public string? UserId { get; set; } [JsonPropertyName("type")] - public MessageType MessageType { get; set; } + public MessageType? MessageType { get; set; } [JsonPropertyName("dt")] - public long DateTime { get; set; } + public long? DateTime { get; set; } [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } [JsonPropertyName("text")] public string? Text { get; set; } @@ -323,29 +323,29 @@ public class MessageItems public class UpdatableChatMember { [JsonPropertyName("Nickname")] - public string Nickname { get; set; } + public string? Nickname { get; set; } [JsonPropertyName("Side")] - public string Side { get; set; } + public string? Side { get; set; } [JsonPropertyName("Level")] - public int Level { get; set; } + public int? Level { get; set; } [JsonPropertyName("MemberCategory")] - public MemberCategory MemberCategory { get; set; } + public MemberCategory? MemberCategory { get; set; } [JsonPropertyName("Ignored")] - public bool IsIgnored { get; set; } + public bool? IsIgnored { get; set; } [JsonPropertyName("Banned")] - public bool IsBanned { get; set; } + public bool? IsBanned { get; set; } } public class Spt { /** What version of SPT was this profile made with */ [JsonPropertyName("version")] - public string Version { get; set; } + public string? Version { get; set; } /** What mods has this profile loaded at any point in time */ [JsonPropertyName("mods")] @@ -375,109 +375,109 @@ public class Spt public class AcceptedCultistReward { [JsonPropertyName("timestamp")] - public long Timestamp { get; set; } + public long? Timestamp { get; set; } [JsonPropertyName("sacrificeItems")] - public List SacrificeItems { get; set; } + public List? SacrificeItems { get; set; } [JsonPropertyName("rewardItems")] - public List RewardItems { get; set; } + public List? RewardItems { get; set; } } public class ModDetails { [JsonPropertyName("name")] - public string Name { get; set; } + public string? Name { get; set; } [JsonPropertyName("version")] - public string Version { get; set; } + public string? Version { get; set; } [JsonPropertyName("author")] - public string Author { get; set; } + public string? Author { get; set; } [JsonPropertyName("dateAdded")] - public long DateAdded { get; set; } + public long? DateAdded { get; set; } [JsonPropertyName("url")] - public string Url { get; set; } + public string? Url { get; set; } } public class ReceivedGift { [JsonPropertyName("giftId")] - public string GiftId { get; set; } + public string? GiftId { get; set; } [JsonPropertyName("timestampLastAccepted")] - public long TimestampLastAccepted { get; set; } + public long? TimestampLastAccepted { get; set; } [JsonPropertyName("current")] - public int Current { get; set; } + public int? Current { get; set; } } public class Vitality { [JsonPropertyName("health")] - public Health Health { get; set; } + public Health? Health { get; set; } [JsonPropertyName("effects")] - public Effects Effects { get; set; } + public Effects? Effects { get; set; } } public class Health { [JsonPropertyName("Hydration")] - public double Hydration { get; set; } + public double? Hydration { get; set; } [JsonPropertyName("Energy")] - public double Energy { get; set; } + public double? Energy { get; set; } [JsonPropertyName("Temperature")] - public double Temperature { get; set; } + public double? Temperature { get; set; } [JsonPropertyName("Head")] - public double Head { get; set; } + public double? Head { get; set; } [JsonPropertyName("Chest")] - public double Chest { get; set; } + public double? Chest { get; set; } [JsonPropertyName("Stomach")] - public double Stomach { get; set; } + public double? Stomach { get; set; } [JsonPropertyName("LeftArm")] - public double LeftArm { get; set; } + public double? LeftArm { get; set; } [JsonPropertyName("RightArm")] - public double RightArm { get; set; } + public double? RightArm { get; set; } [JsonPropertyName("LeftLeg")] - public double LeftLeg { get; set; } + public double? LeftLeg { get; set; } [JsonPropertyName("RightLeg")] - public double RightLeg { get; set; } + public double? RightLeg { get; set; } } public class Effects { [JsonPropertyName("Head")] - public Head Head { get; set; } + public Head? Head { get; set; } [JsonPropertyName("Chest")] - public Chest Chest { get; set; } + public Chest? Chest { get; set; } [JsonPropertyName("Stomach")] - public Stomach Stomach { get; set; } + public Stomach? Stomach { get; set; } [JsonPropertyName("LeftArm")] - public LeftArm LeftArm { get; set; } + public LeftArm? LeftArm { get; set; } [JsonPropertyName("RightArm")] - public RightArm RightArm { get; set; } + public RightArm? RightArm { get; set; } [JsonPropertyName("LeftLeg")] - public LeftLeg LeftLeg { get; set; } + public LeftLeg? LeftLeg { get; set; } [JsonPropertyName("RightLeg")] - public RightLeg RightLeg { get; set; } + public RightLeg? RightLeg { get; set; } } public class Head @@ -519,44 +519,44 @@ public class RightLeg public class Inraid { [JsonPropertyName("location")] - public string Location { get; set; } + public string? Location { get; set; } [JsonPropertyName("character")] - public string Character { get; set; } + public string? Character { get; set; } } public class Insurance { [JsonPropertyName("scheduledTime")] - public int ScheduledTime { get; set; } + public int? ScheduledTime { get; set; } [JsonPropertyName("traderId")] - public string TraderId { get; set; } + public string? TraderId { get; set; } [JsonPropertyName("maxStorageTime")] - public int MaxStorageTime { get; set; } + public int? MaxStorageTime { get; set; } [JsonPropertyName("systemData")] - public SystemData SystemData { get; set; } + public SystemData? SystemData { get; set; } [JsonPropertyName("messageType")] - public MessageType MessageType { get; set; } + public MessageType? MessageType { get; set; } [JsonPropertyName("messageTemplateId")] - public string MessageTemplateId { get; set; } + public string? MessageTemplateId { get; set; } [JsonPropertyName("items")] - public List Items { get; set; } + public List? Items { get; set; } } public class MessageContentRagfair { [JsonPropertyName("offerId")] - public string OfferId { get; set; } + public string? OfferId { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } [JsonPropertyName("handbookId")] - public string HandbookId { get; set; } + public string? HandbookId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/UserDialogInfo.cs b/Core/Models/Eft/Profile/UserDialogInfo.cs index 26731e58..030cc515 100644 --- a/Core/Models/Eft/Profile/UserDialogInfo.cs +++ b/Core/Models/Eft/Profile/UserDialogInfo.cs @@ -6,29 +6,29 @@ namespace Core.Models.Eft.Profile; public class UserDialogInfo { [JsonPropertyName("_id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("aid")] - public int Aid { get; set; } - + public int? Aid { get; set; } + [JsonPropertyName("Info")] - public UserDialogDetails Info { get; set; } + public UserDialogDetails? Info { get; set; } } public class UserDialogDetails { [JsonPropertyName("Nickname")] - public string Nickname { get; set; } - + public string? Nickname { get; set; } + [JsonPropertyName("Side")] - public string Side { get; set; } - + public string? Side { get; set; } + [JsonPropertyName("Level")] - public int Level { get; set; } - + public int? Level { get; set; } + [JsonPropertyName("MemberCategory")] - public MemberCategory MemberCategory { get; set; } - + public MemberCategory? MemberCategory { get; set; } + [JsonPropertyName("SelectedMemberCategory")] - public MemberCategory SelectedMemberCategory { get; set; } + public MemberCategory? SelectedMemberCategory { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs b/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs index 8f0d6e70..70eab556 100644 --- a/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs +++ b/Core/Models/Eft/Profile/ValidateNicknameRequestData.cs @@ -5,5 +5,5 @@ namespace Core.Models.Eft.Profile; public class ValidateNicknameRequestData { [JsonPropertyName("nickname")] - public string Nickname { get; set; } + public string? Nickname { get; set; } } \ No newline at end of file From f9d04b1774142dd99830b5a5dfea3e117f8d30d8 Mon Sep 17 00:00:00 2001 From: CWX Date: Wed, 8 Jan 2025 13:19:24 +0000 Subject: [PATCH 2/4] more nullable --- Core/Models/Eft/Hideout/HideoutArea.cs | 116 +++++++------- Core/Models/Eft/Hideout/HideoutProduction.cs | 76 ++++----- Core/Models/Eft/Hideout/QteData.cs | 153 ++++++++++--------- 3 files changed, 173 insertions(+), 172 deletions(-) diff --git a/Core/Models/Eft/Hideout/HideoutArea.cs b/Core/Models/Eft/Hideout/HideoutArea.cs index beb96da6..04e7fe39 100644 --- a/Core/Models/Eft/Hideout/HideoutArea.cs +++ b/Core/Models/Eft/Hideout/HideoutArea.cs @@ -6,144 +6,144 @@ namespace Core.Models.Eft.Hideout; public class HideoutArea { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("type")] - public int Type { get; set; } + public int? Type { get; set; } [JsonPropertyName("enabled")] - public bool IsEnabled { get; set; } + public bool? IsEnabled { get; set; } [JsonPropertyName("needsFuel")] - public bool NeedsFuel { get; set; } + public bool? NeedsFuel { get; set; } [JsonPropertyName("requirements")] - public List Requirements { get; set; } + public List? Requirements { get; set; } [JsonPropertyName("takeFromSlotLocked")] - public bool IsTakeFromSlotLocked { get; set; } + public bool? IsTakeFromSlotLocked { get; set; } [JsonPropertyName("craftGivesExp")] - public bool CraftGivesExperience { get; set; } + public bool? CraftGivesExperience { get; set; } [JsonPropertyName("displayLevel")] - public bool DisplayLevel { get; set; } + public bool? DisplayLevel { get; set; } [JsonPropertyName("enableAreaRequirements")] - public bool EnableAreaRequirements { get; set; } + public bool? EnableAreaRequirements { get; set; } [JsonPropertyName("parentArea")] public string? ParentArea { get; set; } [JsonPropertyName("stages")] - public Dictionary Stages { get; set; } + public Dictionary? Stages { get; set; } } public class HideoutAreaRequirement { [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("requiredLevel")] - public int RequiredLevel { get; set; } + public int? RequiredLevel { get; set; } [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } } public class Stage { [JsonPropertyName("autoUpgrade")] - public bool AutoUpgrade { get; set; } + public bool? AutoUpgrade { get; set; } [JsonPropertyName("bonuses")] - public List Bonuses { get; set; } + public List? Bonuses { get; set; } [JsonPropertyName("constructionTime")] - public double ConstructionTime { get; set; } + public double? ConstructionTime { get; set; } /** Containers inventory tpl */ [JsonPropertyName("container")] public string? Container { get; set; } [JsonPropertyName("description")] - public string Description { get; set; } - + public string? Description { get; set; } + [JsonPropertyName("globalCounterId")] - public string GlobalCounterId { get; set; } + public string? GlobalCounterId { get; set; } [JsonPropertyName("displayInterface")] - public bool DisplayInterface { get; set; } + public bool? DisplayInterface { get; set; } [JsonPropertyName("improvements")] - public List Improvements { get; set; } + public List? Improvements { get; set; } [JsonPropertyName("requirements")] - public List Requirements { get; set; } + public List? Requirements { get; set; } [JsonPropertyName("slots")] - public int Slots { get; set; } + public int? Slots { get; set; } } public class StageImprovement { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("bonuses")] - public List Bonuses { get; set; } + public List? Bonuses { get; set; } [JsonPropertyName("improvementTime")] - public int ImprovementTime { get; set; } + public int? ImprovementTime { get; set; } [JsonPropertyName("requirements")] - public List Requirements { get; set; } + public List? Requirements { get; set; } } public class StageImprovementBonus { [JsonPropertyName("id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("passive")] - public bool IsPassive { get; set; } + public bool? IsPassive { get; set; } [JsonPropertyName("production")] - public bool IsProduction { get; set; } - + public bool? IsProduction { get; set; } + [JsonPropertyName("skillType")] [JsonConverter(typeof(JsonStringEnumConverter))] - public SkillTypes SkillType { get; set; } + public SkillTypes? SkillType { get; set; } [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } [JsonPropertyName("value")] - public int Value { get; set; } + public int? Value { get; set; } [JsonPropertyName("visible")] - public bool IsVisible { get; set; } + public bool? IsVisible { get; set; } } public class StageImprovementRequirement { [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } [JsonPropertyName("isEncoded")] - public bool IsEncoded { get; set; } + public bool? IsEncoded { get; set; } [JsonPropertyName("isFunctional")] - public bool IsFunctional { get; set; } + public bool? IsFunctional { get; set; } [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } [JsonPropertyName("isSpawnedInSession")] - public bool IsSpawnedInSession { get; set; } + public bool? IsSpawnedInSession { get; set; } [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } } public class StageRequirement : RequirementBase @@ -155,28 +155,28 @@ public class StageRequirement : RequirementBase public int? RequiredLevel { get; set; } [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } [JsonPropertyName("count")] public int? Count { get; set; } [JsonPropertyName("isEncoded")] - public bool IsEncoded { get; set; } = false; + public bool? IsEncoded { get; set; } = false; [JsonPropertyName("isFunctional")] - public bool IsFunctional { get; set; } + public bool? IsFunctional { get; set; } [JsonPropertyName("traderId")] - public string TraderId { get; set; } - + public string? TraderId { get; set; } + [JsonPropertyName("isSpawnedInSession")] - public bool IsSpawnedInSession { get; set; } + public bool? IsSpawnedInSession { get; set; } [JsonPropertyName("loyaltyLevel")] public int? LoyaltyLevel { get; set; } [JsonPropertyName("skillName")] - public string SkillName { get; set; } + public string? SkillName { get; set; } [JsonPropertyName("skillLevel")] public int? SkillLevel { get; set; } @@ -185,16 +185,16 @@ public class StageRequirement : RequirementBase public class StageBonus { [JsonPropertyName("value")] - public int Value { get; set; } + public int? Value { get; set; } [JsonPropertyName("passive")] - public bool Passive { get; set; } + public bool? Passive { get; set; } [JsonPropertyName("production")] - public bool Production { get; set; } + public bool? Production { get; set; } [JsonPropertyName("visible")] - public bool Visible { get; set; } + public bool? Visible { get; set; } [JsonPropertyName("skillType")] [JsonConverter(typeof(JsonStringEnumConverter))] @@ -202,18 +202,18 @@ public class StageBonus [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] - public BonusType Type { get; set; } + public BonusType? Type { get; set; } [JsonPropertyName("filter")] - public List Filter { get; set; } + public List? Filter { get; set; } [JsonPropertyName("icon")] - public string Icon { get; set; } + public string? Icon { get; set; } /** CHANGES PER DUMP */ [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/HideoutProduction.cs b/Core/Models/Eft/Hideout/HideoutProduction.cs index efe8a10f..c4a96289 100644 --- a/Core/Models/Eft/Hideout/HideoutProduction.cs +++ b/Core/Models/Eft/Hideout/HideoutProduction.cs @@ -6,84 +6,84 @@ namespace Core.Models.Eft.Hideout; public class HideoutProductionData { [JsonPropertyName("recipes")] - public List Recipes { get; set; } + public List? Recipes { get; set; } [JsonPropertyName("scavRecipes")] - public List ScavRecipes { get; set; } + public List? ScavRecipes { get; set; } [JsonPropertyName("cultistRecipes")] - public List CultistRecipes { get; set; } + public List? CultistRecipes { get; set; } } public class HideoutProduction { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("areaType")] - public int AreaType { get; set; } + public int? AreaType { get; set; } [JsonPropertyName("requirements")] - public List Requirements { get; set; } + public List? Requirements { get; set; } [JsonPropertyName("productionTime")] - public int ProductionTime { get; set; } + public int? ProductionTime { get; set; } /** Tpl of item being crafted */ [JsonPropertyName("endProduct")] - public string EndProduct { get; set; } + public string? EndProduct { get; set; } [JsonPropertyName("isEncoded")] - public bool IsEncoded { get; set; } + public bool? IsEncoded { get; set; } [JsonPropertyName("locked")] - public bool Locked { get; set; } + public bool? Locked { get; set; } [JsonPropertyName("needFuelForAllProductionTime")] - public bool NeedFuelForAllProductionTime { get; set; } + public bool? NeedFuelForAllProductionTime { get; set; } [JsonPropertyName("continuous")] - public bool Continuous { get; set; } + public bool? Continuous { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } [JsonPropertyName("productionLimitCount")] - public int ProductionLimitCount { get; set; } + public int? ProductionLimitCount { get; set; } [JsonPropertyName("isCodeProduction")] - public bool IsCodeProduction { get; set; } + public bool? IsCodeProduction { get; set; } } public class Requirement : RequirementBase { [JsonPropertyName("templateId")] public string? TemplateId { get; set; } - + [JsonPropertyName("count")] public int? Count { get; set; } - + [JsonPropertyName("isEncoded")] public bool? IsEncoded { get; set; } - + [JsonPropertyName("isFunctional")] public bool? IsFunctional { get; set; } - + [JsonPropertyName("areaType")] public int? AreaType { get; set; } - + [JsonPropertyName("requiredLevel")] public int? RequiredLevel { get; set; } - + [JsonPropertyName("resource")] public int? Resource { get; set; } - + [JsonPropertyName("questId")] public string? QuestId { get; set; } - + [JsonPropertyName("isSpawnedInSession")] public bool? IsSpawnedInSession { get; set; } - + [JsonPropertyName("gameVersions")] public List? GameVersions { get; set; } } @@ -91,38 +91,38 @@ public class Requirement : RequirementBase public class RequirementBase { [JsonPropertyName("type")] - public string Type { get; set; } + public string? Type { get; set; } } public class ScavRecipe { [JsonPropertyName("_id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("requirements")] - public List Requirements { get; set; } - + public List? Requirements { get; set; } + [JsonPropertyName("productionTime")] - public int ProductionTime { get; set; } - + public int? ProductionTime { get; set; } + [JsonPropertyName("endProducts")] - public EndProducts EndProducts { get; set; } + public EndProducts? EndProducts { get; set; } } public class EndProducts { [JsonPropertyName("Common")] - public MinMax Common { get; set; } - + public MinMax? Common { get; set; } + [JsonPropertyName("Rare")] - public MinMax Rare { get; set; } - + public MinMax? Rare { get; set; } + [JsonPropertyName("Superrare")] - public MinMax Superrare { get; set; } + public MinMax? Superrare { get; set; } } public class CultistRecipe { [JsonPropertyName("_id")] - public string Id { get; set; } + public string? Id { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Hideout/QteData.cs b/Core/Models/Eft/Hideout/QteData.cs index 0c1734e0..db2a3c17 100644 --- a/Core/Models/Eft/Hideout/QteData.cs +++ b/Core/Models/Eft/Hideout/QteData.cs @@ -5,25 +5,25 @@ using Core.Models.Enums.Hideout; namespace Core.Models.Eft.Hideout; -public class QteData +public class QteData { [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } [JsonPropertyName("type")] - public QteActivityType Type { get; set; } + public QteActivityType? Type { get; set; } [JsonPropertyName("area")] - public HideoutAreas Area { get; set; } + public HideoutAreas? Area { get; set; } [JsonPropertyName("areaLevel")] - public int AreaLevel { get; set; } + public int? AreaLevel { get; set; } [JsonPropertyName("quickTimeEvents")] - public List QuickTimeEvents { get; set; } + public List? QuickTimeEvents { get; set; } [JsonPropertyName("requirements")] - public List Requirements { get; set; } + public List? Requirements { get; set; } /* TODO: Could be an array of any of these: | IAreaRequirement @@ -39,218 +39,219 @@ public class QteData */ [JsonPropertyName("results")] - public Dictionary Results { get; set; } + public Dictionary? Results { get; set; } } public class QuickTimeEvent { [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] - public QteType EventType { get; set; } - + public QteType? EventType { get; set; } + [JsonPropertyName("position")] - public Position Coordinates { get; set; } - + public Position? Coordinates { get; set; } + [JsonPropertyName("startDelay")] - public double StartDelay { get; set; } - + public double? StartDelay { get; set; } + [JsonPropertyName("endDelay")] - public double EndDelay { get; set; } - + public double? EndDelay { get; set; } + [JsonPropertyName("speed")] - public float MovementSpeed { get; set; } - + public float? MovementSpeed { get; set; } + [JsonPropertyName("successRange")] - public Position SuccessCoordinates { get; set; } - + public Position? SuccessCoordinates { get; set; } + [JsonPropertyName("key")] - public string UniqueKey { get; set; } + public string? UniqueKey { get; set; } } public class QteRequirement { [JsonPropertyName("type")] - public RequirementType RequirementType { get; set; } + public RequirementType? RequirementType { get; set; } } public class QteResult { [JsonPropertyName("energy")] - public int Energy { get; set; } - + public int? Energy { get; set; } + [JsonPropertyName("hydration")] - public int Hydration { get; set; } - + public int? Hydration { get; set; } + [JsonPropertyName("rewardsRange")] - public List RewardEffects { get; set; } + public List? RewardEffects { get; set; } } public class QteEffect { [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] - public QteRewardType EffectType { get; set; } - + public QteRewardType? EffectType { get; set; } + [JsonPropertyName("skillId")] [JsonConverter(typeof(JsonStringEnumConverter))] - public SkillTypes SkillIdentifier { get; set; } - + public SkillTypes? SkillIdentifier { get; set; } + [JsonPropertyName("levelMultipliers")] - public List LevelMultipliers { get; set; } - + public List? LevelMultipliers { get; set; } + [JsonPropertyName("time")] - public int DurationInMilliseconds { get; set; } - + public int? DurationInMilliseconds { get; set; } + [JsonPropertyName("weight")] - public float EffectWeight { get; set; } - + public float? EffectWeight { get; set; } + [JsonPropertyName("result")] [JsonConverter(typeof(JsonStringEnumConverter))] - public QteResultType ResultType { get; set; } + public QteResultType? ResultType { get; set; } } public class SkillLevelMultiplier { [JsonPropertyName("level")] - public int Level { get; set; } - + public int? Level { get; set; } + [JsonPropertyName("multiplier")] - public float MultiplierValue { get; set; } + public float? MultiplierValue { get; set; } } public class Position { [JsonPropertyName("x")] - public float X { get; set; } + public float? X { get; set; } + [JsonPropertyName("y")] - public float Y { get; set; } + public float? Y { get; set; } } public class AreaRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.Area; + public RequirementType? Type { get; set; } = RequirementType.Area; [JsonPropertyName("areaType")] - public HideoutAreas AreaType { get; set; } + public HideoutAreas? AreaType { get; set; } [JsonPropertyName("requiredLevel")] - public int RequiredLevel { get; set; } + public int? RequiredLevel { get; set; } } public class TraderUnlockRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.TraderUnlock; + public RequirementType? Type { get; set; } = RequirementType.TraderUnlock; [JsonPropertyName("traderId")] - public string TraderId { get; set; } + public string? TraderId { get; set; } } public class TraderLoyaltyRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.TraderLoyalty; + public RequirementType? Type { get; set; } = RequirementType.TraderLoyalty; [JsonPropertyName("traderId")] - public string TraderId { get; set; } + public string? TraderId { get; set; } [JsonPropertyName("loyaltyLevel")] - public int LoyaltyLevel { get; set; } + public int? LoyaltyLevel { get; set; } } public class SkillRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.Skill; + public RequirementType? Type { get; set; } = RequirementType.Skill; [JsonPropertyName("skillName")] - public SkillTypes SkillName { get; set; } + public SkillTypes? SkillName { get; set; } [JsonPropertyName("skillLevel")] - public int SkillLevel { get; set; } + public int? SkillLevel { get; set; } } public class ResourceRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.Resource; + public RequirementType? Type { get; set; } = RequirementType.Resource; [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } [JsonPropertyName("resource")] - public int Resource { get; set; } + public int? Resource { get; set; } } public class ItemRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.Item; + public RequirementType? Type { get; set; } = RequirementType.Item; [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } [JsonPropertyName("isFunctional")] - public bool IsFunctional { get; set; } + public bool? IsFunctional { get; set; } [JsonPropertyName("isEncoded")] - public bool IsEncoded { get; set; } + public bool? IsEncoded { get; set; } } public class ToolRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.Tool; + public RequirementType? Type { get; set; } = RequirementType.Tool; [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + public string? TemplateId { get; set; } [JsonPropertyName("count")] - public int Count { get; set; } + public int? Count { get; set; } [JsonPropertyName("isFunctional")] - public bool IsFunctional { get; set; } + public bool? IsFunctional { get; set; } [JsonPropertyName("isEncoded")] - public bool IsEncoded { get; set; } + public bool? IsEncoded { get; set; } } public class QuestRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.QuestComplete; + public RequirementType? Type { get; set; } = RequirementType.QuestComplete; [JsonPropertyName("questId")] - public string QuestId { get; set; } + public string? QuestId { get; set; } } public class HealthRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.Health; + public RequirementType? Type { get; set; } = RequirementType.Health; [JsonPropertyName("energy")] - public int Energy { get; set; } + public int? Energy { get; set; } [JsonPropertyName("hydration")] - public int Hydration { get; set; } + public int? Hydration { get; set; } } public class BodyPartBuffRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType Type { get; set; } = RequirementType.BodyPartBuff; + public RequirementType? Type { get; set; } = RequirementType.BodyPartBuff; [JsonPropertyName("effectName")] - public Effect EffectName { get; set; } + public Effect? EffectName { get; set; } [JsonPropertyName("bodyPart")] - public BodyPart BodyPart { get; set; } + public BodyPart? BodyPart { get; set; } [JsonPropertyName("excluded")] - public bool Excluded { get; set; } + public bool? Excluded { get; set; } } \ No newline at end of file From 9b22e1e45357a6e4f782fa6460c40b068612b279 Mon Sep 17 00:00:00 2001 From: CWX Date: Wed, 8 Jan 2025 13:22:36 +0000 Subject: [PATCH 3/4] temp fix issue to stop errors --- Core/Models/Eft/Hideout/QteData.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Core/Models/Eft/Hideout/QteData.cs b/Core/Models/Eft/Hideout/QteData.cs index db2a3c17..90ed9c94 100644 --- a/Core/Models/Eft/Hideout/QteData.cs +++ b/Core/Models/Eft/Hideout/QteData.cs @@ -130,7 +130,7 @@ public class Position public class AreaRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.Area; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Area; [JsonPropertyName("areaType")] public HideoutAreas? AreaType { get; set; } @@ -142,7 +142,7 @@ public class AreaRequirement : QteRequirement public class TraderUnlockRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.TraderUnlock; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.TraderUnlock; [JsonPropertyName("traderId")] public string? TraderId { get; set; } @@ -151,7 +151,7 @@ public class TraderUnlockRequirement : QteRequirement public class TraderLoyaltyRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.TraderLoyalty; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.TraderLoyalty; [JsonPropertyName("traderId")] public string? TraderId { get; set; } @@ -163,7 +163,7 @@ public class TraderLoyaltyRequirement : QteRequirement public class SkillRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.Skill; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Skill; [JsonPropertyName("skillName")] public SkillTypes? SkillName { get; set; } @@ -175,7 +175,7 @@ public class SkillRequirement : QteRequirement public class ResourceRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.Resource; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Resource; [JsonPropertyName("templateId")] public string? TemplateId { get; set; } @@ -187,7 +187,7 @@ public class ResourceRequirement : QteRequirement public class ItemRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.Item; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Item; [JsonPropertyName("templateId")] public string? TemplateId { get; set; } @@ -205,7 +205,7 @@ public class ItemRequirement : QteRequirement public class ToolRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.Tool; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Tool; [JsonPropertyName("templateId")] public string? TemplateId { get; set; } @@ -223,7 +223,7 @@ public class ToolRequirement : QteRequirement public class QuestRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.QuestComplete; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.QuestComplete; [JsonPropertyName("questId")] public string? QuestId { get; set; } @@ -232,7 +232,7 @@ public class QuestRequirement : QteRequirement public class HealthRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.Health; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.Health; [JsonPropertyName("energy")] public int? Energy { get; set; } @@ -244,7 +244,7 @@ public class HealthRequirement : QteRequirement public class BodyPartBuffRequirement : QteRequirement { [JsonPropertyName("type")] - public RequirementType? Type { get; set; } = RequirementType.BodyPartBuff; + public RequirementType? Type { get; set; } = Models.Enums.Hideout.RequirementType.BodyPartBuff; [JsonPropertyName("effectName")] public Effect? EffectName { get; set; } From 37c6847890f7a14d1c8504c00266c4bf9c340e2e Mon Sep 17 00:00:00 2001 From: CWX Date: Wed, 8 Jan 2025 13:27:58 +0000 Subject: [PATCH 4/4] more nulls --- .../Eft/Quests/AcceptQuestRequestData.cs | 12 +-- .../Eft/Quests/CompleteQuestRequestData.cs | 14 +-- .../Models/Eft/Quests/FailQuestRequestData.cs | 8 +- .../Eft/Quests/HandoverQuestRequestData.cs | 24 ++--- .../Eft/Quests/ListQuestsRequestData.cs | 4 +- .../Eft/Quests/RepeatableQuestChangeEvent.cs | 8 +- .../Models/Eft/Ragfair/AddOfferRequestData.cs | 36 +++---- .../Eft/Ragfair/ExtendOfferRequestData.cs | 8 +- Core/Models/Eft/Ragfair/GetItemPriceResult.cs | 4 +- .../Eft/Ragfair/GetMarketPriceRequestData.cs | 4 +- Core/Models/Eft/Ragfair/GetOffersResult.cs | 6 +- .../Eft/Ragfair/GetRagfairOfferByIdRequest.cs | 4 +- Core/Models/Eft/Ragfair/RagfairOffer.cs | 96 +++++++++---------- .../Eft/Ragfair/RemoveOfferRequestData.cs | 8 +- Core/Models/Eft/Ragfair/SearchRequestData.cs | 46 ++++----- .../Ragfair/SendRagfairReportRequestData.cs | 4 +- .../StorePlayerOfferTaxAmountRequestData.cs | 16 ++-- 17 files changed, 151 insertions(+), 151 deletions(-) diff --git a/Core/Models/Eft/Quests/AcceptQuestRequestData.cs b/Core/Models/Eft/Quests/AcceptQuestRequestData.cs index 70077eff..0fce6a5a 100644 --- a/Core/Models/Eft/Quests/AcceptQuestRequestData.cs +++ b/Core/Models/Eft/Quests/AcceptQuestRequestData.cs @@ -4,12 +4,12 @@ namespace Core.Models.Eft.Quests; public class AcceptQuestRequestData { - [JsonPropertyName("Action")] - public string Action { get; set; } = "QuestAccept"; + [JsonPropertyName("Action")] + public string? Action { get; set; } = "QuestAccept"; - [JsonPropertyName("qid")] - public string QuestId { get; set; } + [JsonPropertyName("qid")] + public string? QuestId { get; set; } - [JsonPropertyName("type")] - public string Type { get; set; } + [JsonPropertyName("type")] + public string? Type { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Quests/CompleteQuestRequestData.cs b/Core/Models/Eft/Quests/CompleteQuestRequestData.cs index 6e105d3b..6be62db2 100644 --- a/Core/Models/Eft/Quests/CompleteQuestRequestData.cs +++ b/Core/Models/Eft/Quests/CompleteQuestRequestData.cs @@ -4,13 +4,13 @@ namespace Core.Models.Eft.Quests; public class CompleteQuestRequestData { - [JsonPropertyName("Action")] - public string Action { get; set; } + [JsonPropertyName("Action")] + public string? Action { get; set; } - /** Quest Id */ - [JsonPropertyName("qid")] - public string QuestId { get; set; } + /** Quest Id */ + [JsonPropertyName("qid")] + public string? QuestId { get; set; } - [JsonPropertyName("removeExcessItems")] - public bool RemoveExcessItems { get; set; } + [JsonPropertyName("removeExcessItems")] + public bool? RemoveExcessItems { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Quests/FailQuestRequestData.cs b/Core/Models/Eft/Quests/FailQuestRequestData.cs index fb4f6721..f7b19306 100644 --- a/Core/Models/Eft/Quests/FailQuestRequestData.cs +++ b/Core/Models/Eft/Quests/FailQuestRequestData.cs @@ -2,14 +2,14 @@ namespace Core.Models.Eft.Quests; -public class FailQuestRequestData +public class FailQuestRequestData { [JsonPropertyName("Action")] - public string Action { get; set; } = "QuestFail"; + public string? Action { get; set; } = "QuestFail"; [JsonPropertyName("qid")] - public string QuestId { get; set; } + public string? QuestId { get; set; } [JsonPropertyName("removeExcessItems")] - public bool RemoveExcessItems { get; set; } + public bool? RemoveExcessItems { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Quests/HandoverQuestRequestData.cs b/Core/Models/Eft/Quests/HandoverQuestRequestData.cs index 58a413bd..3690d902 100644 --- a/Core/Models/Eft/Quests/HandoverQuestRequestData.cs +++ b/Core/Models/Eft/Quests/HandoverQuestRequestData.cs @@ -4,24 +4,24 @@ namespace Core.Models.Eft.Quests; public class HandoverQuestRequestData { - [JsonPropertyName("Action")] - public string Action { get; set; } = "QuestHandover"; + [JsonPropertyName("Action")] + public string? Action { get; set; } = "QuestHandover"; - [JsonPropertyName("qid")] - public string QuestId { get; set; } + [JsonPropertyName("qid")] + public string? QuestId { get; set; } - [JsonPropertyName("conditionId")] - public string ConditionId { get; set; } + [JsonPropertyName("conditionId")] + public string? ConditionId { get; set; } - [JsonPropertyName("items")] - public List Items { get; set; } + [JsonPropertyName("items")] + public List? Items { get; set; } } public class HandoverItem { - [JsonPropertyName("id")] - public string Id { get; set; } + [JsonPropertyName("id")] + public string? Id { get; set; } - [JsonPropertyName("count")] - public int Count { get; set; } + [JsonPropertyName("count")] + public int? Count { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Quests/ListQuestsRequestData.cs b/Core/Models/Eft/Quests/ListQuestsRequestData.cs index 5c02fb27..3f846c32 100644 --- a/Core/Models/Eft/Quests/ListQuestsRequestData.cs +++ b/Core/Models/Eft/Quests/ListQuestsRequestData.cs @@ -4,6 +4,6 @@ namespace Core.Models.Eft.Quests; public class ListQuestsRequestData { - [JsonPropertyName("completed")] - public bool Completed { get; set; } + [JsonPropertyName("completed")] + public bool? Completed { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs b/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs index fdc5b65a..4a03d579 100644 --- a/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs +++ b/Core/Models/Eft/Quests/RepeatableQuestChangeEvent.cs @@ -4,9 +4,9 @@ namespace Core.Models.Eft.Quests; public class RepeatableQuestChangeRequest { - [JsonPropertyName("Action")] - public string Action { get; set; } = "RepeatableQuestChange"; + [JsonPropertyName("Action")] + public string? Action { get; set; } = "RepeatableQuestChange"; - [JsonPropertyName("qid")] - public string QuestId { get; set; } + [JsonPropertyName("qid")] + public string? QuestId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Core/Models/Eft/Ragfair/AddOfferRequestData.cs index 2de8c102..b5ded6db 100644 --- a/Core/Models/Eft/Ragfair/AddOfferRequestData.cs +++ b/Core/Models/Eft/Ragfair/AddOfferRequestData.cs @@ -4,33 +4,33 @@ namespace Core.Models.Eft.Ragfair; public class AddOfferRequestData { - [JsonPropertyName("Action")] - public string Action { get; set; } + [JsonPropertyName("Action")] + public string? Action { get; set; } - [JsonPropertyName("sellInOnePiece")] - public bool SellInOnePiece { get; set; } + [JsonPropertyName("sellInOnePiece")] + public bool? SellInOnePiece { get; set; } - [JsonPropertyName("items")] - public List Items { get; set; } + [JsonPropertyName("items")] + public List? Items { get; set; } - [JsonPropertyName("requirements")] - public List Requirements { get; set; } + [JsonPropertyName("requirements")] + public List? Requirements { get; set; } } public class Requirement { - [JsonPropertyName("_tpl")] - public string Template { get; set; } + [JsonPropertyName("_tpl")] + public string? Template { get; set; } - [JsonPropertyName("count")] - public int Count { get; set; } + [JsonPropertyName("count")] + public int? Count { get; set; } - [JsonPropertyName("level")] - public int Level { get; set; } + [JsonPropertyName("level")] + public int? Level { get; set; } - [JsonPropertyName("side")] - public int Side { get; set; } + [JsonPropertyName("side")] + public int? Side { get; set; } - [JsonPropertyName("onlyFunctional")] - public bool OnlyFunctional { get; set; } + [JsonPropertyName("onlyFunctional")] + public bool? OnlyFunctional { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs b/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs index ffb29d65..42c941a8 100644 --- a/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs +++ b/Core/Models/Eft/Ragfair/ExtendOfferRequestData.cs @@ -4,9 +4,9 @@ namespace Core.Models.Eft.Ragfair; public class ExtendOfferRequestData { - [JsonPropertyName("offerId")] - public string OfferId { get; set; } + [JsonPropertyName("offerId")] + public string? OfferId { get; set; } - [JsonPropertyName("renewalTime")] - public int RenewalTime { get; set; } + [JsonPropertyName("renewalTime")] + public int? RenewalTime { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/GetItemPriceResult.cs b/Core/Models/Eft/Ragfair/GetItemPriceResult.cs index 43d8ea66..b4fbcd52 100644 --- a/Core/Models/Eft/Ragfair/GetItemPriceResult.cs +++ b/Core/Models/Eft/Ragfair/GetItemPriceResult.cs @@ -5,6 +5,6 @@ namespace Core.Models.Eft.Ragfair; public class GetItemPriceResult : MinMax { - [JsonPropertyName("avg")] - public int Avg { get; set; } + [JsonPropertyName("avg")] + public int? Avg { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs b/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs index df4c7b03..44bb3853 100644 --- a/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs +++ b/Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs @@ -4,6 +4,6 @@ namespace Core.Models.Eft.Ragfair; public class GetMarketPriceRequestData { - [JsonPropertyName("templateId")] - public string TemplateId { get; set; } + [JsonPropertyName("templateId")] + public string? TemplateId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/GetOffersResult.cs b/Core/Models/Eft/Ragfair/GetOffersResult.cs index b464da73..75618aff 100644 --- a/Core/Models/Eft/Ragfair/GetOffersResult.cs +++ b/Core/Models/Eft/Ragfair/GetOffersResult.cs @@ -8,11 +8,11 @@ public class GetOffersResult public Dictionary? Categories { get; set; } [JsonPropertyName("offers")] - public List Offers { get; set; } + public List? Offers { get; set; } [JsonPropertyName("offersCount")] - public int OffersCount { get; set; } + public int? OffersCount { get; set; } [JsonPropertyName("selectedCategory")] - public string SelectedCategory { get; set; } + public string? SelectedCategory { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs b/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs index 74bef8b2..7cb942d4 100644 --- a/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs +++ b/Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs @@ -4,6 +4,6 @@ namespace Core.Models.Eft.Ragfair; public class GetRagfairOfferByIdRequest { - [JsonPropertyName("id")] - public int Id { get; set; } + [JsonPropertyName("id")] + public int? Id { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/RagfairOffer.cs b/Core/Models/Eft/Ragfair/RagfairOffer.cs index 3e120aa3..d1c26a45 100644 --- a/Core/Models/Eft/Ragfair/RagfairOffer.cs +++ b/Core/Models/Eft/Ragfair/RagfairOffer.cs @@ -8,60 +8,60 @@ public class RagfairOffer { [JsonPropertyName("sellResult")] public List? SellResults { get; set; } - + [JsonPropertyName("_id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("items")] - public List Items { get; set; } - + public List? Items { get; set; } + [JsonPropertyName("requirements")] - public List Requirements { get; set; } - + public List? Requirements { get; set; } + [JsonPropertyName("root")] - public string Root { get; set; } - + public string? Root { get; set; } + [JsonPropertyName("intId")] - public int InternalId { get; set; } - + public int? InternalId { get; set; } + /** Handbook price */ [JsonPropertyName("itemsCost")] - public decimal ItemsCost { get; set; } - + public decimal? ItemsCost { get; set; } + /** Rouble price per item */ [JsonPropertyName("requirementsCost")] - public decimal RequirementsCost { get; set; } - + public decimal? RequirementsCost { get; set; } + [JsonPropertyName("startTime")] - public long StartTime { get; set; } - + public long? StartTime { get; set; } + [JsonPropertyName("endTime")] - public long EndTime { get; set; } - + public long? EndTime { get; set; } + /** True when offer is sold as pack */ [JsonPropertyName("sellInOnePiece")] - public bool SellInOnePiece { get; set; } - + public bool? SellInOnePiece { get; set; } + /** Rouble price - same as requirementsCost */ [JsonPropertyName("summaryCost")] - public decimal SummaryCost { get; set; } - + public decimal? SummaryCost { get; set; } + [JsonPropertyName("user")] - public RagfairOfferUser User { get; set; } + public RagfairOfferUser? User { get; set; } /** Trader only */ [JsonPropertyName("unlimitedCount")] public bool? UnlimitedCount { get; set; } - + [JsonPropertyName("loyaltyLevel")] - public int LoyaltyLevel { get; set; } - + public int? LoyaltyLevel { get; set; } + [JsonPropertyName("buyRestrictionMax")] public int? BuyRestrictionMax { get; set; } - + [JsonPropertyName("buyRestrictionCurrent")] public int? BuyRestrictionCurrent { get; set; } - + [JsonPropertyName("locked")] public bool? Locked { get; set; } } @@ -69,17 +69,17 @@ public class RagfairOffer public class OfferRequirement { [JsonPropertyName("_tpl")] - public string Template { get; set; } - + public string? Template { get; set; } + [JsonPropertyName("count")] - public int Count { get; set; } - + public int? Count { get; set; } + [JsonPropertyName("onlyFunctional")] - public bool OnlyFunctional { get; set; } - + public bool? OnlyFunctional { get; set; } + [JsonPropertyName("level")] public int? Level { get; set; } - + [JsonPropertyName("side")] public DogtagExchangeSide? Side { get; set; } } @@ -87,26 +87,26 @@ public class OfferRequirement public class RagfairOfferUser { [JsonPropertyName("id")] - public string Id { get; set; } - + public string? Id { get; set; } + [JsonPropertyName("nickname")] public string? Nickname { get; set; } - + [JsonPropertyName("rating")] public decimal? Rating { get; set; } - + [JsonPropertyName("memberType")] - public MemberCategory MemberType { get; set; } - + public MemberCategory? MemberType { get; set; } + [JsonPropertyName("selectedMemberCategory")] public MemberCategory? SelectedMemberCategory { get; set; } - + [JsonPropertyName("avatar")] public string? Avatar { get; set; } - + [JsonPropertyName("isRatingGrowing")] public bool? IsRatingGrowing { get; set; } - + [JsonPropertyName("aid")] public int? Aid { get; set; } } @@ -114,8 +114,8 @@ public class RagfairOfferUser public class SellResult { [JsonPropertyName("sellTime")] - public long SellTime { get; set; } - + public long? SellTime { get; set; } + [JsonPropertyName("amount")] - public decimal Amount { get; set; } + public decimal? Amount { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs b/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs index f54a1b3b..34704a72 100644 --- a/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs +++ b/Core/Models/Eft/Ragfair/RemoveOfferRequestData.cs @@ -4,9 +4,9 @@ namespace Core.Models.Eft.Ragfair; public class RemoveOfferRequestData { - [JsonPropertyName("Action")] - public string Action { get; set; } + [JsonPropertyName("Action")] + public string? Action { get; set; } - [JsonPropertyName("offerId")] - public string OfferId { get; set; } + [JsonPropertyName("offerId")] + public string? OfferId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/SearchRequestData.cs b/Core/Models/Eft/Ragfair/SearchRequestData.cs index fa37c184..10d2d2f6 100644 --- a/Core/Models/Eft/Ragfair/SearchRequestData.cs +++ b/Core/Models/Eft/Ragfair/SearchRequestData.cs @@ -6,73 +6,73 @@ namespace Core.Models.Eft.Ragfair; public class SearchRequestData { [JsonPropertyName("page")] - public int Page { get; set; } + public int? Page { get; set; } [JsonPropertyName("limit")] - public int Limit { get; set; } + public int? Limit { get; set; } [JsonPropertyName("sortType")] - public RagfairSort SortType { get; set; } + public RagfairSort? SortType { get; set; } [JsonPropertyName("sortDirection")] - public int SortDirection { get; set; } + public int? SortDirection { get; set; } [JsonPropertyName("currency")] - public int Currency { get; set; } + public int? Currency { get; set; } [JsonPropertyName("priceFrom")] - public int PriceFrom { get; set; } + public int? PriceFrom { get; set; } [JsonPropertyName("priceTo")] - public int PriceTo { get; set; } + public int? PriceTo { get; set; } [JsonPropertyName("quantityFrom")] - public int QuantityFrom { get; set; } + public int? QuantityFrom { get; set; } [JsonPropertyName("quantityTo")] - public int QuantityTo { get; set; } + public int? QuantityTo { get; set; } [JsonPropertyName("conditionFrom")] - public int ConditionFrom { get; set; } + public int? ConditionFrom { get; set; } [JsonPropertyName("conditionTo")] - public int ConditionTo { get; set; } + public int? ConditionTo { get; set; } [JsonPropertyName("oneHourExpiration")] - public bool OneHourExpiration { get; set; } + public bool? OneHourExpiration { get; set; } [JsonPropertyName("removeBartering")] - public bool RemoveBartering { get; set; } + public bool? RemoveBartering { get; set; } [JsonPropertyName("offerOwnerType")] - public OfferOwnerType OfferOwnerType { get; set; } + public OfferOwnerType? OfferOwnerType { get; set; } [JsonPropertyName("onlyFunctional")] - public bool OnlyFunctional { get; set; } + public bool? OnlyFunctional { get; set; } [JsonPropertyName("updateOfferCount")] - public bool UpdateOfferCount { get; set; } + public bool? UpdateOfferCount { get; set; } [JsonPropertyName("handbookId")] - public string HandbookId { get; set; } + public string? HandbookId { get; set; } [JsonPropertyName("linkedSearchId")] - public string LinkedSearchId { get; set; } + public string? LinkedSearchId { get; set; } [JsonPropertyName("neededSearchId")] - public string NeededSearchId { get; set; } + public string? NeededSearchId { get; set; } [JsonPropertyName("buildItems")] - public BuildItems BuildItems { get; set; } + public BuildItems? BuildItems { get; set; } [JsonPropertyName("buildCount")] - public int BuildCount { get; set; } + public int? BuildCount { get; set; } [JsonPropertyName("tm")] - public int Tm { get; set; } + public int? Tm { get; set; } [JsonPropertyName("reload")] - public int Reload { get; set; } + public int? Reload { get; set; } } public enum OfferOwnerType diff --git a/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs b/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs index 27e05b6b..d69e542e 100644 --- a/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs +++ b/Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs @@ -4,6 +4,6 @@ namespace Core.Models.Eft.Ragfair; public class SendRagfairReportRequestData { - [JsonPropertyName("offerId")] - public int OfferId { get; set; } + [JsonPropertyName("offerId")] + public int? OfferId { get; set; } } \ No newline at end of file diff --git a/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs b/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs index fba10c63..ed51b0d2 100644 --- a/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs +++ b/Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs @@ -4,15 +4,15 @@ namespace Core.Models.Eft.Ragfair; public class StorePlayerOfferTaxAmountRequestData { - [JsonPropertyName("id")] - public string Id { get; set; } + [JsonPropertyName("id")] + public string? Id { get; set; } - [JsonPropertyName("tpl")] - public string Tpl { get; set; } + [JsonPropertyName("tpl")] + public string? Tpl { get; set; } - [JsonPropertyName("count")] - public int Count { get; set; } + [JsonPropertyName("count")] + public int? Count { get; set; } - [JsonPropertyName("fee")] - public double Fee { get; set; } + [JsonPropertyName("fee")] + public double? Fee { get; set; } } \ No newline at end of file