Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-26 22:10:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow searching encounter db for shiny state

Browse source 
random shinies behave like not-shinies
so it only really filters for "always shiny" or "can be nonshiny".
This commit is contained in:
Kurt 2021-05-18 16:17:57 -07:00
parent 74e0cba3b0
commit 53e9d31545
3 changed files with 50 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/PKM/Searching/SearchSettings.cs
View file

@ -21,7 +21,7 @@ namespace PKHeX.Core.Searching
public SearchComparison SearchFormat { private get; init; }
public SearchComparison SearchLevel { private get; init; }
public bool? SearchShiny { private get; set; }
public bool? SearchShiny { get; set; }
public bool? SearchLegal { private get; set; }
public bool? SearchEgg { get; set; }
public int? ESV { private get; set; }

68
PKHeX.WinForms/Subforms/SAV_Encounters.Designer.cs generated
View file

@ -50,7 +50,6 @@
this.L_Count = new System.Windows.Forms.Label();
this.L_Viewed = new System.Windows.Forms.Label();
this.FLP_Egg = new System.Windows.Forms.FlowLayoutPanel();
this.CHK_IsEgg = new System.Windows.Forms.CheckBox();
this.TLP_Filters = new System.Windows.Forms.TableLayoutPanel();
this.FLP_Level = new System.Windows.Forms.FlowLayoutPanel();
this.CB_GameOrigin = new System.Windows.Forms.ComboBox();
@ -63,6 +62,8 @@
this.TC_SearchOptions = new System.Windows.Forms.TabControl();
this.Tab_General = new System.Windows.Forms.TabPage();
this.Tab_Advanced = new System.Windows.Forms.TabPage();
this.CHK_IsEgg = new System.Windows.Forms.CheckBox();
this.CHK_Shiny = new System.Windows.Forms.CheckBox();
this.menuStrip1.SuspendLayout();
this.P_Results.SuspendLayout();
this.TLP_Filters.SuspendLayout();
@ -301,28 +302,12 @@
//
this.FLP_Egg.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.FLP_Egg.AutoSize = true;
this.FLP_Egg.Location = new System.Drawing.Point(0, 8);
this.FLP_Egg.Location = new System.Drawing.Point(0, 235);
this.FLP_Egg.Margin = new System.Windows.Forms.Padding(0);
this.FLP_Egg.Name = "FLP_Egg";
this.FLP_Egg.Size = new System.Drawing.Size(0, 0);
this.FLP_Egg.TabIndex = 120;
//
// CHK_IsEgg
//
this.CHK_IsEgg.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.CHK_IsEgg.AutoSize = true;
this.CHK_IsEgg.Checked = true;
this.CHK_IsEgg.CheckState = System.Windows.Forms.CheckState.Indeterminate;
this.CHK_IsEgg.Location = new System.Drawing.Point(69, 0);
this.CHK_IsEgg.Margin = new System.Windows.Forms.Padding(0);
this.CHK_IsEgg.Name = "CHK_IsEgg";
this.CHK_IsEgg.Size = new System.Drawing.Size(45, 17);
this.CHK_IsEgg.TabIndex = 98;
this.CHK_IsEgg.Text = "Egg";
this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.CHK_IsEgg.ThreeState = true;
this.CHK_IsEgg.UseVisualStyleBackColor = true;
//
// TLP_Filters
//
this.TLP_Filters.AutoScroll = true;
@ -342,11 +327,12 @@
this.TLP_Filters.Controls.Add(this.CB_Move3, 1, 11);
this.TLP_Filters.Controls.Add(this.L_Move4, 0, 12);
this.TLP_Filters.Controls.Add(this.CB_Move4, 1, 12);
this.TLP_Filters.Controls.Add(this.CHK_IsEgg, 1, 0);
this.TLP_Filters.Controls.Add(this.CB_GameOrigin, 1, 16);
this.TLP_Filters.Controls.Add(this.FLP_Egg, 0, 0);
this.TLP_Filters.Controls.Add(this.L_Version, 0, 16);
this.TLP_Filters.Controls.Add(this.TypeFilters, 1, 17);
this.TLP_Filters.Controls.Add(this.CHK_IsEgg, 1, 0);
this.TLP_Filters.Controls.Add(this.FLP_Egg, 0, 17);
this.TLP_Filters.Controls.Add(this.CHK_Shiny, 0, 0);
this.TLP_Filters.Dock = System.Windows.Forms.DockStyle.Fill;
this.TLP_Filters.Location = new System.Drawing.Point(3, 3);
this.TLP_Filters.Name = "TLP_Filters";
@ -369,6 +355,7 @@
this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.TLP_Filters.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.TLP_Filters.Size = new System.Drawing.Size(250, 308);
this.TLP_Filters.TabIndex = 118;
//
@ -410,7 +397,7 @@
this.TypeFilters.Dock = System.Windows.Forms.DockStyle.Fill;
this.TypeFilters.Location = new System.Drawing.Point(72, 146);
this.TypeFilters.Name = "TypeFilters";
this.TypeFilters.Size = new System.Drawing.Size(175, 159);
this.TypeFilters.Size = new System.Drawing.Size(228, 179);
this.TypeFilters.TabIndex = 123;
//
// RTB_Instructions
@ -418,7 +405,7 @@
this.RTB_Instructions.Dock = System.Windows.Forms.DockStyle.Fill;
this.RTB_Instructions.Location = new System.Drawing.Point(0, 0);
this.RTB_Instructions.Name = "RTB_Instructions";
this.RTB_Instructions.Size = new System.Drawing.Size(255, 310);
this.RTB_Instructions.Size = new System.Drawing.Size(256, 314);
this.RTB_Instructions.TabIndex = 119;
this.RTB_Instructions.Text = "";
//
@ -465,11 +452,43 @@
this.Tab_Advanced.Controls.Add(this.RTB_Instructions);
this.Tab_Advanced.Location = new System.Drawing.Point(4, 22);
this.Tab_Advanced.Name = "Tab_Advanced";
this.Tab_Advanced.Size = new System.Drawing.Size(255, 310);
this.Tab_Advanced.Size = new System.Drawing.Size(256, 314);
this.Tab_Advanced.TabIndex = 1;
this.Tab_Advanced.Text = "Advanced";
this.Tab_Advanced.UseVisualStyleBackColor = true;
//
// CHK_IsEgg
//
this.CHK_IsEgg.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.CHK_IsEgg.AutoSize = true;
this.CHK_IsEgg.Checked = true;
this.CHK_IsEgg.CheckState = System.Windows.Forms.CheckState.Indeterminate;
this.CHK_IsEgg.Location = new System.Drawing.Point(69, 0);
this.CHK_IsEgg.Margin = new System.Windows.Forms.Padding(0);
this.CHK_IsEgg.Name = "CHK_IsEgg";
this.CHK_IsEgg.Size = new System.Drawing.Size(45, 17);
this.CHK_IsEgg.TabIndex = 125;
this.CHK_IsEgg.Text = "Egg";
this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.CHK_IsEgg.ThreeState = true;
this.CHK_IsEgg.UseVisualStyleBackColor = true;
//
// CHK_Shiny
//
this.CHK_Shiny.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.CHK_Shiny.AutoSize = true;
this.CHK_Shiny.Checked = true;
this.CHK_Shiny.CheckState = System.Windows.Forms.CheckState.Indeterminate;
this.CHK_Shiny.Location = new System.Drawing.Point(0, 0);
this.CHK_Shiny.Margin = new System.Windows.Forms.Padding(0);
this.CHK_Shiny.Name = "CHK_Shiny";
this.CHK_Shiny.Size = new System.Drawing.Size(52, 17);
this.CHK_Shiny.TabIndex = 126;
this.CHK_Shiny.Text = "Shiny";
this.CHK_Shiny.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.CHK_Shiny.ThreeState = true;
this.CHK_Shiny.UseVisualStyleBackColor = true;
//
// SAV_Encounters
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -526,7 +545,6 @@
private System.Windows.Forms.Label L_Count;
private System.Windows.Forms.Label L_Viewed;
private System.Windows.Forms.TableLayoutPanel TLP_Filters;
public System.Windows.Forms.CheckBox CHK_IsEgg;
private System.Windows.Forms.FlowLayoutPanel FLP_Egg;
private System.Windows.Forms.FlowLayoutPanel FLP_Level;
private System.Windows.Forms.RichTextBox RTB_Instructions;
@ -540,5 +558,7 @@
private System.Windows.Forms.TabControl TC_SearchOptions;
private System.Windows.Forms.TabPage Tab_General;
private System.Windows.Forms.TabPage Tab_Advanced;
public System.Windows.Forms.CheckBox CHK_IsEgg;
public System.Windows.Forms.CheckBox CHK_Shiny;
}
}

5
PKHeX.WinForms/Subforms/SAV_Encounters.cs
View file

@ -199,6 +199,8 @@ namespace PKHeX.WinForms
var results = species.SelectMany(z => GetEncounters(z, moves, pk, versions));
if (settings.SearchEgg != null)
results = results.Where(z => z.EggEncounter == settings.SearchEgg);
if (settings.SearchShiny != null)
results = results.Where(z => z.IsShiny == settings.SearchShiny);
// return filtered results
var comparer = new ReferenceComparer<IEncounterInfo>();
@ -257,6 +259,9 @@ namespace PKHeX.WinForms
if (CHK_IsEgg.CheckState != CheckState.Indeterminate)
settings.SearchEgg = CHK_IsEgg.CheckState == CheckState.Checked;
if (CHK_Shiny.CheckState != CheckState.Indeterminate)
settings.SearchShiny = CHK_Shiny.CheckState == CheckState.Checked;
return settings;
}