From 55f0143400a1c15bda43387e50812c29ccb3f722 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 28 Apr 2018 15:59:33 -0700 Subject: [PATCH] Handle generating gb2 events & eggs restrict the simple encounter provider to not spit out cart era only gifts. --- .../Encounters/Generator/EncounterStaticGenerator.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs index b499971b7..9c670d65c 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs @@ -12,7 +12,8 @@ public static IEnumerable GetPossible(PKM pkm, GameVersion game if (gameSource == GameVersion.Any) gameSource = (GameVersion)pkm.Version; - return GetStaticEncounters(pkm, gameSource: gameSource); + var encs = GetStaticEncounters(pkm, gameSource: gameSource); + return encs.Where(e => AllowGBCartEra || !GameVersion.GBCartEraOnly.Contains(e.Version)); } public static IEnumerable GetValidStaticEncounter(PKM pkm, GameVersion gameSource = GameVersion.Any) { @@ -77,7 +78,7 @@ private static bool GetIsMatchStatic(PKM pkm, EncounterStatic e, int lvl) case 1 when pkm.Met_Location == 0: return false; default: - if (pkm.Met_Location == 0) + if (pkm.Met_Location == 0 && pkm.Met_Level != 0) return false; break; }