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

Minor tweak

Browse Source 
no functional change, just split up the filtering from the initial
static fetch
This commit is contained in:
Kurt
2017-04-03 20:43:13 -07:00
parent cd9987ed09
commit 32fdcf4c10
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PKHeX/Legality/Core.cs
View File

@@ -899,7 +899,6 @@ internal static List<EncounterStatic> getValidStaticEncounter(PKM pkm, GameVersi
if (gameSource == GameVersion.Any)
gameSource = (GameVersion)pkm.Version;
var enc = new List<EncounterStatic>();
// Get possible encounters
IEnumerable<EncounterStatic> poss = getStaticEncounters(pkm, gameSource: gameSource);
@@ -907,13 +906,18 @@ internal static List<EncounterStatic> getValidStaticEncounter(PKM pkm, GameVersi
if (lvl <= 0)
return null;
// Back Check against pkm
var enc = getMatchingStaticEncounters(pkm, poss, lvl).ToList();
return enc.Any() ? enc : null;
}
private static IEnumerable<EncounterStatic> getMatchingStaticEncounters(PKM pkm, IEnumerable<EncounterStatic> poss, int lvl)
{
foreach (EncounterStatic e in poss)
{
if (e.Nature != Nature.Random && pkm.Nature != (int)e.Nature)
continue;
if(pkm.Gen3 && e.EggLocation != 0)
{
//Hartched gen 3 gift egg can not be differentiated form normal eggs
if (pkm.Gen3 && e.EggLocation != 0)
{
// Hatched gen 3 gift egg can not be differentiated from normal eggs
if (!pkm.IsEgg || pkm.Format > 3)
continue;
if (e.EggLocation != pkm.Met_Location)
@@ -946,9 +950,8 @@ internal static List<EncounterStatic> getValidStaticEncounter(PKM pkm, GameVersi
if (!AllowGBCartEra && GameVersion.GBCartEraOnly.Contains(e.Version))
continue; // disallow gb cart era encounters (as they aren't obtainable by Main/VC series)
enc.Add(e);
yield return e;
}
return enc.Any() ? enc : null;
}
internal static EncounterTrade getValidIngameTrade(PKM pkm, GameVersion gameSource = GameVersion.Any)
{