From 871ca63aaad01518891098f0dce19c7b39f5b6a3 Mon Sep 17 00:00:00 2001 From: hulkhan22 Date: Sun, 27 Apr 2025 01:39:21 +0200 Subject: [PATCH] More type changes --- .../Assets/database/templates/quests.json | 2 +- .../Models/Eft/Common/Tables/BotBase.cs | 13 ++----------- .../Models/Eft/Common/Tables/Item.cs | 2 -- .../Models/Eft/Common/Tables/Quest.cs | 10 +++++----- UnitTests/TestAssets/quests.json | 2 +- 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/Assets/database/templates/quests.json b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/quests.json index 3386dc5d..8eb040f5 100644 --- a/Libraries/SPTarkov.Server.Assets/Assets/database/templates/quests.json +++ b/Libraries/SPTarkov.Server.Assets/Assets/database/templates/quests.json @@ -98657,7 +98657,7 @@ "conditionType": "Kills", "id": "655e484b52dc506c051b4409", "target": "AnyPmc", - "value": "1" + "value": 1 } ], "id": "655e483da3ee7d4c56241e18" 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 7d540e94..19b31bed 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -1499,8 +1499,6 @@ public record DeathCause public record LastPlayerState { - private object? _equipment; - public LastPlayerStateInfo? Info { get; @@ -1516,15 +1514,8 @@ public record LastPlayerState // TODO: there is no definition on TS just any public object? Equipment { - get - { - return _equipment; - } - set - { - Console.WriteLine($"Equipment: {value}"); - _equipment = value; - } + get; + set; } } 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 29be9361..438b70c8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs @@ -646,8 +646,6 @@ public record UpdLight public record UpdDogtag { - private object? _side; - [JsonPropertyName("AccountId")] public string? AccountId { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs index 6ccbbc4e..86972834 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs @@ -179,11 +179,11 @@ public record Quest /// Becomes 'AppearStatus' inside client /// [JsonPropertyName("status")] - public object? Status + public int? Status { get; set; - } // TODO: string | number + } [JsonPropertyName("KeyQuest")] public bool? KeyQuest @@ -447,11 +447,11 @@ public record QuestCondition } [JsonPropertyName("type")] - public object? Type + public string? Type { get; set; - } // TODO: boolean | string + } [JsonPropertyName("status")] public List? Status @@ -770,7 +770,7 @@ public record QuestConditionCounterCondition } [JsonPropertyName("value")] - public object? Value + public int? Value { get; set; diff --git a/UnitTests/TestAssets/quests.json b/UnitTests/TestAssets/quests.json index 0c12f837..cd3d3388 100644 --- a/UnitTests/TestAssets/quests.json +++ b/UnitTests/TestAssets/quests.json @@ -98796,7 +98796,7 @@ "conditionType": "Kills", "id": "655e484b52dc506c051b4409", "target": "AnyPmc", - "value": "1" + "value": 1 } ], "id": "655e483da3ee7d4c56241e18"