diff --git a/NHSE.Core/Structures/GameLists.cs b/NHSE.Core/Structures/GameLists.cs index 16dbcda..f9e7e09 100644 --- a/NHSE.Core/Structures/GameLists.cs +++ b/NHSE.Core/Structures/GameLists.cs @@ -341,6 +341,50 @@ public static class GameLists 12629, // scenic painting (forgery) }; + public static readonly IReadOnlyList Dive = new ushort[] + { + 02620, // seaweed + 02830, // sea grapes + 02831, // sea urchin + 02832, // acorn barnacle + 02833, // oyster + 02834, // turban shell + 02835, // abalone + 02838, // pearl oyster + 02839, // scallop + 02840, // sea anemone + 02841, // sea star + 02842, // sea cucumber + 02843, // sea slug + 02844, // flatworm + 02845, // mantis shrimp + 02846, // sweet shrimp + 02847, // tiger prawn + 02848, // spiny lobster + 02849, // lobster + 02850, // snow crab + 02852, // red king crab + 02853, // spider crab + 02854, // octopus + 02855, // spotted garden eel + 02856, // chambered nautilus + 02857, // horseshoe crab + 02858, // giant isopod + 06920, // firefly squid + 07191, // gazami crab + 07203, // vampire squid + 07214, // gigas giant clam + 07228, // sea pineapple + 07245, // moon jellyfish + 07252, // umbrella octopus + 07267, // slate pencil urchin + 07278, // whelk + 07303, // sea pig + 07308, // Dungeness crab + 07318, // Venus' flower basket + 07411, // mussel + }; + public static readonly HashSet Shells = new HashSet { 1374, // sea snail @@ -353,6 +397,7 @@ public static class GameLists 1382, // cowrie 5982, // summer shell + 12968, // pearl }; public static readonly HashSet Terraforming = new HashSet diff --git a/NHSE.Core/Structures/Misc/MuseumEditor.cs b/NHSE.Core/Structures/Misc/MuseumEditor.cs index 1544d8f..f81840c 100644 --- a/NHSE.Core/Structures/Misc/MuseumEditor.cs +++ b/NHSE.Core/Structures/Misc/MuseumEditor.cs @@ -61,6 +61,7 @@ public int GiveAll(string[] englishNames, int interval = 20) GameLists.Fish, GameLists.Fossils, GameLists.Bugs, + GameLists.Dive, }.SelectMany(z => z).ToArray(); RandUtil.Shuffle(items); diff --git a/NHSE.Parsing/GameBCSVDumper.cs b/NHSE.Parsing/GameBCSVDumper.cs index ff01262..477357f 100644 --- a/NHSE.Parsing/GameBCSVDumper.cs +++ b/NHSE.Parsing/GameBCSVDumper.cs @@ -53,6 +53,7 @@ void DumpB(string fn, byte[] bytes, string dir = "bin") DumpS("outsideAcres.txt", GetAcreNames(pathBCSV)); DumpS("fish.txt", GetFishList(pathBCSV, itemNames)); + DumpS("dive.txt", GetDiveList(pathBCSV, itemNames)); DumpS("bugs.txt", GetInsectList(pathBCSV, itemNames)); DumpS("fossils.txt", GetFossilList(pathBCSV, itemNames)); DumpS("eventFlagPlayer.txt", GetEventFlagNames(pathBCSV)); @@ -339,6 +340,11 @@ public static IEnumerable GetFishList(string pathBCSV, string fn = "Fish return GetItemList(pathBCSV, fn, 0x20CB67BC); } + public static IEnumerable GetDiveList(string pathBCSV, string fn = "SeafoodStatusParam.bcsv") + { + return GetItemList(pathBCSV, fn, 0x20CB67BC); + } + public static IEnumerable GetInsectList(string pathBCSV, IReadOnlyList items, string fn = "InsectStatusParam.bcsv") { var insects = GetInsectList(pathBCSV, fn); @@ -351,6 +357,12 @@ public static IEnumerable GetFishList(string pathBCSV, IReadOnlyList $"{z:00000}, // {items[z]}"); } + public static IEnumerable GetDiveList(string pathBCSV, IReadOnlyList items, string fn = "SeafoodStatusParam.bcsv") + { + var insects = GetDiveList(pathBCSV, fn); + return insects.Select(z => $"{z:00000}, // {items[z]}"); + } + public static IEnumerable GetFossilList(string pathBCSV, IReadOnlyList items, string fn = "MuseumFossilDonateInfo.bcsv") { var fossils = GetFossilList(pathBCSV, fn); diff --git a/NHSE.WinForms/Controls/ItemGridEditor.Designer.cs b/NHSE.WinForms/Controls/ItemGridEditor.Designer.cs index 86af256..14e3c74 100644 --- a/NHSE.WinForms/Controls/ItemGridEditor.Designer.cs +++ b/NHSE.WinForms/Controls/ItemGridEditor.Designer.cs @@ -39,9 +39,6 @@ private void InitializeComponent() this.Menu_Set = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Delete = new System.Windows.Forms.ToolStripMenuItem(); this.B_Clear = new System.Windows.Forms.Button(); - this.FLP_Controls = new System.Windows.Forms.FlowLayoutPanel(); - this.PAN_Navigation = new System.Windows.Forms.Panel(); - this.HoverTip = new System.Windows.Forms.ToolTip(this.components); this.CM_Remove = new System.Windows.Forms.ContextMenuStrip(this.components); this.B_ClearAll = new System.Windows.Forms.ToolStripMenuItem(); this.B_ClearClothing = new System.Windows.Forms.ToolStripMenuItem(); @@ -49,10 +46,14 @@ private void InitializeComponent() this.B_ClearBugs = new System.Windows.Forms.ToolStripMenuItem(); this.B_ClearFish = new System.Windows.Forms.ToolStripMenuItem(); this.B_ClearFurniture = new System.Windows.Forms.ToolStripMenuItem(); + this.FLP_Controls = new System.Windows.Forms.FlowLayoutPanel(); + this.PAN_Navigation = new System.Windows.Forms.Panel(); + this.HoverTip = new System.Windows.Forms.ToolTip(this.components); + this.B_ClearDive = new System.Windows.Forms.ToolStripMenuItem(); this.CM_Hand.SuspendLayout(); + this.CM_Remove.SuspendLayout(); this.FLP_Controls.SuspendLayout(); this.PAN_Navigation.SuspendLayout(); - this.CM_Remove.SuspendLayout(); this.SuspendLayout(); // // ItemGrid @@ -60,19 +61,20 @@ private void InitializeComponent() this.ItemGrid.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ItemGrid.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ItemGrid.Location = new System.Drawing.Point(0, 24); + this.ItemGrid.Location = new System.Drawing.Point(0, 30); this.ItemGrid.Margin = new System.Windows.Forms.Padding(0); this.ItemGrid.Name = "ItemGrid"; - this.ItemGrid.Size = new System.Drawing.Size(163, 142); + this.ItemGrid.Size = new System.Drawing.Size(217, 174); this.ItemGrid.TabIndex = 0; // // B_Up // this.B_Up.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.B_Up.Location = new System.Drawing.Point(3, 3); + this.B_Up.Location = new System.Drawing.Point(4, 4); + this.B_Up.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.B_Up.Name = "B_Up"; - this.B_Up.Size = new System.Drawing.Size(64, 30); + this.B_Up.Size = new System.Drawing.Size(85, 37); this.B_Up.TabIndex = 3; this.B_Up.Text = "↑\t"; this.B_Up.UseVisualStyleBackColor = true; @@ -83,9 +85,10 @@ private void InitializeComponent() // this.B_Down.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.B_Down.Location = new System.Drawing.Point(3, 59); + this.B_Down.Location = new System.Drawing.Point(4, 73); + this.B_Down.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.B_Down.Name = "B_Down"; - this.B_Down.Size = new System.Drawing.Size(64, 29); + this.B_Down.Size = new System.Drawing.Size(85, 36); this.B_Down.TabIndex = 4; this.B_Down.Text = "↓"; this.B_Down.UseVisualStyleBackColor = true; @@ -97,9 +100,10 @@ private void InitializeComponent() this.L_Page.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.L_Page.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_Page.Location = new System.Drawing.Point(3, 36); + this.L_Page.Location = new System.Drawing.Point(4, 44); + this.L_Page.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.L_Page.Name = "L_Page"; - this.L_Page.Size = new System.Drawing.Size(64, 20); + this.L_Page.Size = new System.Drawing.Size(85, 25); this.L_Page.TabIndex = 5; this.L_Page.Text = "250/250"; this.L_Page.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -108,41 +112,43 @@ private void InitializeComponent() // this.L_ItemName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.L_ItemName.Location = new System.Drawing.Point(3, 0); + this.L_ItemName.Location = new System.Drawing.Point(4, 0); + this.L_ItemName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.L_ItemName.Name = "L_ItemName"; - this.L_ItemName.Size = new System.Drawing.Size(233, 24); + this.L_ItemName.Size = new System.Drawing.Size(311, 30); this.L_ItemName.TabIndex = 6; this.L_ItemName.Text = "(None)"; this.L_ItemName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // CM_Hand // + this.CM_Hand.ImageScalingSize = new System.Drawing.Size(20, 20); this.CM_Hand.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Menu_View, this.Menu_Set, this.Menu_Delete}); this.CM_Hand.Name = "CM_Hand"; this.CM_Hand.ShowImageMargin = false; - this.CM_Hand.Size = new System.Drawing.Size(83, 70); + this.CM_Hand.Size = new System.Drawing.Size(98, 76); // // Menu_View // this.Menu_View.Name = "Menu_View"; - this.Menu_View.Size = new System.Drawing.Size(82, 22); + this.Menu_View.Size = new System.Drawing.Size(97, 24); this.Menu_View.Text = "View"; this.Menu_View.Click += new System.EventHandler(this.ClickView); // // Menu_Set // this.Menu_Set.Name = "Menu_Set"; - this.Menu_Set.Size = new System.Drawing.Size(82, 22); + this.Menu_Set.Size = new System.Drawing.Size(97, 24); this.Menu_Set.Text = "Set"; this.Menu_Set.Click += new System.EventHandler(this.ClickSet); // // Menu_Delete // this.Menu_Delete.Name = "Menu_Delete"; - this.Menu_Delete.Size = new System.Drawing.Size(82, 22); + this.Menu_Delete.Size = new System.Drawing.Size(97, 24); this.Menu_Delete.Text = "Delete"; this.Menu_Delete.Click += new System.EventHandler(this.ClickDelete); // @@ -151,14 +157,72 @@ private void InitializeComponent() this.B_Clear.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.B_Clear.ContextMenuStrip = this.CM_Remove; - this.B_Clear.Location = new System.Drawing.Point(3, 110); + this.B_Clear.Location = new System.Drawing.Point(4, 135); + this.B_Clear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.B_Clear.Name = "B_Clear"; - this.B_Clear.Size = new System.Drawing.Size(64, 29); + this.B_Clear.Size = new System.Drawing.Size(85, 36); this.B_Clear.TabIndex = 7; this.B_Clear.Text = "Clear"; this.B_Clear.UseVisualStyleBackColor = true; this.B_Clear.Click += new System.EventHandler(this.B_Clear_Click); // + // CM_Remove + // + this.CM_Remove.ImageScalingSize = new System.Drawing.Size(20, 20); + this.CM_Remove.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.B_ClearAll, + this.B_ClearClothing, + this.B_ClearCrafting, + this.B_ClearBugs, + this.B_ClearFish, + this.B_ClearDive, + this.B_ClearFurniture}); + this.CM_Remove.Name = "CM_Picture"; + this.CM_Remove.ShowImageMargin = false; + this.CM_Remove.Size = new System.Drawing.Size(186, 200); + // + // B_ClearAll + // + this.B_ClearAll.Name = "B_ClearAll"; + this.B_ClearAll.Size = new System.Drawing.Size(185, 24); + this.B_ClearAll.Text = "All"; + this.B_ClearAll.Click += new System.EventHandler(this.B_ClearAll_Click); + // + // B_ClearClothing + // + this.B_ClearClothing.Name = "B_ClearClothing"; + this.B_ClearClothing.Size = new System.Drawing.Size(185, 24); + this.B_ClearClothing.Text = "Clothing"; + this.B_ClearClothing.Click += new System.EventHandler(this.B_ClearClothing_Click); + // + // B_ClearCrafting + // + this.B_ClearCrafting.Name = "B_ClearCrafting"; + this.B_ClearCrafting.Size = new System.Drawing.Size(185, 24); + this.B_ClearCrafting.Text = "Crafting Materials"; + this.B_ClearCrafting.Click += new System.EventHandler(this.B_ClearCrafting_Click); + // + // B_ClearBugs + // + this.B_ClearBugs.Name = "B_ClearBugs"; + this.B_ClearBugs.Size = new System.Drawing.Size(185, 24); + this.B_ClearBugs.Text = "Bugs"; + this.B_ClearBugs.Click += new System.EventHandler(this.B_ClearBugs_Click); + // + // B_ClearFish + // + this.B_ClearFish.Name = "B_ClearFish"; + this.B_ClearFish.Size = new System.Drawing.Size(185, 24); + this.B_ClearFish.Text = "Fish"; + this.B_ClearFish.Click += new System.EventHandler(this.B_ClearFish_Click); + // + // B_ClearFurniture + // + this.B_ClearFurniture.Name = "B_ClearFurniture"; + this.B_ClearFurniture.Size = new System.Drawing.Size(185, 24); + this.B_ClearFurniture.Text = "Furniture"; + this.B_ClearFurniture.Click += new System.EventHandler(this.B_ClearFurniture_Click); + // // FLP_Controls // this.FLP_Controls.Controls.Add(this.L_ItemName); @@ -166,8 +230,9 @@ private void InitializeComponent() this.FLP_Controls.Controls.Add(this.PAN_Navigation); this.FLP_Controls.Dock = System.Windows.Forms.DockStyle.Fill; this.FLP_Controls.Location = new System.Drawing.Point(0, 0); + this.FLP_Controls.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.FLP_Controls.Name = "FLP_Controls"; - this.FLP_Controls.Size = new System.Drawing.Size(241, 197); + this.FLP_Controls.Size = new System.Drawing.Size(321, 242); this.FLP_Controls.TabIndex = 8; // // PAN_Navigation @@ -176,82 +241,35 @@ private void InitializeComponent() this.PAN_Navigation.Controls.Add(this.L_Page); this.PAN_Navigation.Controls.Add(this.B_Down); this.PAN_Navigation.Controls.Add(this.B_Clear); - this.PAN_Navigation.Location = new System.Drawing.Point(163, 24); + this.PAN_Navigation.Location = new System.Drawing.Point(217, 30); this.PAN_Navigation.Margin = new System.Windows.Forms.Padding(0); this.PAN_Navigation.Name = "PAN_Navigation"; - this.PAN_Navigation.Size = new System.Drawing.Size(70, 142); + this.PAN_Navigation.Size = new System.Drawing.Size(93, 175); this.PAN_Navigation.TabIndex = 9; // // HoverTip // this.HoverTip.AutomaticDelay = 100; // - // CM_Remove + // B_ClearDive // - this.CM_Remove.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.B_ClearAll, - this.B_ClearClothing, - this.B_ClearCrafting, - this.B_ClearBugs, - this.B_ClearFish, - this.B_ClearFurniture}); - this.CM_Remove.Name = "CM_Picture"; - this.CM_Remove.ShowImageMargin = false; - this.CM_Remove.Size = new System.Drawing.Size(156, 158); - // - // B_ClearAll - // - this.B_ClearAll.Name = "B_ClearAll"; - this.B_ClearAll.Size = new System.Drawing.Size(155, 22); - this.B_ClearAll.Text = "All"; - this.B_ClearAll.Click += new System.EventHandler(this.B_ClearAll_Click); - // - // B_ClearClothing - // - this.B_ClearClothing.Name = "B_ClearClothing"; - this.B_ClearClothing.Size = new System.Drawing.Size(155, 22); - this.B_ClearClothing.Text = "Clothing"; - this.B_ClearClothing.Click += new System.EventHandler(this.B_ClearClothing_Click); - // - // B_ClearCrafting - // - this.B_ClearCrafting.Name = "B_ClearCrafting"; - this.B_ClearCrafting.Size = new System.Drawing.Size(155, 22); - this.B_ClearCrafting.Text = "Crafting Materials"; - this.B_ClearCrafting.Click += new System.EventHandler(this.B_ClearCrafting_Click); - // - // B_ClearBugs - // - this.B_ClearBugs.Name = "B_ClearBugs"; - this.B_ClearBugs.Size = new System.Drawing.Size(155, 22); - this.B_ClearBugs.Text = "Bugs"; - this.B_ClearBugs.Click += new System.EventHandler(this.B_ClearBugs_Click); - // - // B_ClearFish - // - this.B_ClearFish.Name = "B_ClearFish"; - this.B_ClearFish.Size = new System.Drawing.Size(155, 22); - this.B_ClearFish.Text = "Fish"; - this.B_ClearFish.Click += new System.EventHandler(this.B_ClearFish_Click); - // - // B_ClearFurniture - // - this.B_ClearFurniture.Name = "B_ClearFurniture"; - this.B_ClearFurniture.Size = new System.Drawing.Size(155, 22); - this.B_ClearFurniture.Text = "Furniture"; - this.B_ClearFurniture.Click += new System.EventHandler(this.B_ClearFurniture_Click); + this.B_ClearDive.Name = "B_ClearDive"; + this.B_ClearDive.Size = new System.Drawing.Size(185, 24); + this.B_ClearDive.Text = "Dive"; + this.B_ClearDive.Click += new System.EventHandler(this.B_ClearDive_Click); // // ItemGridEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.FLP_Controls); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "ItemGridEditor"; - this.Size = new System.Drawing.Size(241, 197); + this.Size = new System.Drawing.Size(321, 242); this.CM_Hand.ResumeLayout(false); + this.CM_Remove.ResumeLayout(false); this.FLP_Controls.ResumeLayout(false); this.PAN_Navigation.ResumeLayout(false); - this.CM_Remove.ResumeLayout(false); this.ResumeLayout(false); } @@ -278,5 +296,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem B_ClearBugs; private System.Windows.Forms.ToolStripMenuItem B_ClearFish; private System.Windows.Forms.ToolStripMenuItem B_ClearFurniture; + private System.Windows.Forms.ToolStripMenuItem B_ClearDive; } } diff --git a/NHSE.WinForms/Controls/ItemGridEditor.cs b/NHSE.WinForms/Controls/ItemGridEditor.cs index db1a24e..6d51d67 100644 --- a/NHSE.WinForms/Controls/ItemGridEditor.cs +++ b/NHSE.WinForms/Controls/ItemGridEditor.cs @@ -250,6 +250,7 @@ private void ClearItemIf(Func criteria) private void B_ClearFurniture_Click(object sender, EventArgs e) => ClearItemIf(z => ItemInfo.GetItemKind(z).IsFurniture()); private void B_ClearBugs_Click(object sender, EventArgs e) => ClearItemIf(z => GameLists.Bugs.Contains(z.ItemId)); private void B_ClearFish_Click(object sender, EventArgs e) => ClearItemIf(z => GameLists.Fish.Contains(z.ItemId)); + private void B_ClearDive_Click(object sender, EventArgs e) => ClearItemIf(z => GameLists.Dive.Contains(z.ItemId)); private class GridSize : IGridItem { diff --git a/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.Designer.cs b/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.Designer.cs index 5679aca..8deb8cc 100644 --- a/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.Designer.cs +++ b/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.Designer.cs @@ -42,15 +42,17 @@ private void InitializeComponent() this.L_Received = new System.Windows.Forms.Label(); this.L_VariantBody = new System.Windows.Forms.Label(); this.CLB_Remake = new System.Windows.Forms.CheckedListBox(); + this.B_AllDive = new System.Windows.Forms.ToolStripMenuItem(); this.CM_Buttons.SuspendLayout(); this.SuspendLayout(); // // B_Cancel // this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Cancel.Location = new System.Drawing.Point(449, 349); + this.B_Cancel.Location = new System.Drawing.Point(599, 430); + this.B_Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.B_Cancel.Name = "B_Cancel"; - this.B_Cancel.Size = new System.Drawing.Size(72, 23); + this.B_Cancel.Size = new System.Drawing.Size(96, 28); this.B_Cancel.TabIndex = 7; this.B_Cancel.Text = "Cancel"; this.B_Cancel.UseVisualStyleBackColor = true; @@ -59,9 +61,10 @@ private void InitializeComponent() // B_Save // this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Save.Location = new System.Drawing.Point(527, 349); + this.B_Save.Location = new System.Drawing.Point(703, 430); + this.B_Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.B_Save.Name = "B_Save"; - this.B_Save.Size = new System.Drawing.Size(72, 23); + this.B_Save.Size = new System.Drawing.Size(96, 28); this.B_Save.TabIndex = 6; this.B_Save.Text = "Save"; this.B_Save.UseVisualStyleBackColor = true; @@ -73,9 +76,10 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left))); this.CLB_Items.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.CLB_Items.FormattingEnabled = true; - this.CLB_Items.Location = new System.Drawing.Point(12, 27); + this.CLB_Items.Location = new System.Drawing.Point(16, 33); + this.CLB_Items.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.CLB_Items.Name = "CLB_Items"; - this.CLB_Items.Size = new System.Drawing.Size(231, 289); + this.CLB_Items.Size = new System.Drawing.Size(307, 346); this.CLB_Items.TabIndex = 8; this.CLB_Items.SelectedIndexChanged += new System.EventHandler(this.CLB_Items_SelectedIndexChanged); // @@ -86,9 +90,10 @@ private void InitializeComponent() this.CB_Item.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Item.DropDownWidth = 322; this.CB_Item.FormattingEnabled = true; - this.CB_Item.Location = new System.Drawing.Point(12, 322); + this.CB_Item.Location = new System.Drawing.Point(16, 396); + this.CB_Item.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.CB_Item.Name = "CB_Item"; - this.CB_Item.Size = new System.Drawing.Size(231, 21); + this.CB_Item.Size = new System.Drawing.Size(307, 24); this.CB_Item.TabIndex = 13; this.CB_Item.SelectedValueChanged += new System.EventHandler(this.CB_Item_SelectedValueChanged); // @@ -96,9 +101,10 @@ private void InitializeComponent() // this.B_GiveAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.B_GiveAll.ContextMenuStrip = this.CM_Buttons; - this.B_GiveAll.Location = new System.Drawing.Point(12, 349); + this.B_GiveAll.Location = new System.Drawing.Point(16, 430); + this.B_GiveAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.B_GiveAll.Name = "B_GiveAll"; - this.B_GiveAll.Size = new System.Drawing.Size(82, 23); + this.B_GiveAll.Size = new System.Drawing.Size(109, 28); this.B_GiveAll.TabIndex = 14; this.B_GiveAll.Text = "Give All"; this.B_GiveAll.UseVisualStyleBackColor = true; @@ -106,57 +112,61 @@ private void InitializeComponent() // // CM_Buttons // + this.CM_Buttons.ImageScalingSize = new System.Drawing.Size(20, 20); this.CM_Buttons.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.B_AllFish, this.B_AllBugs, + this.B_AllDive, this.B_AllArt, this.B_GiveEverything}); this.CM_Buttons.Name = "CM_Buttons"; - this.CM_Buttons.Size = new System.Drawing.Size(144, 92); + this.CM_Buttons.Size = new System.Drawing.Size(166, 124); // // B_AllFish // this.B_AllFish.Name = "B_AllFish"; - this.B_AllFish.Size = new System.Drawing.Size(143, 22); + this.B_AllFish.Size = new System.Drawing.Size(165, 24); this.B_AllFish.Text = "Give All Fish"; this.B_AllFish.Click += new System.EventHandler(this.B_AllFish_Click); // // B_AllBugs // this.B_AllBugs.Name = "B_AllBugs"; - this.B_AllBugs.Size = new System.Drawing.Size(143, 22); + this.B_AllBugs.Size = new System.Drawing.Size(165, 24); this.B_AllBugs.Text = "Give All Bugs"; this.B_AllBugs.Click += new System.EventHandler(this.B_AllBugs_Click); // // B_AllArt // this.B_AllArt.Name = "B_AllArt"; - this.B_AllArt.Size = new System.Drawing.Size(143, 22); + this.B_AllArt.Size = new System.Drawing.Size(165, 24); this.B_AllArt.Text = "Give All Art"; this.B_AllArt.Click += new System.EventHandler(this.B_AllArt_Click); // // B_GiveEverything // this.B_GiveEverything.Name = "B_GiveEverything"; - this.B_GiveEverything.Size = new System.Drawing.Size(143, 22); + this.B_GiveEverything.Size = new System.Drawing.Size(165, 24); this.B_GiveEverything.Text = "Everything"; this.B_GiveEverything.Click += new System.EventHandler(this.B_GiveEverything_Click); // // L_Received // this.L_Received.AutoSize = true; - this.L_Received.Location = new System.Drawing.Point(12, 9); + this.L_Received.Location = new System.Drawing.Point(16, 11); + this.L_Received.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.L_Received.Name = "L_Received"; - this.L_Received.Size = new System.Drawing.Size(53, 13); + this.L_Received.Size = new System.Drawing.Size(67, 17); this.L_Received.TabIndex = 15; this.L_Received.Text = "Received"; // // L_VariantBody // this.L_VariantBody.AutoSize = true; - this.L_VariantBody.Location = new System.Drawing.Point(246, 9); + this.L_VariantBody.Location = new System.Drawing.Point(328, 11); + this.L_VariantBody.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.L_VariantBody.Name = "L_VariantBody"; - this.L_VariantBody.Size = new System.Drawing.Size(67, 13); + this.L_VariantBody.Size = new System.Drawing.Size(89, 17); this.L_VariantBody.TabIndex = 16; this.L_VariantBody.Text = "Variant Body"; // @@ -167,16 +177,24 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.CLB_Remake.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.CLB_Remake.FormattingEnabled = true; - this.CLB_Remake.Location = new System.Drawing.Point(249, 27); + this.CLB_Remake.Location = new System.Drawing.Point(332, 33); + this.CLB_Remake.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.CLB_Remake.Name = "CLB_Remake"; - this.CLB_Remake.Size = new System.Drawing.Size(350, 289); + this.CLB_Remake.Size = new System.Drawing.Size(465, 346); this.CLB_Remake.TabIndex = 17; // + // B_AllDive + // + this.B_AllDive.Name = "B_AllDive"; + this.B_AllDive.Size = new System.Drawing.Size(165, 24); + this.B_AllDive.Text = "Give All Dive"; + this.B_AllDive.Click += new System.EventHandler(this.B_AllDive_Click); + // // ItemReceivedEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(611, 384); + this.ClientSize = new System.Drawing.Size(815, 473); this.Controls.Add(this.CLB_Remake); this.Controls.Add(this.L_VariantBody); this.Controls.Add(this.L_Received); @@ -186,6 +204,7 @@ private void InitializeComponent() this.Controls.Add(this.B_Cancel); this.Controls.Add(this.B_Save); this.Icon = global::NHSE.WinForms.Properties.Resources.icon; + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ItemReceivedEditor"; @@ -212,5 +231,6 @@ private void InitializeComponent() private System.Windows.Forms.Label L_Received; private System.Windows.Forms.Label L_VariantBody; private System.Windows.Forms.CheckedListBox CLB_Remake; + private System.Windows.Forms.ToolStripMenuItem B_AllDive; } } \ No newline at end of file diff --git a/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.cs b/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.cs index 4f97167..ca8e51f 100644 --- a/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.cs +++ b/NHSE.WinForms/Subforms/Player/ItemReceivedEditor.cs @@ -122,6 +122,7 @@ private void GiveItem(ushort item, bool value = true) private void B_AllBugs_Click(object sender, EventArgs e) => GiveAll(GameLists.Bugs, ModifierKeys != Keys.Alt); private void B_AllFish_Click(object sender, EventArgs e) => GiveAll(GameLists.Fish, ModifierKeys != Keys.Alt); private void B_AllArt_Click(object sender, EventArgs e) => GiveAll(GameLists.Art, ModifierKeys != Keys.Alt); + private void B_AllDive_Click(object sender, EventArgs e) => GiveAll(GameLists.Dive, ModifierKeys != Keys.Alt); private void B_GiveEverything_Click(object sender, EventArgs e) => GiveEverything(GameInfo.Strings.itemlist, ModifierKeys != Keys.Alt); private void B_Cancel_Click(object sender, EventArgs e) => Close();