Move custom color loading to OnLoad

FirstPersonKSP · May 4, 2023 · 90354b8 · 90354b8
1 parent 08f74a8
commit 90354b8
Showing 1 changed file with 16 additions and 29 deletions.
diff --git a/RasterPropMonitor/Core/RasterPropMonitorComputer.cs b/RasterPropMonitor/Core/RasterPropMonitorComputer.cs
@@ -240,6 +240,22 @@ private VariableOrNumber AddVariable(string variableName)
         public override void OnLoad(ConfigNode node)
         {
             m_persistentVariables.Load(node);
+
+            foreach (var overrideColorSetup in node.GetNodes("RPM_COLOROVERRIDE"))
+            {
+                foreach (var colorConfig in overrideColorSetup.GetNodes("COLORDEFINITION"))
+                {
+                    string name = colorConfig.GetValue("name");
+                    Color32 color = default(Color);
+
+                    if (name != null && colorConfig.TryGetValue("color", ref color))
+                    {
+                        name = "COLOR_" + name.Trim();
+
+                        overrideColors[name] = color;
+                    }
+                }
+            }
         }
 
         public override void OnSave(ConfigNode node)
@@ -396,35 +412,6 @@ public void Start()
                     }
                 }
 
-                ConfigNode[] moduleConfigs = part.partInfo.partConfig.GetNodes("MODULE");
-                for (int moduleId = 0; moduleId < moduleConfigs.Length; ++moduleId)
-                {
-                    if (moduleConfigs[moduleId].GetValue("name") == moduleName)
-                    {
-                        ConfigNode[] overrideColorSetup = moduleConfigs[moduleId].GetNodes("RPM_COLOROVERRIDE");
-                        for (int colorGrp = 0; colorGrp < overrideColorSetup.Length; ++colorGrp)
-                        {
-                            ConfigNode[] colorConfig = overrideColorSetup[colorGrp].GetNodes("COLORDEFINITION");
-                            for (int defIdx = 0; defIdx < colorConfig.Length; ++defIdx)
-                            {
-                                if (colorConfig[defIdx].HasValue("name") && colorConfig[defIdx].HasValue("color"))
-                                {
-                                    string name = "COLOR_" + (colorConfig[defIdx].GetValue("name").Trim());
-                                    Color32 color = ConfigNode.ParseColor32(colorConfig[defIdx].GetValue("color").Trim());
-                                    if (overrideColors.ContainsKey(name))
-                                    {
-                                        overrideColors[name] = color;
-                                    }
-                                    else
-                                    {
-                                        overrideColors.Add(name, color);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
                 UpdateLocalCrew();
                 UpdateLocalVars();
             }