From b8ef700e2842665ffc837c8567867ee31bc3a5af Mon Sep 17 00:00:00 2001 From: CWX Date: Tue, 14 Jan 2025 14:16:15 +0000 Subject: [PATCH] Type fixings --- Core/Models/Common/MinMax.cs | 1 + Core/Models/Eft/Common/Tables/Item.cs | 1 + Core/Models/Spt/Config/LocationConfig.cs | 3 +++ Core/Models/Spt/Config/PmcConfig.cs | 16 ++++++++++++++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Core/Models/Common/MinMax.cs b/Core/Models/Common/MinMax.cs index 5aa35d40..cc0dd6bb 100644 --- a/Core/Models/Common/MinMax.cs +++ b/Core/Models/Common/MinMax.cs @@ -6,6 +6,7 @@ public class MinMax { [JsonPropertyName("type")] public string? Type { get; set; } + [JsonPropertyName("max")] public double? Max { get; set; } diff --git a/Core/Models/Eft/Common/Tables/Item.cs b/Core/Models/Eft/Common/Tables/Item.cs index d2eb2967..c7dda70c 100644 --- a/Core/Models/Eft/Common/Tables/Item.cs +++ b/Core/Models/Eft/Common/Tables/Item.cs @@ -11,6 +11,7 @@ public class Item public string? Template { get; set; } [JsonPropertyName("parentId")] + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public string? ParentId { get; set; } [JsonPropertyName("slotId")] diff --git a/Core/Models/Spt/Config/LocationConfig.cs b/Core/Models/Spt/Config/LocationConfig.cs index 35576369..2d751689 100644 --- a/Core/Models/Spt/Config/LocationConfig.cs +++ b/Core/Models/Spt/Config/LocationConfig.cs @@ -131,6 +131,9 @@ public class LocationConfig : BaseConfig /// [JsonPropertyName("reserveRaiderSpawnChanceOverrides")] public ReserveRaiderSpawnChanceOverrides ReserveRaiderSpawnChanceOverrides { get; set; } + + [JsonPropertyName("tplsToStripChildItemsFrom")] + public List TplsToStripChildItemsFrom { get; set; } /// /// Map ids players cannot visit diff --git a/Core/Models/Spt/Config/PmcConfig.cs b/Core/Models/Spt/Config/PmcConfig.cs index e2ab433b..09ee02e5 100644 --- a/Core/Models/Spt/Config/PmcConfig.cs +++ b/Core/Models/Spt/Config/PmcConfig.cs @@ -76,7 +76,7 @@ public class PmcConfig : BaseConfig public Dictionary>> PmcType { get; set; } [JsonPropertyName("maxBackpackLootTotalRub")] - public List MaxBackpackLootTotalRub { get; set; } + public List MaxBackpackLootTotalRub { get; set; } [JsonPropertyName("maxPocketLootTotalRub")] public double MaxPocketLootTotalRub { get; set; } @@ -115,6 +115,9 @@ public class PmcConfig : BaseConfig [JsonPropertyName("addPrefixToSameNamePMCAsPlayerChance")] public int? AddPrefixToSameNamePMCAsPlayerChance { get; set; } + + [JsonPropertyName("lootItemLimitsRub")] + public List? LootItemLimitsRub { get; set; } } public class HostilitySettings @@ -164,8 +167,17 @@ public class SlotLootSettings public List Blacklist { get; set; } } -public class IMinMaxLootValue : MinMax +public class MinMaxLootValue : MinMax { [JsonPropertyName("value")] public double Value { get; set; } + + [JsonPropertyName("backpack")] + public MinMax Backpack { get; set; } + + [JsonPropertyName("pocket")] + public MinMax Pocket { get; set; } + + [JsonPropertyName("vest")] + public MinMax Vest { get; set; } }