Merge pull request #334 from hulkhan22/fix/armbands-and-rewards

fix: Lootable armbands and skill rewards resetting skill to 0

Libraries/SPTarkov.Server.Core/Helpers/PrestigeHelper.cs

@@ -137,7 +137,7 @@ public class PrestigeHelper
                         _profileHelper.AddSkillPointsToPlayer(
                             newProfile.CharacterData.PmcData,
                             result,
-                            ((JsonElement) reward.Value).ToObject<double>()
+                            reward.Value
                         );
                     }
                     else

Libraries/SPTarkov.Server.Core/Helpers/RewardHelper.cs

@@ -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:

Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs

@@ -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

Libraries/SPTarkov.Server.Core/Models/Enums/PlayerSideMask.cs

@@ -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
 }