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

Merge pull request #1418 from javierhimura/master

Browse Source 
Fix generation 1/2 encounters from issue #1417
This commit is contained in:
Kurt
2017-08-25 07:32:18 -07:00
committed by GitHub
parent ccc6357294 f889a6ce7f
commit 37b826d0ec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
View File

@@ -99,7 +99,7 @@ private static IEnumerable<GBEncounterData> GenerateRawEncounters12(PKM pkm, Gam
deferred.Add(t);
continue;
}
yield return new GBEncounterData(pkm, gen, t, game);
yield return new GBEncounterData(pkm, gen, t, t.Version);
}
foreach (var s in GetValidStaticEncounter(pkm, game).Where(z => species.Contains(z.Species)))
{
@@ -119,13 +119,13 @@ private static IEnumerable<GBEncounterData> GenerateRawEncounters12(PKM pkm, Gam
}
if (game == GameVersion.GSC && !s.EggEncounter && s.Version == GameVersion.C && !pkm.HasOriginalMetLocation)
continue;
yield return new GBEncounterData(pkm, gen, s, game);
yield return new GBEncounterData(pkm, gen, s, s.Version);
}
foreach (var e in GetValidWildEncounters(pkm, game))
foreach (var e in GetValidWildEncounters(pkm, game).OfType<EncounterSlot1>())
{
if (!species.Contains(e.Species))
continue;
yield return new GBEncounterData(pkm, gen, e, game);
yield return new GBEncounterData(pkm, gen, e, e.Version);
}
if (game == GameVersion.GSC || game == GameVersion.C)