Fixed 2 errors & added vein counts + cleanup

Author: GreyHak

ConfigSettingsWindow.jpg

@@ -35,24 +35,22 @@ public class SpreadsheetGenMod : BaseUnityPlugin  // Plugin config: "C:\Program
     {
         public const string pluginGuid = "greyhak.dysonsphereprogram.resourcespreadsheetgen";
         public const string pluginName = "DSP Star Sector Resource Spreadsheet Generator";
-        public const string pluginVersion = "3.1.1";
+        public const string pluginVersion = "3.1.2";
 
-        public static BepInEx.Configuration.ConfigEntry<bool> enablePlanetLoadingFlag;
-        public static bool enableOnStartTrigger = false;
-        public static bool enableOnPauseTrigger = false;
         public static bool spreadsheetGenRequestFlag = false;
         public static List<PlanetData> planetsToLoad = new List<PlanetData> { };
         public static Dictionary<int, string> planetResourceData = new Dictionary<int, string>();
         public static bool checkForPlanetsToUnload = false;
-        public static BepInEx.Configuration.ConfigEntry<string> spreadsheetFileNameTemplate;
-        public static BepInEx.Configuration.ConfigEntry<string> spreadsheetColumnSeparator;
         public static CultureInfo spreadsheetLocale = CultureInfo.CurrentUICulture;
-        public static BepInEx.Configuration.ConfigEntry<int> spreadsheetFloatPrecision;
         new internal static ManualLogSource Logger;
         new internal static BepInEx.Configuration.ConfigFile Config;
         public static readonly int[] gases = { 1120, 1121, 1011 };
         public static int planetCount = 0;
-        
+
+        public static BepInEx.Configuration.ConfigEntry<bool> enablePlanetLoadingFlag;
+        public static BepInEx.Configuration.ConfigEntry<string> spreadsheetFileNameTemplate;
+        public static BepInEx.Configuration.ConfigEntry<string> spreadsheetColumnSeparator;
+        public static BepInEx.Configuration.ConfigEntry<int> spreadsheetFloatPrecision;
         public class ConfigExtraFlags
         {
             public static BepInEx.Configuration.ConfigEntry<bool> starAge;
@@ -73,6 +71,7 @@ public class ConfigExtraFlags
             public static BepInEx.Configuration.ConfigEntry<bool> planetRotationPeriod;
             public static BepInEx.Configuration.ConfigEntry<bool> planetRotationPhase;
             public static BepInEx.Configuration.ConfigEntry<bool> planetSunDistance;
+            public static BepInEx.Configuration.ConfigEntry<bool> veinCounts;
         }
 
         private static Thread veinGenerationThread;
@@ -114,6 +113,7 @@ public void Awake()
             ConfigExtraFlags.planetRotationPeriod = Config.Bind<bool>("ExtraData", "PlanetRotationPeriod", false, "Add planets' rotation period to the spreadsheet");
             ConfigExtraFlags.planetRotationPhase = Config.Bind<bool>("ExtraData", "PlanetRotationPhase", false, "Add planets' rotation phase to the spreadsheet");
             ConfigExtraFlags.planetSunDistance = Config.Bind<bool>("ExtraData", "PlanetSunDistance", false, "Add planets' distance from their star to the spreadsheet");
+            ConfigExtraFlags.veinCounts = Config.Bind<bool>("ExtraData", "VeinCounts", false, "Add the number of veins for each vein resource in addition to the total number of items.");
 
             Config.SettingChanged += OnConfigSettingChanged;
 
@@ -140,6 +140,10 @@ public static void OnConfigSettingChanged(object sender, BepInEx.Configuration.S
                 spreadsheetGenRequestFlag = false;
                 planetsToLoad.Clear();
                 planetResourceData.Clear();
+                if (progressImage != null)
+                {
+                    progressImage.fillAmount = 0;
+                }
                 Monitor.Exit(planetComputeThreadMutexLock);
 
                 if (changedSetting.Section == "Output" && changedSetting.Key == "SpreadsheetLocale")
@@ -177,7 +181,7 @@ public static void QueuePlanetLoading()
             {
                 foreach (PlanetData planet in star.planets)
                 {
-                    if (!planetResourceData.ContainsKey(planet.id) && (planet.type != EPlanetType.Gas) && (planet.veinGroups.Length == 0))
+                    if (enablePlanetLoadingFlag.Value && (planet.type != EPlanetType.Gas) && (planet.veinGroups.Length == 0) && !planetResourceData.ContainsKey(planet.id))
                     {
                         planetsToLoad.Add(planet);
 
@@ -369,9 +373,19 @@ public static void GenerateResourceSpreadsheet()
                 sb.Append("Singularity").Append(spreadsheetColumnSeparator.Value);
                 sb.Append("Ocean").Append(spreadsheetColumnSeparator.Value);
 
+                EVeinType type = (EVeinType)1;
                 foreach (VeinProto item in LDB.veins.dataArray)
                 {
-                    sb.Append(item.name).Append(spreadsheetColumnSeparator.Value);
+                    if (type == EVeinType.Oil || !ConfigExtraFlags.veinCounts.Value)
+                    {
+                        sb.Append(item.name).Append(spreadsheetColumnSeparator.Value);
+                    }
+                    else
+                    {
+                        sb.Append(item.name + " (items)").Append(spreadsheetColumnSeparator.Value);
+                        sb.Append(item.name + " (veins)").Append(spreadsheetColumnSeparator.Value);
+                    }
+                    type++;
                 }
                 foreach (int item in gases)
                 {
@@ -505,9 +519,15 @@ public static void CapturePlanetResourceData(PlanetData planet, StringBuilder sb
             if (planet.type == EPlanetType.Gas)
             {
                 sb.Append("None").Append(spreadsheetColumnSeparator.Value);  // Ocean
+                EVeinType type = (EVeinType)1;
                 foreach (VeinProto item in LDB.veins.dataArray)
                 {
                     sb.Append("0").Append(spreadsheetColumnSeparator.Value);
+                    if (type != EVeinType.Oil && ConfigExtraFlags.veinCounts.Value)
+                    {
+                        sb.Append("0").Append(spreadsheetColumnSeparator.Value);
+                    }
+                    type++;
                 }
                 foreach (int item in gases)
                 {
@@ -540,9 +560,15 @@ public static void CapturePlanetResourceData(PlanetData planet, StringBuilder sb
 
                 if (planet.veinGroups.Length == 0)
                 {
+                    EVeinType type = (EVeinType)1;
                     foreach (VeinProto item in LDB.veins.dataArray)
                     {
                         sb.Append("Unloaded").Append(spreadsheetColumnSeparator.Value);
+                        if (type != EVeinType.Oil && ConfigExtraFlags.veinCounts.Value)
+                        {
+                            sb.Append("Unloaded").Append(spreadsheetColumnSeparator.Value);
+                        }
+                        type++;
                     }
                 }
                 else
@@ -558,6 +584,20 @@ public static void CapturePlanetResourceData(PlanetData planet, StringBuilder sb
                         else
                         {
                             sb.Append(amount.ToString(spreadsheetLocale)).Append(spreadsheetColumnSeparator.Value);
+
+                            if (ConfigExtraFlags.veinCounts.Value)
+                            {
+                                long numVeins = 0;
+                                foreach (PlanetData.VeinGroup veinGroup in planet.veinGroups)
+                                {
+                                    if (veinGroup.type == type)
+                                    {
+                                        numVeins += veinGroup.count;
+                                    }
+                                }
+
+                                sb.Append(numVeins.ToString(spreadsheetLocale)).Append(spreadsheetColumnSeparator.Value);
+                            }
                         }
                         type++;
                     }
@@ -597,7 +637,7 @@ public static void GameMain_Begin_Prefix()
 
             if (GameMain.instance != null && GameObject.Find("Game Menu/button-1-bg"))
             {
-                if (GameObject.Find("greyhak-csv-trigger-button"))
+                if (progressImage != null)
                 {
                     progressImage.fillAmount = 0;
                 }
@@ -639,20 +679,6 @@ public static void GameMain_Begin_Prefix()
                     Logger.LogInfo("Button load complete");
                 }
             }
-
-            if (enableOnStartTrigger)
-            {
-                QueuePlanetLoading();
-            }
-        }
-
-        [HarmonyPrefix, HarmonyPatch(typeof(GameMain), "Pause")]
-        public static void GameMain_Pause_Prefix()
-        {
-            if (enableOnPauseTrigger)
-            {
-                QueuePlanetLoading();
-            }
         }
 
         public static Sprite GetSprite()

DSPSpreadsheetGenMod.cs

@@ -41,5 +41,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.1")]
-[assembly: AssemblyFileVersion("3.1.1")]
+[assembly: AssemblyVersion("3.1.2")]
+[assembly: AssemblyFileVersion("3.1.2")]

Properties/AssemblyInfo.cs

@@ -52,6 +52,7 @@ The generated spreadsheet will contain columns for the following data.
    - _ Optical grating crystal quantity
    - _ Spiniform stalagmite crystal quantity
    - _ Unipolar magnet quantity
+   - _ Number of veins for each resource can be configurable enabled
  - Gas Planet Resource
    - _ Hydrogen rate
    - _ Deuterium rate
@@ -162,6 +163,11 @@ The source code for this mod is available for download, review and forking on Gi
 在BSD3条例许可下，本mod的源代码可供在[GitHub](https://github.com/GreyHak/dsp-csv-gen)下载、查看、克隆。
 
 ## Change Log
+### v3.1.2
+ - Fixed an error which wasn't outputting the available information when configured not to load planets.
+ - Added new optional output for the number of veins of each resource on a planet.
+ - Fixed a graphical glitch if config changes were made in game while spreadsheet generation was in progress.
+ - Minor code cleanup for efficiency.
 ### v3.1.1
  - Minor bug fix in log entry of filename.
 ### v3.1.0

README.md

@@ -1,6 +1,6 @@
 {
     "name": "DSP_Star_Sector_Resource_Spreadsheet_Generator",
-    "version_number": "3.1.1",
+    "version_number": "3.1.2",
     "website_url": "https://github.com/GreyHak/dsp-csv-gen",
     "description": "Generates a spreadsheet of all resources in the star sector.",
     "dependencies": [