From 102430ebf5b931685d0838765dfce85ea22770fb Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 26 Aug 2018 18:32:39 -0700 Subject: [PATCH] Update trade nickname check reorder for simplicity, add test Thanks ThePunish3D! --- PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs | 9 ++++++--- ...0 - Ralts - 4732E9FE3B34 No Nickname Trade.pk6 | Bin 0 -> 232 bytes 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 6/280 - Ralts - 4732E9FE3B34 No Nickname Trade.pk6 diff --git a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs index f60a31601..2cdc92973 100644 --- a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs @@ -411,11 +411,14 @@ private void VerifyTradeOTNick(LegalityAnalysis data, string[] validOT, int inde private static bool IsNicknameMatch(string nick, PKM pkm, IEncounterable EncounterMatch) { - if (nick != pkm.Nickname) // if not match, must not be a nicknamed trade && not currently named - return !((EncounterTrade)EncounterMatch).IsNicknamed && !pkm.IsNicknamed; if (nick == "Quacklin’" && pkm.Nickname == "Quacklin'") return true; - return ((EncounterTrade)EncounterMatch).IsNicknamed; + var trade = (EncounterTrade) EncounterMatch; + if (trade.IsNicknamed != pkm.IsNicknamed) + return false; + if (nick != pkm.Nickname) // if not match, must not be a nicknamed trade && not currently named + return !trade.IsNicknamed && !pkm.IsNicknamed; + return true; } } } diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 6/280 - Ralts - 4732E9FE3B34 No Nickname Trade.pk6 b/Tests/PKHeX.Tests/Legality/Legal/Generation 6/280 - Ralts - 4732E9FE3B34 No Nickname Trade.pk6 new file mode 100644 index 0000000000000000000000000000000000000000..5b2b40102e39f452d42ceb64e7f3af089022997b GIT binary patch literal 232 zcmXr9{`ZoB!N^^LaU#>V2@DK#7#J927#SGk6uJV zLuSgQ|C-JWnLs^>Kr$a)o{=M%BN!p5%)rRPz#sq>Z~^K_WXJ>Bm;t1bfieS&u_6Od XDFYu5&;tyHr7W!s62TlyARz_-qKy