Clamp UntrackedObjectClass for 1.8 (not clear this is needed, but eh)

KSP-RO · Jul 29, 2022 · 68509b1 · 68509b1
1 parent aed6b9b
commit 68509b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+Contract Configurator 2.1.2
+- Fix compatibility with 1.8.1/1.9
+
 Contract Configurator 2.1.1
 - Fix tag handling
 

diff --git a/source/ContractConfigurator/Behaviour/SpawnVessel.cs b/source/ContractConfigurator/Behaviour/SpawnVessel.cs
@@ -271,6 +271,10 @@ public static SpawnVessel Create(ConfigNode configNode, SpawnVesselFactory facto
 
             return valid ? spawnVessel : null;
         }
+
+        // For 1.8/1.9 compat
+        protected static int UntrackedObjectEnumCount = System.Enum.GetValues(typeof(UntrackedObjectClass)).Length;
+        protected static UntrackedObjectClass GetObjectSize(int size) => (UntrackedObjectClass)(Math.Min(UntrackedObjectEnumCount - 1, size));
 
         protected bool CreateVessels()
         {
@@ -379,19 +383,19 @@ protected bool CreateVessels()
                     // Only for KSP 1.10+
                     else if (size < 52.125f)
                     {
-                        sizeClass = UntrackedObjectClass.F;
+                        sizeClass = GetObjectSize(5);
                     }
                     else if (size < 86.875f)
                     {
-                        sizeClass = UntrackedObjectClass.G;
+                        sizeClass = GetObjectSize(6);
                     }
                     else if (size < 144.75f)
                     {
-                        sizeClass = UntrackedObjectClass.H;
+                        sizeClass = GetObjectSize(7);
                     }
                     else
                     {
-                        sizeClass = UntrackedObjectClass.I;
+                        sizeClass = GetObjectSize(8);
                     }
 
                     foreach (CrewData cd in vesselData.crew)