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

Fix Bug Contest Butterfree error reported in issue #1011

Browse Source 
There is in the national park a butterfree encounter as a normal wild pokemon and another with the same levels in the bug contest, that means even in format 4 it could be more than one type encounters in the list, it should be filtered
This commit is contained in:
javierhimura
2017-04-15 00:10:19 +02:00
parent 60cde3ec68
commit 9fa2c135c6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PKHeX/Legality/Core.cs
View File

@@ -1148,10 +1148,10 @@ internal static EncounterSlot[] getValidWildEncounters(PKM pkm, GameVersion game
foreach (var area in getEncounterAreas(pkm, gameSource))
s.AddRange(getValidEncounterSlots(pkm, area, DexNav: pkm.AO, gameSource: gameSource));
if (s.Count <= 1 || 3 > pkm.GenNumber || pkm.GenNumber > 4 || pkm.HasOriginalMetLocation)
if (s.Count <= 1 || 3 > pkm.GenNumber || pkm.GenNumber > 4 || (pkm.Gen3 && pkm.HasOriginalMetLocation))
return s.Any() ? s.ToArray() : null;
// If has original met location or there is only one possible slot does not check safari zone nor BCC
// If has original met location or there is only one possible slot does not check safari zone
// defer to ball legality
var IsSafariBall = pkm.Ball == 5;
var s_Safari = IsSafariBall
@@ -1164,6 +1164,8 @@ internal static EncounterSlot[] getValidWildEncounters(PKM pkm, GameVersion game
if (s.Count <= 1 || pkm.GenNumber != 4)
return s.Any() ? s.ToArray() : null;
// BCC should be checked even if the pokemon have original met location, there are encounters of the same species
// in the national park as both normal wild encounters and contest encounters
var IsSportsBall = pkm.Ball == 0x18;
var s_BugContest = IsSportsBall
? s.Where(slot => slot.Type == SlotType.BugContest).ToList()