diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs index ee22fd8e..282b8f3b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs @@ -1,4 +1,5 @@ -using System.Text.Json.Serialization; +using System.ComponentModel; +using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Eft.Common.Tables; using SPTarkov.Server.Core.Utils.Json.Converters; @@ -20,7 +21,10 @@ public record PmcData : BotBase set; } - public object CheckedChambers + /// + /// Returns the list of IDs of the weapons, which the player has checked the chamber of in the last raid. + /// + public List CheckedChambers { get; set; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs index ced49d93..7d540e94 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -763,11 +763,20 @@ public record BodyPartHealth public record BodyPartEffectProperties { + private object? _extraData; + // TODO: this was any, what actual type is it? public object? ExtraData { - get; - set; + get + { + return _extraData; + } + set + { + Console.WriteLine($"ExtraData: {value}"); + _extraData = value; + } } public double? Time @@ -1490,6 +1499,8 @@ public record DeathCause public record LastPlayerState { + private object? _equipment; + public LastPlayerStateInfo? Info { get; @@ -1505,8 +1516,15 @@ public record LastPlayerState // TODO: there is no definition on TS just any public object? Equipment { - get; - set; + get + { + return _equipment; + } + set + { + Console.WriteLine($"Equipment: {value}"); + _equipment = value; + } } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs index 19a04dce..7fa6c9df 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs @@ -169,11 +169,11 @@ public record ItemLocation } [JsonPropertyName("r")] - public object? R + public int R { get; set; - } // TODO: Can be string or number + } [JsonPropertyName("isSearched")] public bool? IsSearched @@ -186,11 +186,11 @@ public record ItemLocation /// SPT property? /// [JsonPropertyName("rotation")] - public object? Rotation + public bool? Rotation { get; set; - } // TODO: Can be string or boolean + } } public record Upd @@ -646,6 +646,8 @@ public record UpdLight public record UpdDogtag { + private object? _side; + [JsonPropertyName("AccountId")] public string? AccountId { @@ -670,8 +672,15 @@ public record UpdDogtag [JsonPropertyName("Side")] public object? Side { - get; - set; + get + { + return _side; + } + set + { + Console.WriteLine($"Side: {value}"); + _side = value; + } } [JsonPropertyName("Level")]