Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-09 22:25:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add traded egg allowance for nickname

Browse Source 
store bool for reuse, not any slower :)
Closes #2320
This commit is contained in:
Kurt
2019-07-11 22:55:41 -07:00
parent face8d64a9
commit d153224af1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PKHeX.Core/Legality/Verifiers/NicknameVerifier.cs
View File

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