From 7c36190661b192c30c03f259c69ebf631a006c2f Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 20 Oct 2017 08:47:31 -0700 Subject: [PATCH] Expand IdentifierContains feature now behaves the same as a property filtering --- PKHeX.Core/PKM/PKX.cs | 2 +- PKHeX.WinForms/Subforms/SAV_Database.cs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/PKM/PKX.cs b/PKHeX.Core/PKM/PKX.cs index 4a6b55ff5..7ac2bcd14 100644 --- a/PKHeX.Core/PKM/PKX.cs +++ b/PKHeX.Core/PKM/PKX.cs @@ -746,7 +746,7 @@ namespace PKHeX.Core byte[] xorkey = BitConverter.GetBytes(seed); for (int i = 32; i < 80; i++) - ekm[i] ^= xorkey[i & 4]; + ekm[i] ^= xorkey[i & 3]; return ShuffleArray3(ekm, PID%24); } diff --git a/PKHeX.WinForms/Subforms/SAV_Database.cs b/PKHeX.WinForms/Subforms/SAV_Database.cs index cecc3fdfc..39bf11e17 100644 --- a/PKHeX.WinForms/Subforms/SAV_Database.cs +++ b/PKHeX.WinForms/Subforms/SAV_Database.cs @@ -496,7 +496,12 @@ namespace PKHeX.WinForms foreach (var cmd in filters) { if (cmd.PropertyName == nameof(PKM.Identifier) + "Contains") - return pkm.Identifier.Contains(cmd.PropertyValue); + { + bool result = pkm.Identifier.Contains(cmd.PropertyValue); + if (result != cmd.Evaluator) + return false; + continue; + } if (!pkm.GetType().HasPropertyAll(cmd.PropertyName)) return false; try { if (pkm.GetType().IsValueEqual(pkm, cmd.PropertyName, cmd.PropertyValue) == cmd.Evaluator) continue; }