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

Check shiny state for GB Era events

Browse Source
This commit is contained in:
Kurt
2020-10-18 10:57:18 -07:00
parent f6476a4737
commit a4baec9939
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic1E.cs
View File

@@ -31,6 +31,10 @@ public override bool IsMatch(PKM pkm, DexLevel evo)
if (Language != EncounterGBLanguage.Any && pkm.Japanese != (Language == EncounterGBLanguage.Japanese))
return false;
// EC/PID check doesn't exist for these, so check Shiny state here.
if ((Shiny == Shiny.Always) != pkm.IsShiny)
return false;
if (TID != -1 && pkm.TID != TID)
return false;

4
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2E.cs
View File

@@ -36,6 +36,10 @@ public override bool IsMatch(PKM pkm, DexLevel evo)
if (CurrentLevel != -1 && CurrentLevel > pkm.CurrentLevel)
return false;
// EC/PID check doesn't exist for these, so check Shiny state here.
if ((Shiny == Shiny.Always) != pkm.IsShiny && Location != 14) // Celebi is the only Wild "event", can be either.
return false;
if (EggEncounter && !pkm.IsEgg)
return true;