From c1aa51c8e68469f744b5e82164e0f5dfd4b587d9 Mon Sep 17 00:00:00 2001 From: MattNL Date: Mon, 26 Sep 2022 14:17:28 -0400 Subject: [PATCH] Col Editor now fills in missing color files --- PCK-Studio/Forms/Editor/COLEditor.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs index 40a45035..f032cbd2 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.cs @@ -16,6 +16,7 @@ namespace PckStudio.Forms.Editor { public partial class COLEditor : MetroForm { + COLFile default_colourfile; COLFile colourfile; private readonly PCKFile.FileData _file; @@ -30,22 +31,29 @@ namespace PckStudio.Forms.Editor colourfile = COLFileReader.Read(stream); } - foreach (var obj in colourfile.entries) + using (var stream = new MemoryStream(Properties.Resources.colours)) { + default_colourfile = COLFileReader.Read(stream); + } + + foreach (var obj in default_colourfile.entries) + { + COLFile.ColorEntry entry = colourfile.entries.Find(color => color.name == obj.name); TreeNode tn = new TreeNode(obj.name); - tn.Tag = obj; + tn.Tag = entry != null ? entry : obj; colorTreeView.Nodes.Add(tn); } foreach (var obj in colourfile.waterEntries) { + COLFile.ExtendedColorEntry entry = colourfile.waterEntries.Find(color => color.name == obj.name); TreeNode tn = new TreeNode(obj.name); - tn.Tag = obj; + tn.Tag = entry != null ? entry : obj; waterTreeView.Nodes.Add(tn); TreeNode tnB = new TreeNode(obj.name); - tnB.Tag = obj; + tnB.Tag = entry != null ? entry : obj; underwaterTreeView.Nodes.Add(tnB); TreeNode tnC = new TreeNode(obj.name); - tnC.Tag = obj; + tnC.Tag = entry != null ? entry : obj; fogTreeView.Nodes.Add(tnC); } }