Avoid compatibility issues with other mods and restrict storage size

Author: sungaila

etc/SteamDescription_de-DE.txt

@@ -18,6 +18,4 @@ Ein neues Spiel start mit einer Basis, einer Bel
 [h1]Schlussbemerkungen[/h1]
 Ich hoffe diese Mod hilft neuen Spielern, indem es den Spielstart weniger �berfordernd und bestrafend macht. Erfahrenere Spieler, welche sich nicht mit der Errichtung der Basisinfrastruktur hetzen und einen gem�tlicheren Spielstart haben wollen, k�nnten diese Mod ebenfalls m�gen.
 
-Der [b]Mini-Pod[/b] erh�lt standardm��ig ebenfalls die oben beschriebenen Verbesserungen, dies kann aber in den Modeinstellungen deaktiviert werden (siehe oben). �ndere dazu die Einstellung auf [b]extendMiniPod: false[/b].
-
 Du hast Verbesserungsvorschl�ge oder m�chtest den Quelltext dieser Mod sehen? Wirf einen Blick aufs [url=https://github.com/sungaila/SurvivalNotRequired]GitHub Repository[/url]!

etc/SteamDescription_en-US.txt

@@ -18,6 +18,4 @@ Open the file [b]%USERPROFILE%\Documents\Klei\OxygenNotIncluded\mods\Steam\28402
 [h1]Concluding remarks[/h1]
 I hope this mod helps new players by making the beginning less overwhelming and punishing. More experienced players, who don't want to rush basic colony infrastructure and wish for a more relaxed game start, might enjoy this mod as well.
 
-The [b]Mini-Pod[/b] is enhanced by default but you can disable it by changing the mod settings (see above). Just change the setting to [b]extendMiniPod: false[/b].
-
 You have ideas to improve this mod or wish to see its source code? Take a look at [url=https://github.com/sungaila/SurvivalNotRequired]the GitHub repository[/url]!

src/ComponentExtensions.cs

@@ -0,0 +1,14 @@
+using UnityEngine;
+
+namespace SurvivalNotRequired
+{
+    internal static class ComponentExtensions
+    {
+        internal static T AddComponentAndTag<T>(this GameObject go, Tag tag) where T : Component
+        {
+            var result = go.AddComponent<T>();
+            result.AddTag(tag);
+            return result;
+        }
+    }
+}

src/ModSettings.cs

@@ -20,5 +20,8 @@ internal class ModSettings
 
         [YamlMember(Alias = "extendMiniPod")]
         public bool? ExtendMiniPod { get; set; }
+
+        [YamlMember(Alias = "capacityInKg")]
+        public float? CapacityInKg { get; set; }
     }
 }

src/MyUserMod.cs

@@ -35,6 +35,9 @@ public override void OnLoad(Harmony harmony)
 
                 if (settings.ExtendMiniPod.HasValue)
                     TelepadStatesInstancePatch.ExtendMiniPod = settings.ExtendMiniPod.Value;
+
+                if (settings.CapacityInKg.HasValue)
+                    TelepadStatesInstancePatch.CapacityInKg = settings.CapacityInKg.Value;
             }
             catch (Exception ex)
             {

src/Patches/HeadquartersConfigPatch.cs

@@ -1,4 +1,5 @@
 using HarmonyLib;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace SurvivalNotRequired.Patches
@@ -10,6 +11,11 @@ namespace SurvivalNotRequired.Patches
     [HarmonyPatch(typeof(HeadquartersConfig))]
     public static class HeadquartersConfigPatch
     {
+        internal static readonly Tag StorageTag = TagManager.Create("6DB61B5E-2CC7-4354-BFAE-A0577DD7D65B");
+        internal static readonly Tag ConduitDispenserTag = TagManager.Create("32EAE057-3F2E-44F0-833A-D9A212CD5F21");
+        internal static readonly Tag ElementConverterTag = TagManager.Create("051FC465-2947-453C-BE2E-FEAFDF51B5EA");
+        internal static readonly Tag GeneratorTag = TagManager.Create("B217C2D3-AAA6-4D7C-B079-C8EC0332BCAC");
+
         /// <summary>
         /// Postfix for <see cref="HeadquartersConfig.CreateBuildingDef"/>.
         /// </summary>
@@ -50,10 +56,11 @@ public static void ConfigureBuildingTemplatePostfix(GameObject go)
 
         internal static void ModifyBuildingTemplate(ref GameObject go)
         {
-            Storage defaultStorage = BuildingTemplates.CreateDefaultStorage(go);
-            defaultStorage.SetDefaultStoredItemModifiers(Storage.StandardSealedStorage);
+            Storage storage = go.AddComponentAndTag<Storage>(StorageTag);
+            storage.capacityKg = TelepadStatesInstancePatch.CapacityInKg;
+            storage.SetDefaultStoredItemModifiers(Storage.StandardSealedStorage);
 
-            ConduitDispenser conduitDispenser = go.AddOrGet<ConduitDispenser>();
+            ConduitDispenser conduitDispenser = go.AddComponentAndTag<ConduitDispenser>(ConduitDispenserTag);
             conduitDispenser.alwaysDispense = true;
             conduitDispenser.conduitType = ConduitType.Gas;
             conduitDispenser.elementFilter = new SimHashes[1]
@@ -62,14 +69,14 @@ internal static void ModifyBuildingTemplate(ref GameObject go)
             };
 
             // this converter is used indirectly but won't be converting anything
-            ElementConverter elementConverter = go.AddOrGet<ElementConverter>();
+            ElementConverter elementConverter = go.AddComponentAndTag<ElementConverter>(ElementConverterTag);
             elementConverter.OutputMultiplier = 1f;
             elementConverter.outputElements = new ElementConverter.OutputElement[]
             {
                 new ElementConverter.OutputElement(TelepadStatesInstancePatch.OxygenOutputInKgPerSecond, SimHashes.Oxygen, TelepadStatesInstancePatch.OxygenMinTemperatureInKelvin, false, true)
             };
 
-            Generator generator = go.AddOrGet<Generator>();
+            Generator generator = go.AddComponentAndTag<Generator>(GeneratorTag);
             generator.powerDistributionOrder = 10;
         }
     }

