Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-11 07:04:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check if pokemon is inside an egg in getEvolutionChainsAllGens

Browse source 
Add special conditions for gen1 encounters and chains for spcies in gen2 future evolutions
Use current level to filter encounter slot for pokemon in format 1 and 2
This commit is contained in:
javierhimura 2017-02-16 10:35:14 +01:00
parent 98e11e2332
commit 3a830ca682
3 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKHeX/Legality/Checks.cs
View file

@ -526,9 +526,9 @@ namespace PKHeX.Core
{
// Since encounter matching is super weak due to limited stored data in the structure
// Calculate all 3 at the same time and pick the best result (by species).
var s = Legal.getValidStaticEncounter(pkm);
var s = Legal.getValidStaticEncounter(pkm, gen1Encounter: true);
var e = Legal.getValidWildEncounters(pkm);
var t = Legal.getValidIngameTrade(pkm);
var t = Legal.getValidIngameTrade(pkm, gen1Encounter: true);
const byte invalid = 255;

42
PKHeX/Legality/Core.cs
View file

@ -276,10 +276,17 @@ namespace PKHeX.Core
s.AddRange(getValidEncounterSlots(pkm, area, DexNav: pkm.AO));
return s.Any() ? s.ToArray() : null;
}
internal static EncounterStatic getValidStaticEncounter(PKM pkm)
internal static EncounterStatic getValidStaticEncounter(PKM pkm, bool gen1Encounter = false)
{
// Get possible encounters
IEnumerable<EncounterStatic> poss = getStaticEncounters(pkm);
int lvl = (pkm.Format < 3) ? pkm.CurrentLevel : pkm.Met_Level;
if (pkm.Gen3 && pkm.Format > 4 && lvl == pkm.CurrentLevel && FutureEvolutionsGen3_LevelUp.Contains(pkm.Species))
lvl--;
if (gen1Encounter && (pkm.Format == 2 || pkm.VC2) && lvl == pkm.CurrentLevel && FutureEvolutionsGen1_Gen2LevelUp.Contains(pkm.Species))
lvl--;
// Back Check against pkm
foreach (EncounterStatic e in poss)
{
@ -291,12 +298,12 @@ namespace PKHeX.Core
{
if (e.Location != 0 && e.Location != pkm.Met_Location)
continue;
if (e.Level != pkm.Met_Level)
if (e.Level != lvl)
continue;
}
else
{
if (e.Level > pkm.Met_Level)
if (e.Level > lvl)
continue;
}
if (e.Gender != -1 && e.Gender != pkm.Gender)
@ -317,7 +324,7 @@ namespace PKHeX.Core
}
return null;
}
internal static EncounterTrade getValidIngameTrade(PKM pkm)
internal static EncounterTrade getValidIngameTrade(PKM pkm, bool gen1Encounter = false)
{
if (!pkm.WasIngameTrade)
return null;
@ -325,6 +332,12 @@ namespace PKHeX.Core
if (lang == 0 || lang == 6)
return null;
int lvl = (pkm.Format < 3) ? pkm.CurrentLevel : pkm.Met_Level;
if (pkm.Gen3 && pkm.Format > 4 && lvl == pkm.CurrentLevel && FutureEvolutionsGen3_LevelUp.Contains(pkm.Species))
lvl--;
if (gen1Encounter && (pkm.Format == 2 || pkm.VC2) && lvl == pkm.CurrentLevel && FutureEvolutionsGen1_Gen2LevelUp.Contains(pkm.Species))
lvl--;
// Get valid pre-evolutions
IEnumerable<DexLevel> p = getValidPreEvolutions(pkm);
@ -355,9 +368,9 @@ namespace PKHeX.Core
return null;
if (pkm.HasOriginalMetLocation && z.Location != pkm.Met_Location)
return null;
if (pkm.HasOriginalMetLocation && z.Level != pkm.Met_Level)
if (pkm.HasOriginalMetLocation && z.Level != lvl)
return null;
if (!pkm.HasOriginalMetLocation && z.Level > pkm.Met_Level)
if (!pkm.HasOriginalMetLocation && z.Level > lvl)
return null;
if (z.Nature != Nature.Random && (int)z.Nature != pkm.Nature)
return null;
@ -808,6 +821,15 @@ namespace PKHeX.Core
GensEvoChains[pkm.Format] = CompleteEvoChain.ToArray();
return GensEvoChains;
}
//If is egg skip the other checks and just return the evo chain for GenNumber, that will contains only the pokemon inside the egg
//Empty list returned if is an impossible egg (like a gen 3 infernape inside an egg)
if (pkm.IsEgg && getMaxSpeciesOrigin(pkm.GenNumber) > pkm.Species)
return GensEvoChains;
else if (pkm.IsEgg)
{
GensEvoChains[pkm.GenNumber] = CompleteEvoChain.ToArray();
return GensEvoChains;
}
int currengenlevel = pkm.CurrentLevel;
int maxgen = (pkm.Format <= 2) ? 2 : pkm.Format;
@ -822,9 +844,10 @@ namespace PKHeX.Core
if (!pkm.HasOriginalMetLocation && pkm.Format >2 && gen <= 4 && currengenlevel > pkm.Met_Level)
//Met location was lost at this point but it also means the pokemon existed in generations 1 to 4 with maximun level equals to met level
currengenlevel = pkm.Met_Level;
int maxspeciesgen = getMaxSpeciesOrigin(gen);
//Remove future gen evolutions after a few special considerations,
//it the pokemon origin is illegal like a "gen 3" Infernape the list will be emptied, it didnt existed in gen 3 in any evolution phase
while (CompleteEvoChain.Any() && CompleteEvoChain.First().Species > getMaxSpeciesOrigin(gen))
while (CompleteEvoChain.Any() && CompleteEvoChain.First().Species > maxspeciesgen)
{
//Eeve requieres to level one time to be Sylveon, it can be deduced in gen 5 and before it existed with maximun one level bellow current
if (CompleteEvoChain.First().Species == 700 && gen == 5)
@ -834,6 +857,9 @@ namespace PKHeX.Core
//but if current level is met level we can also deduce it existed in gen 3 until maximun met level -1
if (gen == 3 && pkm.Format>4 && currengenlevel == pkm.CurrentLevel && CompleteEvoChain.First().Species > MaxSpeciesID_3 && CompleteEvoChain.First().RequiresLvlUp)
currengenlevel--;
//The same condition for gen2 evolution of gen 1 pokemon, level of the pokemon in gen 1 games would be CurrentLevel -1 one level bellow gen 2 level
if (gen == 1 && (pkm.Format == 2 || pkm.VC2 ) && currengenlevel == pkm.CurrentLevel && CompleteEvoChain.First().Species > MaxSpeciesID_1 && CompleteEvoChain.First().RequiresLvlUp)
currengenlevel--;
CompleteEvoChain = CompleteEvoChain.Skip(1);
};
//Alolan form evolutions, remove from gens 1-6 chains
@ -1034,6 +1060,8 @@ namespace PKHeX.Core
//See comments in getEvolutionChainsAllGens for more info in this sentence
if (gen == 3 && pkm.Format > 4 && lvl == pkm.CurrentLevel && FutureEvolutionsGen3_LevelUp.Contains(pkm.Species))
lvl--;
if (gen == 1 && ( pkm.Format == 2 || pkm.VC2 ) && lvl == pkm.CurrentLevel && FutureEvolutionsGen1_Gen2LevelUp.Contains(pkm.Species))
lvl--;
//Those encounters with level min greater that met level are not valid for this pokemon
encounterSlots = slots.Where(slot => ignoreLevel || slot.LevelMin <= lvl).ToList();
}

6
PKHeX/Legality/Tables1.cs
View file

@ -119,5 +119,11 @@ namespace PKHeX.Core
{
169,182,186,196,197,199,208,212,230,233,242,462,463,464,465,466,467,470,471,474,700
};
internal static readonly int[] FutureEvolutionsGen1_Gen2LevelUp = new int[]
{
169,196,197,242
};
//Crobat Espeon Umbreon Blissey
}
}