more work

Core/Models/Common/MinMax.cs

@@ -4,9 +4,11 @@ namespace Core.Models.Common;
 
 public class MinMax
 {
+    [JsonPropertyName("type")]
+    public string? Type { get; set; }
     [JsonPropertyName("max")]
     public double? Max { get; set; }
 
     [JsonPropertyName("min")]
     public double? Min { get; set; }
-}
+}

Core/Models/Eft/Common/Tables/Item.cs

@@ -18,6 +18,9 @@ public class Item
 
     [JsonPropertyName("location")]
     public object? Location { get; set; } // TODO: Can be IItemLocation or number
+    
+    [JsonPropertyName("desc")]
+    public string? Desc { get; set; }
 
     [JsonPropertyName("upd")]
     public Upd? Update { get; set; }
@@ -254,4 +257,4 @@ public class UpdCultistAmulet
 {
     [JsonPropertyName("NumberOfUsages")]
     public double? NumberOfUsages { get; set; }
-}
+}

Core/Models/Eft/Launcher/LoginRequestData.cs

@@ -1,12 +1,13 @@
 using System.Text.Json.Serialization;
+using Core.Models.Utils;
 
 namespace Core.Models.Eft.Launcher;
 
-public class LoginRequestData
+public class LoginRequestData : IRequestData
 {
     [JsonPropertyName("username")]
     public string? Username { get; set; }
 
     [JsonPropertyName("password")]
     public string? Password { get; set; }
-}
+}

Core/Models/Spt/Config/AirdropConfig.cs

@@ -58,7 +58,8 @@ public class AirdropChancePercent
 /// </summary>
 public class AirdropLoot
 {
-    [JsonPropertyName("Icon")]
+    [JsonPropertyName("icon")]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public AirdropTypeEnum Icon { get; set; }
 
     /// <summary>
@@ -126,4 +127,4 @@ public class AirdropLoot
 
     [JsonPropertyName("forcedLoot")]
     public Dictionary<string, MinMax>? ForcedLoot { get; set; }
-}
+}

Core/Models/Spt/Config/BotConfig.cs

@@ -138,6 +138,15 @@ public class PresetBatch
     [JsonPropertyName("bossKnight")]
     public int BossKnight { get; set; }
 
+    [JsonPropertyName("bossZryachiy")]
+    public int BossZryachiy { get; set; }
+
+    [JsonPropertyName("bossKolontay")]
+    public int BossKolontay { get; set; }
+
+    [JsonPropertyName("bossPartisan")]
+    public int BossPartisan { get; set; }
+
     [JsonPropertyName("bossTest")]
     public int BossTest { get; set; }
 
@@ -180,6 +189,21 @@ public class PresetBatch
     [JsonPropertyName("followerBoar")]
     public int FollowerBoar { get; set; }
 
+    [JsonPropertyName("followerBoarClose1")]
+    public int FollowerBoarClose1 { get; set; }
+
+    [JsonPropertyName("followerBoarClose2")]
+    public int FollowerBoarClose2 { get; set; }
+
+    [JsonPropertyName("followerZryachiy")]
+    public int FollowerZryachiy { get; set; }
+
+    [JsonPropertyName("followerKolontayAssault")]
+    public int FollowerKolontayAssault { get; set; }
+
+    [JsonPropertyName("followerKolontaySecurity")]
+    public int FollowerKolontaySecurity { get; set; }
+
     [JsonPropertyName("marksman")]
     public int Marksman { get; set; }
 
@@ -221,6 +245,12 @@ public class PresetBatch
 
     [JsonPropertyName("pmcBEAR")]
     public int PmcBEAR { get; set; }
+
+    [JsonPropertyName("shooterBTR")]
+    public int ShooterBTR { get; set; }
+    
+    [JsonExtensionData]
+    public IDictionary<string, object> AdditionalData { get; set; }
 }
 
 public class WalletLootSettings
@@ -288,7 +318,7 @@ public class EquipmentFilters
     /// <summary>
     /// Chance NODS are down/active during the day
     /// </summary>
