From 750fde2e1dc5a6d8633cc5ecb0ff39f4195b6235 Mon Sep 17 00:00:00 2001 From: Chomp Date: Thu, 23 Jan 2025 16:06:42 +0000 Subject: [PATCH] Made use of `IdWithCount` --- Libraries/Core/Controllers/QuestController.cs | 6 ++--- .../Hideout/HideoutImproveAreaRequestData.cs | 3 ++- .../Hideout/HideoutPutItemInRequestData.cs | 14 +++-------- .../HideoutScavCaseStartRequestData.cs | 25 +++---------------- ...HideoutSingleProductionStartRequestData.cs | 16 +++--------- .../Eft/Hideout/HideoutUpgradeRequestData.cs | 3 ++- .../Eft/Quests/HandoverQuestRequestData.cs | 12 ++------- Libraries/Core/Services/RepairService.cs | 1 + 8 files changed, 21 insertions(+), 59 deletions(-) diff --git a/Libraries/Core/Controllers/QuestController.cs b/Libraries/Core/Controllers/QuestController.cs index 02bb4e1a..5d266572 100644 --- a/Libraries/Core/Controllers/QuestController.cs +++ b/Libraries/Core/Controllers/QuestController.cs @@ -255,7 +255,7 @@ public class QuestController( return ShowRepeatableQuestInvalidConditionError(handoverQuestRequest, output); } - var totalItemCountToRemove = 0; + var totalItemCountToRemove = 0d; foreach (var itemHandover in handoverQuestRequest.Items) { var matchingItemInProfile = pmcData.Inventory.Items.FirstOrDefault(item => item.Id == itemHandover.Id); @@ -279,7 +279,7 @@ public class QuestController( _questHelper.ChangeItemStack( pmcData, itemHandover.Id, - itemHandover.Count - itemCountToRemove ?? 0, + (int)(itemHandover.Count - itemCountToRemove ?? 0), sessionID, output ); @@ -377,7 +377,7 @@ public class QuestController( return _httpResponseUtil.AppendErrorToOutput(output, errorMessage); } - private void UpdateProfileTaskConditionCounterValue(PmcData pmcData, string conditionId, string questId, int counterValue) + private void UpdateProfileTaskConditionCounterValue(PmcData pmcData, string conditionId, string questId, double counterValue) { if (pmcData.TaskConditionCounters[conditionId] != null) { diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs index f857e7de..9044f94c 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs @@ -1,5 +1,6 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using Core.Models.Eft.Common.Request; +using Core.Models.Eft.Common.Tables; namespace Core.Models.Eft.Hideout; diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs index 03b0497d..43b822eb 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs @@ -1,4 +1,5 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; +using Core.Models.Common; using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; @@ -10,17 +11,8 @@ public record HideoutPutItemInRequestData : BaseInteractionRequestData 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 record ItemDetails -{ - [JsonPropertyName("count")] - public int? Count { get; set; } - - [JsonPropertyName("id")] - public string? Id { get; set; } -} diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs index c06a18d5..a8f1456e 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs @@ -1,4 +1,5 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; +using Core.Models.Common; using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; @@ -9,29 +10,11 @@ public record HideoutScavCaseStartRequestData : BaseInteractionRequestData 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 record HideoutItem -{ - [JsonPropertyName("id")] - public string? Id { get; set; } - - [JsonPropertyName("count")] - public int? Count { get; set; } -} - -public record Tool -{ - [JsonPropertyName("id")] - public string? Id { get; set; } - - [JsonPropertyName("count")] - public int? Count { get; set; } -} diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs index df4127d6..4423d5a3 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs @@ -1,4 +1,5 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; +using Core.Models.Common; using Core.Models.Eft.Common.Request; namespace Core.Models.Eft.Hideout; @@ -9,20 +10,11 @@ public record HideoutSingleProductionStartRequestData : BaseInteractionRequestDa 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 record HandoverItem -{ - [JsonPropertyName("id")] - public string? Id { get; set; } - - [JsonPropertyName("count")] - public int? Count { get; set; } -} diff --git a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs index c0859247..bfd4d24f 100644 --- a/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs +++ b/Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs @@ -1,5 +1,6 @@ -using System.Text.Json.Serialization; +using System.Text.Json.Serialization; using Core.Models.Eft.Common.Request; +using Core.Models.Eft.Common.Tables; namespace Core.Models.Eft.Hideout; diff --git a/Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs b/Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs index eef9be4f..8669280e 100644 --- a/Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs +++ b/Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Common; using Core.Models.Eft.Inventory; namespace Core.Models.Eft.Quests; @@ -12,14 +13,5 @@ public record HandoverQuestRequestData : InventoryBaseActionRequestData public string? ConditionId { get; set; } [JsonPropertyName("items")] - public List? Items { get; set; } -} - -public record HandoverItem -{ - [JsonPropertyName("id")] - public string? Id { get; set; } - - [JsonPropertyName("count")] - public int? Count { get; set; } + public List? Items { get; set; } } diff --git a/Libraries/Core/Services/RepairService.cs b/Libraries/Core/Services/RepairService.cs index f2fdd1f6..1deecc4e 100644 --- a/Libraries/Core/Services/RepairService.cs +++ b/Libraries/Core/Services/RepairService.cs @@ -1,5 +1,6 @@ using System.Text.Json.Serialization; using Core.Helpers; +using Core.Models.Common; using SptCommon.Annotations; using Core.Models.Eft.Common; using Core.Models.Eft.Common.Tables;