diff --git a/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs index 61c66b54..3e08e808 100644 --- a/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs +++ b/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs @@ -340,7 +340,7 @@ public static class ItemExtensions SlotId = item.SlotId, Location = item.Location, Desc = item.Desc, - ExtensionData = item.ExtensionData, + // TODO: re-enable ExtensionData = item.ExtensionData, }; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs index 27a2cb5c..1fce05e2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Common/IdWithCount.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Common; public record IdWithCount { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// ID of stack to take money from diff --git a/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs index 96190533..79dcd141 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Common/MinMax.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Common; public record MinMax where T : IMinMaxValue { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public MinMax(T min, T max) { diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs index 2643ed5e..9abd7a02 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GenerateBotsRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Bot; public record GenerateBotsRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("conditions")] public List? Conditions { get; set; } @@ -14,8 +13,7 @@ public record GenerateBotsRequestData : IRequestData public record GenerateCondition { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// e.g. assault/pmcBot/bossKilla diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs index e7dd6d8d..1fd2025e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/RandomisedBotLevelResult.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Bot; public record RandomisedBotLevelResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("level")] public int? Level { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs index 9f65adcc..b9750170 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Builds/SetMagazineRequest.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Builds; public record SetMagazineRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs index 93a6670c..400dd74a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/EmptyRequestData.cs @@ -5,6 +5,5 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record EmptyRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs index df79acb6..fa0aebbc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record Globals { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("config")] public required Config Configuration { get; init; } @@ -29,8 +28,7 @@ public record Globals public record PlayerSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BaseMaxMovementRolloff")] public double BaseMaxMovementRolloff { get; set; } @@ -59,8 +57,7 @@ public record PlayerSettings public record SearchSoundVolumeSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double FpVolume { get; set; } @@ -69,8 +66,7 @@ public record SearchSoundVolumeSettings public record MovementRolloffMultiplier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MovementState")] public string MovementState { get; set; } @@ -81,8 +77,7 @@ public record MovementRolloffMultiplier public record RadioBroadcastSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("EnabledBroadcast")] public bool EnabledBroadcast { get; set; } @@ -93,8 +88,7 @@ public record RadioBroadcastSettings public record RadioStation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Enabled")] public bool Enabled { get; set; } @@ -105,8 +99,7 @@ public record RadioStation public record LocationInfection { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Interchange")] public double Interchange { get; set; } @@ -141,8 +134,7 @@ public record LocationInfection public record ArtilleryShelling { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ArtilleryMapsConfigs")] public Dictionary ArtilleryMapsConfigs { get; set; } @@ -156,8 +148,7 @@ public record ArtilleryShelling public record ArtilleryMapSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("PlanedShellingOn")] public bool PlanedShellingOn { get; set; } @@ -195,8 +186,7 @@ public record ArtilleryMapSettings public record ShellingZone { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ID")] public double ID { get; set; } @@ -252,8 +242,7 @@ public record ShellingZone public record AlarmStage { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Value")] public Position Value { get; set; } @@ -261,8 +250,7 @@ public record AlarmStage public record Brigade { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ID")] public double Id { get; set; } @@ -273,8 +261,7 @@ public record Brigade public record ArtilleryGun { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Position")] public XYZ Position { get; set; } @@ -282,8 +269,7 @@ public record ArtilleryGun public record ArtilleryShellingAirDropSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("UseAirDrop")] public bool UseAirDrop { get; set; } @@ -300,8 +286,7 @@ public record ArtilleryShellingAirDropSettings public record ProjectileExplosionParams { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Blindness")] public XYZ Blindness { get; set; } @@ -353,8 +338,7 @@ public record ProjectileExplosionParams public record Config { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ArtilleryShelling")] public ArtilleryShelling ArtilleryShelling { get; set; } @@ -679,8 +663,7 @@ public record Config public record GlobalAudioSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("RadioBroadcastSettings")] public RadioBroadcastSettings RadioBroadcastSettings { get; set; } @@ -688,16 +671,14 @@ public record GlobalAudioSettings public record Triggers { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public Dictionary> HandlerDamage { get; set; } } public record DamageData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public int Amount { get; set; } @@ -707,8 +688,7 @@ public record DamageData public record HandlerDamageObject { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public int Amount { get; set; } @@ -717,8 +697,7 @@ public record HandlerDamageObject public record PveSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public IEnumerable AvailableVersions { get; set; } @@ -727,16 +706,14 @@ public record PveSettings public record CoopSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public IEnumerable AvailableVersions { get; set; } } public record RunddansSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("accessKeys")] public IEnumerable AccessKeys { get; set; } @@ -795,8 +772,7 @@ public record RunddansSettings public record SeasonActivity { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("InfectionHalloween")] public SeasonActivityHalloween InfectionHalloween { get; set; } @@ -804,8 +780,7 @@ public record SeasonActivity public record SeasonActivityHalloween { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DisplayUIEnabled")] public bool DisplayUIEnabled { get; set; } @@ -819,24 +794,21 @@ public record SeasonActivityHalloween public record EnvironmentUISettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public EnvironmentUIData EnvironmentUIData { get; set; } } public record EnvironmentUIData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required string[] TheUnheardEditionEnvironmentUiType { get; set; } } public record BodyPartColliderSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public BodyPartColliderPart BackHead { get; set; } @@ -893,8 +865,7 @@ public record BodyPartColliderSettings public record BodyPartColliderPart { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("PenetrationChance")] public double PenetrationChance { get; set; } @@ -908,8 +879,7 @@ public record BodyPartColliderPart public record WeaponFastDrawSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HandShakeCurveFrequency")] public double HandShakeCurveFrequency { get; set; } @@ -938,8 +908,7 @@ public record WeaponFastDrawSettings public record EventSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("EventActive")] public bool EventActive { get; set; } @@ -968,8 +937,7 @@ public record EventSettings public record EventWeather { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Cloudness")] public double Cloudness { get; set; } @@ -1001,8 +969,7 @@ public record EventWeather public record TransitSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BearPriceMod")] public double BearPriceMod { get; set; } @@ -1046,8 +1013,7 @@ public record TransitSettings public record TripwiresSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("CollisionCapsuleCheckCoef")] public double CollisionCapsuleCheckCoef { get; set; } @@ -1094,8 +1060,7 @@ public record TripwiresSettings public record MountingSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MovementSettings")] public MountingMovementSettings MovementSettings { get; set; } @@ -1106,8 +1071,7 @@ public record MountingSettings public record MountingMovementSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ApproachTime")] public double ApproachTime { get; set; } @@ -1157,8 +1121,7 @@ public record MountingMovementSettings public record MountingPointDetectionSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("CheckHorizontalSecondaryOffset")] public double CheckHorizontalSecondaryOffset { get; set; } @@ -1226,8 +1189,7 @@ public record MountingPointDetectionSettings public record GraphicSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ExperimentalFogInCity")] public bool ExperimentalFogInCity { get; set; } @@ -1235,8 +1197,7 @@ public record GraphicSettings public record BufferZone { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("CustomerAccessTime")] public double CustomerAccessTime { get; set; } @@ -1250,8 +1211,7 @@ public record BufferZone public record ItemsCommonSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ItemRemoveAfterInterruptionTime")] public double ItemRemoveAfterInterruptionTime { get; set; } @@ -1262,8 +1222,7 @@ public record ItemsCommonSettings public record TradingSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BuyRestrictionMaxBonus")] public Dictionary BuyRestrictionMaxBonus { get; set; } @@ -1274,8 +1233,7 @@ public record TradingSettings public record BuyRestrictionMaxBonus { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("multiplier")] public double Multiplier { get; set; } @@ -1283,8 +1241,7 @@ public record BuyRestrictionMaxBonus public record BuyoutRestrictions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MinDurability")] public double MinDurability { get; set; } @@ -1298,8 +1255,7 @@ public record BuyoutRestrictions public record Content { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ip")] public string Ip { get; set; } @@ -1313,8 +1269,7 @@ public record Content public record Exp { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("heal")] public Heal Heal { get; set; } @@ -1349,8 +1304,7 @@ public record Exp public record Heal { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("expForHeal")] public double ExpForHeal { get; set; } @@ -1364,8 +1318,7 @@ public record Heal public record MatchEnd { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("README")] public string ReadMe { get; set; } @@ -1413,8 +1366,7 @@ public record MatchEnd public record Kill { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("combo")] public required Combo[] Combos { get; set; } @@ -1452,8 +1404,7 @@ public record Kill public record Combo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("percent")] public double Percentage { get; set; } @@ -1461,8 +1412,7 @@ public record Combo public record Level { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("exp_table")] public required ExpTable[] ExperienceTable { get; set; } @@ -1485,8 +1435,7 @@ public record Level public record ExpTable { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("exp")] public int Experience { get; set; } @@ -1494,8 +1443,7 @@ public record ExpTable public record LootAttempt { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("k_exp")] public double ExperiencePoints { get; set; } @@ -1503,8 +1451,7 @@ public record LootAttempt public record Armor { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("class")] public IEnumerable Classes { get; set; } @@ -1512,8 +1459,7 @@ public record Armor public record Class { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // Checked in client [JsonPropertyName("resistance")] @@ -1522,8 +1468,7 @@ public record Class public record Mastering { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Name")] public string Name { get; set; } @@ -1545,8 +1490,7 @@ public record Mastering public record Customization { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("SavageHead")] public Dictionary Head { get; set; } @@ -1566,8 +1510,7 @@ public record Customization public record WildHead { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("head")] public string Head { get; set; } @@ -1584,8 +1527,7 @@ public record WildHead public record WildBody { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("body")] public MongoId Body { get; set; } @@ -1602,8 +1544,7 @@ public record WildBody public record WildFeet { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("feet")] public string Feet { get; set; } @@ -1620,8 +1561,7 @@ public record WildFeet public record CustomizationVoice { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("voice")] public string Voice { get; set; } @@ -1635,8 +1575,7 @@ public record CustomizationVoice public record BodyParts { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Head { get; set; } @@ -1649,8 +1588,7 @@ public record BodyParts public record AirdropGlobalSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string AirdropViewType { get; set; } @@ -1677,8 +1615,7 @@ public record AirdropGlobalSettings public record KarmaCalculationSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("defaultPveKarmaValue")] public double DefaultPveKarmaValue { get; set; } @@ -1701,8 +1638,7 @@ public record KarmaCalculationSettings public record ArenaEftTransferSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double ArenaManagerReputationTaxMultiplier { get; set; } @@ -1719,8 +1655,7 @@ public record ArenaEftTransferSettings public record ArmorType { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Destructibility")] public double Destructibility { get; set; } @@ -1743,8 +1678,7 @@ public record ArmorType public record Health { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Falling")] public Falling Falling { get; set; } @@ -1761,8 +1695,7 @@ public record Health public record Falling { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DamagePerMeter")] public double DamagePerMeter { get; set; } @@ -1773,8 +1706,7 @@ public record Falling public record Effects { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Existence")] public Existence Existence { get; set; } @@ -1863,8 +1795,7 @@ public record Effects public record ZombieInfection { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Dehydration")] public double Dehydration { get; set; } @@ -1880,8 +1811,7 @@ public record ZombieInfection public record Existence { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("EnergyLoopTime")] public double EnergyLoopTime { get; set; } @@ -1904,8 +1834,7 @@ public record Existence public record Dehydration { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -1931,8 +1860,7 @@ public record Dehydration public record BreakPart { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -1964,8 +1892,7 @@ public record BreakPart public record Contusion { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -1973,8 +1900,7 @@ public record Contusion public record Disorientation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -1982,8 +1908,7 @@ public record Disorientation public record Exhaustion { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2000,8 +1925,7 @@ public record Exhaustion public record LowEdgeHealth { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2015,8 +1939,7 @@ public record LowEdgeHealth public record RadExposure { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Damage")] public double Damage { get; set; } @@ -2027,8 +1950,7 @@ public record RadExposure public record Stun { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -2036,8 +1958,7 @@ public record Stun public record Intoxication { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2069,8 +1990,7 @@ public record Intoxication public record Regeneration { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("LoopTime")] public double LoopTime { get; set; } @@ -2093,8 +2013,7 @@ public record Regeneration public record BodyHealth { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Head")] public BodyHealthValue Head { get; set; } @@ -2120,8 +2039,7 @@ public record BodyHealth public record BodyHealthValue { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Value")] public double Value { get; set; } @@ -2129,8 +2047,7 @@ public record BodyHealthValue public record Influences { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("LightBleeding")] public Influence LightBleeding { get; set; } @@ -2150,8 +2067,7 @@ public record Influences public record Influence { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HealthSlowDownPercentage")] public double HealthSlowDownPercentage { get; set; } @@ -2165,8 +2081,7 @@ public record Influence public record Wound { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("WorkingTime")] public double WorkingTime { get; set; } @@ -2180,8 +2095,7 @@ public record Wound public record Berserk { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2195,8 +2109,7 @@ public record Berserk public record Flash { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Dummy")] public double Dummy { get; set; } @@ -2204,8 +2117,7 @@ public record Flash public record MedEffect { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("LoopTime")] public double LoopTime { get; set; } @@ -2234,8 +2146,7 @@ public record MedEffect public record Pain { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("TremorDelay")] public double TremorDelay { get; set; } @@ -2246,24 +2157,21 @@ public record Pain public record PainKiller { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double Dummy { get; set; } } public record SandingScreen { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double Dummy { get; set; } } public record MusclePainEffect { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double GymEffectivity { get; set; } @@ -2276,8 +2184,7 @@ public record MusclePainEffect public record Stimulator { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double BuffLoopTime { get; set; } @@ -2286,8 +2193,7 @@ public record Stimulator public record Buff { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BuffType")] public string BuffType { get; set; } @@ -2315,8 +2221,7 @@ public record Buff public record Tremor { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2327,8 +2232,7 @@ public record Tremor public record ChronicStaminaFatigue { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("EnergyRate")] public double EnergyRate { get; set; } @@ -2345,8 +2249,7 @@ public record ChronicStaminaFatigue public record Fracture { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2378,8 +2281,7 @@ public record Fracture public record HeavyBleeding { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2432,8 +2334,7 @@ public record HeavyBleeding public record Probability { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("FunctionType")] public string FunctionType { get; set; } @@ -2450,8 +2351,7 @@ public record Probability public record LightBleeding { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultDelay")] public double DefaultDelay { get; set; } @@ -2504,8 +2404,7 @@ public record LightBleeding public record BodyTemperature { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DefaultBuildUpTime")] public double DefaultBuildUpTime { get; set; } @@ -2519,8 +2418,7 @@ public record BodyTemperature public record HealPrice { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HealthPointPrice")] public double HealthPointPrice { get; set; } @@ -2540,8 +2438,7 @@ public record HealPrice public record ProfileHealthSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BodyPartsSettings")] public BodyPartsSettings BodyPartsSettings { get; set; } @@ -2555,8 +2452,7 @@ public record ProfileHealthSettings public record BodyPartsSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Head")] public BodyPartsSetting Head { get; set; } @@ -2582,8 +2478,7 @@ public record BodyPartsSettings public record BodyPartsSetting { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Minimum")] public double Minimum { get; set; } @@ -2603,8 +2498,7 @@ public record BodyPartsSetting public record HealthFactorsSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Energy")] public HealthFactorSetting Energy { get; set; } @@ -2624,8 +2518,7 @@ public record HealthFactorsSettings public record HealthFactorSetting { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Minimum")] public double Minimum { get; set; } @@ -2639,8 +2532,7 @@ public record HealthFactorSetting public record Rating { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("levelRequired")] public double LevelRequired { get; set; } @@ -2654,8 +2546,7 @@ public record Rating public record Categories { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("experience")] public bool Experience { get; set; } @@ -2690,8 +2581,7 @@ public record Categories public record Tournament { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("categories")] public TournamentCategories Categories { get; set; } @@ -2705,8 +2595,7 @@ public record Tournament public record TournamentCategories { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dogtags")] public bool Dogtags { get; set; } @@ -2714,8 +2603,7 @@ public record TournamentCategories public record RagFair { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -2833,8 +2721,7 @@ public record RagFair public record ItemGlobalRestrictions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MaxFlea")] public double MaxFlea { get; set; } @@ -2848,8 +2735,7 @@ public record ItemGlobalRestrictions public record MaxActiveOfferCount { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("from")] public double From { get; set; } @@ -2866,8 +2752,7 @@ public record MaxActiveOfferCount public record MaxSumForRarity { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Common")] public RarityMaxSum Common { get; set; } @@ -2884,8 +2769,7 @@ public record MaxSumForRarity public record RarityMaxSum { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("value")] public double Value { get; set; } @@ -2893,8 +2777,7 @@ public record RarityMaxSum public record Handbook { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("defaultCategory")] public string DefaultCategory { get; set; } @@ -2902,8 +2785,7 @@ public record Handbook public record Stamina { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Capacity")] public double Capacity { get; set; } @@ -3065,8 +2947,7 @@ public record Stamina public record StaminaRestoration { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("LowerLeftPoint")] public double LowerLeftPoint { get; set; } @@ -3089,8 +2970,7 @@ public record StaminaRestoration public record StaminaDrain { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("LowerLeftPoint")] public double LowerLeftPoint { get; set; } @@ -3113,8 +2993,7 @@ public record StaminaDrain public record RequirementReferences { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Alpinist")] public IEnumerable Alpinists { get; set; } @@ -3122,8 +3001,7 @@ public record RequirementReferences public record Alpinist { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Requirement")] public string Requirement { get; set; } @@ -3143,8 +3021,7 @@ public record Alpinist public record RestrictionsInRaid { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MaxInLobby")] public double MaxInLobby { get; set; } @@ -3158,8 +3035,7 @@ public record RestrictionsInRaid public record FavoriteItemsSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("WeaponStandMaxItemsCount")] public double WeaponStandMaxItemsCount { get; set; } @@ -3170,8 +3046,7 @@ public record FavoriteItemsSettings public record VaultingSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("IsActive")] public bool IsActive { get; set; } @@ -3188,8 +3063,7 @@ public record VaultingSettings public record VaultingGridSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("GridSizeX")] public double GridSizeX { get; set; } @@ -3224,8 +3098,7 @@ public record VaultingGridSettings public record VaultingMovesSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("VaultSettings")] public VaultingSubMoveSettings VaultSettings { get; set; } @@ -3236,8 +3109,7 @@ public record VaultingMovesSettings public record VaultingSubMoveSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("IsActive")] public bool IsActive { get; set; } @@ -3259,8 +3131,7 @@ public record VaultingSubMoveSettings public record MoveRestrictions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("IsActive")] public bool IsActive { get; set; } @@ -3283,8 +3154,7 @@ public record MoveRestrictions public record BTRSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("LocationsWithBTR")] public IEnumerable LocationsWithBTR { get; set; } @@ -3352,8 +3222,7 @@ public record BTRSettings public record BtrMapConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BtrSkin")] public string BtrSkin { get; set; } @@ -3403,8 +3272,7 @@ public record BtrMapConfig public record PathConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("active")] public bool Active { get; set; } @@ -3439,8 +3307,7 @@ public record PathConfig public record SquadSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("CountOfRequestsToOnePlayer")] public double CountOfRequestsToOnePlayer { get; set; } @@ -3454,8 +3321,7 @@ public record SquadSettings public record Insurance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ChangeForReturnItemsInOfflineRaid")] public double ChangeForReturnItemsInOfflineRaid { get; set; } @@ -3478,8 +3344,7 @@ public record Insurance public record MessageSendTimeMultiplier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("multiplier")] public double Multiplier { get; set; } @@ -3487,8 +3352,7 @@ public record MessageSendTimeMultiplier public record SkillsSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("SkillProgressRate")] public double SkillProgressRate { get; set; } @@ -3700,16 +3564,14 @@ public record SkillsSettings public record MeleeSkill { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public BuffSettings BuffSettings { get; set; } } public record ArmorSkills { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double BluntThroughputDamageHVestsReducePerLevel { get; set; } @@ -3742,8 +3604,7 @@ public record ArmorSkills public record ArmorCounters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("armorDurability")] public SkillCounter ArmorDurability { get; set; } @@ -3751,8 +3612,7 @@ public record ArmorCounters public record HideoutManagement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double SkillPointsPerAreaUpgrade { get; set; } @@ -3771,8 +3631,7 @@ public record HideoutManagement public record SkillPointsRate { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public SkillPointRate Generator { get; set; } @@ -3785,8 +3644,7 @@ public record SkillPointsRate public record SkillPointRate { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double ResourceSpent { get; set; } @@ -3795,8 +3653,7 @@ public record SkillPointRate public record EliteSlots { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public EliteSlot Generator { get; set; } @@ -3809,8 +3666,7 @@ public record EliteSlots public record EliteSlot { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double Slots { get; set; } @@ -3819,8 +3675,7 @@ public record EliteSlot public record Crafting { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DependentSkillRatios")] public IEnumerable DependentSkillRatios { get; set; } @@ -3853,8 +3708,7 @@ public record Crafting public record Metabolism { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HydrationRecoveryRate")] public double HydrationRecoveryRate { get; set; } @@ -3874,8 +3728,7 @@ public record Metabolism public record Immunity { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ImmunityMiscEffects")] public double ImmunityMiscEffects { get; set; } @@ -3895,8 +3748,7 @@ public record Immunity public record Endurance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MovementAction")] public double MovementAction { get; set; } @@ -3916,8 +3768,7 @@ public record Endurance public record Strength { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DependentSkillRatios")] public IEnumerable DependentSkillRatios { get; set; } @@ -3952,8 +3803,7 @@ public record Strength public record DependentSkillRatio { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Ratio")] public double Ratio { get; set; } @@ -3964,8 +3814,7 @@ public record DependentSkillRatio public record QTELevelMultiplier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Level")] public double Level { get; set; } @@ -3976,8 +3825,7 @@ public record QTELevelMultiplier public record Vitality { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DamageTakenAction")] public double DamageTakenAction { get; set; } @@ -3988,8 +3836,7 @@ public record Vitality public record HealthSkillProgress { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("SkillProgress")] public double SkillProgress { get; set; } @@ -3997,8 +3844,7 @@ public record HealthSkillProgress public record StressResistance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HealthNegativeEffect")] public double HealthNegativeEffect { get; set; } @@ -4009,8 +3855,7 @@ public record StressResistance public record Throwing { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ThrowAction")] public double ThrowAction { get; set; } @@ -4018,8 +3863,7 @@ public record Throwing public record RecoilControl { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("RecoilAction")] public double RecoilAction { get; set; } @@ -4030,8 +3874,7 @@ public record RecoilControl public record WeaponSkills { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("WeaponReloadAction")] public double WeaponReloadAction { get; set; } @@ -4048,8 +3891,7 @@ public record WeaponSkills public record CovertMovement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MovementAction")] public double MovementAction { get; set; } @@ -4057,8 +3899,7 @@ public record CovertMovement public record Search { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("SearchAction")] public double SearchAction { get; set; } @@ -4069,8 +3910,7 @@ public record Search public record WeaponTreatment { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BuffMaxCount")] public double BuffMaxCount { get; set; } @@ -4099,8 +3939,7 @@ public record WeaponTreatment public record WeaponTreatmentCounters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("firearmsDurability")] public SkillCounter FirearmsDurability { get; set; } @@ -4108,8 +3947,7 @@ public record WeaponTreatmentCounters public record BuffSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("CommonBuffChanceLevelBonus")] public double CommonBuffChanceLevelBonus { get; set; } @@ -4132,8 +3970,7 @@ public record BuffSettings public record MagDrills { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("RaidLoadedAmmoAction")] public double RaidLoadedAmmoAction { get; set; } @@ -4147,8 +3984,7 @@ public record MagDrills public record Perception { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DependentSkillRatios")] public IEnumerable DependentSkillRatios { get; set; } @@ -4162,8 +3998,7 @@ public record Perception public record SkillRatio { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Ratio")] public double Ratio { get; set; } @@ -4174,8 +4009,7 @@ public record SkillRatio public record Intellect { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required SkillRatio[] DependentSkillRatios { get; set; } @@ -4203,8 +4037,7 @@ public record Intellect public record IntellectCounters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("armorDurability")] public SkillCounter ArmorDurability { get; set; } @@ -4218,8 +4051,7 @@ public record IntellectCounters public record SkillCounter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("divisor")] public double Divisor { get; set; } @@ -4230,8 +4062,7 @@ public record SkillCounter public record Attention { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DependentSkillRatios")] public required SkillRatio[] DependentSkillRatios { get; set; } @@ -4248,8 +4079,7 @@ public record Attention public record Charisma { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BonusSettings")] public BonusSettings BonusSettings { get; set; } @@ -4269,8 +4099,7 @@ public record Charisma public record CharismaSkillCounters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("insuranceCost")] public SkillCounter InsuranceCost { get; set; } @@ -4290,8 +4119,7 @@ public record CharismaSkillCounters public record BonusSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("EliteBonusSettings")] public EliteBonusSettings EliteBonusSettings { get; set; } @@ -4302,8 +4130,7 @@ public record BonusSettings public record EliteBonusSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("FenceStandingLossDiscount")] public double FenceStandingLossDiscount { get; set; } @@ -4317,8 +4144,7 @@ public record EliteBonusSettings public record LevelBonusSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HealthRestoreDiscount")] public double HealthRestoreDiscount { get; set; } @@ -4341,8 +4167,7 @@ public record LevelBonusSettings public record Memory { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AnySkillUp")] public double AnySkillUp { get; set; } @@ -4353,8 +4178,7 @@ public record Memory public record Surgery { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("SurgeryAction")] public double SurgeryAction { get; set; } @@ -4365,8 +4189,7 @@ public record Surgery public record AimDrills { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("WeaponShotAction")] public double WeaponShotAction { get; set; } @@ -4374,8 +4197,7 @@ public record AimDrills public record TroubleShooting { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MalfRepairSpeedBonusPerLevel")] public double MalfRepairSpeedBonusPerLevel { get; set; } @@ -4395,8 +4217,7 @@ public record TroubleShooting public record Aiming { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ProceduralIntensityByPose")] public XYZ ProceduralIntensityByPose { get; set; } @@ -4458,8 +4279,7 @@ public record Aiming public record Malfunction { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AmmoMalfChanceMult")] public double AmmoMalfChanceMult { get; set; } @@ -4539,8 +4359,7 @@ public record Malfunction public record Overheat { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MinOverheat")] public double MinimumOverheat { get; set; } @@ -4629,8 +4448,7 @@ public record Overheat public record FenceSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // MongoId [JsonPropertyName("FenceId")] @@ -4648,8 +4466,7 @@ public record FenceSettings public record FenceLevel { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ReachOnMarkOnUnknowns")] public bool CanReachOnMarkOnUnknowns { get; set; } @@ -4732,8 +4549,7 @@ public record FenceLevel public record Inertia { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("InertiaLimits")] public XYZ InertiaLimits { get; set; } @@ -4854,8 +4670,7 @@ public record Inertia public record Ballistic { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("GlobalDamageDegradationCoefficient")] public double GlobalDamageDegradationCoefficient { get; set; } @@ -4863,8 +4678,7 @@ public record Ballistic public record RepairSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ItemEnhancementSettings")] public ItemEnhancementSettings ItemEnhancementSettings { get; set; } @@ -4887,8 +4701,7 @@ public record RepairSettings public record ItemEnhancementSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("DamageReduction")] public PriceModifier DamageReduction { get; set; } @@ -4902,8 +4715,7 @@ public record ItemEnhancementSettings public record PriceModifier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("PriceModifier")] public double PriceModifierValue { get; set; } @@ -4911,8 +4723,7 @@ public record PriceModifier public record RepairStrategies { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Armor")] public RepairStrategy Armor { get; set; } @@ -4923,8 +4734,7 @@ public record RepairStrategies public record RepairStrategy { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BuffTypes")] public IEnumerable BuffTypes { get; set; } @@ -4935,8 +4745,7 @@ public record RepairStrategy public record BotPreset { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("UseThis")] public bool UseThis { get; set; } @@ -4974,8 +4783,7 @@ public record BotPreset public record BotWeaponScattering { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Name")] public string Name { get; set; } @@ -4992,8 +4800,7 @@ public record BotWeaponScattering public record Preset { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -5022,8 +4829,7 @@ public record Preset public record QuestSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("GlobalRewardRepModifierDailyQuestPvE")] public double GlobalRewardRepModifierDailyQuestPvE { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs index 404fcb24..f86b2a7f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Location.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record Location { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Map meta-data @@ -51,8 +50,7 @@ public record Location public record StaticContainer { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("containersGroups")] public Dictionary? ContainersGroups { get; set; } @@ -63,8 +61,7 @@ public record StaticContainer public record ContainerMinMax { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("minContainers")] public int? MinContainers { get; set; } @@ -81,8 +78,7 @@ public record ContainerMinMax public record ContainerData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("groupId")] public string? GroupId { get; set; } @@ -90,8 +86,7 @@ public record ContainerData public record StaticLootDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("itemcountDistribution")] public ItemCountDistribution[] ItemCountDistribution { get; set; } @@ -102,8 +97,7 @@ public record StaticLootDetails public record ItemCountDistribution { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("count")] public int? Count { get; set; } @@ -114,8 +108,7 @@ public record ItemCountDistribution public record ItemDistribution { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("tpl")] public MongoId Tpl { get; set; } @@ -126,8 +119,7 @@ public record ItemDistribution public record StaticContainerDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("staticWeapons")] public IEnumerable StaticWeapons { get; set; } @@ -141,8 +133,7 @@ public record StaticContainerDetails public record StaticForced { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("containerId")] public string ContainerId { get; set; } @@ -153,8 +144,7 @@ public record StaticForced public record StaticContainerData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("probability")] public float? Probability { get; set; } @@ -165,8 +155,7 @@ public record StaticContainerData public record StaticAmmoDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("tpl")] public MongoId? Tpl { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs index 024837fa..0e908097 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record LocationBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AccessKeys")] public IEnumerable? AccessKeys { get; set; } @@ -375,8 +374,7 @@ public record LocationBase public record EventTrapsData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double MaxBarbedWires { get; set; } @@ -389,8 +387,7 @@ public record EventTrapsData public record Transit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("activateAfterSec")] public int? ActivateAfterSeconds { get; set; } @@ -428,8 +425,7 @@ public record Transit public record NonWaveGroupScenario { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Chance")] public double? Chance { get; set; } @@ -452,8 +448,7 @@ public record Limit : MinMax public record AirdropParameter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AirdropPointDeactivateDistance")] public int? AirdropPointDeactivateDistance { get; set; } @@ -488,8 +483,7 @@ public record AirdropParameter public record Banner { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -500,8 +494,7 @@ public record Banner public record Pic { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("file")] public string? File { get; set; } @@ -518,8 +511,7 @@ public record Pic public record BossLocationSpawn { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BossChance")] public double? BossChance { get; set; } @@ -591,8 +583,7 @@ public record BossLocationSpawn public record BossSupport { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BossEscortAmount")] public string? BossEscortAmount { get; set; } @@ -606,8 +597,7 @@ public record BossSupport public record BotLocationModifier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AccuracySpeed")] public double? AccuracySpeed { get; set; } @@ -693,8 +683,7 @@ public record BotLocationModifier public record AdditionalHostilitySettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AlwaysEnemies")] public HashSet? AlwaysEnemies { get; set; } @@ -735,8 +724,7 @@ public record AdditionalHostilitySettings public record ChancedEnemy { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("EnemyChance")] public int? EnemyChance { get; set; } @@ -753,8 +741,7 @@ public record MinMaxBot : MinMax public record MinPlayerWaitTime { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("minPlayers")] public int? MinPlayers { get; set; } @@ -765,8 +752,7 @@ public record MinPlayerWaitTime public record Preview { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("path")] public string? Path { get; set; } @@ -777,8 +763,7 @@ public record Preview public record Scene { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("path")] public string? Path { get; set; } @@ -789,8 +774,7 @@ public record Scene public record SpawnPointParam { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BotZoneName")] public string? BotZoneName { get; set; } @@ -825,8 +809,7 @@ public record SpawnPointParam public record ColliderParams { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _parent; @@ -843,8 +826,7 @@ public record ColliderParams public record ColliderProps { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Center")] public XYZ? Center { get; set; } @@ -858,8 +840,7 @@ public record ColliderProps public record Exit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// % Chance out of 100 exit will appear in raid @@ -954,8 +935,7 @@ public record Exit public record MaxItemCountInLocation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("TemplateId")] public string? TemplateId { get; set; } @@ -966,8 +946,7 @@ public record MaxItemCountInLocation public record Wave { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BotPreset")] public string? BotPreset { get; set; } @@ -1024,8 +1003,7 @@ public record Wave public record LocationEvents { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Halloween2024")] public Halloween2024? Halloween2024 { get; set; } @@ -1035,16 +1013,14 @@ public record LocationEvents public record Khorovod { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double? Chance { get; set; } } public record Halloween2024 { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("CrowdAttackBlockRadius")] public double? CrowdAttackBlockRadius { get; set; } @@ -1093,8 +1069,7 @@ public record Halloween2024 public record CrowdAttackSpawnParam { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Difficulty")] public string? Difficulty { get; set; } @@ -1108,8 +1083,7 @@ public record CrowdAttackSpawnParam public record Area { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("center")] public XYZ? Center { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs index e711c152..e2606c4b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/LooseLoot.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record LooseLoot { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("spawnpointCount")] public SpawnpointCount? SpawnpointCount { get; set; } @@ -20,8 +19,7 @@ public record LooseLoot public record SpawnpointCount { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("mean")] public required double Mean { get; set; } @@ -32,8 +30,7 @@ public record SpawnpointCount public record SpawnpointTemplate { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _root; @@ -80,8 +77,7 @@ public record SpawnpointTemplate public record SptLootItem : Item { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("composedKey")] public string? ComposedKey { get; set; } @@ -89,8 +85,7 @@ public record SptLootItem : Item public record GroupPosition { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _name; @@ -113,8 +108,7 @@ public record GroupPosition public record Spawnpoint { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("locationId")] public string? LocationId { get; set; } @@ -131,8 +125,7 @@ public record Spawnpoint public record LooseLootItemDistribution { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("composedKey")] public ComposedKey? ComposedKey { get; set; } @@ -143,8 +136,7 @@ public record LooseLootItemDistribution public record ComposedKey { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _key; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs index 52c3e53d..fad483cd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/MetricsTableData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record MetricsTableData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Keys")] public List? Keys { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs index 61e9d945..1a72821d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/PmcData.cs @@ -22,8 +22,7 @@ public record PostRaidPmcData : PmcData { } public record PostRaidStats { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Eft")] public EftStats? Eft { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs index 2e4d23a9..afed92a1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/BaseInteractionRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Request; public record BaseInteractionRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Action")] public string? Action { get; set; } @@ -20,8 +19,7 @@ public record BaseInteractionRequestData public record OwnerInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs index f4ade453..c2a0b354 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Request/UIDRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Request; public record UIDRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("uid")] public string? Uid { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs index 9313c0bc..173ee684 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Achievement.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Achievement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("index")] public required int Index { get; set; } @@ -53,8 +52,7 @@ public record Achievement public record AchievementQuestConditionTypes { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("started")] public List? Started { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs index b246ab90..83229631 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -9,8 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId? Id { get; set; } @@ -118,8 +117,7 @@ public record BotBase public record MoneyTransferLimits { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // Resets every 24 hours in live /// @@ -142,8 +140,7 @@ public record TaskConditionCounter { private string? _type; - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId? Id { get; set; } @@ -167,8 +164,7 @@ public record TaskConditionCounter public record UnlockedInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("unlockedProductionRecipe")] public HashSet? UnlockedProductionRecipe { get; set; } @@ -176,8 +172,7 @@ public record UnlockedInfo public record Info { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _side; @@ -267,8 +262,7 @@ public record Info public record BotInfoSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _botDifficulty; private string? _role; @@ -297,8 +291,7 @@ public record BotInfoSettings public record Ban { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("banType")] public BanType? BanType { get; set; } @@ -320,8 +313,7 @@ public enum BanType public record Customization { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public MongoId? Head { get; set; } @@ -338,8 +330,7 @@ public record Customization public record BotBaseHealth { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public CurrentMinMax? Hydration { get; set; } @@ -360,8 +351,7 @@ public record BotBaseHealth public record BodyPartHealth { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public CurrentMinMax? Health { get; set; } @@ -370,8 +360,7 @@ public record BodyPartHealth public record BodyPartEffectProperties { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // TODO: this was any, what actual type is it? public object? ExtraData { get; set; } @@ -381,8 +370,7 @@ public record BodyPartEffectProperties public record CurrentMinMax { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double? Current { get; set; } @@ -397,8 +385,7 @@ public record CurrentMinMax public record BotBaseInventory { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("items")] public List? Items { get; set; } @@ -445,8 +432,7 @@ public record BotBaseInventory public record Skills { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public IEnumerable Common { get; set; } @@ -457,8 +443,7 @@ public record Skills public record MasterySkill { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Id { get; set; } @@ -467,8 +452,7 @@ public record MasterySkill public record CommonSkill { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double PointsEarnedDuringSession { get; set; } @@ -488,16 +472,14 @@ public record CommonSkill public record Stats { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public EftStats? Eft { get; set; } } public record EftStats { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public IEnumerable? CarriedQuestItems { get; set; } @@ -539,8 +521,7 @@ public record EftStats public record DroppedItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public MongoId QuestId { get; set; } @@ -551,8 +532,7 @@ public record DroppedItem public record FoundInRaidItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public MongoId QuestId { get; set; } @@ -561,8 +541,7 @@ public record FoundInRaidItem public record Victim { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string? AccountId { get; set; } @@ -593,24 +572,21 @@ public record Victim public record SessionCounters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public IEnumerable? Items { get; set; } } public record OverallCounters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public List? Items { get; set; } } public record CounterKeyValue { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public HashSet? Key { get; set; } @@ -619,8 +595,7 @@ public record CounterKeyValue public record Aggressor { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double? PrestigeLevel { get; set; } @@ -652,8 +627,7 @@ public record Aggressor public record DamageHistory { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string? LethalDamagePart { get; set; } @@ -667,8 +641,7 @@ public record DamageHistory public record BodyPartsDamageHistory { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public List? Head { get; set; } @@ -691,8 +664,7 @@ public record DamageStats { private string? _type; - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double? Amount { get; set; } @@ -714,8 +686,7 @@ public record DamageStats public record DeathCause { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonConverter(typeof(JsonStringEnumConverter))] public DamageType? DamageType { get; set; } @@ -731,8 +702,7 @@ public record DeathCause public record LastPlayerState { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public LastPlayerStateInfo? Info { get; set; } @@ -744,8 +714,7 @@ public record LastPlayerState public record LastPlayerStateInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string? Nickname { get; set; } @@ -758,8 +727,7 @@ public record LastPlayerStateInfo public record BackendCounter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -773,8 +741,7 @@ public record BackendCounter public record InsuredItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Trader ID item was insured by @@ -788,8 +755,7 @@ public record InsuredItem public record Hideout { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public Dictionary? Production { get; set; } @@ -815,8 +781,7 @@ public record Hideout public record HideoutCounters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("fuelCounter")] public double? FuelCounter { get; set; } @@ -833,8 +798,7 @@ public record HideoutCounters public record HideoutImprovement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("completed")] public bool? Completed { get; set; } @@ -845,8 +809,7 @@ public record HideoutImprovement public record Production // use this instead of productive and scavcase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public List? Products { get; set; } @@ -922,8 +885,7 @@ public record Production // use this instead of productive and scavcase public record BotHideoutArea { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("type")] public HideoutAreas Type { get; set; } @@ -955,8 +917,7 @@ public record BotHideoutArea public record HideoutSlot { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// SPT specific value to keep track of what index this slot is (0,1,2,3 etc.) @@ -970,8 +931,7 @@ public record HideoutSlot public record LastCompleted { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("$oid")] public string? OId { get; set; } @@ -979,8 +939,7 @@ public record LastCompleted public record Notes { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Notes")] public List? DataNotes { get; set; } @@ -997,8 +956,7 @@ public enum SurvivorClass public record TraderInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("loyaltyLevel")] public int? LoyaltyLevel { get; set; } @@ -1021,8 +979,7 @@ public record TraderInfo public record RagfairInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("rating")] public double? Rating { get; set; } @@ -1042,8 +999,7 @@ public record RagfairInfo public record Bonus { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs index a687acd1..e97b28c4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotCore.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotCore { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("SAVAGE_KILL_DIST")] public double? SavageKillDistance { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs index a8755731..6c211740 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record BotType { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("appearance")] public Appearance BotAppearance { get; set; } @@ -43,8 +42,7 @@ public record BotType public record Appearance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("body")] public Dictionary Body { get; set; } @@ -67,8 +65,7 @@ public record Appearance public record Chances { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("equipment")] public Dictionary EquipmentChances { get; set; } @@ -87,8 +84,7 @@ public record Chances GenerateWeaponRequest.ModSpawnChances public record ModsChances { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("mod_charge")] public double? ModCharge { get; set; } @@ -250,8 +246,7 @@ public double? ModPistol_Grip { get; set; } public record DifficultyCategories { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public Dictionary? Aiming { get; set; } // TODO: string | number | boolean @@ -284,8 +279,7 @@ public record DifficultyCategories public record Experience { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// key = bot difficulty @@ -314,8 +308,7 @@ public record Experience public record Generation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("items")] public GenerationWeightingItems Items { get; set; } @@ -323,8 +316,7 @@ public record Generation public record GenerationData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// key: number of items, value: weighting @@ -342,8 +334,7 @@ public record GenerationData public record GenerationWeightingItems { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("grenades")] public GenerationData Grenades { get; set; } @@ -387,8 +378,7 @@ public record GenerationWeightingItems public record BotTypeHealth { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public IEnumerable BodyParts { get; set; } @@ -401,8 +391,7 @@ public record BotTypeHealth public record BodyPart { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public MinMax Chest { get; set; } @@ -421,8 +410,7 @@ public record BodyPart public record BotTypeInventory { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("equipment")] public Dictionary> Equipment { get; set; } @@ -438,8 +426,7 @@ public record BotTypeInventory public record ItemPools { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public Dictionary Backpack { get; set; } @@ -454,8 +441,7 @@ public record ItemPools public record BotDbSkills { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public Dictionary> Common { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs index 0dd85a2f..73df4e93 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomisationStorage.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record CustomisationStorage { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // Customisation.json/itemId [JsonPropertyName("id")] @@ -21,8 +20,7 @@ public record CustomisationStorage public record CustomisationType { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string SUITE = "suite"; public const string DOG_TAG = "dogTag"; @@ -42,8 +40,7 @@ public record CustomisationType public record CustomisationTypeId { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string CUSTOMIZATION = "5cbdb4a2e2b501000d352ae2"; public const string BODY_PARTS = "5cd943c31388ce000a659df5"; @@ -71,8 +68,7 @@ public record CustomisationTypeId public record CustomisationSource { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string QUEST = "quest"; public const string PRESTIGE = "prestige"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs index 1ca5be99..8182fa22 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/CustomizationItem.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record CustomizationItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -29,8 +28,7 @@ public record CustomizationItem public class CustomizationProps { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Prefab")] public object? Prefab { get; set; } // Prefab object or string diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs index 3ab42de6..3eaada7a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/HandbookBase.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record HandbookBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Categories")] public List Categories { get; set; } @@ -17,8 +16,7 @@ public record HandbookBase public record HandbookCategory { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Id")] public MongoId Id { get; set; } @@ -40,8 +38,7 @@ public record HandbookCategory public record HandbookItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs index 9de85d8e..c4bbf741 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs @@ -7,8 +7,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Item { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; private string? _parentId; @@ -48,8 +46,7 @@ public record Item public record HideoutItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Hideout inventory id that was used by improvement action @@ -86,8 +83,7 @@ public record HideoutItem public record ItemLocation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("x")] public int? X { get; set; } @@ -120,8 +116,7 @@ public enum ItemRotation public record Upd { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public UpdBuff? Buff { get; set; } @@ -187,8 +182,7 @@ public record Upd public record LockableKeyComponent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public float? RelativeValue { get; set; } public int? NumberOfUsages { get; set; } @@ -196,8 +190,7 @@ public record LockableKeyComponent public record LockableComponent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public IEnumerable? KeyIds { get; set; } public bool? Locked { get; set; } @@ -213,8 +206,7 @@ public enum PinLockState public record UpdBuff { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Rarity")] public string? Rarity { get; set; } @@ -232,8 +224,7 @@ public record UpdBuff public record UpdTogglable { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("On")] public bool? On { get; set; } @@ -241,8 +232,7 @@ public record UpdTogglable public record UpdMap { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Markers")] public List? Markers { get; set; } @@ -250,8 +240,7 @@ public record UpdMap public record MapMarker { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Type")] public string? Type { get; set; } @@ -268,8 +257,7 @@ public record MapMarker public record UpdTag { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Color")] public int? Color { get; set; } @@ -280,8 +268,7 @@ public record UpdTag public record UpdFaceShield { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Hits")] public int? Hits { get; set; } @@ -292,8 +279,7 @@ public record UpdFaceShield public record UpdRepairable { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Durability")] public double? Durability { get; set; } @@ -304,8 +290,7 @@ public record UpdRepairable public record UpdRecodableComponent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("IsEncoded")] public bool? IsEncoded { get; set; } @@ -313,8 +298,7 @@ public record UpdRecodableComponent public record UpdMedKit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HpResource")] public double? HpResource { get; set; } @@ -322,8 +306,7 @@ public record UpdMedKit public record UpdSight { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ScopesCurrentCalibPointIndexes")] public IEnumerable? ScopesCurrentCalibPointIndexes { get; set; } @@ -339,8 +322,7 @@ public record UpdSight public record UpdFoldable { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Folded")] public bool? Folded { get; set; } @@ -348,8 +330,7 @@ public record UpdFoldable public record UpdFireMode { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("FireMode")] public string? FireMode { get; set; } @@ -357,8 +338,7 @@ public record UpdFireMode public record UpdFoodDrink { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("HpPercent")] public double? HpPercent { get; set; } @@ -366,8 +346,7 @@ public record UpdFoodDrink public record UpdKey { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // Checked in client [JsonPropertyName("NumberOfUsages")] @@ -376,8 +355,7 @@ public record UpdKey public record UpdResource { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Value")] public double? Value { get; set; } @@ -388,8 +366,7 @@ public record UpdResource public record UpdLight { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("IsActive")] public bool? IsActive { get; set; } @@ -400,8 +377,7 @@ public record UpdLight public record UpdDogtag { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AccountId")] public string? AccountId { get; set; } @@ -451,8 +427,7 @@ public record UpdDogtag public record UpdSideEffect { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Value")] public double? Value { get; set; } @@ -460,8 +435,7 @@ public record UpdSideEffect public record UpdRepairKit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Resource")] public double? Resource { get; set; } @@ -469,8 +443,7 @@ public record UpdRepairKit public record UpdCultistAmulet { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("NumberOfUsages")] public double? NumberOfUsages { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs index 7ab18e5f..9e26b0d0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationServices { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("TraderServerSettings")] public TraderServerSettings TraderServerSettings { get; set; } @@ -19,8 +18,7 @@ public record LocationServices public record TraderServerSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("TraderServices")] public TraderServices TraderServices { get; set; } @@ -28,8 +26,7 @@ public record TraderServerSettings public record TraderServices { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ExUsecLoyalty")] public TraderService ExUsecLoyalty { get; set; } @@ -55,8 +52,7 @@ public record TraderServices public record TraderService { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("TraderId")] public string TraderId { get; set; } @@ -78,8 +74,7 @@ public record TraderService public record ServiceRequirements { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("CompletedQuests")] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] @@ -93,8 +88,7 @@ public record ServiceRequirements public record CompletedQuest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("QuestId")] public string QuestId { get; set; } @@ -102,8 +96,7 @@ public record CompletedQuest public record StandingRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Value")] public double Value { get; set; } @@ -111,8 +104,7 @@ public record StandingRequirement public record ServiceItemCostDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Count")] public int Count { get; set; } @@ -120,8 +112,7 @@ public record ServiceItemCostDetails public record BtrServerSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ChanceSpawn")] public double ChanceSpawn { get; set; } @@ -171,8 +162,7 @@ public record BtrServerSettings public record ServerMapBtrsettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MapID")] public string MapID { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs index c26cbeba..475cc7a2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsBase.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationsBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("locations")] public Locations? Locations { get; set; } @@ -16,16 +15,14 @@ public record LocationsBase public record Locations { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // Add properties as necessary } public record Path { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Source")] public string? Source { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs index a58f19bc..d77af074 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationsGenerateAllResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record LocationsGenerateAllResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("locations")] public Dictionary Locations { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs index ab60cd4d..1da5cf54 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Match.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Match { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("metrics")] public Metrics Metrics { get; set; } @@ -13,8 +12,7 @@ public record Match public record Metrics { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Keys")] public List Keys { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs index ef744935..405bd042 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Prestige.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Prestige { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("elements")] public List Elements { get; set; } @@ -14,8 +13,7 @@ public record Prestige public record PrestigeElement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string Id { get; set; } @@ -38,8 +36,7 @@ public record PrestigeElement public record TransferConfigs { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("stashConfig")] public StashPrestigeConfig StashConfig { get; set; } @@ -53,8 +50,7 @@ public record TransferConfigs public record StashPrestigeConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("xCellCount")] public int? XCellCount { get; set; } @@ -68,8 +64,7 @@ public record StashPrestigeConfig public record StashPrestigeFilters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("includedItems")] public List IncludedItems { get; set; } @@ -80,8 +75,7 @@ public record StashPrestigeFilters public record PrestigeSkillConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("transferMultiplier")] public double TransferMultiplier { get; set; } @@ -89,8 +83,7 @@ public record PrestigeSkillConfig public record PrestigeMasteringConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("transferMultiplier")] public double TransferMultiplier { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs index 430993b8..699318cd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/ProfileTemplate.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record ProfileSides { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("descriptionLocaleKey")] public string? DescriptionLocaleKey { get; set; } @@ -21,8 +20,7 @@ public record ProfileSides public record TemplateSide { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("character")] public PmcData? Character { get; set; } @@ -48,8 +46,7 @@ public record TemplateSide public record ProfileTraderTemplate { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("initialLoyaltyLevel")] public Dictionary? InitialLoyaltyLevel { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs index 38a94f1e..16b0da93 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Quest.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Quest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// SPT addition - human readable quest name @@ -129,8 +128,7 @@ public record Quest /// public record QuestStatus { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("qid")] public required MongoId QId { get; set; } @@ -153,8 +151,7 @@ public record QuestStatus public record QuestConditionTypes { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Started")] public List? Started { get; set; } @@ -176,8 +173,7 @@ public record QuestCondition { private string _conditionType; - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public required MongoId Id { get; set; } @@ -324,8 +320,7 @@ public record QuestCondition public record QuestConditionCounter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -336,8 +331,7 @@ public record QuestConditionCounter public record QuestConditionCounterCondition { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -429,8 +423,7 @@ public record QuestConditionCounterCondition public record EnemyHealthEffect { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("bodyParts")] public List? BodyParts { get; set; } @@ -441,8 +434,7 @@ public record EnemyHealthEffect public record ValueCompare { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("compareMethod")] public string? CompareMethod { get; set; } @@ -453,8 +445,7 @@ public record ValueCompare public record CounterConditionDistance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("value")] public double? Value { get; set; } @@ -465,8 +456,7 @@ public record CounterConditionDistance public record DaytimeCounter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("from")] public int? From { get; set; } @@ -477,8 +467,7 @@ public record DaytimeCounter public record VisibilityCondition { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs index c7c36a26..4170ce9d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/RepeatableQuests.cs @@ -23,8 +23,7 @@ public record RepeatableQuest : Quest public record RepeatableQuestDatabase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("templates")] public RepeatableTemplates? Templates { get; set; } @@ -41,8 +40,7 @@ public record RepeatableQuestDatabase public record RepeatableQuestStatus { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -65,8 +63,7 @@ public record RepeatableQuestStatus public record RepeatableTemplates { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Elimination")] public RepeatableQuest? Elimination { get; set; } @@ -83,8 +80,7 @@ public record RepeatableTemplates public record PmcDataRepeatableQuest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId? Id { get; set; } @@ -120,8 +116,7 @@ public record PmcDataRepeatableQuest public record ChangeRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("changeCost")] public List? ChangeCost { get; set; } @@ -132,8 +127,7 @@ public record ChangeRequirement public record ChangeCost { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// What item it will take to reset daily @@ -152,8 +146,7 @@ public record ChangeCost public record RewardOptions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("itemsBlacklist")] public List? ItemsBlacklist { get; set; } @@ -161,8 +154,7 @@ public record RewardOptions public record Options { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Completion")] public CompletionFilter? Completion { get; set; } @@ -170,8 +162,7 @@ public record Options public record CompletionFilter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("itemsBlacklist")] public List? ItemsBlacklist { get; set; } @@ -182,8 +173,7 @@ public record CompletionFilter public record ItemsBlacklist { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("minPlayerLevel")] public int? MinPlayerLevel { get; set; } @@ -194,8 +184,7 @@ public record ItemsBlacklist public record ItemsWhitelist { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("minPlayerLevel")] public int? MinPlayerLevel { get; set; } @@ -206,8 +195,7 @@ public record ItemsWhitelist public record SampleQuests { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs index bf05d421..ddf385f7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Reward.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Reward { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("value")] [JsonConverter(typeof(StringToNumberFactoryConverter))] @@ -73,8 +72,7 @@ public record Reward public record IllustrationConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Image")] public string image { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs index 6caf3a33..c14b3805 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record TemplateItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private Dictionary? _blocks; @@ -73,8 +72,7 @@ public record TemplateItem public record Props { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _backgroundColor; @@ -1578,8 +1576,7 @@ public record Props public record WeaponRecoilSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Enable")] public bool? Enable { get; set; } @@ -1590,8 +1587,7 @@ public record WeaponRecoilSettings public record WeaponRecoilSettingValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Enable")] public bool? Enable { get; set; } @@ -1605,8 +1601,7 @@ public record WeaponRecoilSettingValues public record WeaponRecoilProcess { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ComponentType")] public string? ComponentType { get; set; } @@ -1626,8 +1621,7 @@ public record WeaponRecoilProcess public record WeaponRecoilTransformationCurve { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Keys")] public IEnumerable? Keys { get; set; } @@ -1635,8 +1629,7 @@ public record WeaponRecoilTransformationCurve public record WeaponRecoilTransformationCurveKey { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("inTangent")] public double? InTangent { get; set; } @@ -1653,8 +1646,7 @@ public record WeaponRecoilTransformationCurveKey public record HealthEffect { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("type")] public string? Type { get; set; } @@ -1665,8 +1657,7 @@ public record HealthEffect public record Prefab { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("path")] public string? Path { get; set; } @@ -1677,8 +1668,7 @@ public record Prefab public record Grid { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_name")] public string? Name { get; set; } @@ -1698,8 +1688,7 @@ public record Grid public record GridProps { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("filters")] public IEnumerable? Filters { get; set; } @@ -1725,8 +1714,7 @@ public record GridProps public record GridFilter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Filter")] public HashSet? Filter { get; set; } @@ -1740,8 +1728,7 @@ public record GridFilter public record Slot { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + private string? _name; @@ -1782,8 +1769,7 @@ public record Slot public record SlotProps { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("filters")] public IEnumerable? Filters { get; set; } @@ -1794,8 +1780,7 @@ public record SlotProps public record SlotFilter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Shift")] public double? Shift { get; set; } @@ -1827,8 +1812,7 @@ public record SlotFilter public record StackSlot { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_name")] public string? Name { get; set; } @@ -1854,8 +1838,7 @@ public record StackSlot public record StackSlotProps { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("filters")] public IEnumerable? Filters { get; set; } @@ -1863,8 +1846,7 @@ public record StackSlotProps public record RandomLootSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("allowToSpawnIdenticalItems")] public bool? AllowToSpawnIdenticalItems { get; set; } @@ -1893,8 +1875,7 @@ public record RandomLootSettings public record RandomLootExcluded { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("categoryTemplates")] public IEnumerable? CategoryTemplates { get; set; } // TODO: object here @@ -1908,8 +1889,7 @@ public record RandomLootExcluded public record EffectsHealth { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Energy")] public EffectsHealthProps? Energy { get; set; } @@ -1920,8 +1900,7 @@ public record EffectsHealth public record EffectsHealthProps { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("value")] public double? Value { get; set; } @@ -1935,8 +1914,7 @@ public record EffectsHealthProps public record EffectsDamage { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Pain")] public EffectDamageProps? Pain { get; set; } @@ -1962,8 +1940,7 @@ public record EffectsDamage public record EffectDamageProps { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("value")] public double? Value { get; set; } @@ -1989,8 +1966,7 @@ public record EffectDamageProps public record Color { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("r")] public double? R { get; set; } @@ -2007,8 +1983,7 @@ public record Color public record ShotsGroupSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("EndShotIndex")] public double? EndShotIndex { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs index 5b9f95c2..e27ab81d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Trader.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record Trader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("assort")] public required TraderAssort Assort { get; set; } @@ -32,8 +31,7 @@ public record Trader public record TraderBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("refreshTraderRagfairOffers")] public bool? RefreshTraderRagfairOffers { get; set; } @@ -133,8 +131,7 @@ public record TraderBase public record ItemBuyData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // MongoId [JsonPropertyName("category")] @@ -147,8 +144,7 @@ public record ItemBuyData public record ItemSellData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("category")] public required HashSet Category { get; set; } @@ -159,8 +155,7 @@ public record ItemSellData public record TraderInsurance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("availability")] public bool? Availability { get; set; } @@ -187,8 +182,7 @@ public record TraderInsurance public record TraderLoyaltyLevel { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("buy_price_coef")] public double? BuyPriceCoefficient { get; set; } @@ -219,8 +213,7 @@ public record TraderLoyaltyLevel public record TraderRepair { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("availability")] public bool? Availability { get; set; } @@ -250,8 +243,7 @@ public record TraderRepair public record TraderAssort { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("nextResupply")] public double? NextResupply { get; set; } @@ -268,8 +260,7 @@ public record TraderAssort public record BarterScheme { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // Confirmed in client [JsonPropertyName("count")] @@ -294,8 +285,7 @@ public record BarterScheme public record Suit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -327,8 +317,7 @@ public record Suit public record SuitRequirements { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("achievementRequirements")] public List? AchievementRequirements { get; set; } @@ -361,8 +350,7 @@ public record SuitRequirements public record ItemRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("count")] public double? Count { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TraderDialogs.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TraderDialogs.cs index 3d968257..3c1e221b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TraderDialogs.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TraderDialogs.cs @@ -5,8 +5,6 @@ namespace SPTarkov.Server.Core.Models.Eft.Common.Tables; public record TraderDialogs { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; [JsonPropertyName("elements")] public required List Elements; @@ -14,9 +12,6 @@ public record TraderDialogs public record TraderDialogElements { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; - [JsonPropertyName("CanBeFirstDialogue")] public bool CanBeFirstDialog { get; set; } = true; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs index a36cd554..ad98f09c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XY.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record XY { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("x")] public double? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs index deab4d94..5d7c300e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/XYZ.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Common; public record XYZ { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("x")] public double? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs index c1fc49db..68d76d92 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/BuyClothingRequestData.cs @@ -15,8 +15,7 @@ public record BuyClothingRequestData : InventoryBaseActionRequestData public record PaymentItemForClothing { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("del")] public bool? Del { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs index 15546de2..d7f4224f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/CustomizationSetRequest.cs @@ -12,8 +12,7 @@ public record CustomizationSetRequest : InventoryBaseActionRequestData public record CustomizationSetOption { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs index 04425f36..5fc9fb0a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Customization/WearClothingRequestData.cs @@ -4,6 +4,5 @@ namespace SPTarkov.Server.Core.Models.Eft.Customization; public record WearClothingRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs index 5ab0fb77..a43296b7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AcceptFriendRequestData.cs @@ -11,8 +11,7 @@ public record DeclineFriendRequestData : BaseFriendRequest { } public record BaseFriendRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("profileId")] public string? ProfileId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs index f4bca1ee..0ba4b119 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/AddUserGroupMailRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record AddUserGroupMailRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs index 4485be91..e9ed3ddb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChangeGroupMailOwnerRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ChangeGroupMailOwnerRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs index 8d487c4a..e2d76d65 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ChatServer.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ChatServer { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -41,8 +40,7 @@ public record ChatServer public record Chat { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs index 89181b17..1b7b9b88 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/ClearMailMessageRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record ClearMailMessageRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public required MongoId DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs index 9bbd1f7b..4e906965 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/CreateGroupMailRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record CreateGroupMailRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Name")] public string? Name { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs index 89506008..37a6073d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/DeleteFriendRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record DeleteFriendRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("friend_id")] public MongoId FriendId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs index 3b66b3bb..81dd9de7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record FriendRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("status")] public int? Status { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs index 4b4a77b1..17465390 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/FriendRequestSendResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record FriendRequestSendResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("status")] public BackendErrorCodes? Status { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs index 3e17df31..0a7d4201 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetAllAttachmentsRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public string DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs index 58e763a1..cb753b40 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetAllAttachmentsResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetAllAttachmentsResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("messages")] public List? Messages { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs index 8f4e030b..d54db71b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetChatServerListRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetChatServerListRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("VersionId")] public string? VersionId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs index 11ff0abe..d5ee4d4b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetFriendListDataResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetFriendListDataResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Friends")] public List? Friends { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs index 5cae743e..219c3033 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogInfoRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogInfoRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public MongoId? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs index 59f58fb5..a4164267 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogListRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogListRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("limit")] public int? Limit { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs index 13644f9a..3cc3b610 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewRequestData.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogViewRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("type")] public MessageType? Type { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs index ba8dd208..eca18cc3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/GetMailDialogViewResponseData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record GetMailDialogViewResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("messages")] public List? Messages { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs index 08b732fa..ab70b843 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/PinDialogRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record PinDialogRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public MongoId? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs index 0595f667..849cbf44 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveDialogRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveDialogRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public MongoId? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs index 9bbead3a..a7efa6b4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveMailMessageRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveMailMessageRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs index 52141c09..041af2d1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/RemoveUserGroupMailRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record RemoveUserGroupMailRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public string? DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs index 09bc2704..534faef0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SendMessageRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record SendMessageRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogId")] public required string DialogId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs index 1f64e6dc..0f05d235 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Dialog/SetDialogReadRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Dialog; public record SetDialogReadRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dialogs")] public List? Dialogs { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs index 372823b1..3fc3bc33 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CheckVersionResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record CheckVersionResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("isvalid")] public bool? IsValid { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs index 1b7bdeb3..ccc124d3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/CurrentGroupResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record CurrentGroupResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("squad")] public List? Squad { get; set; } @@ -14,8 +13,7 @@ public record CurrentGroupResponse public record CurrentGroupSquadMember { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public string? Id { get; set; } @@ -35,8 +33,7 @@ public record CurrentGroupSquadMember public record CurrentGroupMemberInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs index 478ac2ae..41c7d1c7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameConfigResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameConfigResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("aid")] public double? Aid { get; set; } @@ -58,8 +57,7 @@ public record GameConfigResponse public record PurchasedGames { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("eft")] public bool? IsEftPurchased { get; set; } @@ -70,8 +68,7 @@ public record PurchasedGames public record Backend { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Lobby")] public string? Lobby { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs index 91da778e..6d4ba6fd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameEmptyCrcRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameEmptyCrcRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs index 932868eb..2d1c62a3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameKeepAliveResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameKeepAliveResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("msg")] public string? Message { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs index c735aad4..fa08e92e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameLogoutResponseData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameLogoutResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("status")] public string? Status { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs index 59639ba4..80d97693 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameModeRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("sessionMode")] public string? SessionMode { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs index 599e3e3d..d77a4810 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs @@ -10,8 +10,7 @@ public enum SessionMode public record GameModeResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("gameMode")] public string? GameMode { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs index d32d0be6..29450f02 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameStartResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GameStartResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("utc_time")] public double UtcTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs index a87db5b7..0138f1f7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetItemPricesResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetItemPricesResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("supplyNextTime")] public double? SupplyNextTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs index 8c837bc9..c08edc0a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetRaidTimeRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Side")] public string? Side { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs index 10f6bfff..bfff4695 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GetRaidTimeResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record GetRaidTimeResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("NewSurviveTimeSeconds")] public double? NewSurviveTimeSeconds { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs index 39d99e0b..2fd32df9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendClientModsRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record SendClientModsRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("activeClientMods")] public List ActiveClientMods { get; set; } = []; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs index 8d3dc69f..b3a600cd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SendSurveyOpinionRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record SendSurveyOpinionRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("resultJson")] public string? ResultJson { get; set; } @@ -20,8 +19,7 @@ public record SendSurveyOpinionRequest : IRequestData public record SurveyOpinionAnswer { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("questionId")] public int? QuestionId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs index 2a246131..ca436eaf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/ServerDetails.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record ServerDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ip")] public string? Ip { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs index 3ee0903e..0486f0ea 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/SurveyResponseData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record SurveyResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("locale")] public Dictionary>? Locale { get; set; } @@ -16,8 +15,7 @@ public record SurveyResponseData public record Survey { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public int? Id { get; set; } @@ -40,8 +38,7 @@ public record Survey public record WelcomePageData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("titleLocaleKey")] public string? TitleLocaleKey { get; set; } @@ -55,8 +52,7 @@ public record WelcomePageData public record FarewellPageData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("textLocaleKey")] public string? TextLocaleKey { get; set; } @@ -64,8 +60,7 @@ public record FarewellPageData public record SurveyQuestion { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public int? Id { get; set; } @@ -91,8 +86,7 @@ public record SurveyQuestion public record SurveyAnswer { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public int? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs index eab12d21..61d8dbdb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/VersionValidateRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public record VersionValidateRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("version")] public Version? Version { get; set; } @@ -17,8 +16,7 @@ public record VersionValidateRequestData : IRequestData public record Version { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("major")] public string? Major { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs index 3d6aea72..2c7971d3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/HealthTreatmentRequestData.cs @@ -25,8 +25,7 @@ public record HealthTreatmentRequestData : InventoryBaseActionRequestData public record Difference { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("BodyParts")] public Dictionary? BodyParts { get; set; } @@ -40,8 +39,7 @@ public record Difference public record BodyPartValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double Health { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs index ab9a577b..d3449a0f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/SyncHealthRequestData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public record SyncHealthRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Health")] public List? Health { get; set; } @@ -25,8 +24,7 @@ public record SyncHealthRequestData public record BodyPartCollection { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Head")] public BodyPartHealth? Head { get; set; } @@ -52,8 +50,7 @@ public record BodyPartCollection public record BodyPartHealth { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Maximum")] public int? Maximum { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs index e889e6fb..acdd1654 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Health/WorkoutData.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Health; public class WorkoutData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("skills")] public WorkoutSkills? Skills { get; set; } @@ -16,8 +15,7 @@ public class WorkoutData : IRequestData public record WorkoutSkills { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Common")] public List Common { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs index 2c2e6759..17580672 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutArea.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutArea { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -46,8 +45,7 @@ public record HideoutArea public record HideoutAreaRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("areaType")] public int? AreaType { get; set; } @@ -61,8 +59,7 @@ public record HideoutAreaRequirement public record Stage { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("autoUpgrade")] public bool? AutoUpgrade { get; set; } @@ -100,8 +97,7 @@ public record Stage public record StageImprovement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -118,8 +114,7 @@ public record StageImprovement public record StageImprovementBonus { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -145,8 +140,7 @@ public record StageImprovementBonus public record StageImprovementRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("count")] public int? Count { get; set; } @@ -169,8 +163,7 @@ public record StageImprovementRequirement public record StageRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("areaType")] public int? AreaType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs index e25c0497..5042c72f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutContinuousProductionStartRequestData.cs @@ -15,8 +15,7 @@ public record HideoutContinuousProductionStartRequestData : InventoryBaseActionR public record HideoutProperties { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public int? BtcFarmGcs { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs index 2ac1fa33..874ed9c2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutCustomisation.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutCustomisation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("globals")] public List? Globals { get; set; } @@ -18,8 +17,7 @@ public record HideoutCustomisation public record HideoutCustomisationGlobal { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -45,8 +43,7 @@ public record HideoutCustomisationGlobal public record HideoutCustomisationSlot { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs index 515869aa..5d943834 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutProduction.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutProductionData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("recipes")] public List? Recipes { get; set; } @@ -21,8 +20,7 @@ public record HideoutProductionData public record HideoutProduction { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -66,8 +64,7 @@ public record HideoutProduction public record Requirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("templateId")] public MongoId? TemplateId { get; set; } @@ -105,8 +102,7 @@ public record Requirement public record ScavRecipe { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -123,8 +119,7 @@ public record ScavRecipe public record EndProducts { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Common")] public MinMax? Common { get; set; } @@ -138,8 +133,7 @@ public record EndProducts public record CultistRecipe { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs index 6d15bab1..49a54edb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/HideoutSettingsBase.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record HideoutSettingsBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("generatorSpeedWithoutFuel")] public double? GeneratorSpeedWithoutFuel { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs index c61fdc40..1d3dddfa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Hideout/QteData.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Hideout; public record QteData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -48,8 +47,7 @@ public record QteData public record QuickTimeEvent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] @@ -76,8 +74,7 @@ public record QuickTimeEvent public record QteRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("type")] public RequirementType? RequirementType { get; set; } @@ -85,8 +82,7 @@ public record QteRequirement public record QteResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("energy")] public int? Energy { get; set; } @@ -100,8 +96,7 @@ public record QteResult public record QteEffect { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] @@ -127,8 +122,7 @@ public record QteEffect public record SkillLevelMultiplier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("level")] public int? Level { get; set; } @@ -139,8 +133,7 @@ public record SkillLevelMultiplier public record Position { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("x")] public float? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs index 47d359d3..fa78e4f8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/GetBodyResponseData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.HttpResponse; public record GetBodyResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("err")] public BackendErrorCodes? Err { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs index fb3b2861..5edd65cb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/HttpResponse/NullResponseData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.HttpResponse; public record NullResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("err")] public int? Err { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs index 760e32db..b9192a8d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/InsuredItemsData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record InsuredItemsData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs index 1ccbda36..38ea093c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/ItemDeliveryRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record ItemDeliveryRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("items")] public List? Items { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs index 5df8cec7..ee97efb5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/InRaid/RegisterPlayerRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.InRaid; public record RegisterPlayerRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs index dbc12410..d7bd2776 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Insurance/GetInsuranceCostRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Insurance; public record GetInsuranceCostRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("traders")] public List? Traders { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs index b3f1b126..efb27510 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemDirectRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemDirectRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Item and child mods to add to player inventory diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs index 21202784..cd05a264 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Trader id @@ -20,8 +19,7 @@ public record AddItemRequestData public record ItemToAdd { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("count")] public int? Count { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs index 9a744b8a..bca677d1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemTempObject.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemTempObject { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("itemRef")] public Item? ItemReference { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs index 0193782c..23970f72 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/AddItemsDirectRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Inventory; public record AddItemsDirectRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Item and child mods to add to player inventory diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs index 8a464cd9..40b6c12f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/InventoryBaseActionRequestData.cs @@ -7,8 +7,7 @@ public abstract record InventoryBaseActionRequestData : BaseInteractionRequestDa public record To { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -25,8 +24,7 @@ public record To public record Container { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -40,8 +38,7 @@ public record Container public record Location { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("x")] public double? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs index 20da1e1c..e1d1b9ff 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Inventory/RedeemProfileRequestData.cs @@ -11,8 +11,7 @@ public record RedeemProfileRequestData : InventoryBaseActionRequestData public record RedeemProfileRequestEvent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MessageId")] public MongoId MessageId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs index 128643bd..c487f362 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/EmptyItemEventRouterResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record EmptyItemEventRouterResponse : ItemEventRouterBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("profileChanges")] public new string? ProfileChanges { get; set; } = string.Empty; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs index 58aeecf6..b2c325a6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterBase.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record ItemEventRouterBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] [JsonPropertyName("warnings")] @@ -21,8 +20,7 @@ public record ItemEventRouterBase public record Warning { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("index")] public int? Index { get; set; } @@ -39,8 +37,7 @@ public record Warning public record ProfileChange { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public string? Id { get; set; } @@ -102,8 +99,7 @@ public record ProfileChange public record HideoutStashItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -114,8 +110,7 @@ public record HideoutStashItem public record WeaponBuildChange { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -132,8 +127,7 @@ public record WeaponBuildChange public record EquipmentBuildChange { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -159,8 +153,7 @@ public record EquipmentBuildChange public record ItemChanges { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("new")] public List? NewItems { get; set; } @@ -174,8 +167,7 @@ public record ItemChanges public record DeletedItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -186,8 +178,7 @@ public record DeletedItem /// public record TraderData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("salesSum")] public double? SalesSum { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs index 673413a0..67ff230d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterRequest.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; public record ItemEventRouterRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("data")] public List? Data { get; set; } @@ -23,8 +22,7 @@ public record ItemEventRouterRequest : IRequestData public record Daum { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Action")] public string? Action { get; set; } @@ -53,8 +51,7 @@ public record Daum public record FromOwner { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -65,8 +62,7 @@ public record FromOwner public record To { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } @@ -80,8 +76,7 @@ public record To public record Location { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("x")] public int? X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs index 43ab550e..049ef443 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/ItemEvent/ItemEventRouterResponse.cs @@ -7,6 +7,5 @@ namespace SPTarkov.Server.Core.Models.Eft.ItemEvent; /// public record ItemEventRouterResponse : ItemEventRouterBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs index d41e59d3..e73ec7c5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/GetMiniProfileRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record GetMiniProfileRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("username")] public string? Username { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs index d049412c..c8ff4602 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/LoginRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record LoginRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("username")] public string? Username { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs index 9a8cf0e4..59d9d27c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Launcher/MiniProfile.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Launcher; public record MiniProfile { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("username")] public string? Username { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs index c77931fb..fdf200e9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/AirdropLootResult.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record AirdropLootResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("dropType")] public string? DropType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs index 255508a5..9907c88b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetAirdropLootRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("containerId")] public MongoId ContainerId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs index 3a45bec1..8ca9c10a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetAirdropLootResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetAirdropLootResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// The type of airdrop diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs index a021f061..1b5b45ec 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Location/GetLocationRequestData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Location; public record GetLocationRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs index a3fef313..9389751f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndLocalRaidRequestData.cs @@ -9,8 +9,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record EndLocalRaidRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// ID of server player just left @@ -39,8 +38,7 @@ public record EndLocalRaidRequestData : IRequestData public record EndRaidResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("profile")] public PmcData? Profile { get; set; } @@ -79,8 +77,7 @@ public record EndRaidResult public record LocationTransit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("hash")] public string? Hash { get; set; } @@ -124,8 +121,7 @@ public record LocationTransit public record TransitProfile { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs index 928d9579..e8de124e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/EndOfflineRaidRequestData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record EndOfflineRaidRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("crc")] public int? Crc { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs index fb820a06..8e33268a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/GroupCharacter.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record GroupCharacter { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public string? Id { get; set; } @@ -36,8 +35,7 @@ public record GroupCharacter public record CharacterInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Nickname")] public string? Nickname { get; set; } @@ -66,8 +64,7 @@ public record CharacterInfo public record PlayerVisualRepresentation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Info")] public VisualInfo? Info { get; set; } @@ -81,8 +78,7 @@ public record PlayerVisualRepresentation public record VisualInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Side")] public string? Side { get; set; } @@ -102,8 +98,7 @@ public record VisualInfo public record Customization { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Head")] public string? Head { get; set; } @@ -120,8 +115,7 @@ public record Customization public record Equipment { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs index 7e187825..cee8ba87 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupCurrentResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupCurrentResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("squad")] public List? Squad { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs index 1b90d534..ef31f2ca 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupInviteSendRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupInviteSendRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("to")] public string? To { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs index 6463e49b..b75fb080 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupJoinRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupJoinRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("location")] public string? Location { get; set; } @@ -26,8 +25,7 @@ public record MatchGroupJoinRequest : IRequestData public record JoinServer { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ping")] public int? Ping { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs index 7981e573..e3a7085e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupPlayerRemoveRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupPlayerRemoveRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("aidToKick")] public string? AidToKick { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs index 0b9a2437..c2b59cb5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStartGameRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStartGameRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("groupId")] public string? GroupId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs index 9a245696..98f0c473 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStatusRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("location")] public string? Location { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs index 1a5845b8..003e09c2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupStatusResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupStatusResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("players")] public List? Players { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs index 44711dde..43189163 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/MatchGroupTransferRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record MatchGroupTransferRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("aidToChange")] public string? AidToChange { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs index fb32a319..52027a82 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusRequest.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record ProfileStatusRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("groupId")] public int? GroupId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs index 86ace6af..40a5dd69 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/ProfileStatusResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record ProfileStatusResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("maxPveCountExceeded")] public bool? MaxPveCountExceeded { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs index 37023513..664022f2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/PutMetricsRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record PutMetricsRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("sid")] public string? SessionId { get; set; } @@ -38,8 +37,7 @@ public record PutMetricsRequestData : IRequestData public record SharedSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("StatedFieldOfView")] public double? StatedFieldOfView { get; set; } @@ -47,8 +45,7 @@ public record SharedSettings public record HardwareDescription { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("deviceUniqueIdentifier")] public string? DeviceUniqueIdentifier { get; set; } @@ -104,8 +101,7 @@ public record HardwareDescription public record ClientEvents { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MatchingCompleted")] public double? MatchingCompleted { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs index 6f5c97ae..f7f69211 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RaidSettings.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record RaidSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("keyId")] public string? KeyId { get; set; } @@ -55,8 +54,7 @@ public record RaidSettings public record TimeAndWeatherSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("isRandomTime")] public bool? IsRandomTime { get; set; } @@ -90,8 +88,7 @@ public record TimeAndWeatherSettings public record BotSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("isScavWars")] public bool? IsScavWars { get; set; } @@ -103,8 +100,7 @@ public record BotSettings public record WavesSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("botAmount")] [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs index dd0ec3c3..84eb46cb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/RequestIdRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record RequestIdRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("requestId")] public string? RequestId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs index 248de7e1..25626580 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/Server.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record Server { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ping")] public int? Ping { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs index 7550d119..6b7afc99 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/SessionStatus.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record SessionStatus { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("profileid")] public string? ProfileId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs index ca912f7d..4a1760b5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record StartLocalRaidRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("serverId")] public string? ServerId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs index aa7a7c00..81bfe548 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/StartLocalRaidResponseData.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record StartLocalRaidResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("serverId")] public string? ServerId { get; set; } @@ -35,8 +34,7 @@ public record StartLocalRaidResponseData public record ProfileInsuredItems { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("insuredItems")] public List? InsuredItems { get; set; } @@ -44,8 +42,7 @@ public record ProfileInsuredItems public record Transition { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("transitionType")] public TransitionType? TransitionType { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs index d3840cab..173a3020 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Match/UpdatePingRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Match; public record UpdatePingRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("servers")] public List? servers { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs index 980e7121..b6a6d3c7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notes/NoteActionRequest.cs @@ -14,8 +14,7 @@ public record NoteActionRequest : BaseInteractionRequestData public record Note { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Time")] public double? Time { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs index 4c99a299..9fa2b410 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/Notifier.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier; public record NotifierChannel { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("server")] public string? Server { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs index 643d4bad..e10e40d1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Notifier/SelectProfileResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Notifier; public record SelectProfileResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("status")] public string? Status { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs index 6e0d6d28..02076f3b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/PresetBuildActionRequestData.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.PresetBuild; public record PresetBuildActionRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Action")] public string? Action { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs index 01fb6cb8..17614652 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/PresetBuild/RemoveBuildRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.PresetBuild; public record RemoveBuildRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs index 28e82aa6..78741790 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/GetPrestigeResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Prestige; public record GetPrestigeResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("elements")] public List? Elements { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs index 23c827cb..08bb9454 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Prestige/ObtainPrestigeRequest.cs @@ -8,8 +8,7 @@ public class ObtainPrestigeRequestList : List, IRequestDa public record ObtainPrestigeRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -20,8 +19,7 @@ public record ObtainPrestigeRequest : IRequestData public record Location { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("x")] public int X { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs index 683aa90c..dc7ffc8b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CompletedAchievementsResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record CompletedAchievementsResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("elements")] public Dictionary? Elements { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs index 38ef6aeb..687542f2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ConnectResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ConnectResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("backendUrl")] public string? BackendUrl { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs index bbcbf283..eb045b86 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/CreateProfileResponse.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record CreateProfileResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("uid")] public string? UserId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs index bee70918..b37b2645 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetAchievementsResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetAchievementsResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("elements")] public List? Elements { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs index 290aa56f..e4add254 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetOtherProfileRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("accountId")] public string? AccountId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs index c19856e3..064ee7b7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetOtherProfileResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetOtherProfileResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId? Id { get; set; } @@ -54,8 +53,7 @@ public record GetOtherProfileResponse public record OtherProfileInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("nickname")] public string? Nickname { get; set; } @@ -81,8 +79,7 @@ public record OtherProfileInfo public record OtherProfileCustomization { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("head")] public string? Head { get; set; } @@ -105,8 +102,7 @@ public record OtherProfileCustomization public record OtherProfileEquipment { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Id")] public string? Id { get; set; } @@ -117,8 +113,7 @@ public record OtherProfileEquipment public record OtherProfileStats { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("eft")] public OtherProfileSubStats? Eft { get; set; } @@ -126,8 +121,7 @@ public record OtherProfileStats public record OtherProfileSubStats { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("totalInGameTime")] public long? TotalInGameTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs index 17a58e49..2d5ffa38 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileSettingsRequest.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetProfileSettingsRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Chosen value for profile.Info.SelectedMemberCategory diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs index feed4a83..fb7b6b1b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/GetProfileStatusResponseData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record GetProfileStatusResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("maxPveCountExceeded")] public bool? MaxPveCountExceeded { get; set; } = false; @@ -16,8 +15,7 @@ public record GetProfileStatusResponseData public record ProfileStatusData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("profileid")] public string? ProfileId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs index 2b12b387..0e6f1caf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/MessageContentRagfair.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record MessageContentRagfair { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("offerId")] public string? OfferId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs index cac14664..44e969be 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeNicknameRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileChangeNicknameRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs index 8239f256..ad77937b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileChangeVoiceRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileChangeVoiceRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("voice")] public MongoId Voice { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs index 8cd52f5d..552d0be7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ProfileCreateRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ProfileCreateRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("side")] public string? Side { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs index 971f9711..dc042aa1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchFriendResponse.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; /// public record SearchFriendResponse { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs index 1c559a43..689d867d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SearchProfilesRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SearchProfilesRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs index f51f28f5..ea485d9f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SptProfile.cs @@ -10,8 +10,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SptProfile { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("info")] public Info? ProfileInfo { get; set; } @@ -65,8 +64,7 @@ public record SptProfile public record TraderPurchaseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("count")] public double? PurchaseCount { get; set; } @@ -77,8 +75,7 @@ public record TraderPurchaseData public record Info { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// main profile id @@ -111,8 +108,7 @@ public record Info public record Characters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("pmc")] public PmcData? PmcData { get; set; } @@ -126,8 +122,7 @@ public record Characters /// public record UserBuilds { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("weaponBuilds")] public List? WeaponBuilds { get; set; } @@ -141,8 +136,7 @@ public record UserBuilds public record UserBuild { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Id")] public MongoId Id { get; set; } @@ -190,8 +184,7 @@ public record MagazineBuild : UserBuild public record MagazineTemplateAmmoItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("TemplateId")] public MongoId TemplateId { get; set; } @@ -211,8 +204,7 @@ public record DefaultEquipmentPreset : EquipmentBuild public record Dialogue { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("attachmentsNew")] public int? AttachmentsNew { get; set; } @@ -239,8 +231,7 @@ public record Dialogue //TODO: @Cleanup: Maybe the same as Dialogue? public record DialogueInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("attachmentsNew")] public int? AttachmentsNew { get; set; } @@ -266,8 +257,7 @@ public record DialogueInfo public record Message { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } @@ -317,8 +307,7 @@ public record Message public record ReplyTo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public string? Id { get; set; } @@ -338,8 +327,7 @@ public record ReplyTo public record MessagePreview { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("uid")] public string? UserId { get; set; } @@ -362,8 +350,7 @@ public record MessagePreview public record MessageItems { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("stash")] public MongoId? Stash { get; set; } @@ -374,8 +361,7 @@ public record MessageItems public record UpdatableChatMember { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Nickname")] public string? Nickname { get; set; } @@ -398,8 +384,7 @@ public record UpdatableChatMember public record Spt { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// What version of SPT was this profile made with @@ -452,8 +437,7 @@ public record Spt public record AcceptedCultistReward { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("timestamp")] public long? Timestamp { get; set; } @@ -467,8 +451,7 @@ public record AcceptedCultistReward public record PendingPrestige { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("prestigeLevel")] public int? PrestigeLevel { get; set; } @@ -479,8 +462,7 @@ public record PendingPrestige public record ModDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("name")] public string? Name { get; set; } @@ -500,8 +482,7 @@ public record ModDetails public record ReceivedGift { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("giftId")] public string? GiftId { get; set; } @@ -515,8 +496,7 @@ public record ReceivedGift public record Inraid { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("location")] public string? Location { get; set; } @@ -527,8 +507,7 @@ public record Inraid public record Insurance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("scheduledTime")] public int? ScheduledTime { get; set; } @@ -554,8 +533,7 @@ public record Insurance public record BtrDelivery { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs index 94980f64..8a577447 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/SystemData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record SystemData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("date")] public string? Date { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs index 37af15cb..ca90412c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/UserDialogInfo.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record UserDialogInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// _id @@ -24,8 +23,7 @@ public record UserDialogInfo public record UserDialogDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs index 802979be..1bf715bd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Profile/ValidateNicknameRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Profile; public record ValidateNicknameRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("nickname")] public string? Nickname { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs index 64426ea5..6db18847 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Quests/ListQuestsRequestData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Quests; public record ListQuestsRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("completed")] public bool? Completed { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs index 2a1fd051..21c0bfe2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/AddOfferRequestData.cs @@ -18,8 +18,7 @@ public record AddOfferRequestData : InventoryBaseActionRequestData public record Requirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_tpl")] public MongoId Template { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs index 9d292568..98978f5b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetMarketPriceRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetMarketPriceRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("templateId")] public MongoId TemplateId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs index 3de044bd..92268021 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetOffersResult.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetOffersResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("categories")] public Dictionary? Categories { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs index fa962f09..3a6d02d3 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/GetRagfairOfferByIdRequest.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record GetRagfairOfferByIdRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public int? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs index 1567631d..4c20f146 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/RagfairOffer.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record RagfairOffer { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("sellResult")] public List? SellResults { get; set; } @@ -95,8 +94,7 @@ public record RagfairOffer public record OfferRequirement { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_tpl")] public required MongoId TemplateId { get; set; } @@ -118,8 +116,7 @@ public record RagfairOfferUser { private string? _nickname; - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } @@ -152,8 +149,7 @@ public record RagfairOfferUser public record SellResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("sellTime")] public long? SellTime { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs index 22bed181..13fa3394 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record SearchRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("page")] public int? Page { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs index ceee69af..f3ca5e06 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SendRagfairReportRequestData.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record SendRagfairReportRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("offerId")] public int? OfferId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs index 2a8ad619..bf1a90da 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/StorePlayerOfferTaxAmountRequestData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ragfair; public record StorePlayerOfferTaxAmountRequestData : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs index 03f14499..bf1e6818 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/BaseRepairActionDataRequest.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Repair; public record BaseRepairActionDataRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Action")] public string? Action { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs index 012f7972..b72a1cbf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/RepairActionDataRequest.cs @@ -18,8 +18,7 @@ public record RepairActionDataRequest : InventoryBaseActionRequestData public record RepairKitsInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// id of repair kit to use diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs index 5d07c50d..f8eaa50c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Repair/TraderRepairActionDataRequest.cs @@ -15,8 +15,7 @@ public record TraderRepairActionDataRequest : InventoryBaseActionRequestData public record RepairItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs index f11097fd..ffdaf3b0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessRagfairTradeRequestData.cs @@ -12,8 +12,7 @@ public record ProcessRagfairTradeRequestData : InventoryBaseActionRequestData public record OfferRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public string? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs index 8993d50a..805a6801 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Trade/ProcessSellTradeRequestData.cs @@ -14,8 +14,7 @@ public record ProcessSellTradeRequestData : ProcessBaseTradeRequestData public record SoldItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs index 93abc5a7..2501e598 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Weather/WeatherData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Weather; public record WeatherData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("acceleration")] public double? Acceleration { get; set; } @@ -26,8 +25,7 @@ public record WeatherData public record Weather { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("pressure")] public double? Pressure { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs index 71f02fbd..8d19163c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ws/WsNotificationEvent.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Eft.Ws; public record WsNotificationEvent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("type")] [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs index cb8f03be..4987fb20 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/AccountTypes.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record AccountTypes { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string SPT_DEVELOPER = "spt developer"; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs index 91f640cc..f90a4314 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/GameEditions.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record GameEditions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string STANDARD = "standard"; public const string LEFT_BEHIND = "left_behind"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs index ec3d24b5..40d9c94c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HideoutEventActions.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record HideoutEventActions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string HIDEOUT_UPGRADE = "HideoutUpgrade"; public const string HIDEOUT_UPGRADE_COMPLETE = "HideoutUpgradeComplete"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs index 815adf85..9b892d49 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ItemEventActions.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record ItemEventActions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string MOVE = "Move"; public const string REMOVE = "Remove"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs index 5a9fcc7b..90f5e9fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Money.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Enums; public record Money { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public static readonly MongoId ROUBLES = new("5449016a4bdc2d6f028b456f"); public static readonly MongoId EUROS = new("569668774bdc2da2298b4568"); diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs index 58479226..78eba1e0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotDetailsForChatMessages.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotDetailsForChatMessages { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Nickname { get; set; } = string.Empty; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs index 5b6ba063..ed54cbbe 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotGenerationDetails.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotGenerationDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Should the bot be generated as a PMC diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs index b51823bf..587be4cd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/BotLootCache.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record BotLootCache { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("backpackLoot")] public Dictionary BackpackLoot { get; set; } = []; @@ -50,8 +49,7 @@ public record BotLootCache public record LootCacheType { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public const string Special = "Special"; public const string Backpack = "Backpack"; diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs index 4a4f635c..b06e04f5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/Bots.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record Bots { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("types")] public required Dictionary Types { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs index 512ac381..2b7ac140 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ChooseRandomCompatibleModResult.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ChooseRandomCompatibleModResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("incompatible")] public bool? Incompatible { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs index 6c3168dc..9f21ece9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/FilterPlateModsForSlotByLevelResult.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record FilterPlateModsForSlotByLevelResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("result")] public Result? Result { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs index 13c643ac..2fde6572 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateEquipmentProperties.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateEquipmentProperties { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public MongoId BotId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs index b93a5ca0..00a0e780 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateWeaponRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Weapon to add mods to / result that is returned @@ -72,8 +71,7 @@ public record GenerateWeaponRequest public record BotData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Role of bot weapon is generated for @@ -96,8 +94,7 @@ public record BotData public record WeaponStats { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("hasOptic")] public bool? HasOptic { get; set; } @@ -111,8 +108,7 @@ public record WeaponStats public record BotModLimits { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("scope")] public ItemCount? Scope { get; set; } @@ -135,8 +131,7 @@ public record BotModLimits public record ItemCount { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("count")] public int? Count { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs index d3608b82..32e5e763 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/GenerateWeaponResult.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record GenerateWeaponResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("weapon")] public List? Weapon { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs index d934be32..f2660164 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ItemSpawnLimitSettings.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ItemSpawnLimitSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("currentLimits")] public Dictionary? CurrentLimits { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs index f9f365d8..495d86ad 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Bots/ModToSpawnRequest.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Bots; public record ModToSpawnRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Slot mod will fit into diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs index 9bf98dd6..7792a9db 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/AirdropConfig.cs @@ -27,8 +27,7 @@ public record AirdropConfig : BaseConfig /// public record AirdropLoot { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("icon")] [JsonConverter(typeof(JsonStringEnumConverter))] diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs index 6b51fa93..c965d6b1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BackupConfig.cs @@ -22,8 +22,7 @@ public record BackupConfig : BaseConfig public record BackupConfigInterval { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs index 45d6d8ca..f050273c 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BaseConfig.cs @@ -10,8 +10,7 @@ public abstract record BaseConfig public record RunIntervalValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("inRaid")] public int InRaid { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs index 536b7d4b..270eadb4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs @@ -135,8 +135,7 @@ public record BotConfig : BaseConfig public record WeeklyBossSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Should a weekly boss be picked to 100% spawn @@ -160,8 +159,7 @@ public record WeeklyBossSettings public record WalletLootSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Chance wallets have loot in them @@ -187,8 +185,7 @@ public record WalletLootSettings public record EquipmentFilters { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Limits for mod types per weapon .e.g. scopes @@ -292,8 +289,7 @@ public record EquipmentFilters public record ModLimits { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// How many scopes are allowed on a weapon - hard coded to work with OPTIC_SCOPE, ASSAULT_SCOPE, COLLIMATOR, COMPACT_COLLIMATOR @@ -310,8 +306,7 @@ public record ModLimits public record RandomisationDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Between what levels do these randomisation setting apply to @@ -364,8 +359,7 @@ public record RandomisationDetails public record NighttimeChanges { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Applies changes to values stored in equipmentMods @@ -376,8 +370,7 @@ public record NighttimeChanges public record EquipmentFilterDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Between what levels do these equipment filter setting apply to @@ -400,8 +393,7 @@ public record EquipmentFilterDetails public record WeightingAdjustmentDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Between what levels do these weight settings apply to @@ -430,8 +422,7 @@ public record WeightingAdjustmentDetails public record AdjustmentDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("add")] public Dictionary>? Add { get; set; } @@ -442,8 +433,7 @@ public record AdjustmentDetails public class ArmorPlateWeights { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("levelRange")] public required MinMax LevelRange { get; set; } @@ -454,8 +444,7 @@ public class ArmorPlateWeights public record RandomisedResourceDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("food")] public RandomisedResourceValues? Food { get; set; } @@ -466,8 +455,7 @@ public record RandomisedResourceDetails public record RandomisedResourceValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Minimum percent of item to randomized between min and max resource diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs index 8d9e3e7e..f10b2c2f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotDurability.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Config; public record BotDurability { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("default")] public required DefaultDurability Default { get; set; } @@ -22,8 +21,7 @@ public record BotDurability /// public record DefaultDurability { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("armor")] public required ArmorDurability Armor { get; set; } @@ -34,8 +32,7 @@ public record DefaultDurability public record PmcDurability { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("armor")] public required PmcDurabilityArmor Armor { get; set; } @@ -46,8 +43,7 @@ public record PmcDurability public record PmcDurabilityArmor { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("lowestMaxPercent")] public int LowestMaxPercent { get; set; } @@ -67,8 +63,7 @@ public record PmcDurabilityArmor public record ArmorDurability { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("maxDelta")] public int MaxDelta { get; set; } @@ -88,8 +83,7 @@ public record ArmorDurability public record WeaponDurability { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("lowestMax")] public int LowestMax { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs index 81bef520..8612af95 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/CoreConfig.cs @@ -69,8 +69,7 @@ public record CoreConfig : BaseConfig public record BsgLogging { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// verbosity of what to log, yes I know this is backwards, but its how nlog deals with ordinals.
@@ -96,8 +95,7 @@ public record BsgLogging public record Release { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Disclaimer outlining the intended usage of bleeding edge @@ -180,8 +178,7 @@ public record Release public record GameFixes { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Shotguns use a different value than normal guns causing huge pellet dispersion @@ -210,8 +207,7 @@ public record GameFixes public record ServerFeatures { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("compressProfile")] public bool CompressProfile { get; set; } @@ -234,8 +230,7 @@ public record ServerFeatures public record ChatbotFeatures { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("sptFriendGiftsEnabled")] public bool SptFriendGiftsEnabled { get; set; } @@ -261,8 +256,7 @@ public record ChatbotFeatures public record CommandoFeatures { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("giveCommandEnabled")] public bool GiveCommandEnabled { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs index d003c942..e298252e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs @@ -18,8 +18,7 @@ public record GiftsConfig : BaseConfig public record Gift { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Items to send to player diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs index 591796c9..16a54945 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs @@ -16,8 +16,7 @@ public record HealthConfig : BaseConfig public record HealthMultipliers { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("blacked")] public double Blacked { get; set; } @@ -25,8 +24,7 @@ public record HealthMultipliers public record HealthSave { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("health")] public bool Health { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs index 2c83e5e2..713507cf 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs @@ -48,8 +48,7 @@ public record HideoutConfig : BaseConfig public record HideoutCraftToAdd { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// The new mongoId for the craft to use @@ -69,8 +68,7 @@ public record HideoutCraftToAdd public record CultistCircleSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("maxRewardItemCount")] public int MaxRewardItemCount { get; set; } @@ -147,8 +145,7 @@ public record CraftTimeThreshold : MinMax public record DirectRewardSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("reward")] public required List Reward { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs index 709555d7..263f78a0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs @@ -64,8 +64,7 @@ public record InRaidConfig : BaseConfig public record RaidMenuSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("aiAmount")] public required string AiAmount { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs index c1b87212..ef49de14 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs @@ -35,8 +35,7 @@ public record InventoryConfig : BaseConfig public record RewardDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_type")] public string? Type { get; set; } @@ -56,8 +55,7 @@ public record RewardDetails public record SealedAirdropContainerSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("weaponRewardWeight")] public required Dictionary WeaponRewardWeight { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs index 73e9b253..4848ee97 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ItemConfig.cs @@ -51,8 +51,7 @@ public record ItemConfig : BaseConfig public record HandbookPriceOverride { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Price in roubles diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs index 871b5d9c..bf1b3ce7 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LocationConfig.cs @@ -144,8 +144,7 @@ public record LocationConfig : BaseConfig public record TransitSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("effectsToRemove")] public HashSet? EffectsToRemove { get; set; } @@ -159,8 +158,7 @@ public record TransitSettings public record ReserveRaiderSpawnChanceOverrides { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("nonTriggered")] public int NonTriggered { get; set; } @@ -171,8 +169,7 @@ public record ReserveRaiderSpawnChanceOverrides public record EquipmentLootSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Percentage chance item will be added to equipment @@ -183,8 +180,7 @@ public record EquipmentLootSettings public record RogueLighthouseSpawnTimeSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -195,8 +191,7 @@ public record RogueLighthouseSpawnTimeSettings public record CustomWaves { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Bosses spawn on raid start @@ -216,8 +211,7 @@ public record BotTypeLimit : MinMax public record ContainerRandomisationSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -243,8 +237,7 @@ public record ContainerRandomisationSettings public record ScavRaidTimeSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("settings")] public required ScavRaidTimeConfigSettings Settings { get; set; } @@ -255,8 +248,7 @@ public record ScavRaidTimeSettings public record ScavRaidTimeConfigSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("trainArrivalDelayObservedSeconds")] public int TrainArrivalDelayObservedSeconds { get; set; } @@ -264,8 +256,7 @@ public record ScavRaidTimeConfigSettings public record ScavRaidTimeLocationSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Should loot be reduced by same percent length of raid is reduced by diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs index bfdb1bfc..38f999f8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/LostOnDeathConfig.cs @@ -31,8 +31,7 @@ public record LostOnDeathConfig : BaseConfig public record LostEquipment { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ArmBand")] public bool ArmBand { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs index 5935226e..8372451d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs @@ -16,8 +16,7 @@ public record PlayerScavConfig : BaseConfig public record KarmaLevel { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("botTypeForLoot")] public required string BotTypeForLoot { get; set; } @@ -37,8 +36,7 @@ public record KarmaLevel public record Modifiers { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("equipment")] public required Dictionary Equipment { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs index ee6e385b..5c8aa36d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcChatResponse.cs @@ -16,8 +16,7 @@ public record PmcChatResponse : BaseConfig public record ResponseSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("responseChancePercent")] public double ResponseChancePercent { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs index 8e1ef3ca..ae873aa2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs @@ -151,8 +151,7 @@ public record PmcConfig : BaseConfig public record ForceArmbandSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -166,8 +165,7 @@ public record ForceArmbandSettings public record PmcLootSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("pocket")] public LootContainerSettings Pocket { get; set; } @@ -181,8 +179,7 @@ public record PmcLootSettings public record LootContainerSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("totalRubByLevel")] public List TotalRubByLevel { get; set; } @@ -193,8 +190,7 @@ public record LootContainerSettings public record HostilitySettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Bot roles that are 100% an enemy @@ -229,8 +225,7 @@ public record HostilitySettings public record SlotLootSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Item Type whitelist diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs index 3ce35421..ee532111 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/QuestConfig.cs @@ -74,8 +74,7 @@ public record QuestConfig : BaseConfig public record RepeatableQuestTemplates { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Pmc repeatable quest template ids keyed by type of quest @@ -94,8 +93,7 @@ public record RepeatableQuestTemplates public record EventQuestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Name of the event quest @@ -131,8 +129,7 @@ public record EventQuestData public record RepeatableQuestConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Id for type of repeatable quest @@ -247,8 +244,7 @@ public record RepeatableQuestConfig public record RewardScaling { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Levels at which to increase to the next level of reward potential @@ -307,8 +303,7 @@ public record RewardScaling public record TraderWhitelist { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Trader Id @@ -349,8 +344,7 @@ public record TraderWhitelist public record RepeatableQuestTypesConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Defines exploration repeatable task generation parameters @@ -400,8 +394,7 @@ public record Exploration : BaseQuestConfig public record SpecificExits { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Chance that an operational task is generated with a specific extract @@ -492,8 +485,7 @@ public record Pickup : BaseQuestConfig public record PickupTypeWithMaxCount { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("itemType")] public string? ItemType { get; set; } @@ -624,8 +616,7 @@ public record EliminationConfig : BaseQuestConfig public record BaseQuestConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Possible skills that can be rewarded expirence points @@ -636,8 +627,7 @@ public record BaseQuestConfig public record BossInfo { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Is this target a boss diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs index 7033b4cf..de6b6683 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs @@ -41,8 +41,7 @@ public record RagfairConfig : BaseConfig public record Sell { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Should a fee be deducted from player when listing an item for sale @@ -71,8 +70,7 @@ public record Sell public record Chance { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Base chance percent to sell an item @@ -101,8 +99,7 @@ public record Chance public record Dynamic { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Should a purchased dynamic offers items be flagged as found in raid @@ -240,8 +237,7 @@ public record Dynamic public record PriceRanges { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("default")] public required MinMax Default { get; set; } @@ -255,8 +251,7 @@ public record PriceRanges public record BarterDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Percentage change an offer is listed as a barter @@ -303,8 +298,7 @@ public record BarterDetails public record PackDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Percentage change an offer is listed as a pack @@ -333,8 +327,7 @@ public record PackDetails public record OfferAdjustment { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Shuld offer price be adjusted when below handbook price @@ -363,8 +356,7 @@ public record OfferAdjustment public record Condition { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Percentage change durability is altered @@ -384,8 +376,7 @@ public record Condition public record RagfairBlacklist { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Damaged ammo packs @@ -438,8 +429,7 @@ public record RagfairBlacklist public record ArmorPlateBlacklistSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Max level of plates an armor can have without being removed @@ -456,8 +446,7 @@ public record ArmorPlateBlacklistSettings public record UnreasonableModPrices { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Enable a system that adjusts very high ragfair prices to be below a max multiple of items the handbook values @@ -483,8 +472,7 @@ public record UnreasonableModPrices public record ArmorSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// % chance / 100 that armor plates will be removed from an offer before listing @@ -501,8 +489,7 @@ public record ArmorSettings public record TieredFlea { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs index 9d222e29..f7715c45 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs @@ -38,8 +38,7 @@ public record RepairConfig : BaseConfig public record IntellectGainValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("weapon")] public double Weapon { get; set; } @@ -50,8 +49,7 @@ public record IntellectGainValues public record MaxIntellectGainValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("kit")] public double Kit { get; set; } @@ -62,8 +60,7 @@ public record MaxIntellectGainValues public record WeaponTreatmentRepairValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// The chance to gain more weapon maintenance skill @@ -92,8 +89,7 @@ public record WeaponTreatmentRepairValues public record RepairKit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("armor")] public required BonusSettings Armor { get; set; } @@ -110,8 +106,7 @@ public record RepairKit public record BonusSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("rarityWeight")] public required Dictionary RarityWeight { get; set; } @@ -128,8 +123,7 @@ public record BonusSettings public record BonusValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("valuesMinMax")] public required MinMax ValuesMinMax { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs index a9592ee8..fd03645a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/ScavCaseConfig.cs @@ -35,8 +35,7 @@ public record ScavCaseConfig : BaseConfig public record MoneyRewards { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("moneyRewardChancePercent")] public int MoneyRewardChancePercent { get; set; } @@ -56,8 +55,7 @@ public record MoneyRewards public record MoneyLevels { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("common")] public required MinMax Common { get; set; } @@ -71,8 +69,7 @@ public record MoneyLevels public record AmmoRewards { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ammoRewardChancePercent")] public int AmmoRewardChancePercent { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs index 29efffff..5957f2e5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/SeasonalEventConfig.cs @@ -65,8 +65,7 @@ public record SeasonalEventConfig : BaseConfig public record SeasonalEvent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool Enabled { get; set; } @@ -105,8 +104,7 @@ public record SeasonalEvent public record SeasonalEventSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enableSummoning")] public bool? EnableSummoning { get; set; } @@ -150,8 +148,7 @@ public record SeasonalEventSettings public record ZombieSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("enabled")] public bool? Enabled { get; set; } @@ -168,8 +165,7 @@ public record ZombieSettings public record GifterSetting { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("map")] public string? Map { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs index 305a95ef..0565897a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs @@ -36,8 +36,7 @@ public record TraderConfig : BaseConfig public record UpdateTime { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_name")] public string Name { get; set; } = string.Empty; @@ -54,8 +53,7 @@ public record UpdateTime public record FenceConfig { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("discountOptions")] public required DiscountOptions DiscountOptions { get; set; } @@ -159,8 +157,7 @@ public record FenceConfig public record ItemDurabilityCurrentMax { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("current")] public required MinMax Current { get; set; } @@ -186,8 +183,7 @@ public record CoopExtractReward : LootRequest public record DiscountOptions { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("assortSize")] public int AssortSize { get; set; } @@ -210,8 +206,7 @@ public record DiscountOptions /// public record ModdedTraders { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Trader Ids to enable the clothing service for diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs index ce719e0a..9500eb23 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs @@ -25,8 +25,7 @@ public record WeatherConfig : BaseConfig public record SeasonDateTimes { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("seasonType")] public Season? SeasonType { get; set; } @@ -53,8 +52,7 @@ public record SeasonDateTimes public record WeatherValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("seasonValues")] public Dictionary? SeasonValues { get; set; } @@ -74,8 +72,7 @@ public record WeatherValues public record SeasonalValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("clouds")] public WeatherSettings? Clouds { get; set; } @@ -107,8 +104,7 @@ public record SeasonalValues public record TempDayNight { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("day")] public MinMax? Day { get; set; } @@ -119,8 +115,7 @@ public record TempDayNight public record WeatherSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("values")] public List? Values { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs index 72b41f81..11cfd255 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Dialog/SendMessageDetails.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Dialog; public record SendMessageDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Player id @@ -92,8 +91,7 @@ public record SendMessageDetails public record ProfileChangeEvent { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("_id")] public MongoId? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs index c3bdb0c5..dd0ffc45 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/CreateFenceAssortsResult.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Fence; public record CreateFenceAssortsResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("sptItems")] public List>? SptItems { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs index d64cf178..ab1ab4c6 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Fence/FenceAssortGenerationValues.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Fence; public record FenceAssortGenerationValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("normal")] public GenerationAssortValues? Normal { get; set; } @@ -16,8 +15,7 @@ public record FenceAssortGenerationValues public record GenerationAssortValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("item")] public int? Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs index 6b0a800c..706cc377 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Helper/WeightedRandomResult.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Helper; public record WeightedRandomResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required T Item { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs index ee470614..b7b42b9e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/CircleCraftDetails.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record CircleCraftDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("time")] public required long Time { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs index 968aec45..0b6834dc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/Hideout.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record Hideout { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("areas")] public required List Areas { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs index 5086f66c..6e5fc492 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Hideout/ScavCaseRewardCountsAndPrices.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Hideout; public record ScavCaseRewardCountsAndPrices { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Common")] public RewardCountAndPriceDetails? Common { get; set; } @@ -19,8 +18,7 @@ public record ScavCaseRewardCountsAndPrices public record RewardCountAndPriceDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("minCount")] public double? MinCount { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs index 26422fd1..b0705e8e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/FindSlotResult.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory; public class FindSlotResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public FindSlotResult(bool success) { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs index 77e31a1b..75b1ad9e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/ItemSize.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory; public record ItemSize { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("width")] public required int Width { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs index 0f30c51f..7a1adae8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Inventory/OwnerInventoryItems.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Inventory; public record OwnerInventoryItems { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Inventory items from source diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs index 50156fac..4a0a8a7f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2CompatibleVersion.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2CompatibleVersion : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required string SptVersion { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs index 0f8d57ff..5fe6d408 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2LoginResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2LoginResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required bool Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs index 04c07582..f75d1b50 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ModsResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ModsResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required Dictionary Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs index 7c0f7e3e..e0064fc4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PasswordChangeResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2PasswordChangeResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required bool Response { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs index 8ed1916f..114d9196 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2PingResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2PingResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required string Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs index 45cdc20f..77b44c43 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfileResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ProfileResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public SptProfile Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs index e6419612..b6f46c8e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2ProfilesResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2ProfilesResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required List Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs index ad9f82f2..014c014a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RegisterResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2RegisterResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required bool Response { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs index a826277a..98f528d8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2RemoveResponse.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2RemoveResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required bool Response { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs index faff239d..84158a3e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2TypesResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public class LauncherV2TypesResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required Dictionary Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs index 93e74d05..a7c60130 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Launcher/LauncherV2VersionResponse.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Launcher; public record LauncherV2VersionResponse : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required LauncherV2CompatibleVersion Response { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs index 80f9dd94..9f6b5916 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Location/RaidChanges.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Location; public record RaidChanges { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// What percentage of dynamic loot should the map contain @@ -52,8 +51,7 @@ public record RaidChanges public record ExtractChange { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Name")] public string? Name { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs index 602637d5..8ddb7ce8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Logging/ClientLogRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Logging; public record ClientLogRequest : IRequestData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Source")] public string? Source { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs index 769b19a0..d3ed864d 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/ModOrder.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Mod; public class ModOrder { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("order")] public List Order { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs index f48ae90d..81cd8918 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/NewItemDetails.cs @@ -40,8 +40,7 @@ public record NewItemFromCloneDetails : NewItemDetailsBase public record NewItemDetailsBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("fleaPriceRoubles")] public double? FleaPriceRoubles { get; set; } @@ -58,8 +57,7 @@ public record NewItemDetailsBase public record LocaleDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("name")] public string? Name { get; set; } @@ -73,8 +71,7 @@ public record LocaleDetails public record CreateItemResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public CreateItemResult() { diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs index d0e4a371..808c3ae0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Mod/SptMod.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Mod; public class SptMod { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("directory")] public required string Directory { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs index 1856d4fe..eea99bce 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Presets/PresetCacheDetails.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Presets; public record PresetCacheDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // Preset Ids related to the tpl public HashSet PresetIds { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs index 6bb2c860..72d33208 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Quests/GetRepeatableByIdResult.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Quests; public record GetRepeatableByIdResult { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("quest")] public RepeatableQuest? Quest { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs index 466765ce..7ddf6b69 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/CreateFleaOfferDetails.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record CreateFleaOfferDetails { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Owner of the offer diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs index a5f643d2..47ed477f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/RagfairServerPrices.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record RagfairServerPrices { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("staticPrices")] public Dictionary? StaticPrices { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs index 080558f4..5c5768fd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Ragfair/TplWithFleaPrice.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Ragfair; public record TplWithFleaPrice { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("tpl")] public MongoId Tpl { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs index 611a28be..cc8f489f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestRewardValues.cs @@ -4,8 +4,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable; public record QuestRewardValues { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("skillPointReward")] public required double SkillPointReward { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs index cd17a539..9b7a6637 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Repeatable/QuestTypePool.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Repeatable; public record QuestTypePool { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("types")] public required List Types { get; set; } @@ -17,8 +16,7 @@ public record QuestTypePool public record QuestPool { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Exploration")] public required ExplorationPool Exploration { get; set; } @@ -32,8 +30,7 @@ public record QuestPool public record ExplorationPool { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("locations")] public Dictionary>? Locations { get; set; } // TODO: check the type, originally - Partial> @@ -41,8 +38,7 @@ public record ExplorationPool public record EliminationPool { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("targets")] public Dictionary? Targets { get; set; } @@ -50,8 +46,7 @@ public record EliminationPool public record TargetLocation { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("locations")] public List? Locations { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs index 26fefc3f..275ec5cc 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/DatabaseTables.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record DatabaseTables { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public required Bots.Bots Bots { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs index 8666e0b9..a7739eb2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/LocaleBase.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record LocaleBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// DO NOT USE THIS PROPERTY DIRECTLY, USE LOCALESERVICE INSTEAD diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs index 8ea37612..bd733405 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/Locations.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record Locations { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + // sometimes we get the key or value given so save changing logic in each place // have it key both diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs index 548f1c08..7526e27a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/ServerBase.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; /// public record ServerBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("ip")] public required string Ip { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs index efb19b4c..9ec1d028 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Server/SettingsBase.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Server; public record SettingsBase { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("config")] public required Config Configuration { get; init; } @@ -14,8 +13,7 @@ public record SettingsBase public record Config { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AFKTimeoutSeconds")] public int AFKTimeoutSeconds { get; set; } @@ -104,8 +102,7 @@ public record Config public record AudioSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AudioGroupPresets")] public List AudioGroupPresets { get; set; } @@ -128,8 +125,7 @@ public record AudioSettings public record FramerateLimit { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("MaxFramerateGameLimit")] public int MaxFramerateGameLimit { get; set; } @@ -143,8 +139,7 @@ public record FramerateLimit public record MemoryManagementSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AggressiveGC")] public bool AggressiveGC { get; set; } @@ -167,8 +162,7 @@ public record MemoryManagementSettings public record ReleaseProfiler { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("Enabled")] public bool Enabled { get; set; } @@ -182,8 +176,7 @@ public record ReleaseProfiler public record NetworkStateView { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("LossThreshold")] public int LossThreshold { get; set; } @@ -194,8 +187,7 @@ public record NetworkStateView public record AudioGroupPreset { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AngleToAllowBinaural")] public double? AngleToAllowBinaural { get; set; } @@ -230,8 +222,7 @@ public record AudioGroupPreset public record EnvironmentSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("AutumnLateSettings")] public SeasonEnvironmentSettings AutumnLateSettings { get; set; } @@ -260,8 +251,7 @@ public record EnvironmentSettings public record SeasonEnvironmentSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("RainSettings")] public List RainSettings { get; set; } @@ -275,8 +265,7 @@ public record SeasonEnvironmentSettings public record SurfaceMultiplier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string SurfaceType { get; set; } @@ -285,8 +274,7 @@ public record SurfaceMultiplier public record WindMultiplier { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("VolumeMult")] public double VolumeMult { get; set; } @@ -297,8 +285,7 @@ public record WindMultiplier public record RainSetting { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("IndoorVolumeMult")] public int IndoorVolumeMult { get; set; } @@ -312,8 +299,7 @@ public record RainSetting public record HeadphoneSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public double FadeDuration { get; set; } @@ -324,8 +310,7 @@ public record HeadphoneSettings public record MetaXRAudioPluginSettings { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public bool EnabledPluginErrorChecker { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs index 119519ea..9bcda5f1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/InsuranceEquipmentPkg.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record InsuranceEquipmentPkg { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("sessionID")] public MongoId SessionId { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs index d2c2eb99..44d1b0a8 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootItem.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record LootItem { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("id")] public MongoId? Id { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs index f69d76be..6933e9e4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/LootRequest.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record LootRequest { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + /// /// Count of weapons to generate diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs index b454312b..548b64fe 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/ProfileActivityData.cs @@ -6,8 +6,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public class ProfileActivityData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public long ClientStartedTimestamp { get; set; } public long LastActive { get; set; } @@ -17,8 +16,7 @@ public class ProfileActivityData public class ProfileActivityRaidData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public GetRaidConfigurationRequestData? RaidConfiguration { get; set; } = null; public RaidChanges? RaidAdjustments { get; set; } = null; @@ -27,8 +25,7 @@ public class ProfileActivityRaidData public record ProfileActiveClientMods { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("modName")] public required string Name { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs index 59780e4f..098a05ee 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Services/TraderServiceModel.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Services; public record TraderServiceModel { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("serviceType")] [JsonConverter(typeof(JsonStringEnumConverter))] @@ -27,8 +26,7 @@ public record TraderServiceModel public record TraderServiceRequirementsModel { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("completedQuests")] public List? CompletedQuests { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs index 6fc06c54..ea2e71fd 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs @@ -7,8 +7,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Templates; public record Templates { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("character")] public required List Character { get; init; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs index 3b933447..a67907a4 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Weather/GetLocalWeatherResponseData.cs @@ -5,8 +5,7 @@ namespace SPTarkov.Server.Core.Models.Spt.Weather; public record GetLocalWeatherResponseData { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + [JsonPropertyName("season")] public Season? Season { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs index f0a00ebd..afdebde1 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Trader/Traders.cs @@ -8,8 +8,7 @@ namespace SPTarkov.Server.Core.Models; [Injectable] public record Prapor : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Prapor"; public MongoId Id { get; } = Traders.PRAPOR; @@ -18,8 +17,7 @@ public record Prapor : ITrader [Injectable] public record Therapist : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Therapist"; public MongoId Id { get; } = Traders.THERAPIST; @@ -28,8 +26,7 @@ public record Therapist : ITrader [Injectable] public record Fence : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Fence"; public MongoId Id { get; } = Traders.FENCE; @@ -38,8 +35,7 @@ public record Fence : ITrader [Injectable] public record Skier : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Skier"; public MongoId Id { get; } = Traders.SKIER; @@ -48,8 +44,7 @@ public record Skier : ITrader [Injectable] public record Peacekeeper : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Peacekeeper"; public MongoId Id { get; } = Traders.PEACEKEEPER; @@ -58,8 +53,7 @@ public record Peacekeeper : ITrader [Injectable] public record Mechanic : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Mechanic"; public MongoId Id { get; } = Traders.MECHANIC; @@ -68,8 +62,7 @@ public record Mechanic : ITrader [Injectable] public record Ragman : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Ragman"; public MongoId Id { get; } = Traders.RAGMAN; @@ -78,8 +71,7 @@ public record Ragman : ITrader [Injectable] public record Jaeger : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Jaeger"; public MongoId Id { get; } = Traders.JAEGER; @@ -88,8 +80,7 @@ public record Jaeger : ITrader [Injectable] public record LighthouseKeeper : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "LighthouseKeeper"; public MongoId Id { get; } = Traders.LIGHTHOUSEKEEPER; @@ -98,8 +89,7 @@ public record LighthouseKeeper : ITrader [Injectable] public record Btr : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Btr"; public MongoId Id { get; } = Traders.BTR; @@ -108,8 +98,7 @@ public record Btr : ITrader [Injectable] public record Ref : ITrader { - [JsonExtensionData] - public Dictionary ExtensionData { get; init; } = []; + public string Name { get; } = "Ref"; public MongoId Id { get; } = Traders.REF; diff --git a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj index 82754f00..e3961be2 100644 --- a/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj +++ b/Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj @@ -30,6 +30,7 @@ + + + + diff --git a/Patches/Ceciler.JsonExtensionData/Ceciler.JsonExtensionData.csproj b/Patches/Ceciler.JsonExtensionData/Ceciler.JsonExtensionData.csproj new file mode 100644 index 00000000..a54098c9 --- /dev/null +++ b/Patches/Ceciler.JsonExtensionData/Ceciler.JsonExtensionData.csproj @@ -0,0 +1,17 @@ + + + net9.0 + enable + enable + + + + ..\..\Ceciler\Ceciler.Interfaces.dll + + + + + all + + + diff --git a/Patches/Ceciler.JsonExtensionData/JsonExtensionDataPatch.cs b/Patches/Ceciler.JsonExtensionData/JsonExtensionDataPatch.cs new file mode 100644 index 00000000..e7df3f4c --- /dev/null +++ b/Patches/Ceciler.JsonExtensionData/JsonExtensionDataPatch.cs @@ -0,0 +1,108 @@ +using Ceciler.Interfaces; +using Mono.Cecil; +using Mono.Cecil.Cil; +using Mono.Cecil.Rocks; + +namespace Ceciler.JsonExtensionData; + +public class JsonExtensionDataPatch : IPatcher +{ + private TypeReference? _dictionaryStringObjectReference; + + + private MethodReference? _jsonExtensionDataAttributeReference; + + + private MethodReference? _jsonIgnoreAttributeReference; + + + public void Patch(AssemblyDefinition assembly) + { + _dictionaryStringObjectReference ??= assembly.MainModule.ImportReference(typeof(Dictionary)); + + if (_jsonExtensionDataAttributeReference is null) + { + var jsonConstructorReference = assembly.MainModule.AssemblyResolver + .Resolve(AssemblyNameReference.Parse("System.Text.Json")).MainModule + .GetType("System.Text.Json.Serialization.JsonExtensionDataAttribute").Methods + .First(m => m.IsConstructor && !m.HasParameters); + + _jsonExtensionDataAttributeReference = assembly.MainModule.ImportReference(jsonConstructorReference); + } + + if (_jsonIgnoreAttributeReference is null) + { + var jsonIgnoreConstructorReference = assembly.MainModule.AssemblyResolver + .Resolve(AssemblyNameReference.Parse("System.Text.Json")).MainModule + .GetType("System.Text.Json.Serialization.JsonIgnoreAttribute").Methods + .First(m => m.IsConstructor && !m.HasParameters); + + _jsonIgnoreAttributeReference = assembly.MainModule.ImportReference(jsonIgnoreConstructorReference); + } + + var processed = new HashSet(); + foreach (var typeDefinition in assembly.MainModule.Types) + { + if (!typeDefinition.Namespace.Contains("SPTarkov.Server.Core.Models") || + typeDefinition.IsInterface || + typeDefinition.IsEnum || + processed.Contains(typeDefinition.FullName)) + { + continue; + } + + var propertyDefinition = new PropertyDefinition("ExtensionData", PropertyAttributes.None, _dictionaryStringObjectReference); + propertyDefinition.CustomAttributes.Add(new CustomAttribute(_jsonExtensionDataAttributeReference)); + + // Add backing field + var field = new FieldDefinition("_extensionData", + FieldAttributes.Private, + _dictionaryStringObjectReference); + + field.CustomAttributes.Add(new CustomAttribute(_jsonIgnoreAttributeReference)); + typeDefinition.Fields.Add(field); + + // Add getter + var get = new MethodDefinition("get_ExtensionData", + MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig, + _dictionaryStringObjectReference); + + get.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_0)); + get.Body.Instructions.Add(Instruction.Create(OpCodes.Ldfld, field)); + get.Body.Instructions.Add(Instruction.Create(OpCodes.Ret)); + + propertyDefinition.GetMethod = get; + + typeDefinition.Methods.Add(get); + + // Add setter + var set = new MethodDefinition("set_ExtensionData", + MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig, + assembly.MainModule.TypeSystem.Void); + + set.Parameters.Add(new ParameterDefinition("value", ParameterAttributes.None, _dictionaryStringObjectReference)); + set.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_0)); + set.Body.Instructions.Add(Instruction.Create(OpCodes.Ldarg_1)); + set.Body.Instructions.Add(Instruction.Create(OpCodes.Stfld, field)); + set.Body.Instructions.Add(Instruction.Create(OpCodes.Ret)); + + propertyDefinition.SetMethod = set; + + typeDefinition.Methods.Add(set); + typeDefinition.Properties.Add(propertyDefinition); + + processed.Add(typeDefinition.FullName); + } +#if DEBUG + var writerParams = new WriterParameters() { WriteSymbols = true }; + assembly.Write(writerParams); +#else + assembly.Write(); +#endif + } + + public string Name + { + get { return "Virtualizer"; } + } +} diff --git a/server-csharp.sln b/server-csharp.sln index 9cfc18dc..52d9958b 100644 --- a/server-csharp.sln +++ b/server-csharp.sln @@ -8,6 +8,7 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPTarkov.Server.Core", "Libraries\SPTarkov.Server.Core\SPTarkov.Server.Core.csproj", "{AC8643DC-8779-4B4A-BBDA-2D4CC466F765}" ProjectSection(ProjectDependencies) = postProject {20A5EBD3-75D1-4E06-8240-09EEF874017A} = {20A5EBD3-75D1-4E06-8240-09EEF874017A} + {5D09182A-B0B3-406C-AE88-EE0929F9260C} = {5D09182A-B0B3-406C-AE88-EE0929F9260C} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{F084DDFD-89F3-44F9-89C3-5CA11F4CDEEF}" @@ -40,6 +41,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "Testing\UnitTe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestMod", "Testing\TestMod\TestMod.csproj", "{755E473C-14F2-40BC-9377-2FAB11CA91DC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ceciler.JsonExtensionData", "Patches\Ceciler.JsonExtensionData\Ceciler.JsonExtensionData.csproj", "{5D09182A-B0B3-406C-AE88-EE0929F9260C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -98,6 +101,10 @@ Global {755E473C-14F2-40BC-9377-2FAB11CA91DC}.Debug|Any CPU.Build.0 = Debug|Any CPU {755E473C-14F2-40BC-9377-2FAB11CA91DC}.Release|Any CPU.ActiveCfg = Release|Any CPU {755E473C-14F2-40BC-9377-2FAB11CA91DC}.Release|Any CPU.Build.0 = Release|Any CPU + {5D09182A-B0B3-406C-AE88-EE0929F9260C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5D09182A-B0B3-406C-AE88-EE0929F9260C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D09182A-B0B3-406C-AE88-EE0929F9260C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5D09182A-B0B3-406C-AE88-EE0929F9260C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -115,5 +122,6 @@ Global {3E342BAC-EE44-44E4-8E99-393F0C9F787C} = {07B50C44-6D38-474E-87AF-68672D241EEB} {28B90486-1436-4CD7-88D0-122B6963AB58} = {07B50C44-6D38-474E-87AF-68672D241EEB} {755E473C-14F2-40BC-9377-2FAB11CA91DC} = {07B50C44-6D38-474E-87AF-68672D241EEB} + {5D09182A-B0B3-406C-AE88-EE0929F9260C} = {9E41CD5A-271C-4294-AAF9-8EB379311416} EndGlobalSection EndGlobal