Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 13:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update EncounterGenerator.cs

Browse source
This commit is contained in:
Kurt 2020-08-29 23:50:59 -07:00
parent e532a29e72
commit c1bc371d76
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs
View file

@ -194,7 +194,7 @@ namespace PKHeX.Core
private static IEnumerable<IEncounterable> GenerateFilteredEncounters12(PKM pkm) private static IEnumerable<IEncounterable> GenerateFilteredEncounters12(PKM pkm)
{ {
bool crystal = (pkm.Format == 2 && pkm.Met_Location != 0) || (pkm.Format >= 7 && pkm.OT_Gender == 1); bool crystal = (pkm is PK2 pk2 && pk2.CaughtData != 0) || (pkm.Format >= 7 && pkm.OT_Gender == 1);
bool kadabra = pkm.Species == 64 && pkm is PK1 pk1 bool kadabra = pkm.Species == 64 && pkm is PK1 pk1
&& (pk1.Catch_Rate == PersonalTable.RB[64].CatchRate && (pk1.Catch_Rate == PersonalTable.RB[64].CatchRate
|| pk1.Catch_Rate == PersonalTable.Y[64].CatchRate); // catch rate outsider, return gen1 first always || pk1.Catch_Rate == PersonalTable.Y[64].CatchRate); // catch rate outsider, return gen1 first always