From dfb30cd86a604eb8e0f8cfc5ec60cd08feaa1899 Mon Sep 17 00:00:00 2001
From: Chomp <chomp@noreply.dev.sp-tarkov.com>
Date: Sun, 24 Jul 2022 22:22:53 +0100
Subject: [PATCH] Correctly generate upd object + dont add stackobjectscount to
 mods

---
 AssortGenerator.Common/JsonWriter.cs        |  1 +
 AssortGenerator.Models/Output/AssortRoot.cs |  6 ++++--
 AssortGenerator.Models/Output/FireMode.cs   |  7 +++++++
 AssortGenerator.Models/Output/Foldable.cs   |  7 +++++++
 AssortGenerator/Program.cs                  | 10 ++++++++++
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 AssortGenerator.Models/Output/FireMode.cs
 create mode 100644 AssortGenerator.Models/Output/Foldable.cs

diff --git a/AssortGenerator.Common/JsonWriter.cs b/AssortGenerator.Common/JsonWriter.cs
index eac9328..bb64f7b 100644
--- a/AssortGenerator.Common/JsonWriter.cs
+++ b/AssortGenerator.Common/JsonWriter.cs
@@ -19,6 +19,7 @@ namespace AssortGenerator.Common
             var options = new JsonSerializerOptions
             {
                 WriteIndented = true,
+                DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull,
                 Encoder = JavaScriptEncoder.Create(UnicodeRanges.BasicLatin, UnicodeRanges.Cyrillic)
 
             };
diff --git a/AssortGenerator.Models/Output/AssortRoot.cs b/AssortGenerator.Models/Output/AssortRoot.cs
index 0371590..a9ca514 100644
--- a/AssortGenerator.Models/Output/AssortRoot.cs
+++ b/AssortGenerator.Models/Output/AssortRoot.cs
@@ -20,8 +20,10 @@ namespace AssortGenerator.Models.Output
 
     public class Upd
     {
-        public bool UnlimitedCount { get; set; }
-        public int StackObjectsCount { get; set; }
+        public Foldable Foldable { get;set;}
+        public UpdFireMode FireMode { get;set;}
+        public bool? UnlimitedCount { get; set; }
+        public int? StackObjectsCount { get; set; }
         public object BuyRestrictionMax { get; set; }
         public int? BuyRestrictionCurrent { get; set; }
     }
diff --git a/AssortGenerator.Models/Output/FireMode.cs b/AssortGenerator.Models/Output/FireMode.cs
new file mode 100644
index 0000000..2178f55
--- /dev/null
+++ b/AssortGenerator.Models/Output/FireMode.cs
@@ -0,0 +1,7 @@
+namespace AssortGenerator.Models.Output
+{
+    public class UpdFireMode
+    {
+        public string FireMode { get;set; }
+    }
+}
\ No newline at end of file
diff --git a/AssortGenerator.Models/Output/Foldable.cs b/AssortGenerator.Models/Output/Foldable.cs
new file mode 100644
index 0000000..a47d17a
--- /dev/null
+++ b/AssortGenerator.Models/Output/Foldable.cs
@@ -0,0 +1,7 @@
+namespace AssortGenerator.Models.Output
+{
+    public class Foldable
+    {
+        public bool Folded { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/AssortGenerator/Program.cs b/AssortGenerator/Program.cs
index 4169b82..0778c1e 100644
--- a/AssortGenerator/Program.cs
+++ b/AssortGenerator/Program.cs
@@ -37,6 +37,16 @@ namespace AssortGenerator
                 string itemsJson = data.GetProperty("items").ToString();
                 List<Item> items = JsonSerializer.Deserialize<List<Item>>(itemsJson);
 
+                // fix items that have ran out of stock in the dump and give it some default values
+                foreach (var item in items)
+                {
+                    if (item.upd?.StackObjectsCount == 0 && item.slotId == "hideout")
+                    {
+                        LoggingHelpers.LogError($"item {item._tpl} found with stack count of 0, changing to 100");
+                        item.upd.StackObjectsCount = 100;
+                    }
+                }
+
                 // Find barter scheme node and parse into object
                 var barterSchemeJson = data.GetProperty("barter_scheme").ToString();
                 var barterSchemeItems = JsonSerializer.Deserialize<Dictionary<string, object>>(barterSchemeJson);