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

Fix evolution invalid check

Browse source 
inserted optional param jumped in, resulting in incorrect inputs to the
method.
Closes #1080
This commit is contained in:
Kurt 2017-04-20 19:51:35 -07:00
parent 1aa386a537
commit 346a9c9d4f
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PKHeX/Legality/Core.cs
View file

@ -1103,7 +1103,7 @@ namespace PKHeX.Core
} }
internal static IEnumerable<EncounterStatic> getG3SpecialEggEncounter(PKM pkm) internal static IEnumerable<EncounterStatic> getG3SpecialEggEncounter(PKM pkm)
{ {
IEnumerable<DexLevel> dl = getValidPreEvolutions(pkm,MaxSpeciesID_3); IEnumerable<DexLevel> dl = getValidPreEvolutions(pkm, MaxSpeciesID_3);
var sttctable = pkm.E ? EventEgg_G3_Common : pkm.FRLG ? EventEgg_FRLG : EventEgg_RS; var sttctable = pkm.E ? EventEgg_G3_Common : pkm.FRLG ? EventEgg_FRLG : EventEgg_RS;
var table = sttctable.Where(e => dl.Any(d => d.Species == e.Species)); var table = sttctable.Where(e => dl.Any(d => d.Species == e.Species));
foreach (EncounterStatic e in table) foreach (EncounterStatic e in table)
@ -2201,7 +2201,7 @@ namespace PKHeX.Core
internal static bool getEvolutionValid(PKM pkm) internal static bool getEvolutionValid(PKM pkm)
{ {
var curr = getValidPreEvolutions(pkm); var curr = getValidPreEvolutions(pkm);
var poss = getValidPreEvolutions(pkm, 100, skipChecks: true); var poss = getValidPreEvolutions(pkm, lvl: 100, skipChecks: true);
if (getSplitBreedGeneration(pkm).Contains(getBaseSpecies(pkm, 1))) if (getSplitBreedGeneration(pkm).Contains(getBaseSpecies(pkm, 1)))
return curr.Count() >= poss.Count() - 1; return curr.Count() >= poss.Count() - 1;
@ -2852,7 +2852,7 @@ namespace PKHeX.Core
private static IEnumerable<EncounterArea> getSlots(PKM pkm, IEnumerable<EncounterArea> tables, int lvl = -1) private static IEnumerable<EncounterArea> getSlots(PKM pkm, IEnumerable<EncounterArea> tables, int lvl = -1)
{ {
IEnumerable<DexLevel> vs = getValidPreEvolutions(pkm, lvl); IEnumerable<DexLevel> vs = getValidPreEvolutions(pkm, lvl: lvl);
List<EncounterArea> slotLocations = new List<EncounterArea>(); List<EncounterArea> slotLocations = new List<EncounterArea>();
foreach (var loc in tables) foreach (var loc in tables)
{ {
@ -2864,7 +2864,7 @@ namespace PKHeX.Core
} }
return slotLocations; return slotLocations;
} }
private static IEnumerable<DexLevel> getValidPreEvolutions(PKM pkm, int maxspeciesorigin =-1, int lvl = -1, bool skipChecks = false) private static IEnumerable<DexLevel> getValidPreEvolutions(PKM pkm, int maxspeciesorigin = -1, int lvl = -1, bool skipChecks = false)
{ {
if (lvl < 0) if (lvl < 0)
lvl = pkm.CurrentLevel; lvl = pkm.CurrentLevel;

2
PKHeX/Saves/SaveUtil.cs
View file

@ -433,7 +433,7 @@ namespace PKHeX.Core
switch (MC.SelectedGameVersion) switch (MC.SelectedGameVersion)
{ {
// Side Games // Side Games
case GameVersion.COLO: sav = new SAV3Colosseum(data,MC); break; case GameVersion.COLO: sav = new SAV3Colosseum(data, MC); break;
case GameVersion.XD: sav = new SAV3XD(data, MC); break; case GameVersion.XD: sav = new SAV3XD(data, MC); break;
case GameVersion.RSBOX: sav = new SAV3RSBox(data, MC); break; case GameVersion.RSBOX: sav = new SAV3RSBox(data, MC); break;