-    [JsonPropertyName("NvgIsActiveChanceDayPercent")]
+    [JsonPropertyName("nvgIsActiveChanceDayPercent")]
     public float? NvgIsActiveChanceDayPercent { get; set; }
 
     /// <summary>
@@ -522,4 +552,4 @@ public class RandomisedResourceValues
     /// </summary>
     [JsonPropertyName("chanceMaxResourcePercent")]
     public float ChanceMaxResourcePercent { get; set; }
-}
+}

Core/Models/Spt/Config/BotDurability.cs

@@ -11,43 +11,43 @@ public class BotDurability
     public PmcDurability Pmc { get; set; }
 
     [JsonPropertyName("boss")]
-    public BotDurability Boss { get; set; }
+    public PmcDurability Boss { get; set; }
 
     [JsonPropertyName("follower")]
-    public BotDurability Follower { get; set; }
+    public PmcDurability Follower { get; set; }
 
     [JsonPropertyName("assault")]
-    public BotDurability Assault { get; set; }
+    public PmcDurability Assault { get; set; }
 
     [JsonPropertyName("cursedassault")]
-    public BotDurability CursedAssault { get; set; }
+    public PmcDurability CursedAssault { get; set; }
 
     [JsonPropertyName("marksman")]
-    public BotDurability Marksman { get; set; }
+    public PmcDurability Marksman { get; set; }
 
     [JsonPropertyName("pmcbot")]
-    public BotDurability PmcBot { get; set; }
+    public PmcDurability PmcBot { get; set; }
 
     [JsonPropertyName("arenafighterevent")]
-    public BotDurability ArenaFighterEvent { get; set; }
+    public PmcDurability ArenaFighterEvent { get; set; }
 
     [JsonPropertyName("arenafighter")]
-    public BotDurability ArenaFighter { get; set; }
+    public PmcDurability ArenaFighter { get; set; }
 
     [JsonPropertyName("crazyassaultevent")]
-    public BotDurability CrazyAssaultEvent { get; set; }
+    public PmcDurability CrazyAssaultEvent { get; set; }
 
     [JsonPropertyName("exusec")]
-    public BotDurability Exusec { get; set; }
+    public PmcDurability Exusec { get; set; }
 
     [JsonPropertyName("gifter")]
-    public BotDurability Gifter { get; set; }
+    public PmcDurability Gifter { get; set; }
 
     [JsonPropertyName("sectantpriest")]
-    public BotDurability SectantPriest { get; set; }
+    public PmcDurability SectantPriest { get; set; }
 
     [JsonPropertyName("sectantwarrior")]
-    public BotDurability SectantWarrior { get; set; }
+    public PmcDurability SectantWarrior { get; set; }
 }
 
 /** Durability values to be used when a more specific bot type can't be found */
@@ -82,6 +82,9 @@ public class PmcDurabilityArmor
 
     [JsonPropertyName("minDelta")]
     public double MinDelta { get; set; }
+
+    [JsonPropertyName("minLimitPercent")]
+    public double MinLimitPercent { get; set; }
 }
 
 public class ArmorDurability
@@ -112,4 +115,4 @@ public class WeaponDurability
 
     [JsonPropertyName("minLimitPercent")]
     public double MinLimitPercent { get; set; }
-}
+}

Core/Models/Spt/Config/GiftsConfig.cs

@@ -73,4 +73,8 @@ public class Gift
 
     [JsonPropertyName("maxToSendPlayer")]
     public int? MaxToSendPlayer { get; set; }
-}
+    
+    
+    [JsonPropertyName("maxToSendToPlayer")]
+    public int? MaxToSendToPlayer { get; set; }
+}

Core/Models/Spt/Config/InventoryConfig.cs

@@ -33,6 +33,9 @@ public class InventoryConfig : BaseConfig
 
 public class RewardDetails
 {
+    [JsonPropertyName("_type")]
+    public string? Type { get; set; }
+    
     [JsonPropertyName("rewardCount")]
     public int RewardCount { get; set; }
 
@@ -69,4 +72,4 @@ public class SealedAirdropContainerSettings
 
     [JsonPropertyName("allowBossItems")]
     public bool AllowBossItems { get; set; }
-}
+}

