diff --git a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs index 16afe5f98..e058fa540 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterGenerator.cs @@ -903,12 +903,14 @@ private static IEnumerable GetMatchingWC3(PKM pkm, IEnumerable GetMatchingPCD(PKM pkm, IEnumerable DB) { - if (DB == null) + if (DB == null || pkm.IsEgg && pkm.Format != 4) // transferred yield break; if (IsRangerManaphy(pkm)) + { yield return new PGT { Data = { [0] = 7, [8] = 1 } }; - yield break; + yield break; + } var validPCD = new List(); var vs = GetValidPreEvolutions(pkm).ToArray(); diff --git a/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs index c784153e5..5b80b72c2 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs @@ -42,7 +42,7 @@ public BoxEditor() pb.DragEnter += BoxSlot_DragEnter; pb.DragDrop += BoxSlot_DragDrop; pb.QueryContinueDrag += BoxSlot_QueryContinueDrag; - pb.GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; + pb.GiveFeedback += (sender, e) => e.UseDefaultCursors = false; pb.AllowDrop = true; } } diff --git a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs index fcf0ab956..ad4221c09 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs @@ -49,7 +49,7 @@ public SAVEditor(SaveFile sav = null) dcpkx1, dcpkx2, gtspkx, fusedpkx, subepkx1, subepkx2, subepkx3, }; - GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; + GiveFeedback += (sender, e) => e.UseDefaultCursors = false; SAV = z.Result; Box.Setup(M = new SlotChangeManager(this)); foreach (PictureBox pb in SupplementarySlots) @@ -64,7 +64,7 @@ public SAVEditor(SaveFile sav = null) pb.DragEnter += M.DragEnter; pb.DragDrop += BoxSlot_DragDrop; pb.QueryContinueDrag += M.QueryContinueDrag; - pb.GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; + pb.GiveFeedback += (sender, e) => e.UseDefaultCursors = false; pb.AllowDrop = true; } foreach (TabPage tab in tabBoxMulti.TabPages) diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index f740dfb62..b73ac2951 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -130,8 +130,8 @@ private void FormLoadAddEvents() C_SAV.PKME_Tabs = PKME_Tabs; C_SAV.Menu_Redo = Menu_Redo; C_SAV.Menu_Undo = Menu_Undo; - dragout.GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; - GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; + dragout.GiveFeedback += (sender, e) => e.UseDefaultCursors = false; + GiveFeedback += (sender, e) => e.UseDefaultCursors = false; PKME_Tabs.EnableDragDrop(Main_DragEnter, Main_DragDrop); C_SAV.EnableDragDrop(Main_DragEnter, Main_DragDrop); diff --git a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs index 921276e4f..a889241e7 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs @@ -72,18 +72,16 @@ private void PopulateRibbons() } private void AddRibbonSprite(RibbonInfo rib) { - PictureBox pb = new PictureBox { AutoSize = false, Size = new Size(40,40), BackgroundImageLayout = ImageLayout.Center, Visible = false, Name = PrefixPB + rib.Name }; - var img = PKMUtil.GetRibbonSprite(rib.Name); + var name = rib.Name; + PictureBox pb = new PictureBox { AutoSize = false, Size = new Size(40,40), BackgroundImageLayout = ImageLayout.Center, Visible = false, Name = PrefixPB + name }; + var img = PKMUtil.GetRibbonSprite(name); if (img != null) pb.BackgroundImage = (Bitmap)img; if (img == null) return; - pb.MouseEnter += (s, e) => - { - tipName.SetToolTip(pb, RibbonStrings.GetName(rib.Name)); - }; - + var display = RibbonStrings.GetName(name); + pb.MouseEnter += (s, e) => tipName.SetToolTip(pb, display); FLP_Ribbons.Controls.Add(pb); } private void AddRibbonChoice(RibbonInfo rib) diff --git a/PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.cs index 6d78f85bf..972f59449 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.cs @@ -102,7 +102,7 @@ private static void AddRegimenChoice(RegimenInfo reg, TableLayoutPanel TLP) AutoSize = true, Padding = Padding.Empty, }; - chk.CheckedChanged += (sender, e) => { reg.CompletedRegimen = chk.Checked; }; + chk.CheckedChanged += (sender, e) => reg.CompletedRegimen = chk.Checked; chk.Checked = reg.CompletedRegimen; TLP.Controls.Add(chk, 0, row); } diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs index dfb493e1e..58c5db81c 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs @@ -15,7 +15,7 @@ public SAV_BoxViewer(SAVEditor p, SlotChangeManager m) CenterToParent(); AllowDrop = true; - GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; + GiveFeedback += (sender, e) => e.UseDefaultCursors = false; DragEnter += Main_DragEnter; DragDrop += (sender, e) => { diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs index 4625405e0..80d54e84e 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs @@ -176,7 +176,7 @@ private void AddFlagList(string[] list) AutoSize = true }; chk.CheckStateChanged += ToggleFlag; - lbl.Click += (sender, e) => { chk.Checked ^= true; }; + lbl.Click += (sender, e) => chk.Checked ^= true; TLP_Flags.Controls.Add(chk, 0, i); TLP_Flags.Controls.Add(lbl, 1, i); }