diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
index e34d56f4..8c972a95 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs
@@ -3,34 +3,34 @@ using System.Windows.Forms;
namespace PckStudio.Forms.Editor
{
- partial class COLEditor
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
+ partial class COLEditor
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(COLEditor));
this.metroPanel1 = new MetroFramework.Controls.MetroPanel();
@@ -51,6 +51,20 @@ namespace PckStudio.Forms.Editor
this.menuStrip = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.targetUpdateToolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU13ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU14ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU19ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU31ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU32ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU43ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU46ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU51ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU53ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU54ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.TU69ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this._1_9_1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.waterTab = new System.Windows.Forms.TabPage();
this.waterTreeView = new System.Windows.Forms.TreeView();
this.ColorContextMenu = new MetroFramework.Controls.MetroContextMenu(this.components);
@@ -270,7 +284,8 @@ namespace PckStudio.Forms.Editor
resources.ApplyResources(this.menuStrip, "menuStrip");
this.menuStrip.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.fileToolStripMenuItem});
+ this.fileToolStripMenuItem,
+ this.targetUpdateToolToolStripMenuItem});
this.menuStrip.Name = "menuStrip";
//
// fileToolStripMenuItem
@@ -287,6 +302,91 @@ namespace PckStudio.Forms.Editor
this.saveToolStripMenuItem1.Name = "saveToolStripMenuItem1";
this.saveToolStripMenuItem1.Click += new System.EventHandler(this.saveToolStripMenuItem1_Click);
//
+ // targetUpdateToolToolStripMenuItem
+ //
+ this.targetUpdateToolToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.TU12ToolStripMenuItem,
+ this.TU13ToolStripMenuItem,
+ this.TU14ToolStripMenuItem,
+ this.TU19ToolStripMenuItem,
+ this.TU31ToolStripMenuItem,
+ this.TU32ToolStripMenuItem,
+ this.TU43ToolStripMenuItem,
+ this.TU46ToolStripMenuItem,
+ this.TU51ToolStripMenuItem,
+ this.TU53ToolStripMenuItem,
+ this.TU54ToolStripMenuItem,
+ this.TU69ToolStripMenuItem,
+ this._1_9_1ToolStripMenuItem});
+ this.targetUpdateToolToolStripMenuItem.ForeColor = System.Drawing.Color.White;
+ this.targetUpdateToolToolStripMenuItem.Name = "targetUpdateToolToolStripMenuItem";
+ resources.ApplyResources(this.targetUpdateToolToolStripMenuItem, "targetUpdateToolToolStripMenuItem");
+ //
+ // TU12ToolStripMenuItem
+ //
+ this.TU12ToolStripMenuItem.Name = "TU12ToolStripMenuItem";
+ resources.ApplyResources(this.TU12ToolStripMenuItem, "TU12ToolStripMenuItem");
+ //
+ // TU13ToolStripMenuItem
+ //
+ this.TU13ToolStripMenuItem.Name = "TU13ToolStripMenuItem";
+ resources.ApplyResources(this.TU13ToolStripMenuItem, "TU13ToolStripMenuItem");
+ //
+ // TU14ToolStripMenuItem
+ //
+ this.TU14ToolStripMenuItem.Name = "TU14ToolStripMenuItem";
+ resources.ApplyResources(this.TU14ToolStripMenuItem, "TU14ToolStripMenuItem");
+ //
+ // TU19ToolStripMenuItem
+ //
+ this.TU19ToolStripMenuItem.Name = "TU19ToolStripMenuItem";
+ resources.ApplyResources(this.TU19ToolStripMenuItem, "TU19ToolStripMenuItem");
+ //
+ // TU31ToolStripMenuItem
+ //
+ this.TU31ToolStripMenuItem.Name = "TU31ToolStripMenuItem";
+ resources.ApplyResources(this.TU31ToolStripMenuItem, "TU31ToolStripMenuItem");
+ //
+ // TU32ToolStripMenuItem
+ //
+ this.TU32ToolStripMenuItem.Name = "TU32ToolStripMenuItem";
+ resources.ApplyResources(this.TU32ToolStripMenuItem, "TU32ToolStripMenuItem");
+ //
+ // TU43ToolStripMenuItem
+ //
+ this.TU43ToolStripMenuItem.Name = "TU43ToolStripMenuItem";
+ resources.ApplyResources(this.TU43ToolStripMenuItem, "TU43ToolStripMenuItem");
+ //
+ // TU46ToolStripMenuItem
+ //
+ this.TU46ToolStripMenuItem.Name = "TU46ToolStripMenuItem";
+ resources.ApplyResources(this.TU46ToolStripMenuItem, "TU46ToolStripMenuItem");
+ //
+ // TU51ToolStripMenuItem
+ //
+ this.TU51ToolStripMenuItem.Name = "TU51ToolStripMenuItem";
+ resources.ApplyResources(this.TU51ToolStripMenuItem, "TU51ToolStripMenuItem");
+ //
+ // TU53ToolStripMenuItem
+ //
+ this.TU53ToolStripMenuItem.Name = "TU53ToolStripMenuItem";
+ resources.ApplyResources(this.TU53ToolStripMenuItem, "TU53ToolStripMenuItem");
+ //
+ // TU54ToolStripMenuItem
+ //
+ this.TU54ToolStripMenuItem.Name = "TU54ToolStripMenuItem";
+ resources.ApplyResources(this.TU54ToolStripMenuItem, "TU54ToolStripMenuItem");
+ //
+ // TU69ToolStripMenuItem
+ //
+ this.TU69ToolStripMenuItem.Name = "TU69ToolStripMenuItem";
+ resources.ApplyResources(this.TU69ToolStripMenuItem, "TU69ToolStripMenuItem");
+ //
+ // _1_9_1ToolStripMenuItem
+ //
+ this._1_9_1ToolStripMenuItem.Name = "_1_9_1ToolStripMenuItem";
+ resources.ApplyResources(this._1_9_1ToolStripMenuItem, "_1_9_1ToolStripMenuItem");
+ //
// waterTab
//
this.waterTab.BackColor = System.Drawing.SystemColors.WindowFrame;
@@ -349,12 +449,12 @@ namespace PckStudio.Forms.Editor
// tabControl
//
resources.ApplyResources(this.tabControl, "tabControl");
- this.tabControl.Controls.Add(this.fogTab);
this.tabControl.Controls.Add(this.colorsTab);
this.tabControl.Controls.Add(this.waterTab);
this.tabControl.Controls.Add(this.underwaterTab);
+ this.tabControl.Controls.Add(this.fogTab);
this.tabControl.Name = "tabControl";
- this.tabControl.SelectedIndex = 0;
+ this.tabControl.SelectedIndex = 3;
this.tabControl.Style = MetroFramework.MetroColorStyle.White;
this.tabControl.Theme = MetroFramework.MetroThemeStyle.Dark;
this.tabControl.UseSelectable = true;
@@ -401,28 +501,28 @@ namespace PckStudio.Forms.Editor
this.fogTab.ResumeLayout(false);
this.ResumeLayout(false);
- }
+ }
- #endregion
+ #endregion
- private MetroFramework.Controls.MetroPanel metroPanel1;
- private TreeView colorTreeView;
- private TreeView waterTreeView;
+ private MetroFramework.Controls.MetroPanel metroPanel1;
+ private TreeView colorTreeView;
+ private TreeView waterTreeView;
private TreeView fogTreeView;
private TreeView underwaterTreeView;
- private System.Windows.Forms.PictureBox pictureBox1;
- private System.Windows.Forms.MenuStrip menuStrip;
- private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem1;
- private MetroFramework.Controls.MetroLabel blueLabel;
- private MetroFramework.Controls.MetroLabel greenLabel;
- private MetroFramework.Controls.MetroLabel redLabel;
- private MetroFramework.Controls.MetroLabel alphaLabel;
- private System.Windows.Forms.NumericUpDown alphaUpDown;
- private TabPage waterTab;
- private TabPage colorsTab;
- private MetroFramework.Controls.MetroTabControl tabControl;
- private MetroFramework.Controls.MetroButton setColorBtn;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.MenuStrip menuStrip;
+ private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem1;
+ private MetroFramework.Controls.MetroLabel blueLabel;
+ private MetroFramework.Controls.MetroLabel greenLabel;
+ private MetroFramework.Controls.MetroLabel redLabel;
+ private MetroFramework.Controls.MetroLabel alphaLabel;
+ private System.Windows.Forms.NumericUpDown alphaUpDown;
+ private TabPage waterTab;
+ private TabPage colorsTab;
+ private MetroFramework.Controls.MetroTabControl tabControl;
+ private MetroFramework.Controls.MetroButton setColorBtn;
private TabPage underwaterTab;
private TabPage fogTab;
private NumericUpDown blueUpDown;
@@ -434,5 +534,19 @@ namespace PckStudio.Forms.Editor
private ToolStripMenuItem restoreOriginalColorToolStripMenuItem;
private MetroFramework.Controls.MetroTextBox metroTextBox1;
private MetroFramework.Controls.MetroLabel metroLabel2;
+ private ToolStripMenuItem targetUpdateToolToolStripMenuItem;
+ private ToolStripMenuItem TU12ToolStripMenuItem;
+ private ToolStripMenuItem TU13ToolStripMenuItem;
+ private ToolStripMenuItem TU14ToolStripMenuItem;
+ private ToolStripMenuItem TU19ToolStripMenuItem;
+ private ToolStripMenuItem TU31ToolStripMenuItem;
+ private ToolStripMenuItem TU32ToolStripMenuItem;
+ private ToolStripMenuItem TU43ToolStripMenuItem;
+ private ToolStripMenuItem TU46ToolStripMenuItem;
+ private ToolStripMenuItem TU51ToolStripMenuItem;
+ private ToolStripMenuItem TU53ToolStripMenuItem;
+ private ToolStripMenuItem TU54ToolStripMenuItem;
+ private ToolStripMenuItem TU69ToolStripMenuItem;
+ private ToolStripMenuItem _1_9_1ToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs
index e6afa9a0..8ac3fb19 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.cs
+++ b/PCK-Studio/Forms/Editor/COLEditor.cs
@@ -36,29 +36,78 @@ namespace PckStudio.Forms.Editor
colourfile = COLFileReader.Read(stream);
}
- using (var stream = new MemoryStream(Properties.Resources.colours))
- {
- default_colourfile = COLFileReader.Read(stream);
- }
+ TU12ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 0);
+ TU13ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 1);
+ TU14ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 2);
+ TU19ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 3);
+ TU31ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 4);
+ TU32ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 5);
+ TU43ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 6);
+ TU46ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 7);
+ TU51ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 8);
+ TU53ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 9);
+ TU54ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 10);
+ TU69ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 11);
+ _1_9_1ToolStripMenuItem.Click += (sender, e) => SetUpDefaultFile(sender, e, 12);
- SetUpDefaultTable();
+ SetUpTable(false);
}
- void SetUpDefaultTable()
+ private void SetUpDefaultFile(object sender, EventArgs e, int ID)
{
- foreach (var obj in default_colourfile.entries)
+ var result = MessageBox.Show(this, "This function will set up your colour table to match that of the chosen version. You may lose some entries in the table. Are you sure you would like to continue?", "Target update version?", MessageBoxButtons.YesNo);
+ if (result == DialogResult.No) return;
+
+ switch(ID)
+ {
+ case 0: using (var stream = new MemoryStream(Properties.Resources.tu12colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 1: using (var stream = new MemoryStream(Properties.Resources.tu13colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 2: using (var stream = new MemoryStream(Properties.Resources.tu14colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 3: using (var stream = new MemoryStream(Properties.Resources.tu19colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 4: using (var stream = new MemoryStream(Properties.Resources.tu31colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 5: using (var stream = new MemoryStream(Properties.Resources.tu32colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 6: using (var stream = new MemoryStream(Properties.Resources.tu43colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 7: using (var stream = new MemoryStream(Properties.Resources.tu46colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 8: using (var stream = new MemoryStream(Properties.Resources.tu51colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 9: using (var stream = new MemoryStream(Properties.Resources.tu53colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 10: using (var stream = new MemoryStream(Properties.Resources.tu54colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 11: using (var stream = new MemoryStream(Properties.Resources.tu69colours)) default_colourfile = COLFileReader.Read(stream); break;
+ case 12: using (var stream = new MemoryStream(Properties.Resources._1_91_colours)) default_colourfile = COLFileReader.Read(stream); break;
+ default: return;
+ }
+
+ SetUpTable(true);
+ }
+
+ void SetUpTable(bool targetVersion)
+ {
+ colorTreeView.Nodes.Clear();
+ waterTreeView.Nodes.Clear();
+ underwaterTreeView.Nodes.Clear();
+ fogTreeView.Nodes.Clear();
+
+ COLFile temp = targetVersion ? default_colourfile : colourfile;
+
+ List CurrentEntries = new List();
+
+ foreach (var obj in temp.entries)
{
COLFile.ColorEntry entry = colourfile.entries.Find(color => color.name == obj.name);
TreeNode tn = new TreeNode(obj.name);
tn.Tag = entry != null ? entry : obj;
+ if (CurrentEntries.Contains(obj.name)) continue;
+ CurrentEntries.Add(obj.name);
colorTreeView.Nodes.Add(tn);
colorCache.Add(tn);
}
- foreach (var obj in default_colourfile.waterEntries)
+ CurrentEntries.Clear();
+ foreach (var obj in temp.waterEntries)
{
COLFile.ExtendedColorEntry entry = colourfile.waterEntries.Find(color => color.name == obj.name);
TreeNode tn = new TreeNode(obj.name);
tn.Tag = entry != null ? entry : obj;
+ if (CurrentEntries.Contains(obj.name)) continue;
+ CurrentEntries.Add(obj.name);
waterTreeView.Nodes.Add(tn);
waterCache.Add(tn);
TreeNode tnB = new TreeNode(obj.name);
diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx
index 2a9bbf20..bb3fd405 100644
--- a/PCK-Studio/Forms/Editor/COLEditor.resx
+++ b/PCK-Studio/Forms/Editor/COLEditor.resx
@@ -117,20 +117,212 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ metroTextBox1
+
+
+ MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 2
+
+
+ metroLabel2
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 3
+
+
+ setColorBtn
+
+
+ MetroFramework.Controls.MetroButton, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 4
+
+
+ blueUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 5
+
+
+ greenUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 6
+
+
+ redUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 7
+
+
+ alphaUpDown
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 8
+
+
+ alphaLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 9
+
+
+ blueLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 10
+
+
+ greenLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 11
+
+
+ redLabel
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 12
+
+
+ colorTextbox
+
+
+ MetroFramework.Controls.MetroTextBox, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 13
+
+
+ metroLabel1
+
+
+ MetroFramework.Controls.MetroLabel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ metroPanel1
+
+
+ 14
+
+
+ pictureBox1
+
+
+ System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ metroPanel1
+
+
+ 15
+
+
+ Fill
+
+
+
+ 20, 60
+
+
+ 612, 523
+
+
+
+ 0
+
+
+ metroPanel1
+
+
+ MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
+
+
+ $this
+
+
+ 3
+
-
113, 1
21, 21
-
- 1
+ 0
False
@@ -418,7 +610,7 @@
21, 21
- 1
+ 0
False
@@ -492,58 +684,12 @@
15
-
- Fill
-
-
- 20, 60
-
-
- 612, 523
-
-
- 0
-
-
- metroPanel1
-
-
- MetroFramework.Controls.MetroPanel, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
-
- $this
-
-
- 3
-
17, 17
False
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8
- QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C
- y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga
- QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN
- 38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC
-
-
-
- 98, 22
-
-
- Save
-
-
- 37, 20
-
-
- File
-
20, 60
@@ -568,15 +714,151 @@
1
+
+ 37, 20
+
+
+ File
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADfSURBVDhPYxg8
+ QLt++3yTGbf/Fm599P/Nh49wfPXxq/+rTt37f+Dak/8gOSBgAGEMANIMxGBFyAasPf/0v8GE8//z1t8C
+ y4HU4DIALIluwLpLL+HiMANAGKoNAWASCavv/n/57gPcgOvP3oENOXj7NViOoAFGU6791+k4ghWD5Aga
+ QCyGakMAkODcU89R/I8Ng9TgNADk14dPn/8/c+kqVgySgwUqVBsCwAx49urN/zsPHmPFIDmaGvAXJInN
+ 38gYasBfqDYE0K7dOn/Wvut/sfkdGYPUgJI9VNuAAwYGAGn6yvdevWgPAAAAAElFTkSuQmCC
+
+
+
+ 98, 22
+
+
+ Save
+
+
+ 117, 20
+
+
+ Target Update Tool
+
+
+ 414, 22
+
+
+ TU12 (360)
+
+
+ 414, 22
+
+
+ TU13/1.00 (360/PS3)
+
+
+ 414, 22
+
+
+ TU14/1.04 (360/PS3)
+
+
+ 414, 22
+
+
+ TU19/1.12/CU7 (360/PS3-4-Vita/XONE)
+
+
+ 414, 22
+
+
+ TU31/1.22/CU19 (360/PS3-4-Vita/XONE)
+
+
+ 414, 22
+
+
+ TU32/1.24/CU20/P3 (360/PS3-4-Vita/XONE/WIIU)
+
+
+ 414, 22
+
+
+ TU43/1.35/CU32/P12 (360/PS3-4-Vita/XONE/WIIU)
+
+
+ 414, 22
+
+
+ TU46/1.38/CU36/P15 (360/PS3-4-Vita/XONE/WIIU)
+
+
+ 414, 22
+
+
+ TU51/1.44/CU41/P20 (360/PS3-4-Vita/XONE/WIIU)
+
+
+ 414, 22
+
+
+ TU53/1.49/CU43/P23/1.0.3 (360/PS3-4-Vita/XONE/WIIU/SWITCH)
+
+
+ 414, 22
+
+
+ TU54/1.52/CU44/P24/1.0.4 (360/PS3-4-Vita/XONE/WIIU/SWITCH)
+
+
+ 414, 22
+
+
+ TU69/1.76/P38 (360/PS3-4-Vita/WIIU)
+
+
+ 414, 22
+
+
+ 1.91 (PS4)
+
+
+ waterTreeView
+
+
+ System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ waterTab
+
+
+ 0
+
+
+ 4, 38
+
+
+ 320, 424
+
+
+ 1
+
+
+ Water
+
+
+ waterTab
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl
+
+
+ 1
+
125, 17
-
- 186, 22
-
-
- Restore original color
-
187, 26
@@ -596,7 +878,7 @@
No
- 320, 381
+ 320, 424
0
@@ -613,35 +895,17 @@
0
-
- 4, 38
+
+ 186, 22
-
- 320, 381
-
-
- 1
-
-
- Water
-
-
- waterTab
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl
-
-
- 2
+
+ Restore original color
0, 0
- 320, 381
+ 320, 424
0
@@ -662,7 +926,7 @@
0, 0
- 320, 381
+ 320, 424
0
@@ -679,18 +943,6 @@
0
-
- Fill
-
-
- 0, 0
-
-
- 320, 381
-
-
- 0
-
colorTreeView
@@ -707,7 +959,7 @@
4, 38
- 320, 381
+ 320, 424
0
@@ -725,40 +977,40 @@
tabControl
- 1
+ 0
+
+
+ Fill
+
+
+ 0, 0
+
+
+ 320, 424
+
+
+ 0
+
+
+ colorTreeView
+
+
+ System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ colorsTab
+
+
+ 0
Top, Bottom, Left
-
- 4, 38
-
-
- 320, 381
-
-
- 3
-
-
- Underwater Fog
-
-
- fogTab
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl
-
-
- 0
-
4, 38
- 320, 381
+ 320, 424
2
@@ -776,13 +1028,37 @@
tabControl
+ 2
+
+
+ 4, 38
+
+
+ 320, 424
+
+
+ 3
+
+
+ Underwater Fog
+
+
+ fogTab
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl
+
+
3
23, 114
- 328, 423
+ 328, 466
22
@@ -3335,6 +3611,90 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ targetUpdateToolToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU12ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU13ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU14ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU19ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU31ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU32ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU43ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU46ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU51ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU53ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU54ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ TU69ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ _1_9_1ToolStripMenuItem
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
restoreOriginalColorToolStripMenuItem
diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs
index 650efe86..775fbf42 100644
--- a/PCK-Studio/MainForm.cs
+++ b/PCK-Studio/MainForm.cs
@@ -2776,7 +2776,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/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index e36b48c3..f9d7c198 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -628,7 +628,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -665,12 +677,10 @@
-
-
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