Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-02 14:36:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Yancy Curtis trade OT checks

Browse Source 
Thanks paf!
https://projectpokemon.org/home/forums/topic/46143-bug-in-last-update/
This commit is contained in:
Kurt
2018-07-10 12:37:40 -07:00
parent c8897161b7
commit 027d898f3d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PKHeX.Core/Legality/Encounters/Data/Encounters5.cs
View File

@@ -675,7 +675,8 @@ private static void MarkG5Slots(ref EncounterArea[] Areas)
new EncounterTrade { Species = 065, Level = 40, Ability = 1, TID = 17074, SID = 00001, OTGender = 1, Gender = 0, IVs = new[] {20,20,20,31,20,20}, Nature = Nature.Timid, }, // Alakazam
};
internal const int YancyCurtisTID = 10303;
internal const int YancyTID = 10303;
internal const int CurtisTID = 54118;
internal static readonly EncounterTrade[] TradeGift_B2W2_YancyCurtis =
{
// player is male

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

@@ -312,8 +312,8 @@ private void VerifyTrade5(LegalityAnalysis data)
}
else // B2W2
{
if (EncounterMatch is EncounterTrade t && t.TID == Encounters5.YancyCurtisTID)
VerifyTradeOTOnly(data, pkm.OT_Gender == 0 ? Encounters5.TradeOT_B2W2_M : Encounters5.TradeOT_B2W2_F);
if (EncounterMatch is EncounterTrade t && (t.TID == Encounters5.YancyTID || t.TID == Encounters5.CurtisTID))
VerifyTradeOTOnly(data, t.TrainerNames);
else
VerifyTradeTable(data, Encounters5.TradeB2W2, Encounters5.TradeGift_B2W2);
}