Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-07-20 03:31:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update trade nickname check

Browse Source 
reorder for simplicity, add test
Thanks ThePunish3D!
This commit is contained in:
Kurt 2018-08-26 18:32:39 -07:00
parent 6e41b44047
commit 102430ebf5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

BIN
Tests/PKHeX.Tests/Legality/Legal/Generation 6/280 - Ralts - 4732E9FE3B34 No Nickname Trade.pk6 Normal file
View File

Binary file not shown.