Fixes Usec armbands being lootable and skill rewards resetting to 0

This commit is contained in:
hulkhan22
2025-06-01 18:31:02 +02:00
parent f4428deccf
commit 44332cf785
4 changed files with 13 additions and 10 deletions
@@ -137,7 +137,7 @@ public class PrestigeHelper
_profileHelper.AddSkillPointsToPlayer(
newProfile.CharacterData.PmcData,
result,
((JsonElement) reward.Value).ToObject<double>()
reward.Value
);
}
else
@@ -73,7 +73,7 @@ public class RewardHelper(
_profileHelper.AddSkillPointsToPlayer(
profileData,
Enum.Parse<SkillTypes>(reward.Target),
reward.Value as double?
reward.Value
);
break;
case RewardType.Experience:
@@ -1,16 +1,18 @@
using System.Text.Json.Serialization;
using SPTarkov.Server.Core.Models.Enums;
using SPTarkov.Server.Core.Utils.Json.Converters;
namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
public record Reward
{
[JsonPropertyName("value")]
public object? Value
[JsonConverter(typeof(StringToNumberFactoryConverter))]
public double? Value
{
get;
set;
} // TODO: Can be either string or number
}
[JsonPropertyName("id")]
public string? Id
@@ -3,12 +3,13 @@ using SPTarkov.Server.Core.Utils.Json.Converters;
namespace SPTarkov.Server.Core.Models.Enums;
[EftEnumConverter]
[Flags]
public enum PlayerSideMask
{
None,
Usec,
Bear,
Savage,
Pmc,
All
None = 0,
Usec = 1,
Bear = 2,
Savage = 4,
Pmc = Bear | Usec, // 0x00000003
All = Pmc | Savage, // 0x00000007
}