Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-10 22:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1064 from javierhimura/FixNationalPark

Browse source 
Fix Bug Contest Butterfree error reported in issue #1011
This commit is contained in:
Kurt 2017-04-14 16:23:25 -07:00 committed by GitHub
commit 18794c4484
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX/Legality/Core.cs
View file

@ -1148,10 +1148,10 @@ namespace PKHeX.Core
foreach (var area in getEncounterAreas(pkm, gameSource)) foreach (var area in getEncounterAreas(pkm, gameSource))
s.AddRange(getValidEncounterSlots(pkm, area, DexNav: pkm.AO, gameSource: 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; 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 // defer to ball legality
var IsSafariBall = pkm.Ball == 5; var IsSafariBall = pkm.Ball == 5;
var s_Safari = IsSafariBall var s_Safari = IsSafariBall
@ -1164,6 +1164,8 @@ namespace PKHeX.Core
if (s.Count <= 1 || pkm.GenNumber != 4) if (s.Count <= 1 || pkm.GenNumber != 4)
return s.Any() ? s.ToArray() : null; 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 IsSportsBall = pkm.Ball == 0x18;
var s_BugContest = IsSportsBall var s_BugContest = IsSportsBall
? s.Where(slot => slot.Type == SlotType.BugContest).ToList() ? s.Where(slot => slot.Type == SlotType.BugContest).ToList()