From 6fd7e31b282625d2612588d3cea8fb5bc872fcef Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 6 Jan 2025 16:13:48 +0000 Subject: [PATCH] more namespaces and BotBase migrated --- Core/Models/Eft/Common/Tables/BotBase.cs | 94 ++++++++++++++++++- .../Spt/Quests/GetRepeatableByIdResult.cs | 2 +- .../Models/Spt/Ragfair/RagfairServerPrices.cs | 2 +- Core/Models/Spt/Ragfair/TplWithFleaPrice.cs | 2 +- .../Spt/Repeatable/QuestRewardValues.cs | 2 +- Core/Models/Spt/Repeatable/QuestTypePool.cs | 2 +- Core/Models/Spt/Server/ExhaustableArray.cs | 2 +- Core/Models/Spt/Server/LocaleBase.cs | 2 +- Core/Models/Spt/Server/Locations.cs | 2 +- Core/Models/Spt/Server/ServerBase.cs | 2 +- Core/Models/Spt/Server/SettingsBase.cs | 2 +- 11 files changed, 103 insertions(+), 11 deletions(-) diff --git a/Core/Models/Eft/Common/Tables/BotBase.cs b/Core/Models/Eft/Common/Tables/BotBase.cs index df51dbf4..45092c10 100644 --- a/Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Core/Models/Eft/Common/Tables/BotBase.cs @@ -4,9 +4,101 @@ namespace Core.Models.Eft.Common.Tables; public class BotBase { - + [JsonPropertyName("_id")] + public string Id { get; set; } + [JsonPropertyName("aid")] + public int Aid { get; set; } + /** SPT property - use to store player id - TODO - move to AID ( account id as guid of choice) */ + [JsonPropertyName("sessionId")] + public string SessionId { get; set; } + [JsonPropertyName("savage")] + public string? Savage { get; set; } + [JsonPropertyName("karmaValue")] + public int KarmaValue { get; set; } + [JsonPropertyName("Info")] + public Info Info { get; set; } + [JsonPropertyName("Customization")] + public Customization Customization { get; set; } + [JsonPropertyName("Health")] + public Health Health { get; set; } + [JsonPropertyName("Inventory")] + public Inventory Inventory { get; set; } + [JsonPropertyName("Skills")] + public Skills Skills { get; set; } + [JsonPropertyName("Stats")] + public Stats Stats { get; set; } + [JsonPropertyName("Encyclopedia")] + public Dictionary Encyclopedia { get; set; } + [JsonPropertyName("TaskConditionCounters")] + public Dictionary TaskConditionCounters { get; set; } + [JsonPropertyName("InsuredItems")] + public List InsuredItems { get; set; } + [JsonPropertyName("Hideout")] + public Hideout Hideout { get; set; } + [JsonPropertyName("Quests")] + public List Quests { get; set; } + [JsonPropertyName("TradersInfo")] + public Dictionary TradersInfo { get; set; } + [JsonPropertyName("UnlockedInfo")] + public UnlockedInfo UnlockedInfo { get; set; } + [JsonPropertyName("RagfairInfo")] + public RagfairInfo RagfairInfo { get; set; } + /** Achievement id and timestamp */ + [JsonPropertyName("Achievements")] + public Dictionary Achievements { get; set; } + [JsonPropertyName("RepeatableQuests")] + public List RepeatableQuests { get; set; } + [JsonPropertyName("Bonuses")] + public List Bonuses { get; set; } + [JsonPropertyName("Notes")] + public Notes Notes { get; set; } + [JsonPropertyName("CarExtractCounts")] + public Dictionary CarExtractCounts { get; set; } + [JsonPropertyName("CoopExtractCounts")] + public Dictionary CoopExtractCounts { get; set; } + [JsonPropertyName("SurvivorClass")] + public SurvivorClass SurvivorClass { get; set; } + [JsonPropertyName("WishList")] + public Dictionary WishList { get; set; } + [JsonPropertyName("moneyTransferLimitData")] + public MoneyTransferLimits MoneyTransferLimitData { get; set; } + /** SPT specific property used during bot generation in raid */ + [JsonPropertyName("sptIsPmc")] + public bool? IsPmc { get; set; } } +public class MoneyTransferLimits +{ + // Resets every 24 hours in live + /** TODO: Implement */ + [JsonPropertyName("nextResetTime")] + public double NextResetTime { get; set; } + [JsonPropertyName("remainingLimit")] + public double RemainingLimit { get; set; } + [JsonPropertyName("totalLimit")] + public double TotalLimit { get; set; } + [JsonPropertyName("resetInterval")] + public double ResetInterval { get; set; } +} + +public class TaskConditionCounter +{ + [JsonPropertyName("id")] + public string Id { get; set; } + [JsonPropertyName("type")] + public string Type { get; set; } + [JsonPropertyName("value")] + public double Value { get; set; } + /** Quest id */ + [JsonPropertyName("sourceId")] + public string SourceId { get; set; } +} + +public class UnlockedInfo +{ + [JsonPropertyName("unlockedProductionRecipe")] + public List UnlockedProductionRecipe { get; set; } +} public class Info { diff --git a/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs b/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs index c1abfe7d..7fa2e8e1 100644 --- a/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs +++ b/Core/Models/Spt/Quests/GetRepeatableByIdResult.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Types.Models.Spt.Quests; +namespace Core.Models.Spt.Quests; public class GetRepeatableByIdResult { diff --git a/Core/Models/Spt/Ragfair/RagfairServerPrices.cs b/Core/Models/Spt/Ragfair/RagfairServerPrices.cs index c95c0236..74053c8d 100644 --- a/Core/Models/Spt/Ragfair/RagfairServerPrices.cs +++ b/Core/Models/Spt/Ragfair/RagfairServerPrices.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Types.Models.Spt.Ragfair; +namespace Core.Models.Spt.Ragfair; public class RagfairServerPrices { diff --git a/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs b/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs index a9181ade..50bfa61a 100644 --- a/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs +++ b/Core/Models/Spt/Ragfair/TplWithFleaPrice.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Types.Models.Spt.Ragfair; +namespace Core.Models.Spt.Ragfair; public class TplWithFleaPrice { diff --git a/Core/Models/Spt/Repeatable/QuestRewardValues.cs b/Core/Models/Spt/Repeatable/QuestRewardValues.cs index 89963dd6..c0e986c0 100644 --- a/Core/Models/Spt/Repeatable/QuestRewardValues.cs +++ b/Core/Models/Spt/Repeatable/QuestRewardValues.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Types.Models.Spt.Repeatable; +namespace Core.Models.Spt.Repeatable; public class QuestRewardValues { diff --git a/Core/Models/Spt/Repeatable/QuestTypePool.cs b/Core/Models/Spt/Repeatable/QuestTypePool.cs index ad73a0d7..abdec822 100644 --- a/Core/Models/Spt/Repeatable/QuestTypePool.cs +++ b/Core/Models/Spt/Repeatable/QuestTypePool.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Types.Models.Spt.Repeatable; +namespace Core.Models.Spt.Repeatable; public class QuestTypePool { diff --git a/Core/Models/Spt/Server/ExhaustableArray.cs b/Core/Models/Spt/Server/ExhaustableArray.cs index 2ed7bcb9..7f539d8a 100644 --- a/Core/Models/Spt/Server/ExhaustableArray.cs +++ b/Core/Models/Spt/Server/ExhaustableArray.cs @@ -1,6 +1,6 @@ // using System.Collections.Generic; // -// namespace Types.Models.Spt.Server; +// namespace Core.Models.Spt.Server; // // public class ExhaustableArray // { diff --git a/Core/Models/Spt/Server/LocaleBase.cs b/Core/Models/Spt/Server/LocaleBase.cs index 37feec9e..064301db 100644 --- a/Core/Models/Spt/Server/LocaleBase.cs +++ b/Core/Models/Spt/Server/LocaleBase.cs @@ -1,7 +1,7 @@ using System.Text.Json.Serialization; using System.Collections.Generic; -namespace Types.Models.Spt.Server; +namespace Core.Models.Spt.Server; public class LocaleBase { diff --git a/Core/Models/Spt/Server/Locations.cs b/Core/Models/Spt/Server/Locations.cs index 89d7f8b7..0d0fc118 100644 --- a/Core/Models/Spt/Server/Locations.cs +++ b/Core/Models/Spt/Server/Locations.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Types.Models.Spt.Server; +namespace Core.Models.Spt.Server; public class Locations { diff --git a/Core/Models/Spt/Server/ServerBase.cs b/Core/Models/Spt/Server/ServerBase.cs index 3e12c4ad..fbf2df39 100644 --- a/Core/Models/Spt/Server/ServerBase.cs +++ b/Core/Models/Spt/Server/ServerBase.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Types.Models.Spt.Server; +namespace Core.Models.Spt.Server; public class ServerBase { diff --git a/Core/Models/Spt/Server/SettingsBase.cs b/Core/Models/Spt/Server/SettingsBase.cs index a41cc5cd..1475d93a 100644 --- a/Core/Models/Spt/Server/SettingsBase.cs +++ b/Core/Models/Spt/Server/SettingsBase.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Types.Models.Spt.Server; +namespace Core.Models.Spt.Server; public class SettingsBase {