chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.NET Format Style Fixes

Browse Source
This commit is contained in:
refringe
2025-06-18 17:09:20 +00:00
committed by Format Bot
parent ca0a7d6345
commit 6e01428b2b
774 changed files with 23507 additions and 40003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs
+2 -10
View File
@@ -11,19 +11,11 @@ public record IdWithCount
/// ID of stack to take money from
/// </summary>
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
/// <summary>
/// Amount of money to take off player for treatment
/// </summary>
[JsonPropertyName("count")]
public double? Count
{
get;
set;
}
public double? Count { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs
+6 -19
View File
@@ -3,7 +3,8 @@ using System.Text.Json.Serialization;
namespace SPTarkov.Server.Core.Models.Common;
public record MinMax<T> where T : IMinMaxValue<T>
public record MinMax<T>
where T : IMinMaxValue<T>
{
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
@@ -14,28 +15,14 @@ public record MinMax<T> where T : IMinMaxValue<T>
Max = max;
}
public MinMax()
{
}
public MinMax() { }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("max")]
public T Max
{
get;
set;
}
public T Max { get; set; }
[JsonPropertyName("min")]
public T Min
{
get;
set;
}
public T Min { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs
+4 -20
View File
@@ -9,11 +9,7 @@ public record GenerateBotsRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("conditions")]
public List<GenerateCondition>? Conditions
{
get;
set;
}
public List<GenerateCondition>? Conditions { get; set; }
}
public record GenerateCondition
@@ -25,23 +21,11 @@ public record GenerateCondition
/// e.g. assault/pmcBot/bossKilla
/// </summary>
[JsonPropertyName("Role")]
public string? Role
{
get;
set;
}
public string? Role { get; set; }
[JsonPropertyName("Limit")]
public int Limit
{
get;
set;
}
public int Limit { get; set; }
[JsonPropertyName("Difficulty")]
public string? Difficulty
{
get;
set;
}
public string? Difficulty { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs
+2 -10
View File
@@ -8,16 +8,8 @@ public record RandomisedBotLevelResult
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("level")]
public int? Level
{
get;
set;
}
public int? Level { get; set; }
[JsonPropertyName("exp")]
public int? Exp
{
get;
set;
}
public int? Exp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs
+6 -30
View File
@@ -10,44 +10,20 @@ public record SetMagazineRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("Name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
[JsonPropertyName("Caliber")]
public string? Caliber
{
get;
set;
}
public string? Caliber { get; set; }
[JsonPropertyName("Items")]
public List<MagazineTemplateAmmoItem>? Items
{
get;
set;
}
public List<MagazineTemplateAmmoItem>? Items { get; set; }
[JsonPropertyName("TopCount")]
public int? TopCount
{
get;
set;
}
public int? TopCount { get; set; }
[JsonPropertyName("BottomCount")]
public int? BottomCount
{
get;
set;
}
public int? BottomCount { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs
-1
View File
@@ -7,5 +7,4 @@ public record EmptyRequestData : IRequestData
{
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs
+1314 -6566
View File
File diff suppressed because it is too large Load Diff
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs
+29 -145
View File
@@ -12,68 +12,40 @@ public record Location
/// Map meta-data
/// </summary>
[JsonPropertyName("base")]
public LocationBase? Base
{
get;
set;
}
public LocationBase? Base { get; set; }
/// <summary>
/// Loose loot positions and item weights
/// </summary>
[JsonPropertyName("looseLoot")]
public LazyLoad<LooseLoot>? LooseLoot
{
get;
set;
}
public LazyLoad<LooseLoot>? LooseLoot { get; set; }
/// <summary>
/// Static loot item weights
/// </summary>
[JsonPropertyName("staticLoot")]
public LazyLoad<Dictionary<string, StaticLootDetails>>? StaticLoot
{
get;
set;
}
public LazyLoad<Dictionary<string, StaticLootDetails>>? StaticLoot { get; set; }
/// <summary>
/// Static container positions and item weights
/// </summary>
[JsonPropertyName("staticContainers")]
public LazyLoad<StaticContainerDetails>? StaticContainers
{
get;
set;
}
public LazyLoad<StaticContainerDetails>? StaticContainers { get; set; }
[JsonPropertyName("staticAmmo")]
public Dictionary<string, List<StaticAmmoDetails>> StaticAmmo
{
get;
set;
}
public Dictionary<string, List<StaticAmmoDetails>> StaticAmmo { get; set; }
/// <summary>
/// All possible static containers on map + their assign groupings
/// </summary>
[JsonPropertyName("statics")]
public StaticContainer? Statics
{
get;
set;
}
public StaticContainer? Statics { get; set; }
/// <summary>
/// All possible map extracts
/// </summary>
[JsonPropertyName("allExtracts")]
public Exit[] AllExtracts
{
get;
set;
}
public Exit[] AllExtracts { get; set; }
}
public record StaticContainer
@@ -82,18 +54,10 @@ public record StaticContainer
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("containersGroups")]
public Dictionary<string, ContainerMinMax>? ContainersGroups
{
get;
set;
}
public Dictionary<string, ContainerMinMax>? ContainersGroups { get; set; }
[JsonPropertyName("containers")]
public Dictionary<string, ContainerData>? Containers
{
get;
set;
}
public Dictionary<string, ContainerData>? Containers { get; set; }
}
public record ContainerMinMax
@@ -102,32 +66,16 @@ public record ContainerMinMax
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("minContainers")]
public int? MinContainers
{
get;
set;
}
public int? MinContainers { get; set; }
[JsonPropertyName("maxContainers")]
public int? MaxContainers
{
get;
set;
}
public int? MaxContainers { get; set; }
[JsonPropertyName("current")]
public int? Current
{
get;
set;
}
public int? Current { get; set; }
[JsonPropertyName("chosenCount")]
public int? ChosenCount
{
get;
set;
}
public int? ChosenCount { get; set; }
}
public record ContainerData
@@ -136,11 +84,7 @@ public record ContainerData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("groupId")]
public string? GroupId
{
get;
set;
}
public string? GroupId { get; set; }
}
public record StaticLootDetails
@@ -149,18 +93,10 @@ public record StaticLootDetails
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("itemcountDistribution")]
public ItemCountDistribution[] ItemCountDistribution
{
get;
set;
}
public ItemCountDistribution[] ItemCountDistribution { get; set; }
[JsonPropertyName("itemDistribution")]
public ItemDistribution[] ItemDistribution
{
get;
set;
}
public ItemDistribution[] ItemDistribution { get; set; }
}
public record ItemCountDistribution
@@ -169,18 +105,10 @@ public record ItemCountDistribution
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
[JsonPropertyName("relativeProbability")]
public float? RelativeProbability
{
get;
set;
}
public float? RelativeProbability { get; set; }
}
public record ItemDistribution
@@ -189,18 +117,10 @@ public record ItemDistribution
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("tpl")]
public string? Tpl
{
get;
set;
}
public string? Tpl { get; set; }
[JsonPropertyName("relativeProbability")]
public float? RelativeProbability
{
get;
set;
}
public float? RelativeProbability { get; set; }
}
public record StaticContainerDetails
@@ -209,25 +129,13 @@ public record StaticContainerDetails
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("staticWeapons")]
public List<SpawnpointTemplate> StaticWeapons
{
get;
set;
}
public List<SpawnpointTemplate> StaticWeapons { get; set; }
[JsonPropertyName("staticContainers")]
public List<StaticContainerData> StaticContainers
{
get;
set;
}
public List<StaticContainerData> StaticContainers { get; set; }
[JsonPropertyName("staticForced")]
public List<StaticForced> StaticForced
{
get;
set;
}
public List<StaticForced> StaticForced { get; set; }
}
public record StaticForced
@@ -236,18 +144,10 @@ public record StaticForced
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("containerId")]
public string ContainerId
{
get;
set;
}
public string ContainerId { get; set; }
[JsonPropertyName("itemTpl")]
public string ItemTpl
{
get;
set;
}
public string ItemTpl { get; set; }
}
public record StaticContainerData
@@ -256,18 +156,10 @@ public record StaticContainerData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("probability")]
public float? Probability
{
get;
set;
}
public float? Probability { get; set; }
[JsonPropertyName("template")]
public SpawnpointTemplate? Template
{
get;
set;
}
public SpawnpointTemplate? Template { get; set; }
}
public record StaticAmmoDetails
@@ -276,16 +168,8 @@ public record StaticAmmoDetails
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("tpl")]
public string? Tpl
{
get;
set;
}
public string? Tpl { get; set; }
[JsonPropertyName("relativeProbability")]
public float? RelativeProbability
{
get;
set;
}
public float? RelativeProbability { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs
+302 -1503
View File
File diff suppressed because it is too large Load Diff
Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs
+30 -144
View File
@@ -9,25 +9,13 @@ public record LooseLoot
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("spawnpointCount")]
public SpawnpointCount? SpawnpointCount
{
get;
set;
}
public SpawnpointCount? SpawnpointCount { get; set; }
[JsonPropertyName("spawnpointsForced")]
public List<Spawnpoint>? SpawnpointsForced
{
get;
set;
}
public List<Spawnpoint>? SpawnpointsForced { get; set; }
[JsonPropertyName("spawnpoints")]
public List<Spawnpoint>? Spawnpoints
{
get;
set;
}
public List<Spawnpoint>? Spawnpoints { get; set; }
}
public record SpawnpointCount
@@ -36,18 +24,10 @@ public record SpawnpointCount
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("mean")]
public double? Mean
{
get;
set;
}
public double? Mean { get; set; }
[JsonPropertyName("std")]
public double? Std
{
get;
set;
}
public double? Std { get; set; }
}
public record SpawnpointTemplate
@@ -58,87 +38,41 @@ public record SpawnpointTemplate
private string? _root;
[JsonPropertyName("Id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("IsContainer")]
public bool? IsContainer
{
get;
set;
}
public bool? IsContainer { get; set; }
[JsonPropertyName("useGravity")]
public bool? UseGravity
{
get;
set;
}
public bool? UseGravity { get; set; }
[JsonPropertyName("randomRotation")]
public bool? RandomRotation
{
get;
set;
}
public bool? RandomRotation { get; set; }
[JsonPropertyName("Position")]
public XYZ? Position
{
get;
set;
}
public XYZ? Position { get; set; }
[JsonPropertyName("Rotation")]
public XYZ? Rotation
{
get;
set;
}
public XYZ? Rotation { get; set; }
[JsonPropertyName("IsAlwaysSpawn")]
public bool? IsAlwaysSpawn
{
get;
set;
}
public bool? IsAlwaysSpawn { get; set; }
[JsonPropertyName("IsGroupPosition")]
public bool? IsGroupPosition
{
get;
set;
}
public bool? IsGroupPosition { get; set; }
[JsonPropertyName("GroupPositions")]
public List<GroupPosition>? GroupPositions
{
get;
set;
}
public List<GroupPosition>? GroupPositions { get; set; }
[JsonPropertyName("Root")]
public string? Root
{
get
{
return _root;
}
set
{
_root = value == null ? null : string.Intern(value);
}
get { return _root; }
set { _root = value == null ? null : string.Intern(value); }
}
[JsonPropertyName("Items")]
public List<Item>? Items
{
get;
set;
}
public List<Item>? Items { get; set; }
}
public record GroupPosition
@@ -151,36 +85,18 @@ public record GroupPosition
[JsonPropertyName("Name")]
public string? Name
{
get
{
return _name;
}
set
{
_name = value == null ? null : string.Intern(value);
}
get { return _name; }
set { _name = value == null ? null : string.Intern(value); }
}
[JsonPropertyName("Weight")]
public double? Weight
{
get;
set;
}
public double? Weight { get; set; }
[JsonPropertyName("Position")]
public XYZ? Position
{
get;
set;
}
public XYZ? Position { get; set; }
[JsonPropertyName("Rotation")]
public XYZ? Rotation
{
get;
set;
}
public XYZ? Rotation { get; set; }
}
public record Spawnpoint
@@ -189,32 +105,16 @@ public record Spawnpoint
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("locationId")]
public string? LocationId
{
get;
set;
}
public string? LocationId { get; set; }
[JsonPropertyName("probability")]
public double? Probability
{
get;
set;
}
public double? Probability { get; set; }
[JsonPropertyName("template")]
public SpawnpointTemplate? Template
{
get;
set;
}
public SpawnpointTemplate? Template { get; set; }
[JsonPropertyName("itemDistribution")]
public List<LooseLootItemDistribution>? ItemDistribution
{
get;
set;
}
public List<LooseLootItemDistribution>? ItemDistribution { get; set; }
}
public record LooseLootItemDistribution
@@ -223,18 +123,10 @@ public record LooseLootItemDistribution
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("composedKey")]
public ComposedKey? ComposedKey
{
get;
set;
}
public ComposedKey? ComposedKey { get; set; }
[JsonPropertyName("relativeProbability")]
public double? RelativeProbability
{
get;
set;
}
public double? RelativeProbability { get; set; }
}
public record ComposedKey
@@ -247,13 +139,7 @@ public record ComposedKey
[JsonPropertyName("key")]
public string? Key
{
get
{
return _key;
}
set
{
_key = string.Intern(value);
}
get { return _key; }
set { _key = string.Intern(value); }
}
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs
+5 -25
View File
@@ -8,37 +8,17 @@ public record MetricsTableData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Keys")]
public List<int>? Keys
{
get;
set;
}
public List<int>? Keys { get; set; }
[JsonPropertyName("NetProcessingBins")]
public List<int>? NetProcessingBins
{
get;
set;
}
public List<int>? NetProcessingBins { get; set; }
[JsonPropertyName("RenderBins")]
public List<int>? RenderBins
{
get;
set;
}
public List<int>? RenderBins { get; set; }
[JsonPropertyName("GameUpdateBins")]
public List<int>? GameUpdateBins
{
get;
set;
}
public List<int>? GameUpdateBins { get; set; }
[JsonPropertyName("MemoryMeasureInterval")]
public int? MemoryMeasureInterval
{
get;
set;
}
public int? MemoryMeasureInterval { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs
+6 -28
View File
@@ -8,31 +8,17 @@ public record PmcData : BotBase
{
[JsonPropertyName("Prestige")]
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public Dictionary<string, long>? Prestige
{
get;
set;
}
public Dictionary<string, long>? Prestige { get; set; }
public Dictionary<string, double>? CheckedMagazines
{
get;
set;
}
public Dictionary<string, double>? CheckedMagazines { get; set; }
/// <summary>
/// Returns the list of IDs of the weapons, which the player has checked the chamber of in the last raid.
/// </summary>
public List<string> CheckedChambers
{
get;
set;
}
public List<string> CheckedChambers { get; set; }
}
public record PostRaidPmcData : PmcData
{
}
public record PostRaidPmcData : PmcData { }
public record PostRaidStats
{
@@ -40,19 +26,11 @@ public record PostRaidStats
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Eft")]
public EftStats? Eft
{
get;
set;
}
public EftStats? Eft { get; set; }
/// <summary>
/// Only found in profile we get from client post raid
/// </summary>
[JsonPropertyName("Arena")]
public EftStats? Arena
{
get;
set;
}
public EftStats? Arena { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs
+5 -25
View File
@@ -8,25 +8,13 @@ public record BaseInteractionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Action")]
public string? Action
{
get;
set;
}
public string? Action { get; set; }
[JsonPropertyName("fromOwner")]
public OwnerInfo? FromOwner
{
get;
set;
}
public OwnerInfo? FromOwner { get; set; }
[JsonPropertyName("toOwner")]
public OwnerInfo? ToOwner
{
get;
set;
}
public OwnerInfo? ToOwner { get; set; }
}
public record OwnerInfo
@@ -35,16 +23,8 @@ public record OwnerInfo
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record UIDRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("uid")]
public string? Uid
{
get;
set;
}
public string? Uid { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs
+20 -100
View File
@@ -8,109 +8,49 @@ public record Achievement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("imageUrl")]
public string? ImageUrl
{
get;
set;
}
public string? ImageUrl { get; set; }
[JsonPropertyName("assetPath")]
public string? AssetPath
{
get;
set;
}
public string? AssetPath { get; set; }
[JsonPropertyName("rewards")]
public List<Reward>? Rewards
{
get;
set;
}
public List<Reward>? Rewards { get; set; }
[JsonPropertyName("conditions")]
public AchievementQuestConditionTypes? Conditions
{
get;
set;
}
public AchievementQuestConditionTypes? Conditions { get; set; }
[JsonPropertyName("instantComplete")]
public bool? InstantComplete
{
get;
set;
}
public bool? InstantComplete { get; set; }
[JsonPropertyName("showNotificationsInGame")]
public bool? ShowNotificationsInGame
{
get;
set;
}
public bool? ShowNotificationsInGame { get; set; }
[JsonPropertyName("showProgress")]
public bool? ShowProgress
{
get;
set;
}
public bool? ShowProgress { get; set; }
[JsonPropertyName("prefab")]
public string? Prefab
{
get;
set;
}
public string? Prefab { get; set; }
[JsonPropertyName("rarity")]
public string? Rarity
{
get;
set;
}
public string? Rarity { get; set; }
[JsonPropertyName("hidden")]
public bool? Hidden
{
get;
set;
}
public bool? Hidden { get; set; }
[JsonPropertyName("showConditions")]
public bool? ShowConditions
{
get;
set;
}
public bool? ShowConditions { get; set; }
[JsonPropertyName("progressBarEnabled")]
public bool? ProgressBarEnabled
{
get;
set;
}
public bool? ProgressBarEnabled { get; set; }
[JsonPropertyName("side")]
public string? Side
{
get;
set;
}
public string? Side { get; set; }
[JsonPropertyName("index")]
public int? Index
{
get;
set;
}
public int? Index { get; set; }
}
public record AchievementQuestConditionTypes
@@ -119,37 +59,17 @@ public record AchievementQuestConditionTypes
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("started")]
public List<QuestCondition>? Started
{
get;
set;
}
public List<QuestCondition>? Started { get; set; }
[JsonPropertyName("availableForFinish")]
public List<QuestCondition>? AvailableForFinish
{
get;
set;
}
public List<QuestCondition>? AvailableForFinish { get; set; }
[JsonPropertyName("availableForStart")]
public List<QuestCondition>? AvailableForStart
{
get;
set;
}
public List<QuestCondition>? AvailableForStart { get; set; }
[JsonPropertyName("success")]
public List<QuestCondition>? Success
{
get;
set;
}
public List<QuestCondition>? Success { get; set; }
[JsonPropertyName("fail")]
public List<QuestCondition>? Fail
{
get;
set;
}
public List<QuestCondition>? Fail { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs
+289 -1424
View File
File diff suppressed because it is too large Load Diff
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs
+131 -655
View File
File diff suppressed because it is too large Load Diff
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs
+94 -470
View File
@@ -11,74 +11,34 @@ public record BotType
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("appearance")]
public Appearance? BotAppearance
{
get;
set;
}
public Appearance? BotAppearance { get; set; }
[JsonPropertyName("chances")]
public Chances? BotChances
{
get;
set;
}
public Chances? BotChances { get; set; }
[JsonPropertyName("difficulty")]
public Dictionary<string, DifficultyCategories>? BotDifficulty
{
get;
set;
}
public Dictionary<string, DifficultyCategories>? BotDifficulty { get; set; }
[JsonPropertyName("experience")]
public Experience? BotExperience
{
get;
set;
}
public Experience? BotExperience { get; set; }
[JsonPropertyName("firstName")]
public List<string>? FirstNames
{
get;
set;
}
public List<string>? FirstNames { get; set; }
[JsonPropertyName("generation")]
public Generation? BotGeneration
{
get;
set;
}
public Generation? BotGeneration { get; set; }
[JsonPropertyName("health")]
public BotTypeHealth? BotHealth
{
get;
set;
}
public BotTypeHealth? BotHealth { get; set; }
[JsonPropertyName("inventory")]
public BotTypeInventory? BotInventory
{
get;
set;
}
public BotTypeInventory? BotInventory { get; set; }
[JsonPropertyName("lastName")]
public List<string>? LastNames
{
get;
set;
}
public List<string>? LastNames { get; set; }
[JsonPropertyName("skills")]
public BotDbSkills? BotSkills
{
get;
set;
}
public BotDbSkills? BotSkills { get; set; }
}
public record Appearance
@@ -87,42 +47,22 @@ public record Appearance
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("body")]
public Dictionary<string, double>? Body
{
get;
set;
}
public Dictionary<string, double>? Body { get; set; }
[JsonPropertyName("feet")]
public Dictionary<string, double>? Feet
{
get;
set;
}
public Dictionary<string, double>? Feet { get; set; }
[JsonPropertyName("hands")]
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public Dictionary<string, double>? Hands
{
get;
set;
}
public Dictionary<string, double>? Hands { get; set; }
[JsonPropertyName("head")]
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public Dictionary<string, double>? Head
{
get;
set;
}
public Dictionary<string, double>? Head { get; set; }
[JsonPropertyName("voice")]
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public Dictionary<string, double>? Voice
{
get;
set;
}
public Dictionary<string, double>? Voice { get; set; }
}
public record Chances
@@ -131,32 +71,16 @@ public record Chances
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("equipment")]
public Dictionary<string, double>? EquipmentChances
{
get;
set;
}
public Dictionary<string, double>? EquipmentChances { get; set; }
[JsonPropertyName("weaponMods")]
public Dictionary<string, double>? WeaponModsChances
{
get;
set;
}
public Dictionary<string, double>? WeaponModsChances { get; set; }
[JsonPropertyName("equipmentMods")]
public Dictionary<string, double>? EquipmentModsChances
{
get;
set;
}
public Dictionary<string, double>? EquipmentModsChances { get; set; }
[JsonPropertyName("mods")]
public Dictionary<string, double>? Mods
{
get;
set;
}
public Dictionary<string, double>? Mods { get; set; }
}
/* record removed in favor of Dictionary<string, double>
@@ -333,32 +257,16 @@ public record Difficulties
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("easy")]
public DifficultyCategories? Easy
{
get;
set;
}
public DifficultyCategories? Easy { get; set; }
[JsonPropertyName("normal")]
public DifficultyCategories? Normal
{
get;
set;
}
public DifficultyCategories? Normal { get; set; }
[JsonPropertyName("hard")]
public DifficultyCategories? Hard
{
get;
set;
}
public DifficultyCategories? Hard { get; set; }
[JsonPropertyName("impossible")]
public DifficultyCategories? Impossible
{
get;
set;
}
public DifficultyCategories? Impossible { get; set; }
}
public record DifficultyCategories
@@ -366,89 +274,33 @@ public record DifficultyCategories
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public Dictionary<string, object>? Aiming
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Aiming { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Boss
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Boss { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Change
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Change { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Core
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Core { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Cover
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Cover { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Grenade
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Grenade { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Hearing
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Hearing { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Lay
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Lay { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Look
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Look { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Mind
{
get;
set;
} // TODO: string | number | boolean | string[]
public Dictionary<string, object>? Mind { get; set; } // TODO: string | number | boolean | string[]
public Dictionary<string, object>? Move
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Move { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Patrol
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Patrol { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Scattering
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Scattering { get; set; } // TODO: string | number | boolean
public Dictionary<string, object>? Shoot
{
get;
set;
} // TODO: string | number | boolean
public Dictionary<string, object>? Shoot { get; set; } // TODO: string | number | boolean
}
public record Experience
@@ -460,45 +312,25 @@ public record Experience
/// key = bot difficulty
/// </summary>
[JsonPropertyName("aggressorBonus")]
public Dictionary<string, double>? AggressorBonus
{
get;
set;
}
public Dictionary<string, double>? AggressorBonus { get; set; }
[JsonPropertyName("level")]
public MinMax<int>? Level
{
get;
set;
}
public MinMax<int>? Level { get; set; }
/// <summary>
/// key = bot difficulty
/// </summary>
[JsonPropertyName("reward")]
public Dictionary<string, MinMax<int>>? Reward
{
get;
set;
}
public Dictionary<string, MinMax<int>>? Reward { get; set; }
/// <summary>
/// key = bot difficulty
/// </summary>
[JsonPropertyName("standingForKill")]
public Dictionary<string, double>? StandingForKill
{
get;
set;
}
public Dictionary<string, double>? StandingForKill { get; set; }
[JsonPropertyName("useSimpleAnimator")]
public bool? UseSimpleAnimator
{
get;
set;
}
public bool? UseSimpleAnimator { get; set; }
}
public record Generation
@@ -507,11 +339,7 @@ public record Generation
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("items")]
public GenerationWeightingItems? Items
{
get;
set;
}
public GenerationWeightingItems? Items { get; set; }
}
public record GenerationData
@@ -523,22 +351,14 @@ public record GenerationData
/// key: number of items, value: weighting
/// </summary>
[JsonPropertyName("weights")]
public Dictionary<double, double>? Weights
{
get;
set;
}
public Dictionary<double, double>? Weights { get; set; }
/// <summary>
/// Array of item tpls
/// </summary>
[JsonPropertyName("whitelist")]
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
public Dictionary<string, double>? Whitelist
{
get;
set;
}
public Dictionary<string, double>? Whitelist { get; set; }
}
public record GenerationWeightingItems
@@ -547,95 +367,43 @@ public record GenerationWeightingItems
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("grenades")]
public GenerationData Grenades
{
get;
set;
}
public GenerationData Grenades { get; set; }
[JsonPropertyName("healing")]
public GenerationData Healing
{
get;
set;
}
public GenerationData Healing { get; set; }
[JsonPropertyName("drugs")]
public GenerationData Drugs
{
get;
set;
}
public GenerationData Drugs { get; set; }
[JsonPropertyName("food")]
public GenerationData Food
{
get;
set;
}
public GenerationData Food { get; set; }
[JsonPropertyName("drink")]
public GenerationData Drink
{
get;
set;
}
public GenerationData Drink { get; set; }
[JsonPropertyName("currency")]
public GenerationData Currency
{
get;
set;
}
public GenerationData Currency { get; set; }
[JsonPropertyName("stims")]
public GenerationData Stims
{
get;
set;
}
public GenerationData Stims { get; set; }
[JsonPropertyName("backpackLoot")]
public GenerationData BackpackLoot
{
get;
set;
}
public GenerationData BackpackLoot { get; set; }
[JsonPropertyName("pocketLoot")]
public GenerationData PocketLoot
{
get;
set;
}
public GenerationData PocketLoot { get; set; }
[JsonPropertyName("vestLoot")]
public GenerationData VestLoot
{
get;
set;
}
public GenerationData VestLoot { get; set; }
[JsonPropertyName("magazines")]
public GenerationData Magazines
{
get;
set;
}
public GenerationData Magazines { get; set; }
[JsonPropertyName("specialItems")]
public GenerationData SpecialItems
{
get;
set;
}
public GenerationData SpecialItems { get; set; }
[JsonPropertyName("looseLoot")]
public GenerationData LooseLoot
{
get;
set;
}
public GenerationData LooseLoot { get; set; }
}
public record BotTypeHealth
@@ -643,29 +411,13 @@ public record BotTypeHealth
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public List<BodyPart>? BodyParts
{
get;
set;
}
public List<BodyPart>? BodyParts { get; set; }
public MinMax<double>? Energy
{
get;
set;
}
public MinMax<double>? Energy { get; set; }
public MinMax<double>? Hydration
{
get;
set;
}
public MinMax<double>? Hydration { get; set; }
public MinMax<double>? Temperature
{
get;
set;
}
public MinMax<double>? Temperature { get; set; }
}
public record BodyPart
@@ -673,47 +425,19 @@ public record BodyPart
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public MinMax<double>? Chest
{
get;
set;
}
public MinMax<double>? Chest { get; set; }
public MinMax<double>? Head
{
get;
set;
}
public MinMax<double>? Head { get; set; }
public MinMax<double>? LeftArm
{
get;
set;
}
public MinMax<double>? LeftArm { get; set; }
public MinMax<double>? LeftLeg
{
get;
set;
}
public MinMax<double>? LeftLeg { get; set; }
public MinMax<double>? RightArm
{
get;
set;
}
public MinMax<double>? RightArm { get; set; }
public MinMax<double>? RightLeg
{
get;
set;
}
public MinMax<double>? RightLeg { get; set; }
public MinMax<double>? Stomach
{
get;
set;
}
public MinMax<double>? Stomach { get; set; }
}
public record BotTypeInventory
@@ -722,31 +446,15 @@ public record BotTypeInventory
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("equipment")]
public Dictionary<EquipmentSlots, Dictionary<string, double>>? Equipment
{
get;
set;
}
public Dictionary<EquipmentSlots, Dictionary<string, double>>? Equipment { get; set; }
public GlobalAmmo? Ammo
{
get;
set;
}
public GlobalAmmo? Ammo { get; set; }
[JsonPropertyName("items")]
public ItemPools? Items
{
get;
set;
}
public ItemPools? Items { get; set; }
[JsonPropertyName("mods")]
public GlobalMods? Mods
{
get;
set;
}
public GlobalMods? Mods { get; set; }
}
public record Equipment
@@ -754,89 +462,33 @@ public record Equipment
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public Dictionary<string, double>? ArmBand
{
get;
set;
}
public Dictionary<string, double>? ArmBand { get; set; }
public Dictionary<string, double>? ArmorVest
{
get;
set;
}
public Dictionary<string, double>? ArmorVest { get; set; }
public Dictionary<string, double>? Backpack
{
get;
set;
}
public Dictionary<string, double>? Backpack { get; set; }
public Dictionary<string, double>? Earpiece
{
get;
set;
}
public Dictionary<string, double>? Earpiece { get; set; }
public Dictionary<string, double>? Eyewear
{
get;
set;
}
public Dictionary<string, double>? Eyewear { get; set; }
public Dictionary<string, double>? FaceCover
{
get;
set;
}
public Dictionary<string, double>? FaceCover { get; set; }
public Dictionary<string, double>? FirstPrimaryWeapon
{
get;
set;
}
public Dictionary<string, double>? FirstPrimaryWeapon { get; set; }
public Dictionary<string, double>? Headwear
{
get;
set;
}
public Dictionary<string, double>? Headwear { get; set; }
public Dictionary<string, double>? Holster
{
get;
set;
}
public Dictionary<string, double>? Holster { get; set; }
public Dictionary<string, double>? Pockets
{
get;
set;
}
public Dictionary<string, double>? Pockets { get; set; }
public Dictionary<string, double>? Scabbard
{
get;
set;
}
public Dictionary<string, double>? Scabbard { get; set; }
public Dictionary<string, double>? SecondPrimaryWeapon
{
get;
set;
}
public Dictionary<string, double>? SecondPrimaryWeapon { get; set; }
public Dictionary<string, double>? SecuredContainer
{
get;
set;
}
public Dictionary<string, double>? SecuredContainer { get; set; }
public Dictionary<string, double>? TacticalVest
{
get;
set;
}
public Dictionary<string, double>? TacticalVest { get; set; }
}
public record ItemPools
@@ -844,35 +496,15 @@ public record ItemPools
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public Dictionary<string, double>? Backpack
{
get;
set;
}
public Dictionary<string, double>? Backpack { get; set; }
public Dictionary<string, double>? Pockets
{
get;
set;
}
public Dictionary<string, double>? Pockets { get; set; }
public Dictionary<string, double>? SecuredContainer
{
get;
set;
}
public Dictionary<string, double>? SecuredContainer { get; set; }
public Dictionary<string, double>? SpecialLoot
{
get;
set;
}
public Dictionary<string, double>? SpecialLoot { get; set; }
public Dictionary<string, double>? TacticalVest
{
get;
set;
}
public Dictionary<string, double>? TacticalVest { get; set; }
}
public record BotDbSkills
@@ -880,15 +512,7 @@ public record BotDbSkills
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public Dictionary<string, MinMax<double>>? Common
{
get;
set;
}
public Dictionary<string, MinMax<double>>? Common { get; set; }
public Dictionary<string, MinMax<double>>? Mastering
{
get;
set;
}
public Dictionary<string, MinMax<double>>? Mastering { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs
+3 -15
View File
@@ -9,25 +9,13 @@ public record CustomisationStorage
// Customisation.json/itemId
[JsonPropertyName("id")]
public string Id
{
get;
set;
}
public string Id { get; set; }
[JsonPropertyName("source")]
public string? Source
{
get;
set;
}
public string? Source { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
}
public record CustomisationType
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs
+29 -145
View File
@@ -8,46 +8,22 @@ public record CustomizationItem
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("_name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
[JsonPropertyName("_parent")]
public string? Parent
{
get;
set;
}
public string? Parent { get; set; }
[JsonPropertyName("_type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("_props")]
public CustomizationProps? Properties
{
get;
set;
}
public CustomizationProps? Properties { get; set; }
[JsonPropertyName("_proto")]
public string? Proto
{
get;
set;
}
public string? Proto { get; set; }
}
public class CustomizationProps
@@ -56,163 +32,71 @@ public class CustomizationProps
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Prefab")]
public object? Prefab
{
get;
set;
} // Prefab object or string
public object? Prefab { get; set; } // Prefab object or string
[JsonPropertyName("WatchPrefab")]
public Prefab? WatchPrefab
{
get;
set;
}
public Prefab? WatchPrefab { get; set; }
[JsonPropertyName("WatchRotation")]
public XYZ? WatchRotation
{
get;
set;
}
public XYZ? WatchRotation { get; set; }
[JsonPropertyName("WatchPosition")]
public XYZ? WatchPosition
{
get;
set;
}
public XYZ? WatchPosition { get; set; }
[JsonPropertyName("IntegratedArmorVest")]
public bool? IntegratedArmorVest
{
get;
set;
}
public bool? IntegratedArmorVest { get; set; }
[JsonPropertyName("MannequinPoseName")]
public string? MannequinPoseName
{
get;
set;
}
public string? MannequinPoseName { get; set; }
[JsonPropertyName("BodyPart")]
public string? BodyPart
{
get;
set;
}
public string? BodyPart { get; set; }
[JsonPropertyName("Game")]
public List<string>? Game
{
get;
set;
}
public List<string>? Game { get; set; }
[JsonPropertyName("Hands")]
public string? Hands
{
get;
set;
}
public string? Hands { get; set; }
[JsonPropertyName("Feet")]
public string? Feet
{
get;
set;
}
public string? Feet { get; set; }
[JsonPropertyName("Body")]
public string? Body
{
get;
set;
}
public string? Body { get; set; }
[JsonPropertyName("ProfileVersions")]
public List<string>? ProfileVersions
{
get;
set;
}
public List<string>? ProfileVersions { get; set; }
[JsonPropertyName("Side")]
public List<string>? Side
{
get;
set;
}
public List<string>? Side { get; set; }
[JsonPropertyName("Name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
[JsonPropertyName("ShortName")]
public string? ShortName
{
get;
set;
}
public string? ShortName { get; set; }
[JsonPropertyName("Description")]
public string? Description
{
get;
set;
}
public string? Description { get; set; }
[JsonPropertyName("AvailableAsDefault")]
public bool? AvailableAsDefault
{
get;
set;
}
public bool? AvailableAsDefault { get; set; }
[JsonPropertyName("EnvironmentUIType")]
public string? EnvironmentUIType
{
get;
set;
}
public string? EnvironmentUIType { get; set; }
[JsonPropertyName("Interaction")]
public string? Interaction
{
get;
set;
}
public string? Interaction { get; set; }
[JsonPropertyName("UsecTemplateId")]
public string? UsecTemplateId
{
get;
set;
}
public string? UsecTemplateId { get; set; }
[JsonPropertyName("BearTemplateId")]
public string? BearTemplateId
{
get;
set;
}
public string? BearTemplateId { get; set; }
[JsonPropertyName("AssetPath")]
public Prefab? AssetPath
{
get;
set;
}
public Prefab? AssetPath { get; set; }
[JsonPropertyName("HideGarbage")]
public bool? HideGarbage
{
get;
set;
}
public bool? HideGarbage { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/GlobalTablesUsings.cs
+8 -3
View File
@@ -1,3 +1,8 @@
global using GlobalAmmo = System.Collections.Generic.Dictionary<string, System.Collections.Generic.Dictionary<string, double>>;
global using GlobalMods =
System.Collections.Generic.Dictionary<string, System.Collections.Generic.Dictionary<string, System.Collections.Generic.HashSet<string>>>;
global using GlobalAmmo = System.Collections.Generic.Dictionary<
string,
System.Collections.Generic.Dictionary<string, double>
>;
global using GlobalMods = System.Collections.Generic.Dictionary<
string,
System.Collections.Generic.Dictionary<string, System.Collections.Generic.HashSet<string>>
>;
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs
+10 -50
View File
@@ -8,18 +8,10 @@ public record HandbookBase
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Categories")]
public List<HandbookCategory>? Categories
{
get;
set;
}
public List<HandbookCategory>? Categories { get; set; }
[JsonPropertyName("Items")]
public List<HandbookItem>? Items
{
get;
set;
}
public List<HandbookItem>? Items { get; set; }
}
public record HandbookCategory
@@ -28,41 +20,21 @@ public record HandbookCategory
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("ParentId")]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public string? ParentId
{
get;
set;
}
public string? ParentId { get; set; }
[JsonPropertyName("Icon")]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public string? Icon
{
get;
set;
}
public string? Icon { get; set; }
[JsonPropertyName("Color")]
public string? Color
{
get;
set;
}
public string? Color { get; set; }
[JsonPropertyName("Order")]
public string? Order
{
get;
set;
}
public string? Order { get; set; }
}
public record HandbookItem
@@ -71,24 +43,12 @@ public record HandbookItem
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("ParentId")]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public string? ParentId
{
get;
set;
}
public string? ParentId { get; set; }
[JsonPropertyName("Price")]
public double? Price
{
get;
set;
}
public double? Price { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs
+98 -465
View File
@@ -21,76 +21,40 @@ public record Item
[JsonPropertyName("_id")]
public string? Id
{
get
{
return _id;
}
set
{
_id = string.Intern(value);
}
get { return _id; }
set { _id = string.Intern(value); }
}
[JsonPropertyName("_tpl")]
// MongoId
public string? Template
{
get
{
return _tpl;
}
set
{
_tpl = string.Intern(value);
}
get { return _tpl; }
set { _tpl = string.Intern(value); }
}
[JsonPropertyName("parentId")]
public string? ParentId
{
get
{
return _parentId;
}
set
{
_parentId = value == null ? null : string.Intern(value);
}
get { return _parentId; }
set { _parentId = value == null ? null : string.Intern(value); }
}
[JsonPropertyName("slotId")]
public string? SlotId
{
get
{
return _SlotId;
}
set
{
_SlotId = value == null ? null : string.Intern(value);
}
get { return _SlotId; }
set { _SlotId = value == null ? null : string.Intern(value); }
}
[JsonPropertyName("location")]
public object? Location
{
get;
set;
} // TODO: Can be IItemLocation or number
public object? Location { get; set; } // TODO: Can be IItemLocation or number
[JsonPropertyName("desc")]
public string? Desc
{
get;
set;
}
public string? Desc { get; set; }
[JsonPropertyName("upd")]
public Upd? Upd
{
get;
set;
}
public Upd? Upd { get; set; }
}
public record HideoutItem
@@ -104,10 +68,7 @@ public record HideoutItem
[JsonPropertyName("_id")]
public string? _Id
{
get
{
return Id;
}
get { return Id; }
set
{
if (value == null)
@@ -120,32 +81,16 @@ public record HideoutItem
}
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("_tpl")]
public string? Template
{
get;
set;
}
public string? Template { get; set; }
[JsonPropertyName("upd")]
public Upd? Upd
{
get;
set;
}
public Upd? Upd { get; set; }
[JsonPropertyName("count")]
public double? Count
{
get;
set;
}
public double? Count { get; set; }
public Item ConvertToItem()
{
@@ -153,7 +98,7 @@ public record HideoutItem
{
Id = Id,
Template = Template,
Upd = Upd
Upd = Upd,
};
}
}
@@ -164,51 +109,32 @@ public record ItemLocation
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("x")]
public int? X
{
get;
set;
}
public int? X { get; set; }
[JsonPropertyName("y")]
public int? Y
{
get;
set;
}
public int? Y { get; set; }
[JsonPropertyName("isSearched")]
public bool? IsSearched
{
get;
set;
}
public bool? IsSearched { get; set; }
/// <summary>
/// SPT property?
/// </summary>
[JsonPropertyName("rotation")]
public bool? Rotation
{
get;
set;
}
public bool? Rotation { get; set; }
[JsonPropertyName("r")]
[JsonConverter(typeof(JsonStringEnumConverter))]
public ItemRotation R
{
get;
set;
}
public ItemRotation R { get; set; }
}
public enum ItemRotation
{
// Token: 0x0400259F RID: 9631
Horizontal,
// Token: 0x040025A0 RID: 9632
Vertical
Vertical,
}
public record Upd
@@ -216,178 +142,66 @@ public record Upd
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public UpdBuff? Buff
{
get;
set;
}
public UpdBuff? Buff { get; set; }
public double? OriginalStackObjectsCount
{
get;
set;
}
public double? OriginalStackObjectsCount { get; set; }
public UpdTogglable? Togglable
{
get;
set;
}
public UpdTogglable? Togglable { get; set; }
public UpdMap? Map
{
get;
set;
}
public UpdMap? Map { get; set; }
public UpdTag? Tag
{
get;
set;
}
public UpdTag? Tag { get; set; }
/// <summary>
/// SPT specific property, not made by BSG
/// </summary>
[JsonPropertyName("sptPresetId")]
public string? SptPresetId
{
get;
set;
}
public string? SptPresetId { get; set; }
public UpdFaceShield? FaceShield
{
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 double? StackObjectsCount { get; set; } // TODO: LootDumpGen is outputting doubles, we can turn back to int once fixed
public bool? UnlimitedCount
{
get;
set;
}
public bool? UnlimitedCount { get; set; }
public UpdRepairable? Repairable
{
get;
set;
}
public UpdRepairable? Repairable { get; set; }
public UpdRecodableComponent? RecodableComponent
{
get;
set;
}
public UpdRecodableComponent? RecodableComponent { get; set; }
public UpdFireMode? FireMode
{
get;
set;
}
public UpdFireMode? FireMode { get; set; }
public bool? SpawnedInSession
{
get;
set;
}
public bool? SpawnedInSession { get; set; }
public UpdLight? Light
{
get;
set;
}
public UpdLight? Light { get; set; }
public UpdKey? Key
{
get;
set;
}
public UpdKey? Key { get; set; }
public UpdResource? Resource
{
get;
set;
}
public UpdResource? Resource { get; set; }
public UpdSight? Sight
{
get;
set;
}
public UpdSight? Sight { get; set; }
public UpdMedKit? MedKit
{
get;
set;
}
public UpdMedKit? MedKit { get; set; }
public UpdFoodDrink? FoodDrink
{
get;
set;
}
public UpdFoodDrink? FoodDrink { get; set; }
public UpdDogtag? Dogtag
{
get;
set;
}
public UpdDogtag? Dogtag { get; set; }
public int? BuyRestrictionMax
{
get;
set;
}
public int? BuyRestrictionMax { get; set; }
public int? BuyRestrictionCurrent
{
get;
set;
}
public int? BuyRestrictionCurrent { get; set; }
public UpdFoldable? Foldable
{
get;
set;
}
public UpdFoldable? Foldable { get; set; }
public UpdSideEffect? SideEffect
{
get;
set;
}
public UpdSideEffect? SideEffect { get; set; }
public UpdRepairKit? RepairKit
{
get;
set;
}
public UpdRepairKit? RepairKit { get; set; }
public UpdCultistAmulet? CultistAmulet
{
get;
set;
}
public UpdCultistAmulet? CultistAmulet { get; set; }
public PinLockState? PinLockState
{
get;
set;
}
public PinLockState? PinLockState { get; set; }
public LockableComponent? Lockable
{
get;
set;
}
public LockableComponent? Lockable { get; set; }
}
public record LockableKeyComponent
@@ -397,7 +211,6 @@ public record LockableKeyComponent
public float? RelativeValue { get; set; }
public int? NumberOfUsages { get; set; }
}
public record LockableComponent
@@ -415,7 +228,7 @@ public enum PinLockState
{
Free,
Pinned,
Locked
Locked,
}
public record UpdBuff
@@ -424,33 +237,17 @@ public record UpdBuff
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Rarity")]
public string? Rarity
{
get;
set;
}
public string? Rarity { get; set; }
[JsonPropertyName("BuffType")]
[JsonConverter(typeof(JsonStringEnumConverter))]
public BuffType? BuffType
{
get;
set;
}
public BuffType? BuffType { get; set; }
[JsonPropertyName("Value")]
public double? Value
{
get;
set;
}
public double? Value { get; set; }
[JsonPropertyName("ThresholdDurability")]
public double? ThresholdDurability
{
get;
set;
}
public double? ThresholdDurability { get; set; }
}
public record UpdTogglable
@@ -459,11 +256,7 @@ public record UpdTogglable
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("On")]
public bool? On
{
get;
set;
}
public bool? On { get; set; }
}
public record UpdMap
@@ -472,11 +265,7 @@ public record UpdMap
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Markers")]
public List<MapMarker>? Markers
{
get;
set;
}
public List<MapMarker>? Markers { get; set; }
}
public record MapMarker
@@ -485,32 +274,16 @@ public record MapMarker
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("X")]
public double? X
{
get;
set;
}
public double? X { get; set; }
[JsonPropertyName("Y")]
public double? Y
{
get;
set;
}
public double? Y { get; set; }
[JsonPropertyName("Note")]
public string? Note
{
get;
set;
}
public string? Note { get; set; }
}
public record UpdTag
@@ -519,18 +292,10 @@ public record UpdTag
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Color")]
public int? Color
{
get;
set;
}
public int? Color { get; set; }
[JsonPropertyName("Name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
}
public record UpdFaceShield
@@ -539,18 +304,10 @@ public record UpdFaceShield
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Hits")]
public int? Hits
{
get;
set;
}
public int? Hits { get; set; }
[JsonPropertyName("HitSeed")]
public int? HitSeed
{
get;
set;
}
public int? HitSeed { get; set; }
}
public record UpdRepairable
@@ -559,18 +316,10 @@ public record UpdRepairable
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Durability")]
public double? Durability
{
get;
set;
}
public double? Durability { get; set; }
[JsonPropertyName("MaxDurability")]
public double? MaxDurability
{
get;
set;
}
public double? MaxDurability { get; set; }
}
public record UpdRecodableComponent
@@ -579,11 +328,7 @@ public record UpdRecodableComponent
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("IsEncoded")]
public bool? IsEncoded
{
get;
set;
}
public bool? IsEncoded { get; set; }
}
public record UpdMedKit
@@ -592,11 +337,7 @@ public record UpdMedKit
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("HpResource")]
public double? HpResource
{
get;
set;
}
public double? HpResource { get; set; }
}
public record UpdSight
@@ -605,31 +346,15 @@ public record UpdSight
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("ScopesCurrentCalibPointIndexes")]
public List<int>? ScopesCurrentCalibPointIndexes
{
get;
set;
}
public List<int>? ScopesCurrentCalibPointIndexes { get; set; }
[JsonPropertyName("ScopesSelectedModes")]
public List<int>? ScopesSelectedModes
{
get;
set;
}
public List<int>? ScopesSelectedModes { get; set; }
[JsonPropertyName("SelectedScope")]
public int? SelectedScope
{
get;
set;
}
public int? SelectedScope { get; set; }
public double? ScopeZoomValue
{
get;
set;
}
public double? ScopeZoomValue { get; set; }
}
public record UpdFoldable
@@ -638,11 +363,7 @@ public record UpdFoldable
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Folded")]
public bool? Folded
{
get;
set;
}
public bool? Folded { get; set; }
}
public record UpdFireMode
@@ -651,11 +372,7 @@ public record UpdFireMode
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("FireMode")]
public string? FireMode
{
get;
set;
}
public string? FireMode { get; set; }
}
public record UpdFoodDrink
@@ -664,11 +381,7 @@ public record UpdFoodDrink
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("HpPercent")]
public double? HpPercent
{
get;
set;
}
public double? HpPercent { get; set; }
}
public record UpdKey
@@ -678,11 +391,7 @@ public record UpdKey
// Checked in client
[JsonPropertyName("NumberOfUsages")]
public int? NumberOfUsages
{
get;
set;
}
public int? NumberOfUsages { get; set; }
}
public record UpdResource
@@ -691,18 +400,10 @@ public record UpdResource
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Value")]
public double? Value
{
get;
set;
}
public double? Value { get; set; }
[JsonPropertyName("UnitsConsumed")]
public double? UnitsConsumed
{
get;
set;
}
public double? UnitsConsumed { get; set; }
}
public record UpdLight
@@ -711,18 +412,10 @@ public record UpdLight
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("IsActive")]
public bool? IsActive
{
get;
set;
}
public bool? IsActive { get; set; }
[JsonPropertyName("SelectedMode")]
public int? SelectedMode
{
get;
set;
}
public int? SelectedMode { get; set; }
}
public record UpdDogtag
@@ -731,88 +424,40 @@ public record UpdDogtag
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("AccountId")]
public string? AccountId
{
get;
set;
}
public string? AccountId { get; set; }
[JsonPropertyName("ProfileId")]
public string? ProfileId
{
get;
set;
}
public string? ProfileId { get; set; }
[JsonPropertyName("Nickname")]
public string? Nickname
{
get;
set;
}
public string? Nickname { get; set; }
[JsonPropertyName("Side")]
[JsonConverter(typeof(DogtagSideConverter))]
public DogtagSide? Side
{
get;
set;
}
public DogtagSide? Side { get; set; }
[JsonPropertyName("Level")]
public double? Level
{
get;
set;
}
public double? Level { get; set; }
[JsonPropertyName("Time")]
public string? Time
{
get;
set;
}
public string? Time { get; set; }
[JsonPropertyName("Status")]
public string? Status
{
get;
set;
}
public string? Status { get; set; }
[JsonPropertyName("KillerAccountId")]
public string? KillerAccountId
{
get;
set;
}
public string? KillerAccountId { get; set; }
[JsonPropertyName("KillerProfileId")]
public string? KillerProfileId
{
get;
set;
}
public string? KillerProfileId { get; set; }
[JsonPropertyName("KillerName")]
public string? KillerName
{
get;
set;
}
public string? KillerName { get; set; }
[JsonPropertyName("WeaponName")]
public string? WeaponName
{
get;
set;
}
public string? WeaponName { get; set; }
public bool? CarriedByGroupMember
{
get;
set;
}
public bool? CarriedByGroupMember { get; set; }
}
public record UpdSideEffect
@@ -821,11 +466,7 @@ public record UpdSideEffect
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Value")]
public double? Value
{
get;
set;
}
public double? Value { get; set; }
}
public record UpdRepairKit
@@ -834,11 +475,7 @@ public record UpdRepairKit
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Resource")]
public double? Resource
{
get;
set;
}
public double? Resource { get; set; }
}
public record UpdCultistAmulet
@@ -847,9 +484,5 @@ public record UpdCultistAmulet
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("NumberOfUsages")]
public double? NumberOfUsages
{
get;
set;
}
public double? NumberOfUsages { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs
+50 -250
View File
@@ -10,18 +10,10 @@ public record LocationServices
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("TraderServerSettings")]
public TraderServerSettings? TraderServerSettings
{
get;
set;
}
public TraderServerSettings? TraderServerSettings { get; set; }
[JsonPropertyName("BTRServerSettings")]
public BtrServerSettings? BtrServerSettings
{
get;
set;
}
public BtrServerSettings? BtrServerSettings { get; set; }
}
public record TraderServerSettings
@@ -30,11 +22,7 @@ public record TraderServerSettings
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("TraderServices")]
public TraderServices? TraderServices
{
get;
set;
}
public TraderServices? TraderServices { get; set; }
}
public record TraderServices
@@ -43,53 +31,25 @@ public record TraderServices
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("ExUsecLoyalty")]
public TraderService? ExUsecLoyalty
{
get;
set;
}
public TraderService? ExUsecLoyalty { get; set; }
[JsonPropertyName("ZryachiyAid")]
public TraderService? ZryachiyAid
{
get;
set;
}
public TraderService? ZryachiyAid { get; set; }
[JsonPropertyName("CultistsAid")]
public TraderService? CultistsAid
{
get;
set;
}
public TraderService? CultistsAid { get; set; }
[JsonPropertyName("PlayerTaxi")]
public TraderService? PlayerTaxi
{
get;
set;
}
public TraderService? PlayerTaxi { get; set; }
[JsonPropertyName("BtrItemsDelivery")]
public TraderService? BtrItemsDelivery
{
get;
set;
}
public TraderService? BtrItemsDelivery { get; set; }
[JsonPropertyName("BtrBotCover")]
public TraderService? BtrBotCover
{
get;
set;
}
public TraderService? BtrBotCover { get; set; }
[JsonPropertyName("TransitItemsDelivery")]
public TraderService? TransitItemsDelivery
{
get;
set;
}
public TraderService? TransitItemsDelivery { get; set; }
}
public record TraderService
@@ -98,41 +58,21 @@ public record TraderService
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("TraderId")]
public string? TraderId
{
get;
set;
}
public string? TraderId { get; set; }
[JsonPropertyName("TraderServiceType")]
public TraderServiceType? TraderServiceType
{
get;
set;
}
public TraderServiceType? TraderServiceType { get; set; }
[JsonPropertyName("Requirements")]
public ServiceRequirements? Requirements
{
get;
set;
}
public ServiceRequirements? Requirements { get; set; }
[JsonPropertyName("ServiceItemCost")]
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public Dictionary<string, ServiceItemCostDetails>? ServiceItemCost
{
get;
set;
}
public Dictionary<string, ServiceItemCostDetails>? ServiceItemCost { get; set; }
[JsonPropertyName("UniqueItems")]
public List<string>? UniqueItems
{
get;
set;
}
public List<string>? UniqueItems { get; set; }
}
public record ServiceRequirements
@@ -142,20 +82,12 @@ public record ServiceRequirements
[JsonPropertyName("CompletedQuests")]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public List<CompletedQuest>? CompletedQuests
{
get;
set;
}
public List<CompletedQuest>? CompletedQuests { get; set; }
[JsonPropertyName("Standings")]
[JsonConverter(typeof(ArrayToObjectFactoryConverter))]
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
public Dictionary<string, StandingRequirement>? Standings
{
get;
set;
}
public Dictionary<string, StandingRequirement>? Standings { get; set; }
}
public record CompletedQuest
@@ -164,11 +96,7 @@ public record CompletedQuest
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("QuestId")]
public string? QuestId
{
get;
set;
}
public string? QuestId { get; set; }
}
public record StandingRequirement
@@ -177,11 +105,7 @@ public record StandingRequirement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Value")]
public double? Value
{
get;
set;
}
public double? Value { get; set; }
}
public record ServiceItemCostDetails
@@ -190,11 +114,7 @@ public record ServiceItemCostDetails
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
}
public record BtrServerSettings
@@ -203,109 +123,49 @@ public record BtrServerSettings
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("ChanceSpawn")]
public double? ChanceSpawn
{
get;
set;
}
public double? ChanceSpawn { get; set; }
[JsonPropertyName("SpawnPeriod")]
public XYZ? SpawnPeriod
{
get;
set;
}
public XYZ? SpawnPeriod { get; set; }
[JsonPropertyName("MoveSpeed")]
public float? MoveSpeed
{
get;
set;
}
public float? MoveSpeed { get; set; }
[JsonPropertyName("ReadyToDepartureTime")]
public float? ReadyToDepartureTime
{
get;
set;
}
public float? ReadyToDepartureTime { get; set; }
[JsonPropertyName("CheckTurnDistanceTime")]
public float? CheckTurnDistanceTime
{
get;
set;
}
public float? CheckTurnDistanceTime { get; set; }
[JsonPropertyName("TurnCheckSensitivity")]
public float? TurnCheckSensitivity
{
get;
set;
}
public float? TurnCheckSensitivity { get; set; }
[JsonPropertyName("DecreaseSpeedOnTurnLimit")]
public double? DecreaseSpeedOnTurnLimit
{
get;
set;
}
public double? DecreaseSpeedOnTurnLimit { get; set; }
[JsonPropertyName("EndSplineDecelerationDistance")]
public double? EndSplineDecelerationDistance
{
get;
set;
}
public double? EndSplineDecelerationDistance { get; set; }
[JsonPropertyName("AccelerationSpeed")]
public double? AccelerationSpeed
{
get;
set;
}
public double? AccelerationSpeed { get; set; }
[JsonPropertyName("DecelerationSpeed")]
public double? DecelerationSpeed
{
get;
set;
}
public double? DecelerationSpeed { get; set; }
[JsonPropertyName("PauseDurationRange")]
public XYZ? PauseDurationRange
{
get;
set;
}
public XYZ? PauseDurationRange { get; set; }
[JsonPropertyName("BodySwingReturnSpeed")]
public float? BodySwingReturnSpeed
{
get;
set;
}
public float? BodySwingReturnSpeed { get; set; }
[JsonPropertyName("BodySwingDamping")]
public float? BodySwingDamping
{
get;
set;
}
public float? BodySwingDamping { get; set; }
[JsonPropertyName("BodySwingIntensity")]
public float? BodySwingIntensity
{
get;
set;
}
public float? BodySwingIntensity { get; set; }
[JsonPropertyName("ServerMapBTRSettings")]
public Dictionary<string, ServerMapBtrsettings>? ServerMapBTRSettings
{
get;
set;
}
public Dictionary<string, ServerMapBtrsettings>? ServerMapBTRSettings { get; set; }
}
public record ServerMapBtrsettings
@@ -314,107 +174,47 @@ public record ServerMapBtrsettings
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("MapID")]
public string? MapID
{
get;
set;
}
public string? MapID { get; set; }
[JsonPropertyName("ChanceSpawn")]
public double? ChanceSpawn
{
get;
set;
}
public double? ChanceSpawn { get; set; }
[JsonPropertyName("SpawnPeriod")]
public XYZ? SpawnPeriod
{
get;
set;
}
public XYZ? SpawnPeriod { get; set; }
[JsonPropertyName("MoveSpeed")]
public float? MoveSpeed
{
get;
set;
}
public float? MoveSpeed { get; set; }
[JsonPropertyName("ReadyToDepartureTime")]
public float? ReadyToDepartureTime
{
get;
set;
}
public float? ReadyToDepartureTime { get; set; }
[JsonPropertyName("CheckTurnDistanceTime")]
public float? CheckTurnDistanceTime
{
get;
set;
}
public float? CheckTurnDistanceTime { get; set; }
[JsonPropertyName("TurnCheckSensitivity")]
public float? TurnCheckSensitivity
{
get;
set;
}
public float? TurnCheckSensitivity { get; set; }
[JsonPropertyName("DecreaseSpeedOnTurnLimit")]
public float? DecreaseSpeedOnTurnLimit
{
get;
set;
}
public float? DecreaseSpeedOnTurnLimit { get; set; }
[JsonPropertyName("EndSplineDecelerationDistance")]
public float? EndSplineDecelerationDistance
{
get;
set;
}
public float? EndSplineDecelerationDistance { get; set; }
[JsonPropertyName("AccelerationSpeed")]
public float? AccelerationSpeed
{
get;
set;
}
public float? AccelerationSpeed { get; set; }
[JsonPropertyName("DecelerationSpeed")]
public float? DecelerationSpeed
{
get;
set;
}
public float? DecelerationSpeed { get; set; }
[JsonPropertyName("PauseDurationRange")]
public XYZ? PauseDurationRange
{
get;
set;
}
public XYZ? PauseDurationRange { get; set; }
[JsonPropertyName("BodySwingReturnSpeed")]
public float? BodySwingReturnSpeed
{
get;
set;
}
public float? BodySwingReturnSpeed { get; set; }
[JsonPropertyName("BodySwingDamping")]
public float? BodySwingDamping
{
get;
set;
}
public float? BodySwingDamping { get; set; }
[JsonPropertyName("BodySwingIntensity")]
public float? BodySwingIntensity
{
get;
set;
}
public float? BodySwingIntensity { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs
+5 -25
View File
@@ -8,18 +8,10 @@ public record LocationsBase
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("locations")]
public Locations? Locations
{
get;
set;
}
public Locations? Locations { get; set; }
[JsonPropertyName("paths")]
public List<Path>? Paths
{
get;
set;
}
public List<Path>? Paths { get; set; }
}
public record Locations
@@ -36,22 +28,10 @@ public record Path
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Source")]
public string? Source
{
get;
set;
}
public string? Source { get; set; }
[JsonPropertyName("Destination")]
public string? Destination
{
get;
set;
}
public string? Destination { get; set; }
public bool? Event
{
get;
set;
}
public bool? Event { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs
+2 -10
View File
@@ -8,16 +8,8 @@ public record LocationsGenerateAllResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("locations")]
public Dictionary<string, LocationBase> Locations
{
get;
set;
}
public Dictionary<string, LocationBase> Locations { get; set; }
[JsonPropertyName("paths")]
public List<Path>? Paths
{
get;
set;
}
public List<Path>? Paths { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs
+7 -35
View File
@@ -8,11 +8,7 @@ public record Match
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("metrics")]
public Metrics? Metrics
{
get;
set;
}
public Metrics? Metrics { get; set; }
}
public record Metrics
@@ -21,44 +17,20 @@ public record Metrics
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Keys")]
public List<int>? Keys
{
get;
set;
}
public List<int>? Keys { get; set; }
[JsonPropertyName("NetProcessingBins")]
public List<int>? NetProcessingBins
{
get;
set;
}
public List<int>? NetProcessingBins { get; set; }
[JsonPropertyName("RenderBins")]
public List<int>? RenderBins
{
get;
set;
}
public List<int>? RenderBins { get; set; }
[JsonPropertyName("GameUpdateBins")]
public List<int>? GameUpdateBins
{
get;
set;
}
public List<int>? GameUpdateBins { get; set; }
[JsonPropertyName("MemoryMeasureInterval")]
public int? MemoryMeasureInterval
{
get;
set;
}
public int? MemoryMeasureInterval { get; set; }
[JsonPropertyName("PauseReasons")]
public List<int>? PauseReasons
{
get;
set;
}
public List<int>? PauseReasons { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs
+17 -85
View File
@@ -8,11 +8,7 @@ public record Prestige
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("elements")]
public List<PrestigeElement>? Elements
{
get;
set;
}
public List<PrestigeElement>? Elements { get; set; }
}
public record PrestigeElement
@@ -21,46 +17,22 @@ public record PrestigeElement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("conditions")]
public List<QuestCondition>? Conditions
{
get;
set;
}
public List<QuestCondition>? Conditions { get; set; }
[JsonPropertyName("rewards")]
public List<Reward>? Rewards
{
get;
set;
}
public List<Reward>? Rewards { get; set; }
[JsonPropertyName("transferConfigs")]
public TransferConfigs? TransferConfigs
{
get;
set;
}
public TransferConfigs? TransferConfigs { get; set; }
[JsonPropertyName("image")]
public string? Image
{
get;
set;
}
public string? Image { get; set; }
[JsonPropertyName("bigImage")]
public string? BigImage
{
get;
set;
}
public string? BigImage { get; set; }
}
public record TransferConfigs
@@ -69,25 +41,13 @@ public record TransferConfigs
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("stashConfig")]
public StashPrestigeConfig? StashConfig
{
get;
set;
}
public StashPrestigeConfig? StashConfig { get; set; }
[JsonPropertyName("skillConfig")]
public PrestigeSkillConfig? SkillConfig
{
get;
set;
}
public PrestigeSkillConfig? SkillConfig { get; set; }
[JsonPropertyName("masteringConfig")]
public PrestigeMasteringConfig? MasteringConfig
{
get;
set;
}
public PrestigeMasteringConfig? MasteringConfig { get; set; }
}
public record StashPrestigeConfig
@@ -96,25 +56,13 @@ public record StashPrestigeConfig
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("xCellCount")]
public int? XCellCount
{
get;
set;
}
public int? XCellCount { get; set; }
[JsonPropertyName("yCellCount")]
public int? YCellCount
{
get;
set;
}
public int? YCellCount { get; set; }
[JsonPropertyName("filters")]
public StashPrestigeFilters? Filters
{
get;
set;
}
public StashPrestigeFilters? Filters { get; set; }
}
public record StashPrestigeFilters
@@ -123,18 +71,10 @@ public record StashPrestigeFilters
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("includedItems")]
public List<string>? IncludedItems
{
get;
set;
}
public List<string>? IncludedItems { get; set; }
[JsonPropertyName("excludedItems")]
public List<string>? ExcludedItems
{
get;
set;
}
public List<string>? ExcludedItems { get; set; }
}
public record PrestigeSkillConfig
@@ -143,11 +83,7 @@ public record PrestigeSkillConfig
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("transferMultiplier")]
public double? TransferMultiplier
{
get;
set;
}
public double? TransferMultiplier { get; set; }
}
public record PrestigeMasteringConfig
@@ -156,9 +92,5 @@ public record PrestigeMasteringConfig
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("transferMultiplier")]
public double? TransferMultiplier
{
get;
set;
}
public double? TransferMultiplier { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs
+19 -95
View File
@@ -9,25 +9,13 @@ public record ProfileSides
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("descriptionLocaleKey")]
public string? DescriptionLocaleKey
{
get;
set;
}
public string? DescriptionLocaleKey { get; set; }
[JsonPropertyName("usec")]
public TemplateSide? Usec
{
get;
set;
}
public TemplateSide? Usec { get; set; }
[JsonPropertyName("bear")]
public TemplateSide? Bear
{
get;
set;
}
public TemplateSide? Bear { get; set; }
}
public record TemplateSide
@@ -36,53 +24,25 @@ public record TemplateSide
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("character")]
public PmcData? Character
{
get;
set;
}
public PmcData? Character { get; set; }
[JsonPropertyName("suits")]
public List<string>? Suits
{
get;
set;
}
public List<string>? Suits { get; set; }
[JsonPropertyName("dialogues")]
public Dictionary<string, Dialogue>? Dialogues
{
get;
set;
}
public Dictionary<string, Dialogue>? Dialogues { get; set; }
[JsonPropertyName("userbuilds")]
public UserBuilds? UserBuilds
{
get;
set;
}
public UserBuilds? UserBuilds { get; set; }
[JsonPropertyName("trader")]
public ProfileTraderTemplate? Trader
{
get;
set;
}
public ProfileTraderTemplate? Trader { get; set; }
[JsonPropertyName("equipmentBuilds")]
public object? EquipmentBuilds
{
get;
set;
}
public object? EquipmentBuilds { get; set; }
[JsonPropertyName("weaponbuilds")]
public object? WeaponBuilds
{
get;
set;
}
public object? WeaponBuilds { get; set; }
}
public record ProfileTraderTemplate
@@ -91,74 +51,38 @@ public record ProfileTraderTemplate
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("initialLoyaltyLevel")]
public Dictionary<string, int?>? InitialLoyaltyLevel
{
get;
set;
}
public Dictionary<string, int?>? InitialLoyaltyLevel { get; set; }
[JsonPropertyName("initialStanding")]
public Dictionary<string, double?>? InitialStanding
{
get;
set;
}
public Dictionary<string, double?>? InitialStanding { get; set; }
[JsonPropertyName("setQuestsAvailableForStart")]
public bool? SetQuestsAvailableForStart
{
get;
set;
}
public bool? SetQuestsAvailableForStart { get; set; }
[JsonPropertyName("setQuestsAvailableForFinish")]
public bool? SetQuestsAvailableForFinish
{
get;
set;
}
public bool? SetQuestsAvailableForFinish { get; set; }
[JsonPropertyName("initialSalesSum")]
public int? InitialSalesSum
{
get;
set;
}
public int? InitialSalesSum { get; set; }
[JsonPropertyName("jaegerUnlocked")]
public bool? JaegerUnlocked
{
get;
set;
}
public bool? JaegerUnlocked { get; set; }
/// <summary>
/// How many days is usage of the flea blocked for upon profile creation
/// </summary>
[JsonPropertyName("fleaBlockedDays")]
public int? FleaBlockedDays
{
get;
set;
}
public int? FleaBlockedDays { get; set; }
/// <summary>
/// What traders default to being locked on profile creation
/// </summary>
[JsonPropertyName("lockedByDefaultOverride")]
public List<string>? LockedByDefaultOverride
{
get;
set;
}
public List<string>? LockedByDefaultOverride { get; set; }
/// <summary>
/// What traders should have their clothing unlocked/purchased on creation
/// </summary>
[JsonPropertyName("purchaseAllClothingByDefaultForTrader")]
public List<string>? PurchaseAllClothingByDefaultForTrader
{
get;
set;
}
public List<string>? PurchaseAllClothingByDefaultForTrader { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs
+144 -720
View File
File diff suppressed because it is too large Load Diff
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs
+63 -315
View File
@@ -5,67 +5,31 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables;
public record RepeatableQuest : Quest
{
[JsonPropertyName("changeCost")]
public List<ChangeCost?>? ChangeCost
{
get;
set;
}
public List<ChangeCost?>? ChangeCost { get; set; }
[JsonPropertyName("changeStandingCost")]
public int? ChangeStandingCost
{
get;
set;
}
public int? ChangeStandingCost { get; set; }
[JsonPropertyName("sptRepatableGroupName")]
public string? SptRepatableGroupName
{
get;
set;
}
public string? SptRepatableGroupName { get; set; }
[JsonPropertyName("acceptanceAndFinishingSource")]
public string? AcceptanceAndFinishingSource
{
get;
set;
}
public string? AcceptanceAndFinishingSource { get; set; }
[JsonPropertyName("progressSource")]
public string? ProgressSource
{
get;
set;
}
public string? ProgressSource { get; set; }
[JsonPropertyName("rankingModes")]
public List<string?>? RankingModes
{
get;
set;
}
public List<string?>? RankingModes { get; set; }
[JsonPropertyName("gameModes")]
public List<string>? GameModes
{
get;
set;
}
public List<string>? GameModes { get; set; }
[JsonPropertyName("arenaLocations")]
public List<string>? ArenaLocations
{
get;
set;
}
public List<string>? ArenaLocations { get; set; }
[JsonPropertyName("questStatus")]
public RepeatableQuestStatus? QuestStatus
{
get;
set;
}
public RepeatableQuestStatus? QuestStatus { get; set; }
}
public record RepeatableQuestDatabase
@@ -74,32 +38,16 @@ public record RepeatableQuestDatabase
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("templates")]
public RepeatableTemplates? Templates
{
get;
set;
}
public RepeatableTemplates? Templates { get; set; }
[JsonPropertyName("rewards")]
public RewardOptions? Rewards
{
get;
set;
}
public RewardOptions? Rewards { get; set; }
[JsonPropertyName("data")]
public Options? Data
{
get;
set;
}
public Options? Data { get; set; }
[JsonPropertyName("samples")]
public List<SampleQuests?>? Samples
{
get;
set;
}
public List<SampleQuests?>? Samples { get; set; }
}
public record RepeatableQuestStatus
@@ -108,46 +56,22 @@ public record RepeatableQuestStatus
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("uid")]
public string? Uid
{
get;
set;
}
public string? Uid { get; set; }
[JsonPropertyName("qid")]
public string? QId
{
get;
set;
}
public string? QId { get; set; }
[JsonPropertyName("startTime")]
public long? StartTime
{
get;
set;
}
public long? StartTime { get; set; }
[JsonPropertyName("status")]
public int? Status
{
get;
set;
}
public int? Status { get; set; }
[JsonPropertyName("statusTimers")]
public object? StatusTimers
{
get;
set;
} // Use object for any type
public object? StatusTimers { get; set; } // Use object for any type
}
public record RepeatableTemplates
@@ -156,32 +80,16 @@ public record RepeatableTemplates
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Elimination")]
public RepeatableQuest? Elimination
{
get;
set;
}
public RepeatableQuest? Elimination { get; set; }
[JsonPropertyName("Completion")]
public RepeatableQuest? Completion
{
get;
set;
}
public RepeatableQuest? Completion { get; set; }
[JsonPropertyName("Exploration")]
public RepeatableQuest? Exploration
{
get;
set;
}
public RepeatableQuest? Exploration { get; set; }
[JsonPropertyName("Pickup")]
public RepeatableQuest? Pickup
{
get;
set;
}
public RepeatableQuest? Pickup { get; set; }
}
public record PmcDataRepeatableQuest
@@ -190,71 +98,35 @@ public record PmcDataRepeatableQuest
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
[JsonPropertyName("unavailableTime")]
public string? UnavailableTime
{
get;
set;
}
public string? UnavailableTime { get; set; }
[JsonPropertyName("activeQuests")]
public List<RepeatableQuest>? ActiveQuests
{
get;
set;
}
public List<RepeatableQuest>? ActiveQuests { get; set; }
[JsonPropertyName("inactiveQuests")]
public List<RepeatableQuest>? InactiveQuests
{
get;
set;
}
public List<RepeatableQuest>? InactiveQuests { get; set; }
[JsonPropertyName("endTime")]
public long? EndTime
{
get;
set;
}
public long? EndTime { get; set; }
/// <summary>
/// What it costs to reset: QuestId, ChangeRequirement. Redundant to change requirements within RepeatableQuest
/// </summary>
[JsonIgnore(Condition = JsonIgnoreCondition.Never)]
[JsonPropertyName("changeRequirement")]
public Dictionary<string?, ChangeRequirement?>? ChangeRequirement
{
get;
set;
}
public Dictionary<string?, ChangeRequirement?>? ChangeRequirement { get; set; }
[JsonPropertyName("freeChanges")]
public int? FreeChanges
{
get;
set;
}
public int? FreeChanges { get; set; }
[JsonPropertyName("freeChangesAvailable")]
public int? FreeChangesAvailable
{
get;
set;
}
public int? FreeChangesAvailable { get; set; }
}
public record ChangeRequirement
@@ -263,18 +135,10 @@ public record ChangeRequirement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("changeCost")]
public List<ChangeCost?>? ChangeCost
{
get;
set;
}
public List<ChangeCost?>? ChangeCost { get; set; }
[JsonPropertyName("changeStandingCost")]
public double? ChangeStandingCost
{
get;
set;
}
public double? ChangeStandingCost { get; set; }
}
public record ChangeCost
@@ -286,21 +150,13 @@ public record ChangeCost
/// What item it will take to reset daily
/// </summary>
[JsonPropertyName("templateId")]
public string? TemplateId
{
get;
set;
}
public string? TemplateId { get; set; }
/// <summary>
/// Amount of item needed to reset
/// </summary>
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
}
// Config Options
@@ -311,11 +167,7 @@ public record RewardOptions
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("itemsBlacklist")]
public List<string>? ItemsBlacklist
{
get;
set;
}
public List<string>? ItemsBlacklist { get; set; }
}
public record Options
@@ -324,11 +176,7 @@ public record Options
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Completion")]
public CompletionFilter? Completion
{
get;
set;
}
public CompletionFilter? Completion { get; set; }
}
public record CompletionFilter
@@ -337,18 +185,10 @@ public record CompletionFilter
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("itemsBlacklist")]
public List<ItemsBlacklist>? ItemsBlacklist
{
get;
set;
}
public List<ItemsBlacklist>? ItemsBlacklist { get; set; }
[JsonPropertyName("itemsWhitelist")]
public List<ItemsWhitelist>? ItemsWhitelist
{
get;
set;
}
public List<ItemsWhitelist>? ItemsWhitelist { get; set; }
}
public record ItemsBlacklist
@@ -357,18 +197,10 @@ public record ItemsBlacklist
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("minPlayerLevel")]
public int? MinPlayerLevel
{
get;
set;
}
public int? MinPlayerLevel { get; set; }
[JsonPropertyName("itemIds")]
public List<string>? ItemIds
{
get;
set;
}
public List<string>? ItemIds { get; set; }
}
public record ItemsWhitelist
@@ -377,18 +209,10 @@ public record ItemsWhitelist
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("minPlayerLevel")]
public int? MinPlayerLevel
{
get;
set;
}
public int? MinPlayerLevel { get; set; }
[JsonPropertyName("itemIds")]
public List<string>? ItemIds
{
get;
set;
}
public List<string>? ItemIds { get; set; }
}
public record SampleQuests
@@ -397,135 +221,59 @@ public record SampleQuests
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("traderId")]
public string? TraderId
{
get;
set;
}
public string? TraderId { get; set; }
[JsonPropertyName("location")]
public string? Location
{
get;
set;
}
public string? Location { get; set; }
[JsonPropertyName("image")]
public string? Image
{
get;
set;
}
public string? Image { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("isKey")]
public bool? IsKey
{
get;
set;
}
public bool? IsKey { get; set; }
[JsonPropertyName("restartable")]
public bool? Restartable
{
get;
set;
}
public bool? Restartable { get; set; }
[JsonPropertyName("instantComplete")]
public bool? InstantComplete
{
get;
set;
}
public bool? InstantComplete { get; set; }
[JsonPropertyName("secretQuest")]
public bool? SecretQuest
{
get;
set;
}
public bool? SecretQuest { get; set; }
[JsonPropertyName("canShowNotificationsInGame")]
public bool? CanShowNotificationsInGame
{
get;
set;
}
public bool? CanShowNotificationsInGame { get; set; }
[JsonPropertyName("rewards")]
public QuestRewards? Rewards
{
get;
set;
}
public QuestRewards? Rewards { get; set; }
[JsonPropertyName("conditions")]
public QuestConditionTypes? Conditions
{
get;
set;
}
public QuestConditionTypes? Conditions { get; set; }
[JsonPropertyName("name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
[JsonPropertyName("note")]
public string? Note
{
get;
set;
}
public string? Note { get; set; }
[JsonPropertyName("description")]
public string? Description
{
get;
set;
}
public string? Description { get; set; }
[JsonPropertyName("successMessageText")]
public string? SuccessMessageText
{
get;
set;
}
public string? SuccessMessageText { get; set; }
[JsonPropertyName("failMessageText")]
public string? FailMessageText
{
get;
set;
}
public string? FailMessageText { get; set; }
[JsonPropertyName("startedMessageText")]
public string? StartedMessageText
{
get;
set;
}
public string? StartedMessageText { get; set; }
[JsonPropertyName("templateId")]
public string? TemplateId
{
get;
set;
}
public string? TemplateId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs
+16 -80
View File
@@ -11,125 +11,61 @@ public record Reward
[JsonPropertyName("value")]
[JsonConverter(typeof(StringToNumberFactoryConverter))]
public double? Value
{
get;
set;
}
public double? Value { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("type")]
[JsonConverter(typeof(JsonStringEnumConverter))]
public RewardType? Type
{
get;
set;
}
public RewardType? Type { get; set; }
[JsonPropertyName("index")]
public int? Index
{
get;
set;
}
public int? Index { get; set; }
[JsonPropertyName("target")]
public string? Target
{
get;
set;
}
public string? Target { get; set; }
[JsonPropertyName("items")]
public List<Item>? Items
{
get;
set;
}
public List<Item>? Items { get; set; }
[JsonPropertyName("loyaltyLevel")]
public int? LoyaltyLevel
{
get;
set;
}
public int? LoyaltyLevel { get; set; }
/// <summary>
/// Hideout area id
/// </summary>
[JsonPropertyName("traderId")]
public object? TraderId
{
get;
set;
} // TODO: string | int
public object? TraderId { get; set; } // TODO: string | int
[JsonPropertyName("isEncoded")]
public bool? IsEncoded
{
get;
set;
}
public bool? IsEncoded { get; set; }
[JsonPropertyName("unknown")]
public bool? Unknown
{
get;
set;
}
public bool? Unknown { get; set; }
[JsonPropertyName("findInRaid")]
public bool? FindInRaid
{
get;
set;
}
public bool? FindInRaid { get; set; }
[JsonPropertyName("gameMode")]
public List<string>? GameMode
{
get;
set;
}
public List<string>? GameMode { get; set; }
/// <summary>
/// Game editions whitelisted to get reward
/// </summary>
[JsonPropertyName("availableInGameEditions")]
public HashSet<string>? AvailableInGameEditions
{
get;
set;
}
public HashSet<string>? AvailableInGameEditions { get; set; }
/// <summary>
/// Game editions blacklisted from getting reward
/// </summary>
[JsonPropertyName("notAvailableInGameEditions")]
public HashSet<string>? NotAvailableInGameEditions
{
get;
set;
}
public HashSet<string>? NotAvailableInGameEditions { get; set; }
// This is always Null atm in the achievements.json
[JsonPropertyName("illustrationConfig")]
public object? IllustrationConfig
{
get;
set;
}
public object? IllustrationConfig { get; set; }
[JsonPropertyName("isHidden")]
public bool? IsHidden
{
get;
set;
}
public bool? IsHidden { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs
+597 -2948
View File
File diff suppressed because it is too large Load Diff
Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs
+91 -455
View File
@@ -11,46 +11,22 @@ public record Trader
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("assort")]
public TraderAssort? Assort
{
get;
set;
}
public TraderAssort? Assort { get; set; }
[JsonPropertyName("base")]
public TraderBase? Base
{
get;
set;
}
public TraderBase? Base { get; set; }
[JsonPropertyName("dialogue")]
public Dictionary<string, List<string>?>? Dialogue
{
get;
set;
}
public Dictionary<string, List<string>?>? Dialogue { get; set; }
[JsonPropertyName("questassort")]
public Dictionary<string, Dictionary<string, string>>? QuestAssort
{
get;
set;
}
public Dictionary<string, Dictionary<string, string>>? QuestAssort { get; set; }
[JsonPropertyName("suits")]
public List<Suit>? Suits
{
get;
set;
}
public List<Suit>? Suits { get; set; }
[JsonPropertyName("services")]
public List<TraderServiceModel>? Services
{
get;
set;
}
public List<TraderServiceModel>? Services { get; set; }
}
public record TraderBase
@@ -59,215 +35,95 @@ public record TraderBase
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("refreshTraderRagfairOffers")]
public bool? RefreshTraderRagfairOffers
{
get;
set;
}
public bool? RefreshTraderRagfairOffers { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("availableInRaid")]
public bool? AvailableInRaid
{
get;
set;
}
public bool? AvailableInRaid { get; set; }
[JsonPropertyName("avatar")]
public string? Avatar
{
get;
set;
}
public string? Avatar { get; set; }
[JsonPropertyName("balance_dol")]
public decimal? BalanceDollar
{
get;
set;
}
public decimal? BalanceDollar { get; set; }
[JsonPropertyName("balance_eur")]
public decimal? BalanceEuro
{
get;
set;
}
public decimal? BalanceEuro { get; set; }
[JsonPropertyName("balance_rub")]
public decimal? BalanceRub
{
get;
set;
}
public decimal? BalanceRub { get; set; }
[JsonPropertyName("buyer_up")]
public bool? BuyerUp
{
get;
set;
}
public bool? BuyerUp { get; set; }
[JsonPropertyName("currency")]
public CurrencyType? Currency
{
get;
set;
}
public CurrencyType? Currency { get; set; }
[JsonPropertyName("customization_seller")]
public bool? CustomizationSeller
{
get;
set;
}
public bool? CustomizationSeller { get; set; }
[JsonPropertyName("discount")]
public decimal? Discount
{
get;
set;
}
public decimal? Discount { get; set; }
[JsonPropertyName("discount_end")]
public decimal? DiscountEnd
{
get;
set;
}
public decimal? DiscountEnd { get; set; }
[JsonPropertyName("gridHeight")]
public double? GridHeight
{
get;
set;
}
public double? GridHeight { get; set; }
[JsonPropertyName("sell_modifier_for_prohibited_items")]
public int? ProhibitedItemsSellModifier
{
get;
set;
}
public int? ProhibitedItemsSellModifier { get; set; }
[JsonPropertyName("insurance")]
public TraderInsurance? Insurance
{
get;
set;
}
public TraderInsurance? Insurance { get; set; }
[JsonPropertyName("items_buy")]
public ItemBuyData? ItemsBuy
{
get;
set;
}
public ItemBuyData? ItemsBuy { get; set; }
[JsonPropertyName("items_buy_prohibited")]
public ItemBuyData? ItemsBuyProhibited
{
get;
set;
}
public ItemBuyData? ItemsBuyProhibited { get; set; }
[JsonPropertyName("isCanTransferItems")]
public bool? IsCanTransferItems
{
get;
set;
}
public bool? IsCanTransferItems { get; set; }
[JsonPropertyName("transferableItems")]
public ItemBuyData? TransferableItems
{
get;
set;
}
public ItemBuyData? TransferableItems { get; set; }
[JsonPropertyName("prohibitedTransferableItems")]
public ItemBuyData? ProhibitedTransferableItems
{
get;
set;
}
public ItemBuyData? ProhibitedTransferableItems { get; set; }
[JsonPropertyName("location")]
public string? Location
{
get;
set;
}
public string? Location { get; set; }
[JsonPropertyName("loyaltyLevels")]
public List<TraderLoyaltyLevel>? LoyaltyLevels
{
get;
set;
}
public List<TraderLoyaltyLevel>? LoyaltyLevels { get; set; }
[JsonPropertyName("medic")]
public bool? Medic
{
get;
set;
}
public bool? Medic { get; set; }
[JsonPropertyName("name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
// Confirmed in client
[JsonPropertyName("nextResupply")]
public int? NextResupply
{
get;
set;
}
public int? NextResupply { get; set; }
[JsonPropertyName("nickname")]
public string? Nickname
{
get;
set;
}
public string? Nickname { get; set; }
[JsonPropertyName("repair")]
public TraderRepair? Repair
{
get;
set;
}
public TraderRepair? Repair { get; set; }
[JsonPropertyName("sell_category")]
public List<string>? SellCategory
{
get;
set;
}
public List<string>? SellCategory { get; set; }
[JsonPropertyName("surname")]
public string? Surname
{
get;
set;
}
public string? Surname { get; set; }
[JsonPropertyName("unlockedByDefault")]
public bool? UnlockedByDefault
{
get;
set;
}
public bool? UnlockedByDefault { get; set; }
}
public record ItemBuyData
@@ -277,19 +133,11 @@ public record ItemBuyData
// MongoId
[JsonPropertyName("category")]
public List<string>? Category
{
get;
set;
}
public List<string>? Category { get; set; }
// MongoId
[JsonPropertyName("id_list")]
public List<string>? IdList
{
get;
set;
}
public List<string>? IdList { get; set; }
}
public record TraderInsurance
@@ -298,50 +146,26 @@ public record TraderInsurance
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("availability")]
public bool? Availability
{
get;
set;
}
public bool? Availability { get; set; }
// MongoId
[JsonPropertyName("excluded_category")]
public List<string>? ExcludedCategory
{
get;
set;
}
public List<string>? ExcludedCategory { get; set; }
// Confirmed in client
[JsonPropertyName("max_return_hour")]
public int? MaxReturnHour
{
get;
set;
}
public int? MaxReturnHour { get; set; }
[JsonPropertyName("max_storage_time")]
public double? MaxStorageTime
{
get;
set;
}
public double? MaxStorageTime { get; set; }
// Confirmed in client
[JsonPropertyName("min_payment")]
public int? MinPayment
{
get;
set;
}
public int? MinPayment { get; set; }
// Confirmed in client
[JsonPropertyName("min_return_hour")]
public int? MinReturnHour
{
get;
set;
}
public int? MinReturnHour { get; set; }
}
public record TraderLoyaltyLevel
@@ -350,62 +174,30 @@ public record TraderLoyaltyLevel
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("buy_price_coef")]
public double? BuyPriceCoefficient
{
get;
set;
}
public double? BuyPriceCoefficient { get; set; }
[JsonPropertyName("exchange_price_coef")]
public double? ExchangePriceCoefficient
{
get;
set;
}
public double? ExchangePriceCoefficient { get; set; }
[JsonPropertyName("heal_price_coef")]
public double? HealPriceCoefficient
{
get;
set;
}
public double? HealPriceCoefficient { get; set; }
[JsonPropertyName("insurance_price_coef")]
[JsonConverter(typeof(StringToNumberFactoryConverter))]
public double? InsurancePriceCoefficient
{
get;
set;
}
public double? InsurancePriceCoefficient { get; set; }
// Chceked on client
[JsonPropertyName("minLevel")]
public int? MinLevel
{
get;
set;
}
public int? MinLevel { get; set; }
[JsonPropertyName("minSalesSum")]
public long? MinSalesSum
{
get;
set;
}
public long? MinSalesSum { get; set; }
[JsonPropertyName("minStanding")]
public double? MinStanding
{
get;
set;
}
public double? MinStanding { get; set; }
[JsonPropertyName("repair_price_coef")]
public double? RepairPriceCoefficient
{
get;
set;
}
public double? RepairPriceCoefficient { get; set; }
}
public record TraderRepair
@@ -414,57 +206,29 @@ public record TraderRepair
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("availability")]
public bool? Availability
{
get;
set;
}
public bool? Availability { get; set; }
[JsonPropertyName("currency")]
public string? Currency
{
get;
set;
}
public string? Currency { get; set; }
[JsonPropertyName("currency_coefficient")]
public double? CurrencyCoefficient
{
get;
set;
}
public double? CurrencyCoefficient { get; set; }
[JsonPropertyName("excluded_category")]
public List<string>? ExcludedCategory
{
get;
set;
}
public List<string>? ExcludedCategory { get; set; }
/// <summary>
/// Doesn't exist in client object
/// </summary>
[JsonPropertyName("excluded_id_list")]
public List<string>? ExcludedIdList
{
get;
set;
}
public List<string>? ExcludedIdList { get; set; }
[JsonPropertyName("quality")]
[JsonConverter(typeof(StringToNumberFactoryConverter))]
public double? Quality
{
get;
set;
}
public double? Quality { get; set; }
[JsonPropertyName("price_rate")]
public double? PriceRate
{
get;
set;
}
public double? PriceRate { get; set; }
}
public record TraderAssort
@@ -473,32 +237,16 @@ public record TraderAssort
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("nextResupply")]
public double? NextResupply
{
get;
set;
}
public double? NextResupply { get; set; }
[JsonPropertyName("items")]
public List<Item>? Items
{
get;
set;
}
public List<Item>? Items { get; set; }
[JsonPropertyName("barter_scheme")]
public Dictionary<string, List<List<BarterScheme>>>? BarterScheme
{
get;
set;
}
public Dictionary<string, List<List<BarterScheme>>>? BarterScheme { get; set; }
[JsonPropertyName("loyal_level_items")]
public Dictionary<string, int>? LoyalLevelItems
{
get;
set;
}
public Dictionary<string, int>? LoyalLevelItems { get; set; }
}
public record BarterScheme
@@ -508,47 +256,23 @@ public record BarterScheme
// Confirmed in client
[JsonPropertyName("count")]
public double? Count
{
get;
set;
}
public double? Count { get; set; }
[JsonPropertyName("_tpl")]
public string? Template
{
get;
set;
}
public string? Template { get; set; }
[JsonPropertyName("onlyFunctional")]
public bool? OnlyFunctional
{
get;
set;
}
public bool? OnlyFunctional { get; set; }
[JsonPropertyName("sptQuestLocked")]
public bool? SptQuestLocked
{
get;
set;
}
public bool? SptQuestLocked { get; set; }
[JsonPropertyName("level")]
public int? Level
{
get;
set;
}
public int? Level { get; set; }
[JsonPropertyName("side")]
[JsonConverter(typeof(JsonStringEnumConverter))]
public DogtagExchangeSide? Side
{
get;
set;
}
public DogtagExchangeSide? Side { get; set; }
}
public record Suit
@@ -557,67 +281,31 @@ public record Suit
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("externalObtain")]
public bool? ExternalObtain
{
get;
set;
}
public bool? ExternalObtain { get; set; }
[JsonPropertyName("internalObtain")]
public bool? InternalObtain
{
get;
set;
}
public bool? InternalObtain { get; set; }
[JsonPropertyName("isHiddenInPVE")]
public bool? IsHiddenInPVE
{
get;
set;
}
public bool? IsHiddenInPVE { get; set; }
[JsonPropertyName("tid")]
public string? Tid
{
get;
set;
}
public string? Tid { get; set; }
[JsonPropertyName("suiteId")]
public string? SuiteId
{
get;
set;
}
public string? SuiteId { get; set; }
[JsonPropertyName("isActive")]
public bool? IsActive
{
get;
set;
}
public bool? IsActive { get; set; }
[JsonPropertyName("requirements")]
public SuitRequirements? Requirements
{
get;
set;
}
public SuitRequirements? Requirements { get; set; }
[JsonPropertyName("relatedBattlePassSeason")]
public int? RelatedBattlePassSeason
{
get;
set;
}
public int? RelatedBattlePassSeason { get; set; }
}
public record SuitRequirements
@@ -626,61 +314,29 @@ public record SuitRequirements
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("achievementRequirements")]
public List<string>? AchievementRequirements
{
get;
set;
}
public List<string>? AchievementRequirements { get; set; }
[JsonPropertyName("loyaltyLevel")]
public double? LoyaltyLevel
{
get;
set;
}
public double? LoyaltyLevel { get; set; }
[JsonPropertyName("profileLevel")]
public double? ProfileLevel
{
get;
set;
}
public double? ProfileLevel { get; set; }
// Checked in client
[JsonPropertyName("standing")]
public double? Standing
{
get;
set;
}
public double? Standing { get; set; }
[JsonPropertyName("skillRequirements")]
public List<string>? SkillRequirements
{
get;
set;
}
public List<string>? SkillRequirements { get; set; }
[JsonPropertyName("questRequirements")]
public List<string>? QuestRequirements
{
get;
set;
}
public List<string>? QuestRequirements { get; set; }
[JsonPropertyName("itemRequirements")]
public List<ItemRequirement>? ItemRequirements
{
get;
set;
}
public List<ItemRequirement>? ItemRequirements { get; set; }
[JsonPropertyName("requiredTid")]
public string? RequiredTid
{
get;
set;
}
public string? RequiredTid { get; set; }
}
public record ItemRequirement
@@ -689,37 +345,17 @@ public record ItemRequirement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("count")]
public double? Count
{
get;
set;
}
public double? Count { get; set; }
[JsonPropertyName("_tpl")]
public string? Tpl
{
get;
set;
}
public string? Tpl { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("onlyFunctional")]
public bool? OnlyFunctional
{
get;
set;
}
public bool? OnlyFunctional { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs
+2 -10
View File
@@ -8,16 +8,8 @@ public record XY
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("x")]
public double? X
{
get;
set;
}
public double? X { get; set; }
[JsonPropertyName("y")]
public double? Y
{
get;
set;
}
public double? Y { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs
+3 -15
View File
@@ -8,23 +8,11 @@ public record XYZ
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("x")]
public double? X
{
get;
set;
}
public double? X { get; set; }
[JsonPropertyName("y")]
public double? Y
{
get;
set;
}
public double? Y { get; set; }
[JsonPropertyName("z")]
public double? Z
{
get;
set;
}
public double? Z { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs
+5 -25
View File
@@ -9,18 +9,10 @@ public record BuyClothingRequestData : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("offer")]
public string? Offer
{
get;
set;
}
public string? Offer { get; set; }
[JsonPropertyName("items")]
public List<PaymentItemForClothing>? Items
{
get;
set;
}
public List<PaymentItemForClothing>? Items { get; set; }
}
public record PaymentItemForClothing
@@ -29,23 +21,11 @@ public record PaymentItemForClothing
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("del")]
public bool? Del
{
get;
set;
}
public bool? Del { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs
+4 -20
View File
@@ -9,11 +9,7 @@ public record CustomizationSetRequest : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("customizations")]
public List<CustomizationSetOption>? Customizations
{
get;
set;
}
public List<CustomizationSetOption>? Customizations { get; set; }
}
public record CustomizationSetOption
@@ -22,23 +18,11 @@ public record CustomizationSetOption
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("source")]
public string? Source
{
get;
set;
}
public string? Source { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs
+1 -1
View File
@@ -1,9 +1,9 @@
using System.Text.Json.Serialization;
namespace SPTarkov.Server.Core.Models.Eft.Customization;
public record WearClothingRequestData
{
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs
+4 -14
View File
@@ -3,17 +3,11 @@ using SPTarkov.Server.Core.Models.Utils;
namespace SPTarkov.Server.Core.Models.Eft.Dialog;
public record AcceptFriendRequestData : BaseFriendRequest
{
}
public record AcceptFriendRequestData : BaseFriendRequest { }
public record CancelFriendRequestData : BaseFriendRequest
{
}
public record CancelFriendRequestData : BaseFriendRequest { }
public record DeclineFriendRequestData : BaseFriendRequest
{
}
public record DeclineFriendRequestData : BaseFriendRequest { }
public record BaseFriendRequest : IRequestData
{
@@ -21,9 +15,5 @@ public record BaseFriendRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("profileId")]
public string? ProfileId
{
get;
set;
}
public string? ProfileId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record AddUserGroupMailRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
[JsonPropertyName("uid")]
public string? Uid
{
get;
set;
}
public string? Uid { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record ChangeGroupMailOwnerRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
[JsonPropertyName("uid")]
public string? Uid
{
get;
set;
}
public string? Uid { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs
+11 -55
View File
@@ -8,70 +8,34 @@ public record ChatServer
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("RegistrationId")]
public int? RegistrationId
{
get;
set;
}
public int? RegistrationId { get; set; }
[JsonPropertyName("VersionId")]
public string? VersionId
{
get;
set;
}
public string? VersionId { get; set; }
[JsonPropertyName("Ip")]
public string? Ip
{
get;
set;
}
public string? Ip { get; set; }
[JsonPropertyName("Port")]
public int? Port
{
get;
set;
}
public int? Port { get; set; }
[JsonPropertyName("DateTime")]
public long? DateTime
{
get;
set;
}
public long? DateTime { get; set; }
[JsonPropertyName("Chats")]
public List<Chat>? Chats
{
get;
set;
}
public List<Chat>? Chats { get; set; }
[JsonPropertyName("Regions")]
public List<string>? Regions
{
get;
set;
}
public List<string>? Regions { get; set; }
/// <summary>
/// Possibly removed
/// </summary>
[JsonPropertyName("IsDeveloper")]
public bool? IsDeveloper
{
get;
set;
}
public bool? IsDeveloper { get; set; }
}
public record Chat
@@ -80,16 +44,8 @@ public record Chat
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("Members")]
public int? Members
{
get;
set;
}
public int? Members { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record ClearMailMessageRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record CreateGroupMailRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Name")]
public string? Name
{
get;
set;
}
public string? Name { get; set; }
[JsonPropertyName("Users")]
public List<string>? Users
{
get;
set;
}
public List<string>? Users { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record DeleteFriendRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("friend_id")]
public string? FriendId
{
get;
set;
}
public string? FriendId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs
+4 -20
View File
@@ -9,30 +9,14 @@ public record FriendRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("status")]
public int? Status
{
get;
set;
}
public int? Status { get; set; }
[JsonPropertyName("requestId")]
public string? RequestId
{
get;
set;
}
public string? RequestId { get; set; }
[JsonPropertyName("retryAfter")]
public int? RetryAfter
{
get;
set;
}
public int? RetryAfter { get; set; }
[JsonPropertyName("to")]
public string? To
{
get;
set;
}
public string? To { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs
+3 -15
View File
@@ -9,23 +9,11 @@ public record FriendRequestSendResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("status")]
public BackendErrorCodes? Status
{
get;
set;
}
public BackendErrorCodes? Status { get; set; }
[JsonPropertyName("requestId")]
public string? RequestId
{
get;
set;
}
public string? RequestId { get; set; }
[JsonPropertyName("retryAfter")]
public int? RetryAfter
{
get;
set;
}
public int? RetryAfter { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record GetAllAttachmentsRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string DialogId
{
get;
set;
}
public string DialogId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs
+3 -15
View File
@@ -9,23 +9,11 @@ public record GetAllAttachmentsResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("messages")]
public List<Message>? Messages
{
get;
set;
}
public List<Message>? Messages { get; set; }
[JsonPropertyName("profiles")]
public List<object>? Profiles
{
get;
set;
} // Assuming 'any' translates to 'object'
public List<object>? Profiles { get; set; } // Assuming 'any' translates to 'object'
[JsonPropertyName("hasMessagesWithRewards")]
public bool? HasMessagesWithRewards
{
get;
set;
}
public bool? HasMessagesWithRewards { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record GetChatServerListRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("VersionId")]
public string? VersionId
{
get;
set;
}
public string? VersionId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs
+3 -15
View File
@@ -9,23 +9,11 @@ public record GetFriendListDataResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Friends")]
public List<UserDialogInfo>? Friends
{
get;
set;
}
public List<UserDialogInfo>? Friends { get; set; }
[JsonPropertyName("Ignore")]
public List<string>? Ignore
{
get;
set;
}
public List<string>? Ignore { get; set; }
[JsonPropertyName("InIgnoreList")]
public List<string>? InIgnoreList
{
get;
set;
}
public List<string>? InIgnoreList { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record GetMailDialogInfoRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record GetMailDialogListRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("limit")]
public int? Limit
{
get;
set;
}
public int? Limit { get; set; }
[JsonPropertyName("offset")]
public int? Offset
{
get;
set;
}
public int? Offset { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs
+4 -20
View File
@@ -10,30 +10,14 @@ public record GetMailDialogViewRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("type")]
public MessageType? Type
{
get;
set;
}
public MessageType? Type { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
[JsonPropertyName("limit")]
public int? Limit
{
get;
set;
}
public int? Limit { get; set; }
[JsonPropertyName("time")]
public decimal? Time
{
get;
set;
} // decimal
public decimal? Time { get; set; } // decimal
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs
+3 -15
View File
@@ -9,23 +9,11 @@ public record GetMailDialogViewResponseData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("messages")]
public List<Message>? Messages
{
get;
set;
}
public List<Message>? Messages { get; set; }
[JsonPropertyName("profiles")]
public List<UserDialogInfo>? Profiles
{
get;
set;
}
public List<UserDialogInfo>? Profiles { get; set; }
[JsonPropertyName("hasMessagesWithRewards")]
public bool? HasMessagesWithRewards
{
get;
set;
}
public bool? HasMessagesWithRewards { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record PinDialogRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record RemoveDialogRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record RemoveMailMessageRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record RemoveUserGroupMailRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
[JsonPropertyName("uid")]
public string? Uid
{
get;
set;
}
public string? Uid { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs
+4 -20
View File
@@ -10,30 +10,14 @@ public record SendMessageRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogId")]
public string? DialogId
{
get;
set;
}
public string? DialogId { get; set; }
[JsonPropertyName("type")]
public MessageType? Type
{
get;
set;
}
public MessageType? Type { get; set; }
[JsonPropertyName("text")]
public string? Text
{
get;
set;
}
public string? Text { get; set; }
[JsonPropertyName("replyTo")]
public string? ReplyTo
{
get;
set;
}
public string? ReplyTo { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record SetDialogReadRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("dialogs")]
public List<string>? Dialogs
{
get;
set;
}
public List<string>? Dialogs { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs
+2 -10
View File
@@ -8,16 +8,8 @@ public record CheckVersionResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("isvalid")]
public bool? IsValid
{
get;
set;
}
public bool? IsValid { get; set; }
[JsonPropertyName("latestVersion")]
public string? LatestVersion
{
get;
set;
}
public string? LatestVersion { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs
+10 -50
View File
@@ -9,11 +9,7 @@ public record CurrentGroupResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("squad")]
public List<CurrentGroupSquadMember>? Squad
{
get;
set;
}
public List<CurrentGroupSquadMember>? Squad { get; set; }
}
public record CurrentGroupSquadMember
@@ -22,39 +18,19 @@ public record CurrentGroupSquadMember
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("aid")]
public string? Aid
{
get;
set;
}
public string? Aid { get; set; }
[JsonPropertyName("info")]
public CurrentGroupMemberInfo? Info
{
get;
set;
}
public CurrentGroupMemberInfo? Info { get; set; }
[JsonPropertyName("isLeader")]
public bool? IsLeader
{
get;
set;
}
public bool? IsLeader { get; set; }
[JsonPropertyName("isReady")]
public bool? IsReady
{
get;
set;
}
public bool? IsReady { get; set; }
}
public record CurrentGroupMemberInfo
@@ -63,30 +39,14 @@ public record CurrentGroupMemberInfo
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Nickname")]
public string? Nickname
{
get;
set;
}
public string? Nickname { get; set; }
[JsonPropertyName("Side")]
public string? Side
{
get;
set;
}
public string? Side { get; set; }
[JsonPropertyName("Level")]
public string? Level
{
get;
set;
}
public string? Level { get; set; }
[JsonPropertyName("MemberCategory")]
public MemberCategory? MemberCategory
{
get;
set;
}
public MemberCategory? MemberCategory { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs
+22 -110
View File
@@ -8,112 +8,52 @@ public record GameConfigResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("aid")]
public double? Aid
{
get;
set;
}
public double? Aid { get; set; }
[JsonPropertyName("lang")]
public string? Language
{
get;
set;
}
public string? Language { get; set; }
[JsonPropertyName("languages")]
public Dictionary<string, string>? Languages
{
get;
set;
}
public Dictionary<string, string>? Languages { get; set; }
[JsonPropertyName("ndaFree")]
public bool? IsNdaFree
{
get;
set;
}
public bool? IsNdaFree { get; set; }
[JsonPropertyName("taxonomy")]
public int? Taxonomy
{
get;
set;
}
public int? Taxonomy { get; set; }
[JsonPropertyName("activeProfileId")]
public string? ActiveProfileId
{
get;
set;
}
public string? ActiveProfileId { get; set; }
[JsonPropertyName("backend")]
public Backend? Backend
{
get;
set;
}
public Backend? Backend { get; set; }
[JsonPropertyName("useProtobuf")]
public bool? UseProtobuf
{
get;
set;
}
public bool? UseProtobuf { get; set; }
[JsonPropertyName("utc_time")]
public double? UtcTime
{
get;
set;
}
public double? UtcTime { get; set; }
/// <summary>
/// Total in game time
/// </summary>
[JsonPropertyName("totalInGame")]
public double? TotalInGame
{
get;
set;
}
public double? TotalInGame { get; set; }
[JsonPropertyName("reportAvailable")]
public bool? IsReportAvailable
{
get;
set;
}
public bool? IsReportAvailable { get; set; }
[JsonPropertyName("twitchEventMember")]
public bool? IsTwitchEventMember
{
get;
set;
}
public bool? IsTwitchEventMember { get; set; }
[JsonPropertyName("sessionMode")]
public string? SessionMode
{
get;
set;
}
public string? SessionMode { get; set; }
[JsonPropertyName("purchasedGames")]
public PurchasedGames? PurchasedGames
{
get;
set;
}
public PurchasedGames? PurchasedGames { get; set; }
[JsonPropertyName("isGameSynced")]
public bool? IsGameSynced
{
get;
set;
}
public bool? IsGameSynced { get; set; }
}
public record PurchasedGames
@@ -122,18 +62,10 @@ public record PurchasedGames
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("eft")]
public bool? IsEftPurchased
{
get;
set;
}
public bool? IsEftPurchased { get; set; }
[JsonPropertyName("arena")]
public bool? IsArenaPurchased
{
get;
set;
}
public bool? IsArenaPurchased { get; set; }
}
public record Backend
@@ -142,37 +74,17 @@ public record Backend
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Lobby")]
public string? Lobby
{
get;
set;
}
public string? Lobby { get; set; }
[JsonPropertyName("Trading")]
public string? Trading
{
get;
set;
}
public string? Trading { get; set; }
[JsonPropertyName("Messaging")]
public string? Messaging
{
get;
set;
}
public string? Messaging { get; set; }
[JsonPropertyName("Main")]
public string? Main
{
get;
set;
}
public string? Main { get; set; }
[JsonPropertyName("RagFair")]
public string? RagFair
{
get;
set;
}
public string? RagFair { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record GameEmptyCrcRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("crc")]
public int? Crc
{
get;
set;
}
public int? Crc { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs
+2 -10
View File
@@ -8,16 +8,8 @@ public record GameKeepAliveResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("msg")]
public string? Message
{
get;
set;
}
public string? Message { get; set; }
[JsonPropertyName("utc_time")]
public double? UtcTime
{
get;
set;
}
public double? UtcTime { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs
+1 -5
View File
@@ -8,9 +8,5 @@ public record GameLogoutResponseData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("status")]
public string? Status
{
get;
set;
}
public string? Status { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record GameModeRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("sessionMode")]
public string? SessionMode
{
get;
set;
}
public string? SessionMode { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs
+3 -11
View File
@@ -5,7 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;
public enum SessionMode
{
REGULAR,
PVE
PVE,
}
public record GameModeResponse
@@ -14,16 +14,8 @@ public record GameModeResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("gameMode")]
public string? GameMode
{
get;
set;
}
public string? GameMode { get; set; }
[JsonPropertyName("backendUrl")]
public string? BackendUrl
{
get;
set;
}
public string? BackendUrl { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs
+1 -5
View File
@@ -8,9 +8,5 @@ public record GameStartResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("utc_time")]
public double UtcTime
{
get;
set;
}
public double UtcTime { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs
+3 -15
View File
@@ -8,23 +8,11 @@ public record GetItemPricesResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("supplyNextTime")]
public double? SupplyNextTime
{
get;
set;
}
public double? SupplyNextTime { get; set; }
[JsonPropertyName("prices")]
public Dictionary<string, double>? Prices
{
get;
set;
}
public Dictionary<string, double>? Prices { get; set; }
[JsonPropertyName("currencyCourses")]
public Dictionary<string, double>? CurrencyCourses
{
get;
set;
}
public Dictionary<string, double>? CurrencyCourses { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record GetRaidTimeRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Side")]
public string? Side
{
get;
set;
}
public string? Side { get; set; }
[JsonPropertyName("Location")]
public string? Location
{
get;
set;
}
public string? Location { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs
+2 -10
View File
@@ -8,16 +8,8 @@ public record GetRaidTimeResponse
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("NewSurviveTimeSeconds")]
public double? NewSurviveTimeSeconds
{
get;
set;
}
public double? NewSurviveTimeSeconds { get; set; }
[JsonPropertyName("OriginalSurvivalTimeSeconds")]
public double? OriginalSurvivalTimeSeconds
{
get;
set;
}
public double? OriginalSurvivalTimeSeconds { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs
+6 -30
View File
@@ -9,25 +9,13 @@ public record SendSurveyOpinionRequest : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("resultJson")]
public string? ResultJson
{
get;
set;
}
public string? ResultJson { get; set; }
[JsonPropertyName("surveyId")]
public int? SurveyId
{
get;
set;
}
public int? SurveyId { get; set; }
[JsonPropertyName("answers")]
public List<SurveyOpinionAnswer>? Answers
{
get;
set;
}
public List<SurveyOpinionAnswer>? Answers { get; set; }
}
public record SurveyOpinionAnswer
@@ -36,23 +24,11 @@ public record SurveyOpinionAnswer
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("questionId")]
public int? QuestionId
{
get;
set;
}
public int? QuestionId { get; set; }
[JsonPropertyName("answerType")]
public string? AnswerType
{
get;
set;
}
public string? AnswerType { get; set; }
[JsonPropertyName("answers")]
public object? Answers
{
get;
set;
}
public object? Answers { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs
+2 -10
View File
@@ -8,16 +8,8 @@ public record ServerDetails
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("ip")]
public string? Ip
{
get;
set;
}
public string? Ip { get; set; }
[JsonPropertyName("port")]
public int? Port
{
get;
set;
}
public int? Port { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs
+23 -115
View File
@@ -8,18 +8,10 @@ public record SurveyResponseData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("locale")]
public Dictionary<string, Dictionary<string, string>>? Locale
{
get;
set;
}
public Dictionary<string, Dictionary<string, string>>? Locale { get; set; }
[JsonPropertyName("survey")]
public Survey? Survey
{
get;
set;
}
public Survey? Survey { get; set; }
}
public record Survey
@@ -28,46 +20,22 @@ public record Survey
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public int? Id
{
get;
set;
}
public int? Id { get; set; }
[JsonPropertyName("welcomePageData")]
public WelcomePageData? WelcomePageData
{
get;
set;
}
public WelcomePageData? WelcomePageData { get; set; }
[JsonPropertyName("farewellPageData")]
public FarewellPageData? FarewellPageData
{
get;
set;
}
public FarewellPageData? FarewellPageData { get; set; }
[JsonPropertyName("pages")]
public List<List<int>>? Pages
{
get;
set;
}
public List<List<int>>? Pages { get; set; }
[JsonPropertyName("questions")]
public List<SurveyQuestion>? Questions
{
get;
set;
}
public List<SurveyQuestion>? Questions { get; set; }
[JsonPropertyName("isNew")]
public bool? IsNew
{
get;
set;
}
public bool? IsNew { get; set; }
}
public record WelcomePageData
@@ -76,25 +44,13 @@ public record WelcomePageData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("titleLocaleKey")]
public string? TitleLocaleKey
{
get;
set;
}
public string? TitleLocaleKey { get; set; }
[JsonPropertyName("timeLocaleKey")]
public string? TimeLocaleKey
{
get;
set;
}
public string? TimeLocaleKey { get; set; }
[JsonPropertyName("descriptionLocaleKey")]
public string? DescriptionLocaleKey
{
get;
set;
}
public string? DescriptionLocaleKey { get; set; }
}
public record FarewellPageData
@@ -103,11 +59,7 @@ public record FarewellPageData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("textLocaleKey")]
public string? TextLocaleKey
{
get;
set;
}
public string? TextLocaleKey { get; set; }
}
public record SurveyQuestion
@@ -116,53 +68,25 @@ public record SurveyQuestion
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public int? Id
{
get;
set;
}
public int? Id { get; set; }
[JsonPropertyName("sortIndex")]
public int? SortIndex
{
get;
set;
}
public int? SortIndex { get; set; }
[JsonPropertyName("titleLocaleKey")]
public string? TitleLocaleKey
{
get;
set;
}
public string? TitleLocaleKey { get; set; }
[JsonPropertyName("hintLocaleKey")]
public string? HintLocaleKey
{
get;
set;
}
public string? HintLocaleKey { get; set; }
[JsonPropertyName("answerLimit")]
public int? AnswerLimit
{
get;
set;
}
public int? AnswerLimit { get; set; }
[JsonPropertyName("answerType")]
public string? AnswerType
{
get;
set;
}
public string? AnswerType { get; set; }
[JsonPropertyName("answers")]
public List<SurveyAnswer>? Answers
{
get;
set;
}
public List<SurveyAnswer>? Answers { get; set; }
}
public record SurveyAnswer
@@ -171,30 +95,14 @@ public record SurveyAnswer
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public int? Id
{
get;
set;
}
public int? Id { get; set; }
[JsonPropertyName("questionId")]
public int? QuestionId
{
get;
set;
}
public int? QuestionId { get; set; }
[JsonPropertyName("sortIndex")]
public int? SortIndex
{
get;
set;
}
public int? SortIndex { get; set; }
[JsonPropertyName("localeKey")]
public string? LocaleKey
{
get;
set;
}
public string? LocaleKey { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs
+7 -35
View File
@@ -9,18 +9,10 @@ public record VersionValidateRequestData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("version")]
public Version? Version
{
get;
set;
}
public Version? Version { get; set; }
[JsonPropertyName("develop")]
public bool? Develop
{
get;
set;
}
public bool? Develop { get; set; }
}
public record Version
@@ -29,37 +21,17 @@ public record Version
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("major")]
public string? Major
{
get;
set;
}
public string? Major { get; set; }
[JsonPropertyName("minor")]
public string? Minor
{
get;
set;
}
public string? Minor { get; set; }
[JsonPropertyName("game")]
public string? Game
{
get;
set;
}
public string? Game { get; set; }
[JsonPropertyName("backend")]
public string? Backend
{
get;
set;
}
public string? Backend { get; set; }
[JsonPropertyName("taxonomy")]
public string? Taxonomy
{
get;
set;
}
public string? Taxonomy { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Health/Effect.cs
+1 -1
View File
@@ -6,5 +6,5 @@ public enum Effect
LightBleeding,
HeavyBleeding,
MildMusclePain,
SevereMusclePain
SevereMusclePain,
}
Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs
+16 -80
View File
@@ -10,36 +10,20 @@ public record HealthTreatmentRequestData : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("trader")]
public string? Trader
{
get;
set;
}
public string? Trader { get; set; }
/// <summary>
/// Id of stack to take money from <br />
/// Amount of money to take off player for treatment
/// </summary>
[JsonPropertyName("items")]
public List<IdWithCount>? Items
{
get;
set;
}
public List<IdWithCount>? Items { get; set; }
[JsonPropertyName("difference")]
public Difference? Difference
{
get;
set;
}
public Difference? Difference { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
public record Difference
@@ -48,25 +32,13 @@ public record Difference
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("BodyParts")]
public BodyParts? BodyParts
{
get;
set;
}
public BodyParts? BodyParts { get; set; }
[JsonPropertyName("Energy")]
public double? Energy
{
get;
set;
}
public double? Energy { get; set; }
[JsonPropertyName("Hydration")]
public double? Hydration
{
get;
set;
}
public double? Hydration { get; set; }
}
public record BodyParts
@@ -75,53 +47,25 @@ public record BodyParts
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Head")]
public BodyPartEffects? Head
{
get;
set;
}
public BodyPartEffects? Head { get; set; }
[JsonPropertyName("Chest")]
public BodyPartEffects? Chest
{
get;
set;
}
public BodyPartEffects? Chest { get; set; }
[JsonPropertyName("Stomach")]
public BodyPartEffects? Stomach
{
get;
set;
}
public BodyPartEffects? Stomach { get; set; }
[JsonPropertyName("LeftArm")]
public BodyPartEffects? LeftArm
{
get;
set;
}
public BodyPartEffects? LeftArm { get; set; }
[JsonPropertyName("RightArm")]
public BodyPartEffects? RightArm
{
get;
set;
}
public BodyPartEffects? RightArm { get; set; }
[JsonPropertyName("LeftLeg")]
public BodyPartEffects? LeftLeg
{
get;
set;
}
public BodyPartEffects? LeftLeg { get; set; }
[JsonPropertyName("RightLeg")]
public BodyPartEffects? RightLeg
{
get;
set;
}
public BodyPartEffects? RightLeg { get; set; }
}
public record BodyPartEffects
@@ -129,18 +73,10 @@ public record BodyPartEffects
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public double Health
{
get;
set;
}
public double Health { get; set; }
/// <summary>
/// Effects in array to be removed
/// </summary>
public List<string> Effects
{
get;
set;
}
public List<string> Effects { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidEatRequestData.cs
+3 -15
View File
@@ -9,23 +9,11 @@ public record OffraidEatRequestData : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("item")]
public string? Item
{
get;
set;
}
public string? Item { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
[JsonPropertyName("time")]
public long? Time
{
get;
set;
}
public long? Time { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Health/OffraidHealRequestData.cs
+5 -21
View File
@@ -9,32 +9,16 @@ public record OffraidHealRequestData : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("item")]
public string? Item
{
get;
set;
}
public string? Item { get; set; }
[JsonPropertyName("part")]
public string? Part
{
get;
set;
}
public string? Part { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
[JsonPropertyName("time")]
public long? Time
{
get;
set;
}
public long? Time { get; set; }
}
public enum BodyPart
@@ -46,5 +30,5 @@ public enum BodyPart
RightArm,
LeftLeg,
RightLeg,
Common
Common,
}
Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs
+15 -75
View File
@@ -8,39 +8,19 @@ public record SyncHealthRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Health")]
public List<BodyPartHealth>? Health
{
get;
set;
}
public List<BodyPartHealth>? Health { get; set; }
[JsonPropertyName("IsAlive")]
public bool? IsAlive
{
get;
set;
}
public bool? IsAlive { get; set; }
[JsonPropertyName("Hydration")]
public double? Hydration
{
get;
set;
}
public double? Hydration { get; set; }
[JsonPropertyName("Energy")]
public double? Energy
{
get;
set;
}
public double? Energy { get; set; }
[JsonPropertyName("Temperature")]
public double? Temperature
{
get;
set;
}
public double? Temperature { get; set; }
}
public record BodyPartCollection
@@ -49,53 +29,25 @@ public record BodyPartCollection
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Head")]
public BodyPartHealth? Head
{
get;
set;
}
public BodyPartHealth? Head { get; set; }
[JsonPropertyName("Chest")]
public BodyPartHealth? Chest
{
get;
set;
}
public BodyPartHealth? Chest { get; set; }
[JsonPropertyName("Stomach")]
public BodyPartHealth? Stomach
{
get;
set;
}
public BodyPartHealth? Stomach { get; set; }
[JsonPropertyName("LeftArm")]
public BodyPartHealth? LeftArm
{
get;
set;
}
public BodyPartHealth? LeftArm { get; set; }
[JsonPropertyName("RightArm")]
public BodyPartHealth? RightArm
{
get;
set;
}
public BodyPartHealth? RightArm { get; set; }
[JsonPropertyName("LeftLeg")]
public BodyPartHealth? LeftLeg
{
get;
set;
}
public BodyPartHealth? LeftLeg { get; set; }
[JsonPropertyName("RightLeg")]
public BodyPartHealth? RightLeg
{
get;
set;
}
public BodyPartHealth? RightLeg { get; set; }
}
public record BodyPartHealth
@@ -104,23 +56,11 @@ public record BodyPartHealth
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Maximum")]
public int? Maximum
{
get;
set;
}
public int? Maximum { get; set; }
[JsonPropertyName("Current")]
public int? Current
{
get;
set;
}
public int? Current { get; set; }
[JsonPropertyName("Effects")]
public Dictionary<string, int>? Effects
{
get;
set;
}
public Dictionary<string, int>? Effects { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs
+5 -25
View File
@@ -11,11 +11,7 @@ public class WorkoutData : IRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("skills")]
public WorkoutSkills? Skills
{
get;
set;
}
public WorkoutSkills? Skills { get; set; }
}
public record WorkoutSkills
@@ -24,30 +20,14 @@ public record WorkoutSkills
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Common")]
public List<CommonSkill> Common
{
get;
set;
}
public List<CommonSkill> Common { get; set; }
[JsonPropertyName("Mastering")]
public List<Mastering>? Mastering
{
get;
set;
}
public List<Mastering>? Mastering { get; set; }
[JsonPropertyName("Bonuses")]
public Bonus? Bonuses
{
get;
set;
}
public Bonus? Bonuses { get; set; }
[JsonPropertyName("Points")]
public int? Points
{
get;
set;
}
public int? Points { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HandleQTEEventRequestData.cs
+3 -15
View File
@@ -12,26 +12,14 @@ public record HandleQTEEventRequestData : InventoryBaseActionRequestData
/// true if QTE was successful, otherwise false
/// </summary>
[JsonPropertyName("results")]
public List<bool>? Results
{
get;
set;
}
public List<bool>? Results { get; set; }
/// <summary>
/// Id of the QTE object used from db/hideout/qte.json
/// </summary>
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs
+53 -265
View File
@@ -10,81 +10,37 @@ public record HideoutArea
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("type")]
public HideoutAreas? Type
{
get;
set;
}
public HideoutAreas? Type { get; set; }
[JsonPropertyName("enabled")]
public bool? IsEnabled
{
get;
set;
}
public bool? IsEnabled { get; set; }
[JsonPropertyName("needsFuel")]
public bool? NeedsFuel
{
get;
set;
}
public bool? NeedsFuel { get; set; }
[JsonPropertyName("requirements")]
public List<HideoutAreaRequirement>? Requirements
{
get;
set;
}
public List<HideoutAreaRequirement>? Requirements { get; set; }
[JsonPropertyName("takeFromSlotLocked")]
public bool? IsTakeFromSlotLocked
{
get;
set;
}
public bool? IsTakeFromSlotLocked { get; set; }
[JsonPropertyName("craftGivesExp")]
public bool? CraftGivesExperience
{
get;
set;
}
public bool? CraftGivesExperience { get; set; }
[JsonPropertyName("displayLevel")]
public bool? DisplayLevel
{
get;
set;
}
public bool? DisplayLevel { get; set; }
[JsonPropertyName("enableAreaRequirements")]
public bool? EnableAreaRequirements
{
get;
set;
}
public bool? EnableAreaRequirements { get; set; }
[JsonPropertyName("parentArea")]
public string? ParentArea
{
get;
set;
}
public string? ParentArea { get; set; }
[JsonPropertyName("stages")]
public Dictionary<string, Stage>? Stages
{
get;
set;
}
public Dictionary<string, Stage>? Stages { get; set; }
}
public record HideoutAreaRequirement
@@ -93,25 +49,13 @@ public record HideoutAreaRequirement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("areaType")]
public int? AreaType
{
get;
set;
}
public int? AreaType { get; set; }
[JsonPropertyName("requiredLevel")]
public int? RequiredLevel
{
get;
set;
}
public int? RequiredLevel { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
}
public record Stage
@@ -120,77 +64,37 @@ public record Stage
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("autoUpgrade")]
public bool? AutoUpgrade
{
get;
set;
}
public bool? AutoUpgrade { get; set; }
[JsonPropertyName("bonuses")]
public List<Bonus>? Bonuses
{
get;
set;
}
public List<Bonus>? Bonuses { get; set; }
[JsonPropertyName("constructionTime")]
public double? ConstructionTime
{
get;
set;
}
public double? ConstructionTime { get; set; }
/// <summary>
/// Containers inventory tpl
/// </summary>
[JsonPropertyName("container")]
public string? Container
{
get;
set;
}
public string? Container { get; set; }
[JsonPropertyName("description")]
public string? Description
{
get;
set;
}
public string? Description { get; set; }
[JsonPropertyName("globalCounterId")]
public string? GlobalCounterId
{
get;
set;
}
public string? GlobalCounterId { get; set; }
[JsonPropertyName("displayInterface")]
public bool? DisplayInterface
{
get;
set;
}
public bool? DisplayInterface { get; set; }
[JsonPropertyName("improvements")]
public List<StageImprovement>? Improvements
{
get;
set;
}
public List<StageImprovement>? Improvements { get; set; }
[JsonPropertyName("requirements")]
public List<StageRequirement>? Requirements
{
get;
set;
}
public List<StageRequirement>? Requirements { get; set; }
[JsonPropertyName("slots")]
public int? Slots
{
get;
set;
}
public int? Slots { get; set; }
}
public record StageImprovement
@@ -199,32 +103,16 @@ public record StageImprovement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("bonuses")]
public List<StageImprovementBonus>? Bonuses
{
get;
set;
}
public List<StageImprovementBonus>? Bonuses { get; set; }
[JsonPropertyName("improvementTime")]
public double? ImprovementTime
{
get;
set;
}
public double? ImprovementTime { get; set; }
[JsonPropertyName("requirements")]
public List<StageImprovementRequirement>? Requirements
{
get;
set;
}
public List<StageImprovementRequirement>? Requirements { get; set; }
}
public record StageImprovementBonus
@@ -233,53 +121,25 @@ public record StageImprovementBonus
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("passive")]
public bool? IsPassive
{
get;
set;
}
public bool? IsPassive { get; set; }
[JsonPropertyName("production")]
public bool? IsProduction
{
get;
set;
}
public bool? IsProduction { get; set; }
[JsonPropertyName("skillType")]
public SkillClass? SkillType
{
get;
set;
}
public SkillClass? SkillType { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("value")]
public double? Value
{
get;
set;
}
public double? Value { get; set; }
[JsonPropertyName("visible")]
public bool? IsVisible
{
get;
set;
}
public bool? IsVisible { get; set; }
}
public record StageImprovementRequirement
@@ -288,46 +148,22 @@ public record StageImprovementRequirement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
[JsonPropertyName("isEncoded")]
public bool? IsEncoded
{
get;
set;
}
public bool? IsEncoded { get; set; }
[JsonPropertyName("isFunctional")]
public bool? IsFunctional
{
get;
set;
}
public bool? IsFunctional { get; set; }
[JsonPropertyName("templateId")]
public string? TemplateId
{
get;
set;
}
public string? TemplateId { get; set; }
[JsonPropertyName("isSpawnedInSession")]
public bool? IsSpawnedInSession
{
get;
set;
}
public bool? IsSpawnedInSession { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
}
public record StageRequirement
@@ -336,86 +172,38 @@ public record StageRequirement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("areaType")]
public int? AreaType
{
get;
set;
}
public int? AreaType { get; set; }
[JsonPropertyName("requiredLevel")]
public int? RequiredLevel
{
get;
set;
}
public int? RequiredLevel { get; set; }
[JsonPropertyName("templateId")]
public string? TemplateId
{
get;
set;
}
public string? TemplateId { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
[JsonPropertyName("isEncoded")]
public bool? IsEncoded
{
get;
set;
} = false;
public bool? IsEncoded { get; set; } = false;
[JsonPropertyName("isFunctional")]
public bool? IsFunctional
{
get;
set;
}
public bool? IsFunctional { get; set; }
[JsonPropertyName("traderId")]
public string? TraderId
{
get;
set;
}
public string? TraderId { get; set; }
[JsonPropertyName("isSpawnedInSession")]
public bool? IsSpawnedInSession
{
get;
set;
}
public bool? IsSpawnedInSession { get; set; }
[JsonPropertyName("loyaltyLevel")]
public int? LoyaltyLevel
{
get;
set;
}
public int? LoyaltyLevel { get; set; }
[JsonPropertyName("skillName")]
public string? SkillName
{
get;
set;
}
public string? SkillName { get; set; }
[JsonPropertyName("skillLevel")]
public int? SkillLevel
{
get;
set;
}
public int? SkillLevel { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCancelProductionRequestData.cs
+2 -10
View File
@@ -6,16 +6,8 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout;
public record HideoutCancelProductionRequestData : BaseInteractionRequestData
{
[JsonPropertyName("recipeId")]
public string? RecipeId
{
get;
set;
}
public string? RecipeId { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCircleOfCultistProductionStartRequestData.cs
+1 -5
View File
@@ -9,9 +9,5 @@ public record HideoutCircleOfCultistProductionStartRequestData : InventoryBaseAc
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs
+5 -25
View File
@@ -9,18 +9,10 @@ public record HideoutContinuousProductionStartRequestData : InventoryBaseActionR
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("recipeId")]
public string? RecipeId
{
get;
set;
}
public string? RecipeId { get; set; }
[JsonPropertyName("timestamp")]
public double? Timestamp
{
get;
set;
}
public double? Timestamp { get; set; }
}
public record HideoutProperties
@@ -28,21 +20,9 @@ public record HideoutProperties
[JsonExtensionData]
public Dictionary<string, object> ExtensionData { get; set; }
public int? BtcFarmGcs
{
get;
set;
}
public int? BtcFarmGcs { get; set; }
public bool IsGeneratorOn
{
get;
set;
}
public bool IsGeneratorOn { get; set; }
public bool WaterCollectorHasFilter
{
get;
set;
}
public bool WaterCollectorHasFilter { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs
+17 -85
View File
@@ -9,18 +9,10 @@ public record HideoutCustomisation
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("globals")]
public List<HideoutCustomisationGlobal>? Globals
{
get;
set;
}
public List<HideoutCustomisationGlobal>? Globals { get; set; }
[JsonPropertyName("slots")]
public List<HideoutCustomisationSlot>? Slots
{
get;
set;
}
public List<HideoutCustomisationSlot>? Slots { get; set; }
}
public record HideoutCustomisationGlobal
@@ -29,53 +21,25 @@ public record HideoutCustomisationGlobal
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("conditions")]
public List<QuestCondition>? Conditions
{
get;
set;
}
public List<QuestCondition>? Conditions { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("index")]
public int? Index
{
get;
set;
}
public int? Index { get; set; }
[JsonPropertyName("systemName")]
public string? SystemName
{
get;
set;
}
public string? SystemName { get; set; }
[JsonPropertyName("isEnabled")]
public bool? IsEnabled
{
get;
set;
}
public bool? IsEnabled { get; set; }
[JsonPropertyName("itemId")]
public string? ItemId
{
get;
set;
}
public string? ItemId { get; set; }
}
public record HideoutCustomisationSlot
@@ -84,58 +48,26 @@ public record HideoutCustomisationSlot
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("conditions")]
public List<QuestCondition>? Conditions
{
get;
set;
}
public List<QuestCondition>? Conditions { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
[JsonPropertyName("index")]
public int? Index
{
get;
set;
}
public int? Index { get; set; }
[JsonPropertyName("systemName")]
public string? SystemName
{
get;
set;
}
public string? SystemName { get; set; }
[JsonPropertyName("isEnabled")]
public bool? IsEnabled
{
get;
set;
}
public bool? IsEnabled { get; set; }
[JsonPropertyName("slotId")]
public string? SlotId
{
get;
set;
}
public string? SlotId { get; set; }
[JsonPropertyName("areaTypeId")]
public int? AreaTypeId
{
get;
set;
}
public int? AreaTypeId { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationApplyRequestData.cs
+2 -10
View File
@@ -12,16 +12,8 @@ public record HideoutCustomizationApplyRequestData : InventoryBaseActionRequestD
/// Id of the newly picked item to apply to hideout
/// </summary>
[JsonPropertyName("offerId")]
public string? OfferId
{
get;
set;
}
public string? OfferId { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomizationSetMannequinPoseRequest.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record HideoutCustomizationSetMannequinPoseRequest : InventoryBaseActionR
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("poses")]
public Dictionary<string, string>? Poses
{
get;
set;
}
public Dictionary<string, string>? Poses { get; set; }
[JsonPropertyName("timestamp")]
public double? Timestamp
{
get;
set;
}
public double? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutDeleteProductionRequestData.cs
+2 -10
View File
@@ -9,16 +9,8 @@ public record HideoutDeleteProductionRequestData : InventoryBaseActionRequestDat
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("recipeId")]
public string? RecipeId
{
get;
set;
}
public string? RecipeId { get; set; }
[JsonPropertyName("timestamp")]
public double? Timestamp
{
get;
set;
}
public double? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutImproveAreaRequestData.cs
+4 -20
View File
@@ -14,30 +14,14 @@ public record HideoutImproveAreaRequestData : InventoryBaseActionRequestData
/// Hideout area id from areas.json
/// </summary>
[JsonPropertyName("id")]
public string? AreaId
{
get;
set;
}
public string? AreaId { get; set; }
[JsonPropertyName("areaType")]
public HideoutAreas? AreaType
{
get;
set;
}
public HideoutAreas? AreaType { get; set; }
[JsonPropertyName("items")]
public List<HideoutItem>? Items
{
get;
set;
}
public List<HideoutItem>? Items { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs
+34 -170
View File
@@ -10,25 +10,13 @@ public record HideoutProductionData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("recipes")]
public List<HideoutProduction>? Recipes
{
get;
set;
}
public List<HideoutProduction>? Recipes { get; set; }
[JsonPropertyName("scavRecipes")]
public List<ScavRecipe>? ScavRecipes
{
get;
set;
}
public List<ScavRecipe>? ScavRecipes { get; set; }
[JsonPropertyName("cultistRecipes")]
public List<CultistRecipe>? CultistRecipes
{
get;
set;
}
public List<CultistRecipe>? CultistRecipes { get; set; }
}
public record HideoutProduction
@@ -37,91 +25,43 @@ public record HideoutProduction
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("areaType")]
public HideoutAreas? AreaType
{
get;
set;
}
public HideoutAreas? AreaType { get; set; }
[JsonPropertyName("requirements")]
public List<Requirement>? Requirements
{
get;
set;
}
public List<Requirement>? Requirements { get; set; }
[JsonPropertyName("productionTime")]
public double? ProductionTime
{
get;
set;
}
public double? ProductionTime { get; set; }
/// <summary>
/// Tpl of item being crafted
/// </summary>
[JsonPropertyName("endProduct")]
public string? EndProduct
{
get;
set;
}
public string? EndProduct { get; set; }
[JsonPropertyName("isEncoded")]
public bool? IsEncoded
{
get;
set;
}
public bool? IsEncoded { get; set; }
[JsonPropertyName("locked")]
public bool? Locked
{
get;
set;
}
public bool? Locked { get; set; }
[JsonPropertyName("needFuelForAllProductionTime")]
public bool? NeedFuelForAllProductionTime
{
get;
set;
}
public bool? NeedFuelForAllProductionTime { get; set; }
[JsonPropertyName("continuous")]
public bool? Continuous
{
get;
set;
}
public bool? Continuous { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
[JsonPropertyName("productionLimitCount")]
public int? ProductionLimitCount
{
get;
set;
}
public int? ProductionLimitCount { get; set; }
[JsonPropertyName("isCodeProduction")]
public bool? IsCodeProduction
{
get;
set;
}
public bool? IsCodeProduction { get; set; }
}
public record Requirement
@@ -130,81 +70,37 @@ public record Requirement
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("templateId")]
public string? TemplateId
{
get;
set;
}
public string? TemplateId { get; set; }
[JsonPropertyName("count")]
public int? Count
{
get;
set;
}
public int? Count { get; set; }
[JsonPropertyName("isEncoded")]
public bool? IsEncoded
{
get;
set;
}
public bool? IsEncoded { get; set; }
[JsonPropertyName("isFunctional")]
public bool? IsFunctional
{
get;
set;
}
public bool? IsFunctional { get; set; }
[JsonPropertyName("areaType")]
public int? AreaType
{
get;
set;
}
public int? AreaType { get; set; }
[JsonPropertyName("requiredLevel")]
public int? RequiredLevel
{
get;
set;
}
public int? RequiredLevel { get; set; }
[JsonPropertyName("resource")]
public int? Resource
{
get;
set;
}
public int? Resource { get; set; }
[JsonPropertyName("questId")]
public string? QuestId
{
get;
set;
}
public string? QuestId { get; set; }
[JsonPropertyName("isSpawnedInSession")]
public bool? IsSpawnedInSession
{
get;
set;
}
public bool? IsSpawnedInSession { get; set; }
[JsonPropertyName("gameVersions")]
public List<string>? GameVersions
{
get;
set;
}
public List<string>? GameVersions { get; set; }
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
public string? Type { get; set; }
}
public record ScavRecipe
@@ -213,32 +109,16 @@ public record ScavRecipe
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
[JsonPropertyName("requirements")]
public List<Requirement>? Requirements
{
get;
set;
}
public List<Requirement>? Requirements { get; set; }
[JsonPropertyName("productionTime")]
public double? ProductionTime
{
get;
set;
}
public double? ProductionTime { get; set; }
[JsonPropertyName("endProducts")]
public EndProducts? EndProducts
{
get;
set;
}
public EndProducts? EndProducts { get; set; }
}
public record EndProducts
@@ -247,25 +127,13 @@ public record EndProducts
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("Common")]
public MinMax<int>? Common
{
get;
set;
}
public MinMax<int>? Common { get; set; }
[JsonPropertyName("Rare")]
public MinMax<int>? Rare
{
get;
set;
}
public MinMax<int>? Rare { get; set; }
[JsonPropertyName("Superrare")]
public MinMax<int>? Superrare
{
get;
set;
}
public MinMax<int>? Superrare { get; set; }
}
public record CultistRecipe
@@ -274,9 +142,5 @@ public record CultistRecipe
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("_id")]
public string? Id
{
get;
set;
}
public string? Id { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutPutItemInRequestData.cs
+3 -15
View File
@@ -11,23 +11,11 @@ public record HideoutPutItemInRequestData : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("areaType")]
public HideoutAreas? AreaType
{
get;
set;
}
public HideoutAreas? AreaType { get; set; }
[JsonPropertyName("items")]
public Dictionary<string, IdWithCount>? Items
{
get;
set;
}
public Dictionary<string, IdWithCount>? Items { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutScavCaseStartRequestData.cs
+4 -20
View File
@@ -10,30 +10,14 @@ public record HideoutScavCaseStartRequestData : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("recipeId")]
public string? RecipeId
{
get;
set;
}
public string? RecipeId { get; set; }
[JsonPropertyName("items")]
public List<IdWithCount>? Items
{
get;
set;
}
public List<IdWithCount>? Items { get; set; }
[JsonPropertyName("tools")]
public List<IdWithCount>? Tools
{
get;
set;
}
public List<IdWithCount>? Tools { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs
+5 -25
View File
@@ -8,37 +8,17 @@ public record HideoutSettingsBase
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("generatorSpeedWithoutFuel")]
public double? GeneratorSpeedWithoutFuel
{
get;
set;
}
public double? GeneratorSpeedWithoutFuel { get; set; }
[JsonPropertyName("generatorFuelFlowRate")]
public double? GeneratorFuelFlowRate
{
get;
set;
}
public double? GeneratorFuelFlowRate { get; set; }
[JsonPropertyName("airFilterUnitFlowRate")]
public double? AirFilterUnitFlowRate
{
get;
set;
}
public double? AirFilterUnitFlowRate { get; set; }
[JsonPropertyName("cultistAmuletBonusPercent")]
public double? CultistAmuletBonusPercent
{
get;
set;
}
public double? CultistAmuletBonusPercent { get; set; }
[JsonPropertyName("gpuBoostRate")]
public double? GpuBoostRate
{
get;
set;
}
public double? GpuBoostRate { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSingleProductionStartRequestData.cs
+4 -20
View File
@@ -10,30 +10,14 @@ public record HideoutSingleProductionStartRequestData : InventoryBaseActionReque
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("recipeId")]
public string? RecipeId
{
get;
set;
}
public string? RecipeId { get; set; }
[JsonPropertyName("items")]
public List<IdWithCount>? Items
{
get;
set;
}
public List<IdWithCount>? Items { get; set; }
[JsonPropertyName("tools")]
public List<IdWithCount>? Tools
{
get;
set;
}
public List<IdWithCount>? Tools { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}
Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutTakeItemOutRequestData.cs
+3 -15
View File
@@ -10,23 +10,11 @@ public record HideoutTakeItemOutRequestData : InventoryBaseActionRequestData
public Dictionary<string, object> ExtensionData { get; set; }
[JsonPropertyName("areaType")]
public HideoutAreas? AreaType
{
get;
set;
}
public HideoutAreas? AreaType { get; set; }
[JsonPropertyName("slots")]
public List<int>? Slots
{
get;
set;
}
public List<int>? Slots { get; set; }
[JsonPropertyName("timestamp")]
public long? Timestamp
{
get;
set;
}
public long? Timestamp { get; set; }
}

Some files were not shown because too many files have changed in this diff Show More