From 8c1cc9beea4fd63f672de6848ba123e36b72182a Mon Sep 17 00:00:00 2001 From: CWX Date: Thu, 23 Jan 2025 20:59:19 +0000 Subject: [PATCH] moved unused props to bottom, added additional missing props --- .../Core/Models/Eft/Common/Tables/BotBase.cs | 73 ++++++++++--------- .../Core/Models/Eft/Common/Tables/Item.cs | 13 +++- .../Core/Models/Eft/Common/Tables/Quest.cs | 2 +- .../Models/Eft/Match/PutMetricsRequestData.cs | 2 +- 4 files changed, 50 insertions(+), 40 deletions(-) diff --git a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs index 63604594..c1ee57b6 100644 --- a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs @@ -152,48 +152,45 @@ public record Info public string? LowerNickname { get; set; } public string? Side { get; set; } public bool? SquadInviteRestriction { get; set; } - public bool? HasCoopExtension { get; set; } - public bool? HasPveGame { get; set; } + public int? PrestigeLevel { get; set; } public string? Voice { get; set; } public int? Level { get; set; } public int? Experience { get; set; } - - [JsonConverter(typeof(StringToNumberFactoryConverter))] - public int? RegistrationDate { get; set; } - public string? GameVersion { get; set; } - public double? AccountType { get; set; } - public MemberCategory? MemberCategory { get; set; } - public MemberCategory? SelectedMemberCategory { get; set; } - - [JsonPropertyName("lockedMoveCommands")] - public bool? LockedMoveCommands { get; set; } - - public double? SavageLockTime { get; set; } - public long? LastTimePlayedAsSavage { get; set; } - public BotInfoSettings? Settings { get; set; } - public long? NicknameChangeDate { get; set; } - public List? NeedWipeOptions { get; set; } - - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - [JsonPropertyName("lastCompletedWipe")] - public LastCompleted? LastCompletedWipe { get; set; } - - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - [JsonPropertyName("lastWipeTimestamp")] - public LastCompleted? LastWipeTimestamp { get; set; } - public List? Bans { get; set; } public bool? BannedState { get; set; } public long? BannedUntil { get; set; } public bool? IsStreamerModeAvailable { get; set; } - + [JsonConverter(typeof(StringToNumberFactoryConverter))] + public int? RegistrationDate { get; set; } + public string? GameVersion { get; set; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public MemberCategory? MemberCategory { get; set; } + [JsonConverter(typeof(JsonStringEnumConverter))] + public MemberCategory? SelectedMemberCategory { get; set; } + [JsonPropertyName("lockedMoveCommands")] + public bool? LockedMoveCommands { get; set; } + public double? SavageLockTime { get; set; } + public long? LastTimePlayedAsSavage { get; set; } + public BotInfoSettings? Settings { get; set; } + public List? NeedWipeOptions { get; set; } + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonPropertyName("lastCompletedWipe")] + public LastCompleted? LastCompletedWipe { get; set; } + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] + [JsonPropertyName("lastWipeTimestamp")] + public LastCompleted? LastWipeTimestamp { get; set; } + public double? AccountType { get; set; } + public long? NicknameChangeDate { get; set; } [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [JsonPropertyName("lastCompletedEvent")] public LastCompleted? LastCompletedEvent { get; set; } - [JsonPropertyName("isMigratedSkills")] public bool? IsMigratedSkills { get; set; } - public int? PrestigeLevel { get; set; } + public double? GroupId { get; set; } + public double? TeamId { get; set; } + public bool? HasCoopExtension { get; set; } + public bool? HasPveGame { get; set; } + public string? Type { get; set; } } public record BotInfoSettings @@ -237,9 +234,10 @@ public record Customization public record BotBaseHealth { - public CurrentMax? Hydration { get; set; } - public CurrentMax? Energy { get; set; } - public CurrentMax? Temperature { get; set; } + public CurrentMinMax? Hydration { get; set; } + public CurrentMinMax? Energy { get; set; } + public CurrentMinMax? Temperature { get; set; } + public CurrentMinMax? Poison { get; set; } [JsonConverter(typeof(ArrayToObjectFactoryConverter))] [JsonPropertyName("BodyParts")] @@ -250,7 +248,7 @@ public record BotBaseHealth public record BodyPartHealth { - public CurrentMax? Health { get; set; } + public CurrentMinMax? Health { get; set; } public Dictionary? Effects { get; set; } } @@ -261,10 +259,13 @@ public record BodyPartEffectProperties public double? Time { get; set; } } -public record CurrentMax +public record CurrentMinMax { public double? Current { get; set; } + public double? Minimum { get; set; } public double? Maximum { get; set; } + public double? OverDamageReceivedMultiplier { get; set; } + public double? EnvironmentDamageMultiplier { get; set; } } public record BotBaseInventory @@ -326,7 +327,7 @@ public record Skills public record BaseSkill { - public int? PointsEarnedDuringSession { get; set; } + public double? PointsEarnedDuringSession { get; set; } public long? LastAccess { get; set; } public string? Id { get; set; } public double? Progress { get; set; } diff --git a/Libraries/Core/Models/Eft/Common/Tables/Item.cs b/Libraries/Core/Models/Eft/Common/Tables/Item.cs index 01c729af..89de7475 100644 --- a/Libraries/Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/Core/Models/Eft/Common/Tables/Item.cs @@ -19,7 +19,7 @@ public record Item [JsonPropertyName("location")] public object? Location { get; set; } // TODO: Can be IItemLocation or number - + [JsonPropertyName("desc")] public string? Desc { get; set; } @@ -45,10 +45,13 @@ public record ItemLocation { [JsonPropertyName("x")] public int? X { get; set; } + [JsonPropertyName("y")] public int? Y { get; set; } + [JsonPropertyName("r")] public object? R { get; set; } // TODO: Can be string or number + [JsonPropertyName("isSearched")] public bool? IsSearched { get; set; } @@ -70,8 +73,10 @@ public record Upd public string? SptPresetId { get; set; } public UpdFaceShield? FaceShield { get; set; } + [JsonConverter(typeof(StringToNumberFactoryConverter))] public double? StackObjectsCount { get; set; } // TODO: LootDumpGen is outputting doubles, we can turn back to int once fixed + public bool? UnlimitedCount { get; set; } public UpdRepairable? Repairable { get; set; } public UpdRecodableComponent? RecodableComponent { get; set; } @@ -188,6 +193,8 @@ public record UpdSight [JsonPropertyName("SelectedScope")] public int? SelectedScope { get; set; } + + public double? ScopeZoomValue { get; set; } } public record UpdFoldable @@ -244,7 +251,7 @@ public record UpdDogtag public string? Nickname { get; set; } [JsonPropertyName("Side")] - public string? Side { get; set; } + public object? Side { get; set; } [JsonPropertyName("Level")] public double? Level { get; set; } @@ -266,6 +273,8 @@ public record UpdDogtag [JsonPropertyName("WeaponName")] public string? WeaponName { get; set; } + + public bool? CarriedByGroupMember { get; set; } } public record UpdSideEffect diff --git a/Libraries/Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/Core/Models/Eft/Common/Tables/Quest.cs index 632750ab..36f1cc88 100644 --- a/Libraries/Core/Models/Eft/Common/Tables/Quest.cs +++ b/Libraries/Core/Models/Eft/Common/Tables/Quest.cs @@ -154,7 +154,7 @@ public record QuestStatus public QuestStatusEnum? Status { get; set; } [JsonPropertyName("statusTimers")] - public Dictionary? StatusTimers { get; set; } + public Dictionary? StatusTimers { get; set; } [JsonPropertyName("completedConditions")] public List? CompletedConditions { get; set; } diff --git a/Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs b/Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs index b01cdd2f..90b53df5 100644 --- a/Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs +++ b/Libraries/Core/Models/Eft/Match/PutMetricsRequestData.cs @@ -8,7 +8,7 @@ public record PutMetricsRequestData : IRequestData [JsonPropertyName("sid")] public string? SessionId { get; set; } - [JsonPropertyName("settings")] + [JsonPropertyName("Settings")] public object? Settings { get; set; } [JsonPropertyName("SharedSettings")]