chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made use of IdWithCount

Browse Source
This commit is contained in:
Chomp
2025-01-23 16:06:42 +00:00
parent a3bc91b076
commit 750fde2e1d
8 changed files with 21 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Controllers/QuestController.cs
+3 -3
View File
@@ -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)
{
Libraries/Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
+2 -1
View File
@@ -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;
Libraries/Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
+3 -11
View File
@@ -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<string, ItemDetails>? Items { get; set; }
public Dictionary<string, IdWithCount>? 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; }
}
Libraries/Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
+4 -21
View File
@@ -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<HideoutItem>? Items { get; set; }
public List<IdWithCount>? Items { get; set; }
[JsonPropertyName("tools")]
public List<Tool>? Tools { get; set; }
public List<IdWithCount>? 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; }
}
Libraries/Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
+4 -12
View File
@@ -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<HandoverItem>? Items { get; set; }
public List<IdWithCount>? Items { get; set; }
[JsonPropertyName("tools")]
public List<HandoverItem>? Tools { get; set; }
public List<IdWithCount>? 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; }
}
Libraries/Core/Models/Eft/Hideout/HideoutUpgradeRequestData.cs
+2 -1
View File
@@ -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;
Libraries/Core/Models/Eft/Quests/HandoverQuestRequestData.cs
+2 -10
View File
@@ -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<HandoverItem>? Items { get; set; }
}
public record HandoverItem
{
[JsonPropertyName("id")]
public string? Id { get; set; }
[JsonPropertyName("count")]
public int? Count { get; set; }
public List<IdWithCount>? Items { get; set; }
}
Libraries/Core/Services/RepairService.cs
+1
View File
@@ -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;