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

Improve encounter level met check

Browse Source 
DexNav boosts levels (up to 10?)
Non boosted => met level == slot level
This commit is contained in:
Kaphotics
2016-03-06 17:08:04 -08:00
parent fea468e112
commit d34db0a4a9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Legality/Core.cs
View File

@@ -38,7 +38,7 @@ internal static bool getDexNavValid(PK6 pk6)
if (!alpha && pk6.Version != 27)
return false;
IEnumerable<EncounterArea> locs = (alpha ? DexNavA : DexNavO).Where(l => l.Location == pk6.Met_Location);
return locs.Select(loc => getValidEncounterSlots(pk6, loc)).Any(slots => slots.Any());
return locs.Select(loc => getValidEncounterSlots(pk6, loc, DexNav: true)).Any(slots => slots.Any());
}
internal static int[] getValidMoves(PK6 pk6)
{
@@ -107,14 +107,17 @@ private static int getBaseSpecies(PK6 pk6, int skipOption)
default: return evos.Length <= 0 ? pk6.Species : evos.Last().Species;
}
}
private static IEnumerable<EncounterSlot> getValidEncounterSlots(PK6 pk6, EncounterArea loc)
private static IEnumerable<EncounterSlot> getValidEncounterSlots(PK6 pk6, EncounterArea loc, bool DexNav)
{
// Get Valid levels
IEnumerable<DexLevel> vs = getValidPreEvolutions(pk6);
// Get slots where pokemon can exist
IEnumerable<EncounterSlot> slots = loc.Slots.Where(slot =>
vs.Any(evo => evo.Species == slot.Species && evo.Level >= slot.LevelMin)
&& pk6.Met_Level == slot.LevelMin);
IEnumerable<EncounterSlot> slots = loc.Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Level >= slot.LevelMin));
// Filter for Met Level
slots = DexNav
? slots.Where(slot => slot.LevelMin <= pk6.Met_Level && pk6.Met_Level <= slot.LevelMin + 10) // DexNav Boost Range
: slots.Where(slot => slot.LevelMin == pk6.Met_Level); // Non-boosted Level
// Filter for Form Specific
if (WildForms.Contains(pk6.Species))