From 9615114d71bf128c86ce93b13c862eb2148cecf1 Mon Sep 17 00:00:00 2001 From: MattN-L Date: Sun, 31 Mar 2024 15:37:34 -0400 Subject: [PATCH] Added Menu Tool for PS4 Biome Water Colors --- PCK-Studio/Forms/Editor/COLEditor.Designer.cs | 60 ++- PCK-Studio/Forms/Editor/COLEditor.cs | 49 +- PCK-Studio/Forms/Editor/COLEditor.resx | 468 ++++++++++++------ 3 files changed, 391 insertions(+), 186 deletions(-) diff --git a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs index fd3f96eb..89d8a9de 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.Designer.cs @@ -64,6 +64,8 @@ namespace PckStudio.Forms.Editor this.tabControl = new MetroFramework.Controls.MetroTabControl(); this.underwaterTab = new System.Windows.Forms.TabPage(); this.fogTab = new System.Windows.Forms.TabPage(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.targetUpdateToolStripMenuItem = 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(); @@ -77,7 +79,7 @@ namespace PckStudio.Forms.Editor this.TU54ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TU69ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this._1_9_1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.targetUpdateToolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stripPS4BiomesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.metroPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.blueUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.greenUpDown)).BeginInit(); @@ -289,7 +291,7 @@ namespace PckStudio.Forms.Editor 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.targetUpdateToolToolStripMenuItem}); + this.toolsToolStripMenuItem}); this.menuStrip.Name = "menuStrip"; // // fileToolStripMenuItem @@ -406,6 +408,34 @@ namespace PckStudio.Forms.Editor resources.ApplyResources(this.fogTab, "fogTab"); this.fogTab.Name = "fogTab"; // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.stripPS4BiomesToolStripMenuItem, + this.targetUpdateToolStripMenuItem}); + this.toolsToolStripMenuItem.ForeColor = System.Drawing.Color.White; + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + resources.ApplyResources(this.toolsToolStripMenuItem, "toolsToolStripMenuItem"); + // + // targetUpdateToolStripMenuItem + // + this.targetUpdateToolStripMenuItem.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.targetUpdateToolStripMenuItem.Name = "targetUpdateToolStripMenuItem"; + resources.ApplyResources(this.targetUpdateToolStripMenuItem, "targetUpdateToolStripMenuItem"); + // // TU12ToolStripMenuItem // this.TU12ToolStripMenuItem.Name = "TU12ToolStripMenuItem"; @@ -471,25 +501,11 @@ namespace PckStudio.Forms.Editor this._1_9_1ToolStripMenuItem.Name = "_1_9_1ToolStripMenuItem"; resources.ApplyResources(this._1_9_1ToolStripMenuItem, "_1_9_1ToolStripMenuItem"); // - // targetUpdateToolToolStripMenuItem + // stripPS4BiomesToolStripMenuItem // - 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"); + this.stripPS4BiomesToolStripMenuItem.Name = "stripPS4BiomesToolStripMenuItem"; + resources.ApplyResources(this.stripPS4BiomesToolStripMenuItem, "stripPS4BiomesToolStripMenuItem"); + this.stripPS4BiomesToolStripMenuItem.Click += new System.EventHandler(this.stripPS4BiomesToolStripMenuItem_Click); // // COLEditor // @@ -555,7 +571,8 @@ namespace PckStudio.Forms.Editor private MetroFramework.Controls.MetroLabel metroLabel2; private ToolStripMenuItem copyColorToolStripMenuItem; private ToolStripMenuItem pasteColorToolStripMenuItem; - private ToolStripMenuItem targetUpdateToolToolStripMenuItem; + private ToolStripMenuItem toolsToolStripMenuItem; + private ToolStripMenuItem targetUpdateToolStripMenuItem; private ToolStripMenuItem TU12ToolStripMenuItem; private ToolStripMenuItem TU13ToolStripMenuItem; private ToolStripMenuItem TU14ToolStripMenuItem; @@ -569,5 +586,6 @@ namespace PckStudio.Forms.Editor private ToolStripMenuItem TU54ToolStripMenuItem; private ToolStripMenuItem TU69ToolStripMenuItem; private ToolStripMenuItem _1_9_1ToolStripMenuItem; + private ToolStripMenuItem stripPS4BiomesToolStripMenuItem; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Editor/COLEditor.cs b/PCK-Studio/Forms/Editor/COLEditor.cs index d305ce62..bf87d522 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.cs +++ b/PCK-Studio/Forms/Editor/COLEditor.cs @@ -242,33 +242,6 @@ namespace PckStudio.Forms.Editor private void saveToolStripMenuItem1_Click(object sender, EventArgs e) { - List PS4Biomes = new List - { - "bamboo_jungle", - "bamboo_jungle_hills", - "mesa_mutated", - "mega_spruce_taiga_mutated", - "mega_taiga_mutated" - }; - - if (colourfile.WaterColors.Find(e => PS4Biomes.Contains(e.Name)) != null) - { - var result = MessageBox.Show(this, "Biomes exclusive to PS4 Edition v1.91 were found in the water section of this colour table. This will crash all other editions of the game and PS4 Edition v1.90 and below. Would you like to remove them?", "Potentially unsupported biomes found", MessageBoxButtons.YesNoCancel); - switch (result) - { - case DialogResult.Yes: - foreach (var col in colourfile.WaterColors.ToList()) - { - if(PS4Biomes.Contains(col.Name)) colourfile.WaterColors.Remove(col); - } - break; - case DialogResult.No: - break; - default: - return; - } - } - _file.SetData(new COLFileWriter(colourfile)); DialogResult = DialogResult.OK; @@ -571,5 +544,27 @@ namespace PckStudio.Forms.Editor e.Handled = !hexCheck.Contains(e.KeyChar); } + + private void stripPS4BiomesToolStripMenuItem_Click(object sender, EventArgs e) + { + if(colourfile.WaterColors.Count > 0) + { + List PS4Biomes = new List + { + "bamboo_jungle", + "bamboo_jungle_hills", + "mesa_mutated", + "mega_spruce_taiga_mutated", + "mega_taiga_mutated" + }; + + foreach (var col in colourfile.WaterColors.ToList()) + { + if (PS4Biomes.Contains(col.Name)) colourfile.WaterColors.Remove(col); + } + + SetUpTable(false); + } + } } } diff --git a/PCK-Studio/Forms/Editor/COLEditor.resx b/PCK-Studio/Forms/Editor/COLEditor.resx index c204e40f..add75e29 100644 --- a/PCK-Studio/Forms/Editor/COLEditor.resx +++ b/PCK-Studio/Forms/Editor/COLEditor.resx @@ -117,18 +117,210 @@ 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 - 0 @@ -492,142 +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 - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADdSURBVDhPzZJB - CoJQEIa9jy0iPFAnCDpAtG3ZooUE4b6oVtIuClpJIAgqZEVlKpqEHUAm5pGPmhTbRA18G//5P5iHgvA3 - I7ZniiQ7aVM9QZzcOKYbwVDbw8I6A2YAICBvg2VJdtjSs2Cse1Dt6tCYbliGO0UCFlLBxAj590yA0D4X - 1Ec7CK8JF9j+lUmWzoVlpYJaz4JKZ5ULZqWCT6F9Jhhowcv9eeBOoQBvPXoBrA0zF8yyR6V9LvCjGLYH - NxfMvipIMaQ3Ux6ClPYFsaUq/bmd0rspuIO/Pe3/bu5p+sr3gTvFEQAAAABJRU5ErkJggg== - - - - 180, 22 - - - Save - - - 37, 20 - - - File - - - 416, 22 - - - TU12 (360) - - - 416, 22 - - - TU13/1.00 (360/PS3) - - - 416, 22 - - - TU14/1.04 (360/PS3) - - - 416, 22 - - - TU19/1.12/CU7 (360/PS3-4-Vita/XONE) - - - 416, 22 - - - TU31/1.22/CU19 (360/PS3-4-Vita/XONE) - - - 416, 22 - - - TU32/1.24/CU20/P3 (360/PS3-4-Vita/XONE/WIIU) - - - 416, 22 - - - TU43/1.35/CU32/P12 (360/PS3-4-Vita/XONE/WIIU) - - - 416, 22 - - - TU46/1.38/CU36/P15 (360/PS3-4-Vita/XONE/WIIU) - - - 416, 22 - - - TU51/1.44/CU41/P20 (360/PS3-4-Vita/XONE/WIIU) - - - 416, 22 - - - TU53/1.49/CU43/P23/1.0.3 (360/PS3-4-Vita/XONE/WIIU/SWITCH) - - - 416, 22 - - - TU54/1.52/CU44/P24/1.0.4 (360/PS3-4-Vita/XONE/WIIU/SWITCH) - - - 416, 22 - - - TU69/1.76/P38 (360/PS3-4-Vita/WIIU) - - - 416, 22 - - - 1.91 (PS4) - - - 119, 20 - - - Target Update Tool - 20, 60 @@ -652,6 +714,28 @@ 1 + + 37, 20 + + + File + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4yMfEgaZUAAADdSURBVDhPzZJB + CoJQEIa9jy0iPFAnCDpAtG3ZooUE4b6oVtIuClpJIAgqZEVlKpqEHUAm5pGPmhTbRA18G//5P5iHgvA3 + I7ZniiQ7aVM9QZzcOKYbwVDbw8I6A2YAICBvg2VJdtjSs2Cse1Dt6tCYbliGO0UCFlLBxAj590yA0D4X + 1Ec7CK8JF9j+lUmWzoVlpYJaz4JKZ5ULZqWCT6F9Jhhowcv9eeBOoQBvPXoBrA0zF8yyR6V9LvCjGLYH + NxfMvipIMaQ3Ux6ClPYFsaUq/bmd0rspuIO/Pe3/bu5p+sr3gTvFEQAAAABJRU5ErkJggg== + + + + 180, 22 + + + Save + 125, 17 @@ -668,13 +752,13 @@ Paste Color - 134, 22 + 145, 22 - Restore + Restore Color - 135, 70 + 146, 70 ColorContextMenu @@ -895,6 +979,102 @@ 2 + + 47, 20 + + + Tools + + + 180, 22 + + + Target Update + + + 416, 22 + + + TU12 (360) + + + 416, 22 + + + TU13/1.00 (360/PS3) + + + 416, 22 + + + TU14/1.04 (360/PS3) + + + 416, 22 + + + TU19/1.12/CU7 (360/PS3-4-Vita/XONE) + + + 416, 22 + + + TU31/1.22/CU19 (360/PS3-4-Vita/XONE) + + + 416, 22 + + + TU32/1.24/CU20/P3 (360/PS3-4-Vita/XONE/WIIU) + + + 416, 22 + + + TU43/1.35/CU32/P12 (360/PS3-4-Vita/XONE/WIIU) + + + 416, 22 + + + TU46/1.38/CU36/P15 (360/PS3-4-Vita/XONE/WIIU) + + + 416, 22 + + + TU51/1.44/CU41/P20 (360/PS3-4-Vita/XONE/WIIU) + + + 416, 22 + + + TU53/1.49/CU43/P23/1.0.3 (360/PS3-4-Vita/XONE/WIIU/SWITCH) + + + 416, 22 + + + TU54/1.52/CU44/P24/1.0.4 (360/PS3-4-Vita/XONE/WIIU/SWITCH) + + + 416, 22 + + + TU69/1.76/P38 (360/PS3-4-Vita/WIIU) + + + 416, 22 + + + 1.91 (PS4) + + + 213, 22 + + + Remove PS4 Biome Colors + True @@ -3449,6 +3629,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + targetUpdateToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TU12ToolStripMenuItem @@ -3527,10 +3719,10 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - targetUpdateToolToolStripMenuItem + + stripPS4BiomesToolStripMenuItem - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089