Made use of AddUpd extension

This commit is contained in:
Chomp
2025-08-05 15:56:23 +01:00
parent c7e40deb90
commit 3b4bcaf910
10 changed files with 33 additions and 23 deletions
@@ -1,4 +1,5 @@
using SPTarkov.DI.Annotations;
using SPTarkov.Server.Core.Extensions;
using SPTarkov.Server.Core.Helpers;
using SPTarkov.Server.Core.Models.Common;
using SPTarkov.Server.Core.Models.Eft.Common;
@@ -48,8 +49,8 @@ public class HealthController(
return httpResponseUtil.AppendErrorToOutput(output, errorMessage);
}
// Ensure item has a upd object
itemHelper.AddUpdObjectToItem(healingItemToUse);
// Ensure item has an upd object
healingItemToUse.AddUpd();
if (healingItemToUse.Upd.MedKit is not null)
{
@@ -125,7 +126,7 @@ public class HealthController(
/// <summary>
/// Handle Eat event
/// Consume food/water outside of a raid
/// Consume food/water outside a raid
/// </summary>
/// <param name="pmcData">Player profile</param>
/// <param name="request">Eat request</param>
@@ -138,19 +139,20 @@ public class HealthController(
var itemToConsume = pmcData.Inventory.Items.FirstOrDefault(item => item.Id == request.Item);
if (itemToConsume is null)
// Item not found, very bad
{
// Item not found, very bad
return httpResponseUtil.AppendErrorToOutput(
output,
serverLocalisationService.GetText("health-unable_to_find_item_to_consume", request.Item)
);
}
var consumedItemMaxResource = itemHelper.GetItem(itemToConsume.Template).Value.Properties.MaxResource;
var foodItemDbDetails = itemHelper.GetItem(itemToConsume.Template).Value;
var consumedItemMaxResource = foodItemDbDetails.Properties.MaxResource;
if (consumedItemMaxResource > 1)
{
// Ensure item has a upd object
itemHelper.AddUpdObjectToItem(itemToConsume);
// Ensure item has an upd object
itemToConsume.AddUpd();
if (itemToConsume.Upd.FoodDrink is null)
{
@@ -171,7 +173,7 @@ public class HealthController(
}
// Check what effect eating item has and handle
var foodItemDbDetails = itemHelper.GetItem(itemToConsume.Template).Value;
var foodItemEffectDetails = foodItemDbDetails.Properties.EffectsHealth;
var foodIsSingleUse = foodItemDbDetails.Properties.MaxResource == 1;
@@ -831,11 +831,11 @@ public class HideoutController(
// Recipe has an `isEncoded` requirement for reward(s), Add `RecodableComponent` property
if (recipe.IsEncoded ?? false)
{
foreach (var reward in itemAndChildrenToSendToPlayer)
foreach (var rewardItems in itemAndChildrenToSendToPlayer)
{
itemHelper.AddUpdObjectToItem(reward.FirstOrDefault());
rewardItems.FirstOrDefault()?.AddUpd();
reward.FirstOrDefault().Upd.RecodableComponent = new UpdRecodableComponent { IsEncoded = true };
rewardItems.FirstOrDefault().Upd.RecodableComponent = new UpdRecodableComponent { IsEncoded = true };
}
}
@@ -1,4 +1,5 @@
using SPTarkov.DI.Annotations;
using SPTarkov.Server.Core.Extensions;
using SPTarkov.Server.Core.Generators;
using SPTarkov.Server.Core.Helpers;
using SPTarkov.Server.Core.Models.Common;
@@ -685,7 +686,7 @@ public class InventoryController(
}
// Item may not have upd object
itemHelper.AddUpdObjectToItem(itemToFold);
itemToFold.AddUpd();
itemToFold.Upd.Foldable = new UpdFoldable { Folded = request.Value };