Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-28 08:46:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix batch modify filter bool

Browse Source 
rename methods for clarity
Closes #1977
This commit is contained in:
Kurt
2018-05-31 19:59:05 -07:00
parent f237476ccc
commit 1d9795f774
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PKHeX.Core/Editing/Bulk/BatchEditing.cs
View File

@@ -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;

2
PKHeX.WinForms/Subforms/SAV_Database.cs
View File

@@ -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)

2
PKHeX.WinForms/Subforms/SAV_MysteryGiftDB.cs
View File

@@ -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();