From d153224af1727cd1daebc6788b3bd7e1ae261e73 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 11 Jul 2019 22:55:41 -0700 Subject: [PATCH] Add traded egg allowance for nickname store bool for reuse, not any slower :) Closes #2320 --- PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs index 226633032..95780039f 100644 --- a/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs @@ -112,7 +112,8 @@ private bool IsNicknameValid(PKM pkm, IEncounterable EncounterMatch, string nick // Can't have another language name if it hasn't evolved or wasn't a language-traded egg. bool evolved = EncounterMatch.Species != pkm.Species; - if ((pkm.WasTradedEgg || evolved) && !PKX.IsNicknamedAnyLanguage(pkm.Species, nickname, pkm.Format)) + bool canHaveAnyLanguage = evolved || pkm.WasTradedEgg; + if (canHaveAnyLanguage && !PKX.IsNicknamedAnyLanguage(pkm.Species, nickname, pkm.Format)) return true; switch (EncounterMatch) @@ -127,7 +128,7 @@ private bool IsNicknameValid(PKM pkm, IEncounterable EncounterMatch, string nick if (pkm.Format == 5 && !pkm.IsNative) // transfer { - if (evolved) + if (canHaveAnyLanguage) return !PKX.IsNicknamedAnyLanguage(pkm.Species, nickname, 4); return PKX.GetSpeciesNameGeneration(pkm.Species, pkm.Language, 4) == nickname; }