Core/Models/Spt/Config/LocationConfig.cs

@@ -254,6 +254,9 @@ public class LootMultiplier
 
     [JsonPropertyName("sandbox")]
     public double Sandbox { get; set; }
+
+    [JsonPropertyName("sandbox_high")]
+    public double SandboxHigh { get; set; }
 }
 
 public class ContainerRandomisationSettings
@@ -316,4 +319,4 @@ public class ScavRaidTimeLocationSettings
     /** Should bot waves be removed / spawn times be adjusted */
     [JsonPropertyName("adjustWaves")]
     public bool AdjustWaves { get; set; }
-}
+}

Core/Models/Spt/Config/LostOnDeathConfig.cs

@@ -60,4 +60,10 @@ public class LostEquipment
 
     [JsonPropertyName("Scabbard")]
     public bool Scabbard { get; set; }
-}
+
+    [JsonPropertyName("Compass")]
+    public bool Compass { get; set; }
+
+    [JsonPropertyName("SecuredContainer")]
+    public bool SecuredContainer { get; set; }
+}

Core/Models/Spt/Config/MatchConfig.cs

@@ -9,4 +9,7 @@ public class MatchConfig : BaseConfig
 
     [JsonPropertyName("enabled")]
     public bool Enabled { get; set; }
-}
+    
+    [JsonPropertyName("randomiseMapContainers")]
+    public Dictionary<string, bool> RandomiseMapContainers { get; set; }
+}

Core/Models/Spt/Config/PlayerScavConfig.cs

@@ -26,6 +26,9 @@ public class KarmaLevel
     [JsonPropertyName("equipmentBlacklist")]
     public Dictionary<string, string[]> EquipmentBlacklist { get; set; }
 
+    [JsonPropertyName("labsAccessCardChancePercent")]
+    public double? LabsAccessCardChancePercent { get; set; }
+
     [JsonPropertyName("lootItemsToAddChancePercent")]
     public Dictionary<string, double> LootItemsToAddChancePercent { get; set; }
 }
@@ -58,4 +61,4 @@ public class ItemLimits
 
     [JsonPropertyName("grenades")]
     public GenerationData Grenades { get; set; }
-}
+}

Core/Models/Spt/Config/PmcConfig.cs

@@ -53,6 +53,9 @@ public class PmcConfig : BaseConfig
     [JsonPropertyName("looseWeaponInBackpackLootMinMax")]
     public MinMax LooseWeaponInBackpackLootMinMax { get; set; }
 
+    [JsonPropertyName("_isUsec")]
+    public string? IsUsecDescription { get; set; }
+    
     /** Percentage chance PMC will be USEC */
     [JsonPropertyName("isUsec")]
     public double IsUsec { get; set; }
@@ -65,6 +68,9 @@ public class PmcConfig : BaseConfig
     [JsonPropertyName("bearType")]
     public string BearType { get; set; }
 
+    [JsonPropertyName("_pmcType")]
+    public string? PmcTypeDescription { get; set; }
+
     /** What 'brain' does a PMC use, keyed by map and side (USEC/BEAR) key: map location, value: type for usec/bear */
     [JsonPropertyName("pmcType")]
     public Dictionary<string, Dictionary<string, Dictionary<string, double>>> PmcType { get; set; }
@@ -106,6 +112,9 @@ public class PmcConfig : BaseConfig
     /** Should secure container loot from usec.json/bear.json be added to pmc bots secure */
     [JsonPropertyName("addSecureContainerLootFromBotConfig")]
     public bool AddSecureContainerLootFromBotConfig { get; set; }
+    
+    [JsonPropertyName("addPrefixToSameNamePMCAsPlayerChance")]
+    public int? AddPrefixToSameNamePMCAsPlayerChance { get; set; }
 }
 
 public class HostilitySettings
@@ -159,4 +168,4 @@ public class IMinMaxLootValue : MinMax
 {
     [JsonPropertyName("value")]
     public double Value { get; set; }
-}
+}

Core/Models/Spt/Config/QuestConfig.cs

