From af141581ee8d0b6878b89177942649caa96c950e Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 26 Apr 2022 19:48:09 -0700 Subject: [PATCH] Minor tweaks Single underscore discards (one of the c# language revisions allowed reusing the single underscore discard). Remove a temporary allocation in BDSP flag editor --- PKHeX.Core/Legality/RNG/PIDGenerator.cs | 2 +- .../Controls/PKM Editor/BallBrowser.cs | 4 +- .../Save Editors/Gen8/SAV_FlagWork8b.cs | 37 ++++++++++--------- PKHeX.WinForms/Subforms/SettingsEditor.cs | 4 +- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/PKHeX.Core/Legality/RNG/PIDGenerator.cs b/PKHeX.Core/Legality/RNG/PIDGenerator.cs index 63d47604e..c772711cb 100644 --- a/PKHeX.Core/Legality/RNG/PIDGenerator.cs +++ b/PKHeX.Core/Legality/RNG/PIDGenerator.cs @@ -195,7 +195,7 @@ public static void SetValuesFromSeed(PKM pk, PIDType type, uint seed) case PIDType.G4MGAntiShiny: break; } - return (_, __) => { }; + return (_, _) => { }; } public static void SetRandomChainShinyPID(PKM pk, uint seed) diff --git a/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs b/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs index e1f2fdce8..e7df91e97 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/BallBrowser.cs @@ -45,8 +45,8 @@ private PictureBox GetBallView(Ball b, ICollection legal, IReadOnlyList Text = names.First(z => z.Value == (int)b).Text; - pb.Click += (_, __) => SelectBall(b); + pb.MouseEnter += (_, _) => Text = names.First(z => z.Value == (int)b).Text; + pb.Click += (_, _) => SelectBall(b); return pb; } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs index 80c4672b5..bfb8f012f 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen8/SAV_FlagWork8b.cs @@ -63,13 +63,13 @@ private void LoadFlags(EventLabelCollectionSystem editor) TLP_Flags.SuspendLayout(); TLP_Flags.Scroll += WinFormsUtil.PanelScroll; TLP_Flags.Controls.Clear(); - var labels = editor.Flag; + IEnumerable labels = editor.Flag; var hide = Main.Settings.Advanced.HideEventTypeBelow; - labels = labels.OrderByDescending(z => z.Type).ToList(); - for (int i = 0; i < labels.Count; i++) + labels = labels.OrderByDescending(z => z.Type); + int i = 0; + foreach (var (name, index, type) in labels) { - var (name, index, type) = labels[i]; if (type < hide) break; @@ -81,8 +81,8 @@ private void LoadFlags(EventLabelCollectionSystem editor) Checked = SAV.Work.GetFlag(index), AutoSize = true, }; - lbl.Click += (_, __) => chk.Checked ^= true; - chk.CheckedChanged += (_, __) => + lbl.Click += (_, _) => chk.Checked ^= true; + chk.CheckedChanged += (_, _) => { SAV.Work.SetFlag(index, chk.Checked); if (NUD_Flag.Value == index) @@ -92,6 +92,7 @@ private void LoadFlags(EventLabelCollectionSystem editor) TLP_Flags.Controls.Add(lbl, 1, i); FlagDict.Add(index, chk); + i++; } TLP_Flags.ResumeLayout(); @@ -102,13 +103,13 @@ private void LoadSystem(EventLabelCollectionSystem editor) TLP_System.SuspendLayout(); TLP_System.Scroll += WinFormsUtil.PanelScroll; TLP_System.Controls.Clear(); - var labels = editor.System; + IEnumerable labels = editor.System; var hide = Main.Settings.Advanced.HideEventTypeBelow; - labels = labels.OrderByDescending(z => z.Type).ToList(); - for (int i = 0; i < labels.Count; i++) + labels = labels.OrderByDescending(z => z.Type); + int i = 0; + foreach (var (name, index, type) in labels) { - var (name, index, type) = labels[i]; if (type < hide) break; @@ -120,8 +121,8 @@ private void LoadSystem(EventLabelCollectionSystem editor) Checked = SAV.Work.GetSystemFlag(index), AutoSize = true, }; - lbl.Click += (_, __) => chk.Checked ^= true; - chk.CheckedChanged += (_, __) => + lbl.Click += (_, _) => chk.Checked ^= true; + chk.CheckedChanged += (_, _) => { SAV.Work.SetSystemFlag(index, chk.Checked); if (NUD_System.Value == index) @@ -131,6 +132,7 @@ private void LoadSystem(EventLabelCollectionSystem editor) TLP_System.Controls.Add(lbl, 1, i); SystemDict.Add(index, chk); + i++; } TLP_System.ResumeLayout(); @@ -141,12 +143,12 @@ private void LoadWork(EventLabelCollectionSystem editor) TLP_Work.SuspendLayout(); TLP_Work.Scroll += WinFormsUtil.PanelScroll; TLP_Work.Controls.Clear(); - var labels = editor.Work; + IEnumerable labels = editor.Work; var hide = Main.Settings.Advanced.HideEventTypeBelow; - labels = labels.OrderByDescending(z => z.Type).ToList(); - for (var i = 0; i < labels.Count; i++) + labels = labels.OrderByDescending(z => z.Type); + int i = 0; + foreach (var entry in labels) { - var entry = labels[i]; if (entry.Type < hide) break; var lbl = new Label { Text = entry.Name, Margin = Padding.Empty, AutoSize = true }; @@ -170,7 +172,7 @@ private void LoadWork(EventLabelCollectionSystem editor) cb.InitializeBinding(); cb.DataSource = map; - lbl.Click += (_, __) => mtb.Value = 0; + lbl.Click += (_, _) => mtb.Value = 0; bool updating = false; mtb.ValueChanged += ChangeConstValue; void ChangeConstValue(object? sender, EventArgs e) @@ -206,6 +208,7 @@ void ChangeConstValue(object? sender, EventArgs e) TLP_Work.Controls.Add(mtb, 2, i); WorkDict.Add(entry.Index, mtb); + i++; } TLP_Work.ResumeLayout(); diff --git a/PKHeX.WinForms/Subforms/SettingsEditor.cs b/PKHeX.WinForms/Subforms/SettingsEditor.cs index 914cfed71..4fefea919 100644 --- a/PKHeX.WinForms/Subforms/SettingsEditor.cs +++ b/PKHeX.WinForms/Subforms/SettingsEditor.cs @@ -22,8 +22,8 @@ public SettingsEditor(object obj) CB_Blank.InitializeBinding(); CB_Blank.DataSource = GameInfo.VersionDataSource.Where(z => !noSelectVersions.Contains((GameVersion)z.Value)).ToList(); CB_Blank.SelectedValue = (int) s.Startup.DefaultSaveVersion; - CB_Blank.SelectedValueChanged += (_, __) => s.Startup.DefaultSaveVersion = (GameVersion)WinFormsUtil.GetIndex(CB_Blank); - CB_Blank.SelectedIndexChanged += (_, __) => BlankChanged = true; + CB_Blank.SelectedValueChanged += (_, _) => s.Startup.DefaultSaveVersion = (GameVersion)WinFormsUtil.GetIndex(CB_Blank); + CB_Blank.SelectedIndexChanged += (_, _) => BlankChanged = true; B_Reset.Click += (x, e) => DeleteSettings(); } else