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

Simplification changes

Browse source 
remove dexlevel(lvl) call in favor of single species call, differentiate
maxSpeciesOrigin from maxSpeciesTree
This commit is contained in:
Kurt 2017-01-29 09:26:40 -08:00
parent dfc518faab
commit fefd3e6e72
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
PKHeX/Legality/Structures/EvolutionTree.cs
View file

@ -10,13 +10,13 @@ namespace PKHeX.Core
private readonly EvolutionLineage[] Lineage; private readonly EvolutionLineage[] Lineage;
private readonly GameVersion Game; private readonly GameVersion Game;
private readonly PersonalTable Personal; private readonly PersonalTable Personal;
private readonly int MaxSpecies; private readonly int MaxSpeciesTree;
public EvolutionTree(byte[][] data, GameVersion game, PersonalTable personal, int maxSpecies) public EvolutionTree(byte[][] data, GameVersion game, PersonalTable personal, int maxSpeciesTree)
{ {
Game = game; Game = game;
Personal = personal; Personal = personal;
MaxSpecies = maxSpecies; MaxSpeciesTree = maxSpeciesTree;
switch (game) switch (game)
{ {
case GameVersion.SM: case GameVersion.SM:
@ -32,7 +32,7 @@ namespace PKHeX.Core
for (int i = 0; i < Entries.Count; i++) for (int i = 0; i < Entries.Count; i++)
Lineage[i] = new EvolutionLineage(); Lineage[i] = new EvolutionLineage();
if (Game == GameVersion.ORAS) if (Game == GameVersion.ORAS)
Array.Resize(ref Lineage, maxSpecies + 1); Array.Resize(ref Lineage, maxSpeciesTree + 1);
// Populate Lineages // Populate Lineages
for (int i = 1; i < Lineage.Length; i++) for (int i = 1; i < Lineage.Length; i++)
@ -149,7 +149,8 @@ namespace PKHeX.Core
public IEnumerable<DexLevel> getValidPreEvolutions(PKM pkm, int lvl, bool skipChecks = false) public IEnumerable<DexLevel> getValidPreEvolutions(PKM pkm, int lvl, bool skipChecks = false)
{ {
int index = getIndex(pkm); int index = getIndex(pkm);
return Lineage[index].getExplicitLineage(pkm, lvl, skipChecks, MaxSpecies); int maxSpeciesOrigin = Legal.getMaxSpeciesOrigin(pkm);
return Lineage[index].getExplicitLineage(pkm, lvl, skipChecks, MaxSpeciesTree, maxSpeciesOrigin);
} }
} }
@ -293,16 +294,6 @@ namespace PKHeX.Core
} }
} }
public DexLevel GetDexLevel(int lvl)
{
return new DexLevel
{
Species = Species,
Level = lvl,
Form = Form,
Flag = Method,
};
}
public DexLevel GetDexLevel(int species, int lvl) public DexLevel GetDexLevel(int species, int lvl)
{ {
@ -352,9 +343,8 @@ namespace PKHeX.Core
Chain.Insert(0, evo); Chain.Insert(0, evo);
} }
public IEnumerable<DexLevel> getExplicitLineage(PKM pkm, int lvl, bool skipChecks, int maxSpecies) public IEnumerable<DexLevel> getExplicitLineage(PKM pkm, int lvl, bool skipChecks, int maxSpeciesTree, int maxSpeciesOrigin)
{ {
int maxSpeciesOrigin = Legal.getMaxSpeciesOrigin(pkm);
List<DexLevel> dl = new List<DexLevel> { new DexLevel { Species = pkm.Species, Level = lvl, Form = pkm.AltForm } }; List<DexLevel> dl = new List<DexLevel> { new DexLevel { Species = pkm.Species, Level = lvl, Form = pkm.AltForm } };
for (int i = Chain.Count-1; i >= 0; i--) // reverse evolution! for (int i = Chain.Count-1; i >= 0; i--) // reverse evolution!
{ {
@ -365,10 +355,13 @@ namespace PKHeX.Core
continue; continue;
oneValid = true; oneValid = true;
if (evo.Species > maxSpecies) // Gen7 Personal Formes -- unmap the forme personal entry to the actual species ID since species are consecutive int species = evo.Species;
dl.Add(evo.GetDexLevel(pkm.Species - Chain.Count + i, lvl));
else // Gen7 Personal Formes -- unmap the forme personal entry ID to the actual species ID since species are consecutive
dl.Add(evo.GetDexLevel(lvl)); if (evo.Species > maxSpeciesTree)
species = pkm.Species - Chain.Count + i;
dl.Add(evo.GetDexLevel(species, lvl));
if (evo.RequiresLevelUp) if (evo.RequiresLevelUp)
lvl--; lvl--;
@ -377,8 +370,11 @@ namespace PKHeX.Core
if (!oneValid) if (!oneValid)
break; break;
} }
// Remove future gen preevolutions, no munchlax in a gen3 snorlax, no pichu in a gen1 vc raichu, etc
if (dl.Any(d => d.Species <= maxSpeciesOrigin) && dl.Last().Species > maxSpeciesOrigin) if (dl.Any(d => d.Species <= maxSpeciesOrigin) && dl.Last().Species > maxSpeciesOrigin)
dl.RemoveAt(dl.Count - 1);//remove future gen preevolutions, no munchlax in a gen3 snorlax, no pichu in a gen1 vc raichu, etc dl.RemoveAt(dl.Count - 1);
return dl; return dl;
} }
} }