Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-23 04:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc tweaks

Browse source 
fix pcd detection (yield brewk needed to be inside brackets
remove brackets from single line lambda expressions
This commit is contained in:
Kurt 2017-07-05 23:05:49 -07:00
parent e8f9fd0098
commit 502093b8b2
8 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
View file

@ -903,12 +903,14 @@ namespace PKHeX.Core
}
private static IEnumerable<MysteryGift> GetMatchingPCD(PKM pkm, IEnumerable<MysteryGift> 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<MysteryGift>();
var vs = GetValidPreEvolutions(pkm).ToArray();

2
PKHeX.WinForms/Controls/SAV Editor/BoxEditor.cs
View file

@ -42,7 +42,7 @@ namespace PKHeX.WinForms.Controls
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;
}
}

4
PKHeX.WinForms/Controls/SAV Editor/SAVEditor.cs
View file

@ -49,7 +49,7 @@ namespace PKHeX.WinForms.Controls
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 @@ namespace PKHeX.WinForms.Controls
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)

4
PKHeX.WinForms/MainWindow/Main.cs
View file

@ -130,8 +130,8 @@ namespace PKHeX.WinForms
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);

12
PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs
View file

@ -72,18 +72,16 @@ namespace PKHeX.WinForms
}
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)

2
PKHeX.WinForms/Subforms/PKM Editors/SuperTrainingEditor.cs
View file

@ -102,7 +102,7 @@ namespace PKHeX.WinForms
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);
}

2
PKHeX.WinForms/Subforms/Save Editors/SAV_BoxViewer.cs
View file

@ -15,7 +15,7 @@ namespace PKHeX.WinForms
CenterToParent();
AllowDrop = true;
GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; };
GiveFeedback += (sender, e) => e.UseDefaultCursors = false;
DragEnter += Main_DragEnter;
DragDrop += (sender, e) =>
{

2
PKHeX.WinForms/Subforms/Save Editors/SAV_EventFlags.cs
View file

@ -176,7 +176,7 @@ namespace PKHeX.WinForms
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);
}