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

Handle generating gb2 events & eggs

Browse Source 
restrict the simple encounter provider to not spit out cart era only
gifts.
This commit is contained in:
Kurt
2018-04-28 15:59:33 -07:00
parent b2c54b7a43
commit 55f0143400
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PKHeX.Core/Legality/Encounters/Generator/EncounterStaticGenerator.cs
View File

@@ -12,7 +12,8 @@ public static IEnumerable<EncounterStatic> 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<EncounterStatic> 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;
}