diff --git a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs index 3b670cf1..da150253 100644 --- a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs @@ -536,7 +536,7 @@ public record InsuredItem public record Hideout { - public Dictionary? Production { get; set; } + public Dictionary? Production { get; set; } public List? Areas { get; set; } public Dictionary? Improvements { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs new file mode 100644 index 00000000..967efc4a --- /dev/null +++ b/Libraries/Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs @@ -0,0 +1,13 @@ +using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Request; + +namespace Core.Models.Eft.Hideout; + +public record HideoutCancelProductionRequestData : BaseInteractionRequestData +{ + [JsonPropertyName("recipeId")] + public string? RecipeId { get; set; } + + [JsonPropertyName("timestamp")] + public long? Timestamp { get; set; } +} diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs index 9044f94c..7724c3c4 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs @@ -1,6 +1,7 @@ using System.Text.Json.Serialization; using Core.Models.Eft.Common.Request; using Core.Models.Eft.Common.Tables; +using Core.Models.Enums; namespace Core.Models.Eft.Hideout; @@ -11,7 +12,7 @@ public record HideoutImproveAreaRequestData : BaseInteractionRequestData public string? AreaId { get; set; } [JsonPropertyName("areaType")] - public int? AreaType { get; set; } + public HideoutAreas? AreaType { get; set; } [JsonPropertyName("items")] public List? Items { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs b/Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs index 885eebf6..2a8c4478 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutProduction.cs @@ -1,5 +1,6 @@ using System.Text.Json.Serialization; using Core.Models.Common; +using Core.Models.Enums; namespace Core.Models.Eft.Hideout; @@ -21,7 +22,7 @@ public record HideoutProduction public string? Id { get; set; } [JsonPropertyName("areaType")] - public int? AreaType { get; set; } + public HideoutAreas? AreaType { get; set; } [JsonPropertyName("requirements")] public List? Requirements { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs index 43b822eb..be3e971f 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs @@ -1,6 +1,7 @@ using System.Text.Json.Serialization; using Core.Models.Common; using Core.Models.Eft.Common.Request; +using Core.Models.Enums; namespace Core.Models.Eft.Hideout; @@ -8,7 +9,7 @@ public record HideoutPutItemInRequestData : BaseInteractionRequestData { [JsonPropertyName("areaType")] - public int? AreaType { get; set; } + public HideoutAreas? AreaType { get; set; } [JsonPropertyName("items")] public Dictionary? Items { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs index c54c826a..0b534670 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs @@ -1,12 +1,13 @@ using System.Text.Json.Serialization; using Core.Models.Eft.Common.Request; +using Core.Models.Enums; namespace Core.Models.Eft.Hideout; public record HideoutTakeItemOutRequestData : BaseInteractionRequestData { [JsonPropertyName("areaType")] - public int? AreaType { get; set; } + public HideoutAreas? AreaType { get; set; } [JsonPropertyName("slots")] public List? Slots { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs index 837b619b..3d17c0bf 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutToggleAreaRequestData.cs @@ -1,12 +1,13 @@ using System.Text.Json.Serialization; using Core.Models.Eft.Common.Request; +using Core.Models.Enums; namespace Core.Models.Eft.Hideout; public record HideoutToggleAreaRequestData : BaseInteractionRequestData { [JsonPropertyName("areaType")] - public int? AreaType { get; set; } + public HideoutAreas? AreaType { get; set; } [JsonPropertyName("enabled")] public bool? Enabled { get; set; } diff --git a/Libraries/Core/Models/Eft/Hideout/QteData.cs b/Libraries/Core/Models/Eft/Hideout/QteData.cs index 7a98290f..4edec65e 100644 --- a/Libraries/Core/Models/Eft/Hideout/QteData.cs +++ b/Libraries/Core/Models/Eft/Hideout/QteData.cs @@ -89,24 +89,24 @@ public record QteEffect { [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] - public QteRewardType? EffectType { get; set; } + public QteRewardType? Type { get; set; } [JsonPropertyName("skillId")] [JsonConverter(typeof(JsonStringEnumConverter))] - public SkillTypes? SkillIdentifier { get; set; } + public SkillTypes? SkillId { get; set; } [JsonPropertyName("levelMultipliers")] public List? LevelMultipliers { get; set; } [JsonPropertyName("time")] - public int? DurationInMilliseconds { get; set; } + public int? Time { get; set; } [JsonPropertyName("weight")] - public float? EffectWeight { get; set; } + public float? Weight { get; set; } [JsonPropertyName("result")] [JsonConverter(typeof(JsonStringEnumConverter))] - public QteResultType? ResultType { get; set; } + public QteResultType? Result { get; set; } } public record SkillLevelMultiplier diff --git a/Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs b/Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs index 2804d64d..0cd62f8d 100644 --- a/Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs +++ b/Libraries/Core/Models/Eft/Inventory/AddItemDirectRequest.cs @@ -9,7 +9,7 @@ public record AddItemDirectRequest /// Item and child mods to add to player inventory /// [JsonPropertyName("itemWithModsToAdd")] - public List? ItemWithModsToAdd { get; set; } + public List? ItemWithModsToAdd { get; set; } [JsonPropertyName("foundInRaid")] public bool? FoundInRaid { get; set; }