@@ -56,14 +56,17 @@ public class PlayerTypeQuestIds
 
 public class QuestTypeIds
 {
-    [JsonPropertyName("Elimination")]
+    [JsonPropertyName("elimination")]
     public string Elimination { get; set; }
 
-    [JsonPropertyName("Completion")]
+    [JsonPropertyName("completion")]
     public string Completion { get; set; }
 
-    [JsonPropertyName("Exploration")]
+    [JsonPropertyName("exploration")]
     public string Exploration { get; set; }
+    
+    [JsonPropertyName("pickup")]
+    public string Pickup { get; set; }
 }
 
 public class EventQuestData
@@ -173,6 +176,8 @@ public class RewardScaling
 
 public class TraderWhitelist
 {
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
     [JsonPropertyName("traderId")]
     public string TraderId { get; set; }
 
@@ -253,6 +258,11 @@ public class Pickup : BaseQuestConfig
 {
     [JsonPropertyName("ItemTypeToFetchWithMaxCount")]
     public List<PickupTypeWithMaxCount> ItemTypeToFetchWithMaxCount { get; set; }
+    
+    public List<string> ItemTypesToFetch { get; set; }
+    
+    [JsonPropertyName("maxItemFetchCount")]
+    public int? MaxItemFetchCount { get; set; }
 }
 
 public class PickupTypeWithMaxCount
@@ -370,4 +380,4 @@ public class ProbabilityObject
 
     [JsonPropertyName("data")]
     public object Data { get; set; }
-}
+}

Core/Models/Spt/Config/RagfairConfig.cs

@@ -116,7 +116,7 @@ public class Dynamic
 
     [JsonPropertyName("condition")]
     /** Settings to control the durability range of item items listed on flea */
-    public Condition Condition { get; set; }
+    public Dictionary<string, Condition> Condition { get; set; }
 
     [JsonPropertyName("stackablePercent")]
     /** Size stackable items should be listed for in percent of max stack size */
@@ -138,6 +138,9 @@ public class Dynamic
     /** A multipler to apply to individual tpls price just prior to item quality adjustment */
     public Dictionary<string, double> ItemPriceMultiplier { get; set; }
 
+    [JsonPropertyName("_currencies")]
+    public string? CurrenciesDescription { get; set; }
+    
     [JsonPropertyName("currencies")]
     /** Percentages to sell offers in each currency */
     public Dictionary<string, double> Currencies { get; set; }
@@ -265,6 +268,9 @@ public class Condition
 
     [JsonPropertyName("max")]
     public MinMax Max { get; set; }
+
+    [JsonPropertyName("_name")]
+    public string Name { get; set; }
 }
 
 public class RagfairBlacklist
@@ -352,6 +358,9 @@ public class UnreasonableModPrices
     /// </summary>
     [JsonPropertyName("newPriceHandbookMultiplier")]
     public int NewPriceHandbookMultiplier { get; set; }
+    
+    [JsonPropertyName("itemType")]
+    public string ItemType { get; set; }
 }
 
 public class ArmorSettings
@@ -386,8 +395,9 @@ public class TieredFlea
     [JsonPropertyName("unlocksType")]
     public Dictionary<string, int> UnlocksType { get; set; }
 
-    public bool AmmoTiersEnabled { get; set; }
-
     [JsonPropertyName("ammoTplUnlocks")]
     public Dictionary<string, int> AmmoTplUnlocks { get; set; }
-}
+    
+    [JsonPropertyName("ammoTiersEnabled")]
+    public bool AmmoTiersEnabled { get; set; }
+}

Core/Models/Spt/Config/RepairConfig.cs

@@ -82,6 +82,12 @@ public class RepairKit
 
     [JsonPropertyName("weapon")]
     public BonusSettings Weapon { get; set; }
+    
+    [JsonPropertyName("vest")]
+    public BonusSettings Vest { get; set; }
+    
+    [JsonPropertyName("headwear")]
+    public BonusSettings Headwear { get; set; }
 }
 
 public class BonusSettings
@@ -92,10 +98,10 @@ public class BonusSettings
     [JsonPropertyName("bonusTypeWeight")]
     public Dictionary<string, double> BonusTypeWeight { get; set; }
 
