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

Don't generate invalid sister-pair eggs

Browse Source
This commit is contained in:
Kurt 2019-11-16 09:00:05 -08:00
parent dfcd93bfff
commit 29d52e065f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PKHeX.Core/Legality/Encounters/Generator/EncounterEggGenerator.cs
View File

@ -36,7 +36,7 @@ public static IEnumerable<EncounterEgg> GenerateEggs(PKM pkm, IReadOnlyList<DexL
if (baseSpecies <= max)
{
yield return new EncounterEgg { Version = ver, Level = lvl, Species = baseSpecies };
if (gen > 5 && (pkm.WasTradedEgg || all))
if (gen > 5 && (pkm.WasTradedEgg || all) && HasOtherGamePair(ver))
yield return new EncounterEgg { Version = GetOtherTradePair(ver), Level = lvl, Species = baseSpecies };
}
@ -47,7 +47,7 @@ public static IEnumerable<EncounterEgg> GenerateEggs(PKM pkm, IReadOnlyList<DexL
if (other <= max)
{
yield return new EncounterEggSplit { Version = ver, Level = lvl, Species = other, OtherSpecies = baseSpecies };
if (gen > 5 && (pkm.WasTradedEgg || all))
if (gen > 5 && (pkm.WasTradedEgg || all) && HasOtherGamePair(ver))
yield return new EncounterEggSplit { Version = GetOtherTradePair(ver), Level = lvl, Species = other, OtherSpecies = baseSpecies };
}
}
@ -61,5 +61,10 @@ private static GameVersion GetOtherTradePair(GameVersion ver)
return ver + 2;
return ver - 2;
}
private static bool HasOtherGamePair(GameVersion ver)
{
return ver < GameVersion.GP; // lgpe and sw/sh don't have a sister pair
}
}
}