From 71fd8b36e90bf0bcccbeed5149e9abc3d1390db8 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 8 Jun 2021 20:14:27 -0700 Subject: [PATCH] Enable batch filters for encounter database --- PKHeX.WinForms/Subforms/SAV_Encounters.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.cs index e4290c4c1..2d0e7535c 100644 --- a/PKHeX.WinForms/Subforms/SAV_Encounters.cs +++ b/PKHeX.WinForms/Subforms/SAV_Encounters.cs @@ -213,6 +213,13 @@ private IEnumerable SearchDatabase() : results.Where(z => z.Generation <= 7); } + if (RTB_Instructions.Lines.Any(line => line.Length > 0)) + { + var filters = StringInstruction.GetFilters(RTB_Instructions.Lines).ToArray(); + BatchEditing.ScreenStrings(filters); + results = results.Where(enc => BatchEditing.IsFilterMatch(filters, enc)); // Compare across all filters + } + return results; } @@ -357,11 +364,6 @@ private static Image GetImage(IEncounterTemplate enc) _ => 0, }; - private void Menu_SearchAdvanced_Click(object sender, EventArgs e) - { - // todo - } - private void Menu_Exit_Click(object sender, EventArgs e) => Close(); protected override void OnMouseWheel(MouseEventArgs e)