diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs index e6afa9a0..6094e4e7 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.cs @@ -36,17 +36,24 @@ namespace PckStudio.Forms.Editor colourfile = COLFileReader.Read(stream); } - using (var stream = new MemoryStream(Properties.Resources.colours)) + using (var stream = new MemoryStream(Properties.Resources.tu69colours)) { default_colourfile = COLFileReader.Read(stream); } - SetUpDefaultTable(); + SetUpTable(false); } - void SetUpDefaultTable() + void SetUpTable(bool targetVersion) { - foreach (var obj in default_colourfile.entries) + colorTreeView.Nodes.Clear(); + waterTreeView.Nodes.Clear(); + underwaterTreeView.Nodes.Clear(); + fogTreeView.Nodes.Clear(); + + COLFile temp = targetVersion ? default_colourfile : colourfile; + + foreach (var obj in temp.entries) { COLFile.ColorEntry entry = colourfile.entries.Find(color => color.name == obj.name); TreeNode tn = new TreeNode(obj.name); @@ -54,7 +61,7 @@ namespace PckStudio.Forms.Editor colorTreeView.Nodes.Add(tn); colorCache.Add(tn); } - foreach (var obj in default_colourfile.waterEntries) + foreach (var obj in temp.waterEntries) { COLFile.ExtendedColorEntry entry = colourfile.waterEntries.Find(color => color.name == obj.name); TreeNode tn = new TreeNode(obj.name); diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 8491d81c..6e5f8041 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -2763,7 +2763,7 @@ namespace PckStudio return; } NewColorFile = new PCKFile.FileData("colours.col", PCKFile.FileData.FileType.ColourTableFile); - NewColorFile.SetData(Resources.colours); + NewColorFile.SetData(Resources.tu69colours); currentPCK.Files.Add(NewColorFile); BuildMainTreeView(); } diff --git a/PCK-Studio/Properties/Resources.Designer.cs b/PCK-Studio/Properties/Resources.Designer.cs index f1953c7d..eaa2c666 100644 --- a/PCK-Studio/Properties/Resources.Designer.cs +++ b/PCK-Studio/Properties/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace PckStudio.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] _1_91_colours { + get { + object obj = ResourceManager.GetObject("_1_91_colours", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -209,16 +219,6 @@ namespace PckStudio.Properties { } } - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] colours { - get { - object obj = ResourceManager.GetObject("colours", resourceCulture); - return ((byte[])(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -553,6 +553,126 @@ namespace PckStudio.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu12colours { + get { + object obj = ResourceManager.GetObject("tu12colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu13colours { + get { + object obj = ResourceManager.GetObject("tu13colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu14colours { + get { + object obj = ResourceManager.GetObject("tu14colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu19colours { + get { + object obj = ResourceManager.GetObject("tu19colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu31colours { + get { + object obj = ResourceManager.GetObject("tu31colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu32colours { + get { + object obj = ResourceManager.GetObject("tu32colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu43colours { + get { + object obj = ResourceManager.GetObject("tu43colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu46colours { + get { + object obj = ResourceManager.GetObject("tu46colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu51colours { + get { + object obj = ResourceManager.GetObject("tu51colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu53colours { + get { + object obj = ResourceManager.GetObject("tu53colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu54colours { + get { + object obj = ResourceManager.GetObject("tu54colours", resourceCulture); + return ((byte[])(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] tu69colours { + get { + object obj = ResourceManager.GetObject("tu69colours", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx index 9b83af55..de9fcdfc 100644 --- a/PCK-Studio/Properties/Resources.resx +++ b/PCK-Studio/Properties/Resources.resx @@ -271,13 +271,49 @@ ..\Resources\iconImageList\SKINS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fileTemplates\colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\iconImageList\BEHAVIOURS ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\AddTexture.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fileTemplates\tu12colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu13colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu14colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu19colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu31colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu32colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu43colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu46colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu51colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu53colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu54colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\tu69colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\fileTemplates\1.91_colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/PCK-Studio/Resources/fileTemplates/1.91_colours.col b/PCK-Studio/Resources/fileTemplates/1.91_colours.col new file mode 100644 index 00000000..55285a44 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/1.91_colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu12colours.col b/PCK-Studio/Resources/fileTemplates/tu12colours.col new file mode 100644 index 00000000..6a964f1e Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu12colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu13colours.col b/PCK-Studio/Resources/fileTemplates/tu13colours.col new file mode 100644 index 00000000..ab019900 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu13colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu14colours.col b/PCK-Studio/Resources/fileTemplates/tu14colours.col new file mode 100644 index 00000000..51c27349 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu14colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu19colours.col b/PCK-Studio/Resources/fileTemplates/tu19colours.col new file mode 100644 index 00000000..ebdcf7a9 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu19colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu31colours.col b/PCK-Studio/Resources/fileTemplates/tu31colours.col new file mode 100644 index 00000000..28b5ebf0 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu31colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu32colours.col b/PCK-Studio/Resources/fileTemplates/tu32colours.col new file mode 100644 index 00000000..d7a2c78e Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu32colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu43colours.col b/PCK-Studio/Resources/fileTemplates/tu43colours.col new file mode 100644 index 00000000..7b324870 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu43colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu46colours.col b/PCK-Studio/Resources/fileTemplates/tu46colours.col new file mode 100644 index 00000000..225498b5 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu46colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu51colours.col b/PCK-Studio/Resources/fileTemplates/tu51colours.col new file mode 100644 index 00000000..a8fe546d Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu51colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu53colours.col b/PCK-Studio/Resources/fileTemplates/tu53colours.col new file mode 100644 index 00000000..f8601b81 Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu53colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/tu54colours.col b/PCK-Studio/Resources/fileTemplates/tu54colours.col new file mode 100644 index 00000000..559048cf Binary files /dev/null and b/PCK-Studio/Resources/fileTemplates/tu54colours.col differ diff --git a/PCK-Studio/Resources/fileTemplates/colours.col b/PCK-Studio/Resources/fileTemplates/tu69colours.col similarity index 100% rename from PCK-Studio/Resources/fileTemplates/colours.col rename to PCK-Studio/Resources/fileTemplates/tu69colours.col