src/Patches/TelepadStatesInstancePatch.cs

@@ -15,6 +15,7 @@ public static class TelepadStatesInstancePatch
         public static float WattageRating { get; internal set; } = 400f;
         public static float SelfHeatKilowattsWhenActive { get; internal set; } = 1f; // that's 1,000 DTU/s
         public static bool ExtendMiniPod { get; internal set; } = true;
+        public static float CapacityInKg { get; internal set; } = 10f;
 
         public static void Postfix(Telepad.States __instance)
         {
@@ -23,7 +24,8 @@ static void doAdditionalStuffHandler(Telepad.StatesInstance smi, float dt)
                 smi.master.TryGetComponent<Operational>(out var operational);
 
                 // generate power
-                if (smi.master.TryGetComponent<Generator>(out var generator))
+                var generator = smi.master.GetComponents<Generator>().FirstOrDefault(c => c.HasTag(HeadquartersConfigPatch.GeneratorTag));
+                if (generator != null)
                 {
                     generator.EnergySim200ms(dt);
                     KSelectable component = smi.master.GetComponent<KSelectable>();
@@ -32,12 +34,13 @@ static void doAdditionalStuffHandler(Telepad.StatesInstance smi, float dt)
                 }
 
                 // dispense oxygen
-                if (smi.master.TryGetComponent<Storage>(out var storage) &&
-                    smi.master.TryGetComponent<ElementConverter>(out var elementConverter) &&
-                    operational?.IsOperational == true)
+                var storage = smi.master.GetComponents<Storage>().FirstOrDefault(c => c.HasTag(HeadquartersConfigPatch.StorageTag));
+                var elementConverter = smi.master.GetComponents<ElementConverter>().FirstOrDefault(c => c.HasTag(HeadquartersConfigPatch.ElementConverterTag));
+                if (storage != null && elementConverter != null && operational?.IsOperational == true)
                 {
                     var outputElement = elementConverter.outputElements.Single(o => o.elementHash == SimHashes.Oxygen);
                     float outputMass = outputElement.massGenerationRate * elementConverter.OutputMultiplier * dt;
+                    outputMass = Mathf.Max(Mathf.Min(outputMass, storage.RemainingCapacity()), 0);
                     Game.Instance.accumulators.Accumulate(outputElement.accumulator, outputMass);
 
                     var component = smi.master.GetComponent<PrimaryElement>();

src/PDFtoImage.CodeSigning.targets src/SurvivalNotRequired.CodeSigning.targets

@@ -4,7 +4,7 @@
     <TargetFramework>net471</TargetFramework>
     <AssemblyOriginatorKeyFile>SurvivalNotRequired.snk</AssemblyOriginatorKeyFile>
     <Configurations>Debug;Release;ReleaseSigned;ReleaseSigned</Configurations>
-    <Version>1.1.1</Version>
+    <Version>1.1.2</Version>
   </PropertyGroup>
 
   <!-- C# compiler -->
@@ -74,6 +74,6 @@
     </Reference>
   </ItemGroup>
 
-  <Import Project="PDFtoImage.PropertiesSigning.targets" />
-  <Import Project="PDFtoImage.CodeSigning.targets" />
+  <Import Project="SurvivalNotRequired.PropertiesSigning.targets" />
+  <Import Project="SurvivalNotRequired.CodeSigning.targets" />
 </Project>

src/PDFtoImage.PropertiesSigning.targets src/SurvivalNotRequired.PropertiesSigning.targets

@@ -1,4 +1,4 @@
 supportedContent: ALL
 minimumSupportedBuild: 514967
-version: 1.1.1
+version: 1.1.2
 APIVersion: 2

src/SurvivalNotRequired.csproj

@@ -11,4 +11,7 @@ wattageRating: 400.0
 selfHeatKilowattsWhenActive: 1.0
 
 # whether the Mini-Pod should be extended just like the Printing Pod
-extendMiniPod: true
+extendMiniPod: true
+
+# the storage capacity (for oxygen) of the Printing Pod
+capacityInKg: 10.0