From 1d9795f774a846ffe5d6fca2ec31a2159c4c843f Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Thu, 31 May 2018 19:59:05 -0700
Subject: [PATCH] Fix batch modify filter bool

rename methods for clarity
Closes #1977
---
 PKHeX.Core/Editing/Bulk/BatchEditing.cs      | 14 +++++++-------
 PKHeX.WinForms/Subforms/SAV_Database.cs      |  2 +-
 PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/PKHeX.Core/Editing/Bulk/BatchEditing.cs b/PKHeX.Core/Editing/Bulk/BatchEditing.cs
index 5288f044a..1b9a49d0a 100644
--- a/PKHeX.Core/Editing/Bulk/BatchEditing.cs
+++ b/PKHeX.Core/Editing/Bulk/BatchEditing.cs
@@ -141,7 +141,7 @@ private static void SetInstructionScreenedValue(StringInstruction i)
         /// <param name="filters">Filters which must be satisfied.</param>
         /// <param name="pkm">Object to check.</param>
         /// <returns>True if <see cref="pkm"/> matches all filters.</returns>
-        public static bool IsFiltered(IEnumerable<StringInstruction> filters, PKM pkm) => filters.All(z => IsPKMFiltered(z, pkm, Props[Array.IndexOf(Types, pkm.GetType())]));
+        public static bool IsFilterMatch(IEnumerable<StringInstruction> filters, PKM pkm) => filters.All(z => IsFilterMatch(z, pkm, Props[Array.IndexOf(Types, pkm.GetType())]));
 
         /// <summary>
         /// Checks if the object is filtered by the provided <see cref="filters"/>.
@@ -149,7 +149,7 @@ private static void SetInstructionScreenedValue(StringInstruction i)
         /// <param name="filters">Filters which must be satisfied.</param>
         /// <param name="obj">Object to check.</param>
         /// <returns>True if <see cref="obj"/> matches all filters.</returns>
-        public static bool IsFiltered(IEnumerable<StringInstruction> filters, object obj)
+        public static bool IsFilterMatch(IEnumerable<StringInstruction> filters, object obj)
         {
             foreach (var cmd in filters)
             {
@@ -193,7 +193,7 @@ internal static ModifyResult TryModifyPKM(PKM pkm, IEnumerable<StringInstruction
             {
                 try
                 {
-                    if (IsPKMFiltered(cmd, info, pi))
+                    if (!IsFilterMatch(cmd, info, pi))
                         return ModifyResult.Filtered;
                 }
                 catch (Exception ex)
@@ -252,8 +252,8 @@ private static ModifyResult SetPKMProperty(StringInstruction cmd, PKMInfo info,
         /// <param name="cmd">Command Filter</param>
         /// <param name="info">Pokémon to check.</param>
         /// <param name="props">PropertyInfo cache (optional)</param>
-        /// <returns>True if filtered, else false.</returns>
-        private static bool IsPKMFiltered(StringInstruction cmd, PKMInfo info, IReadOnlyDictionary<string, PropertyInfo> props)
+        /// <returns>True if filter matches, else false.</returns>
+        private static bool IsFilterMatch(StringInstruction cmd, PKMInfo info, IReadOnlyDictionary<string, PropertyInfo> props)
         {
             if (IsLegalFiltered(cmd, () => info.Legal))
                 return true;
@@ -266,8 +266,8 @@ private static bool IsPKMFiltered(StringInstruction cmd, PKMInfo info, IReadOnly
         /// <param name="cmd">Command Filter</param>
         /// <param name="pkm">Pokémon to check.</param>
         /// <param name="props">PropertyInfo cache (optional)</param>
-        /// <returns>True if filtered, else false.</returns>
-        private static bool IsPKMFiltered(StringInstruction cmd, PKM pkm, IReadOnlyDictionary<string, PropertyInfo> props)
+        /// <returns>True if filter matches, else false.</returns>
+        private static bool IsFilterMatch(StringInstruction cmd, PKM pkm, IReadOnlyDictionary<string, PropertyInfo> props)
         {
             if (IsLegalFiltered(cmd, () => new LegalityAnalysis(pkm).Valid))
                 return true;
diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs
index c6f46cce3..3cec6b74e 100644
--- a/PKHeX.WinForms/Subforms/SAV_Database.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Database.cs
@@ -511,7 +511,7 @@ private IEnumerable<PKM> SearchDatabase()
             {
                 var filters = StringInstruction.GetFilters(RTB_Instructions.Lines).ToArray();
                 BatchEditing.ScreenStrings(filters);
-                res = res.Where(pkm => BatchEditing.IsFiltered(filters, pkm)); // Compare across all filters
+                res = res.Where(pkm => BatchEditing.IsFilterMatch(filters, pkm)); // Compare across all filters
             }
 
             if (Menu_SearchClones.Checked)
diff --git a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
index cd21d2802..940a2dee3 100644
--- a/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
+++ b/PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
@@ -283,7 +283,7 @@ private void B_Search_Click(object sender, EventArgs e)
             {
                 var filters = StringInstruction.GetFilters(RTB_Instructions.Lines).ToArray();
                 BatchEditing.ScreenStrings(filters);
-                res = res.Where(pkm => BatchEditing.IsFiltered(filters, pkm)); // Compare across all filters
+                res = res.Where(pkm => BatchEditing.IsFilterMatch(filters, pkm)); // Compare across all filters
             }
 
             var results = res.ToArray();