From af3c559802a5e3b0f2815798f511e07f83f88532 Mon Sep 17 00:00:00 2001 From: clodan Date: Tue, 21 Jan 2025 12:37:55 +0000 Subject: [PATCH] ItemRequestData feeds --- .../Eft/Health/HealthTreatmentRequestData.cs | 5 +-- ...rcleOfCultistProductionStartRequestData.cs | 6 +-- ...outContinuousProductionStartRequestData.cs | 6 +-- .../HideoutCustomizationApplyRequestData.cs | 5 +-- ...outCustomizationSetMannequinPoseRequest.cs | 19 ++++---- .../HideoutDeleteProductionRequestData.cs | 6 +-- .../Hideout/HideoutImproveAreaRequestData.cs | 6 +-- .../Hideout/HideoutPutItemInRequestData.cs | 5 +-- .../HideoutScavCaseStartRequestData.cs | 6 +-- ...HideoutSingleProductionStartRequestData.cs | 6 +-- .../Hideout/HideoutTakeItemOutRequestData.cs | 6 +-- .../HideoutTakeProductionRequestData.cs | 6 +-- .../Hideout/HideoutToggleAreaRequestData.cs | 6 +-- .../HideoutUpgradeCompleteRequestData.cs | 5 +-- .../Eft/Hideout/HideoutUpgradeRequestData.cs | 5 +-- .../Eft/Hideout/RecordShootingRangePoints.cs | 6 +-- .../BaseInteractionRequestDataConverter.cs | 44 +++++++++++++++++++ 17 files changed, 82 insertions(+), 66 deletions(-) diff --git a/Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs index becbff44..3b8ef267 100644 --- a/Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs +++ b/Libraries/Core/Models/Eft/Health/HealthTreatmentRequestData.cs @@ -1,11 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Health; -public record HealthTreatmentRequestData +public record HealthTreatmentRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string Action { get; set; } = "RestoreHealth"; [JsonPropertyName("trader")] public string? Trader { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs index bae945fd..90bf6c03 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutCircleOfCultistProductionStartRequestData +public record HideoutCircleOfCultistProductionStartRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutCircleOfCultistProductionStart"; - [JsonPropertyName("timestamp")] public long? Timestamp { get; set; } } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs index 4049365c..279ca4dd 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutContinuousProductionStartRequestData +public record HideoutContinuousProductionStartRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; } = "HideoutContinuousProductionStart"; - [JsonPropertyName("recipeId")] public string? RecipeId { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs index 313ea830..680e0288 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs @@ -1,11 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutCustomizationApplyRequestData +public record HideoutCustomizationApplyRequestData: BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutCustomizationApply"; /// /// Id of the newly picked item to apply to hideout diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs index 04fc1416..423e464a 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs @@ -1,16 +1,13 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; -namespace Core.Models.Eft.Hideout +namespace Core.Models.Eft.Hideout; + +public record HideoutCustomizationSetMannequinPoseRequest : BaseInteractionRequestData { - public record HideoutCustomizationSetMannequinPoseRequest - { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutCustomizationSetMannequinPose"; + [JsonPropertyName("poses")] + public Dictionary Poses { get; set; } - [JsonPropertyName("poses")] - public Dictionary Poses { get; set; } - - [JsonPropertyName("timestamp")] - public double Timestamp { get; set; } - } + [JsonPropertyName("timestamp")] + public double Timestamp { get; set; } } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs index fed0741b..98620e40 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutDeleteProductionRequestData +public record HideoutDeleteProductionRequestData: BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutDeleteProductionCommand"; - [JsonPropertyName("recipeId")] public string? RecipeId { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs index 718d22ad..f857e7de 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutImproveAreaRequestData +public record HideoutImproveAreaRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutImproveArea"; - /** Hideout area id from areas.json */ [JsonPropertyName("id")] public string? AreaId { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs index f4015267..03b0497d 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs @@ -1,11 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutPutItemInRequestData +public record HideoutPutItemInRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutPutItemsInAreaSlots"; [JsonPropertyName("areaType")] public int? AreaType { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs index 1d686eb4..c06a18d5 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutScavCaseStartRequestData +public record HideoutScavCaseStartRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutScavCaseProductionStart"; - [JsonPropertyName("recipeId")] public string? RecipeId { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs index 8e26dff3..df4127d6 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutSingleProductionStartRequestData +public record HideoutSingleProductionStartRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutSingleProductionStart"; - [JsonPropertyName("recipeId")] public string? RecipeId { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs index 90fcdbc6..c54c826a 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutTakeItemOutRequestData +public record HideoutTakeItemOutRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutTakeItemsFromAreaSlots"; - [JsonPropertyName("areaType")] public int? AreaType { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs index 468bf4dc..44085182 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutTakeProductionRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutTakeProductionRequestData +public record HideoutTakeProductionRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutTakeProduction"; - [JsonPropertyName("recipeId")] public string? RecipeId { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs index ccd9c178..837b619b 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutToggleAreaRequestData +public record HideoutToggleAreaRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutToggleArea"; - [JsonPropertyName("areaType")] public int? AreaType { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs index 828a2888..a8488f4f 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeCompleteRequestData.cs @@ -1,11 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutUpgradeCompleteRequestData +public record HideoutUpgradeCompleteRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutUpgradeComplete"; [JsonPropertyName("areaType")] public int? AreaType { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs index c63a5251..c0859247 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs @@ -1,11 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record HideoutUpgradeRequestData +public record HideoutUpgradeRequestData : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "HideoutUpgrade"; [JsonPropertyName("areaType")] public int? AreaType { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs b/Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs index 043d2f75..84458cc0 100644 --- a/Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs +++ b/Libraries/Core/Models/Eft/Hideout/RecordShootingRangePoints.cs @@ -1,12 +1,10 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; -public record RecordShootingRangePoints +public record RecordShootingRangePoints : BaseInteractionRequestData { - [JsonPropertyName("Action")] - public string? Action { get; set; } = "RecordShootingRangePoints"; - [JsonPropertyName("points")] public int? Points { get; set; } } diff --git a/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs b/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs index 9e2272bb..3243901b 100644 --- a/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs +++ b/Libraries/Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs @@ -2,6 +2,10 @@ using System.Text.Json.Serialization; using Core.Models.Eft.Common.Request; using Core.Models.Eft.Customization; +using Core.Models.Eft.Health; +using Core.Models.Eft.Hideout; +using Core.Models.Eft.Insurance; +using Core.Models.Enums; namespace Core.Utils.Json.Converters; @@ -23,6 +27,46 @@ public class BaseInteractionRequestDataConverter : JsonConverter(jsonText, options); case "CustomizationSet": return JsonSerializer.Deserialize(jsonText, options); + case "Eat": + return JsonSerializer.Deserialize(jsonText, options); + case "Heal": + return JsonSerializer.Deserialize(jsonText, options); + case "RestoreHealth": + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_UPGRADE: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_UPGRADE_COMPLETE: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_PUT_ITEMS_IN_AREA_SLOTS: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_TAKE_ITEMS_FROM_AREA_SLOTS: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_TOGGLE_AREA: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_SINGLE_PRODUCTION_START: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_SCAV_CASE_PRODUCTION_START: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_CONTINUOUS_PRODUCTION_START: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_TAKE_PRODUCTION: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_RECORD_SHOOTING_RANGE_POINTS: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_IMPROVE_AREA: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_CANCEL_PRODUCTION_COMMAND: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_CIRCLE_OF_CULTIST_PRODUCTION_START: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_DELETE_PRODUCTION_COMMAND: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_CUSTOMIZATION_APPLY_COMMAND: + return JsonSerializer.Deserialize(jsonText, options); + case HideoutEventActions.HIDEOUT_CUSTOMIZATION_SET_MANNEQUIN_POSE: + return JsonSerializer.Deserialize(jsonText, options); + case "Insure": + return JsonSerializer.Deserialize(jsonText, options); ///////////////////////////////////////////