Skip to content

Commit 90354b8

Browse files
committed
Move custom color loading to OnLoad
1 parent 08f74a8 commit 90354b8

File tree

1 file changed

+16
-29
lines changed

1 file changed

+16
-29
lines changed

RasterPropMonitor/Core/RasterPropMonitorComputer.cs

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,22 @@ private VariableOrNumber AddVariable(string variableName)
240240
public override void OnLoad(ConfigNode node)
241241
{
242242
m_persistentVariables.Load(node);
243+
244+
foreach (var overrideColorSetup in node.GetNodes("RPM_COLOROVERRIDE"))
245+
{
246+
foreach (var colorConfig in overrideColorSetup.GetNodes("COLORDEFINITION"))
247+
{
248+
string name = colorConfig.GetValue("name");
249+
Color32 color = default(Color);
250+
251+
if (name != null && colorConfig.TryGetValue("color", ref color))
252+
{
253+
name = "COLOR_" + name.Trim();
254+
255+
overrideColors[name] = color;
256+
}
257+
}
258+
}
243259
}
244260

245261
public override void OnSave(ConfigNode node)
@@ -396,35 +412,6 @@ public void Start()
396412
}
397413
}
398414

399-
ConfigNode[] moduleConfigs = part.partInfo.partConfig.GetNodes("MODULE");
400-
for (int moduleId = 0; moduleId < moduleConfigs.Length; ++moduleId)
401-
{
402-
if (moduleConfigs[moduleId].GetValue("name") == moduleName)
403-
{
404-
ConfigNode[] overrideColorSetup = moduleConfigs[moduleId].GetNodes("RPM_COLOROVERRIDE");
405-
for (int colorGrp = 0; colorGrp < overrideColorSetup.Length; ++colorGrp)
406-
{
407-
ConfigNode[] colorConfig = overrideColorSetup[colorGrp].GetNodes("COLORDEFINITION");
408-
for (int defIdx = 0; defIdx < colorConfig.Length; ++defIdx)
409-
{
410-
if (colorConfig[defIdx].HasValue("name") && colorConfig[defIdx].HasValue("color"))
411-
{
412-
string name = "COLOR_" + (colorConfig[defIdx].GetValue("name").Trim());
413-
Color32 color = ConfigNode.ParseColor32(colorConfig[defIdx].GetValue("color").Trim());
414-
if (overrideColors.ContainsKey(name))
415-
{
416-
overrideColors[name] = color;
417-
}
418-
else
419-
{
420-
overrideColors.Add(name, color);
421-
}
422-
}
423-
}
424-
}
425-
}
426-
}
427-
428415
UpdateLocalCrew();
429416
UpdateLocalVars();
430417
}

0 commit comments

Comments
 (0)