- Update typo on cmmcomposite

- Update new plotter when purchasing commodities

Author: njthomson

SrvSurvey/colonization-costs.json

@@ -3,7 +3,7 @@
     "liquidoxygen": 3781,
     "water": 1609,
     "ceramiccomposites": 1207,
-    "cmmcomposites": 11261,
+    "cmmcomposite": 11261,
     "insulatingmembrane": 644,
     "polymers": 1046,
     "semiconductors": 161,
@@ -24,7 +24,7 @@
     "liquidoxygen": 3781,
     "water": 1609,
     "ceramiccomposites": 1207,
-    "cmmcomposites": 11261,
+    "cmmcomposite": 11261,
     "insulatingmembrane": 644,
     "polymers": 1046,
     "semiconductors": 161,
@@ -45,7 +45,7 @@
     "liquidoxygen": 15124,
     "water": 6436,
     "ceramiccomposites": 4828,
-    "cmmcomposites": 45044,
+    "cmmcomposite": 45044,
     "insulatingmembrane": 1288,
     "polymers": 2092,
     "semiconductors": 322,
@@ -66,7 +66,7 @@
     "liquidoxygen": 15124,
     "water": 6436,
     "ceramiccomposites": 4828,
-    "cmmcomposites": 45044,
+    "cmmcomposite": 45044,
     "insulatingmembrane": 1288,
     "polymers": 2092,
     "semiconductors": 322,
@@ -87,7 +87,7 @@
     "liquidoxygen": 1553,
     "water": 621,
     "ceramiccomposites": 497,
-    "cmmcomposites": 3912,
+    "cmmcomposite": 3912,
     "insulatingmembrane": 311,
     "polymers": 497,
     "semiconductors": 56,
@@ -108,7 +108,7 @@
     "liquidoxygen": 1553,
     "water": 621,
     "ceramiccomposites": 497,
-    "cmmcomposites": 3912,
+    "cmmcomposite": 3912,
     "insulatingmembrane": 311,
     "polymers": 497,
     "semiconductors": 56,
@@ -129,7 +129,7 @@
     "liquidoxygen": 1553,
     "water": 621,
     "ceramiccomposites": 497,
-    "cmmcomposites": 3912,
+    "cmmcomposite": 3912,
     "insulatingmembrane": 311,
     "polymers": 497,
     "semiconductors": 56,
@@ -150,7 +150,7 @@
     "liquidoxygen": 1553,
     "water": 621,
     "ceramiccomposites": 497,
-    "cmmcomposites": 3912,
+    "cmmcomposite": 3912,
     "insulatingmembrane": 311,
     "polymers": 497,
     "semiconductors": 56,
@@ -171,7 +171,7 @@
     "liquidoxygen": 1553,
     "water": 621,
     "ceramiccomposites": 497,
-    "cmmcomposites": 3912,
+    "cmmcomposite": 3912,
     "insulatingmembrane": 311,
     "polymers": 497,
     "semiconductors": 56,
@@ -192,7 +192,7 @@
     "liquidoxygen": 1553,
     "water": 621,
     "ceramiccomposites": 497,
-    "cmmcomposites": 3912,
+    "cmmcomposite": 3912,
     "insulatingmembrane": 311,
     "polymers": 497,
     "semiconductors": 56,

SrvSurvey/forms/FormBuildNew.cs

@@ -140,7 +140,7 @@ private void updateProject()
                     factionName = "",
                     notes = "",
 
-                    commodities = data.ToDictionary(_ => _.Key, _ => new CommodityCount(data[_.Key], project.commodities[_.Key].total)),
+                    commodities = data.ToDictionary(_ => _.Key, _ => new CommodityCount(data[_.Key], project.commodities.GetValueOrDefault(_.Key)?.total ?? data[_.Key])),
                 };
 
                 Game.log($"Updating: {project}");

SrvSurvey/game/Game.cs

@@ -1480,11 +1480,25 @@ private void onJournalEntry(Cargo entry)
                         });
                     });
                 }
-                
+
                 form?.Invalidate();
             }
         }
 
+        private void onJournalEntry(MarketBuy entry)
+        {
+            var item = cargoFile.Inventory.Find(i => i.Name == entry.Type);
+            if (item == null)
+            {
+                // add if missing
+                item = new InventoryItem(entry.Type, entry.Type_Localised);
+                cargoFile.Inventory.Add(item);
+            }
+            item.Count += entry.Count;
+
+            Program.invalidate<PlotBuildCommodities>();
+        }
+
         private static Dictionary<string, string> inventoryItemNameMap = new Dictionary<string, string>()
         {
             { "ca", "ancientcasket" },

SrvSurvey/game/JournalEntry.cs

@@ -1280,4 +1280,16 @@ class UseConsumable : JournalEntry
         public string Name_Localised;
         public string Type;
     }
+
+    class MarketBuy : JournalEntry
+    {
+
+        // { "timestamp":"2025-03-04T16:10:26Z", "event":"MarketBuy", "MarketID":3708733696, "Type":"insulatingmembrane", "Type_Localised":"Insulating Membrane", "Count":32, "BuyPrice":10605, "TotalCost":339360 }
+        public long MarketId;
+        public string Type;
+        public string Type_Localised;
+        public int Count;
+        public int BuyPrice;
+        public long TotalCost;
+    }
 }