-    [JsonPropertyName("common")]
+    [JsonPropertyName("Common")]
     public Dictionary<string, BonusValues> Common { get; set; }
 
-    [JsonPropertyName("rare")]
+    [JsonPropertyName("Rare")]
     public Dictionary<string, BonusValues> Rare { get; set; }
 }
 
@@ -107,4 +113,4 @@ public class BonusValues
     /** What dura is buff active between (min max of current max) */
     [JsonPropertyName("activeDurabilityPercentMinMax")]
     public MinMax ActiveDurabilityPercentMinMax { get; set; }
-}
+}

Core/Models/Spt/Config/SeasonalEventConfig.cs

@@ -1,6 +1,7 @@
 using System.Text.Json.Serialization;
 using Core.Models.Eft.Common;
 using Core.Models.Enums;
+using Core.Utils.Json.Converters;
 
 namespace Core.Models.Spt.Config;
 
@@ -20,6 +21,7 @@ public class SeasonalEventConfig : BaseConfig
     [JsonPropertyName("eventLoot")]
     public Dictionary<string, Dictionary<string, Dictionary<string, Dictionary<string, int>>>> EventLoot { get; set; }
 
+    [JsonPropertyName("events")]
     public List<SeasonalEvent> Events { get; set; }
 
     [JsonPropertyName("eventBotMapping")]
@@ -59,19 +61,26 @@ public class SeasonalEvent
     public SeasonalEventType Type { get; set; }
 
     [JsonPropertyName("startDay")]
+    [JsonConverter(typeof(StringToNumberFactoryConverter))]
     public int StartDay { get; set; }
 
     [JsonPropertyName("startMonth")]
+    [JsonConverter(typeof(StringToNumberFactoryConverter))]
     public int StartMonth { get; set; }
 
     [JsonPropertyName("endDay")]
+    [JsonConverter(typeof(StringToNumberFactoryConverter))]
     public int EndDay { get; set; }
 
     [JsonPropertyName("endMonth")]
+    [JsonConverter(typeof(StringToNumberFactoryConverter))]
     public int EndMonth { get; set; }
 
     [JsonPropertyName("settings")]
     public Dictionary<string, object> Settings { get; set; } // TODO: Type was Record<string, ISeasonalEventSettings | IZombieSettings>
+    
+    [JsonPropertyName("setting")]
+    public Dictionary<string, object> SettingsDoNOTUse { set => Settings = value; }
 }
 
 public class SeasonalEventSettings
@@ -102,4 +111,4 @@ public class GifterSetting
 
     [JsonPropertyName("spawnChance")]
     public int SpawnChance { get; set; }
-}
+}

Core/Models/Spt/Config/TraderConfig.cs

@@ -34,6 +34,9 @@ public class TraderConfig : BaseConfig
 
 public class UpdateTime
 {
+    [JsonPropertyName("_name")]
+    public string Name { get; set; }
+
     [JsonPropertyName("traderId")]
     public string TraderId { get; set; }
 
@@ -139,6 +142,9 @@ public class CoopExtractReward : LootRequest
 {
     [JsonPropertyName("sendGift")]
     public bool SendGift { get; set; }
+    
+    [JsonPropertyName("useRewarditemBlacklist")]
+    public bool UseRewarditemBlacklist { get; set; }
 
     [JsonPropertyName("messageLocaleIds")]
     public List<string> MessageLocaleIds { get; set; }
@@ -171,4 +177,4 @@ public class ModdedTraders
     /** Trader Ids to enable the clothing service for */
     [JsonPropertyName("clothingService")]
     public List<string> ClothingService { get; set; }
-}
+}

Core/Models/Spt/Dialog/SendMessageDetails.cs

@@ -93,6 +93,9 @@ public class ProfileChangeEvent
 
     [JsonPropertyName("entity")]
     public string? Entity { get; set; }
+    
+    [JsonPropertyName("data")]
+    public string? Data { get; set; }
 }
 
 public enum ProfileChangeEventType
@@ -105,4 +108,4 @@ public enum ProfileChangeEventType
     UnlockTrader,
     AssortmentUnlockRule,
     HideoutAreaLevel
-}
+}