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

Add glalie/skuntank locations

Browse Source 
#2570
This commit is contained in:
Kurt
2019-12-10 19:54:26 -08:00
parent fcdd7019d3
commit 108233b45f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PKHeX.Core/Legality/Areas/EncounterArea8.cs
View File

@@ -19,11 +19,12 @@ public override bool IsMatchLocation(int location)
if (!PermitCrossover)
return false;
// get all other areas that can bleed encounters to the met location
if (!ConnectingArea8.TryGetValue(location, out var others))
// Get all other areas that the Location can bleed encounters to
if (!ConnectingArea8.TryGetValue(Location, out var others))
return false;
return others.Contains((byte)Location);
// Check if any of the other areas are the met location
return others.Contains((byte)location);
}
protected override IEnumerable<EncounterSlot> GetMatchFromEvoLevel(PKM pkm, IEnumerable<EvoCriteria> vs, int minLevel)
@@ -46,7 +47,7 @@ protected override IEnumerable<EncounterSlot> GetMatchFromEvoLevel(PKM pkm, IEnu
private static bool IsMatch(DexLevel evo, EncounterSlot slot)
{
if (evo.Species != slot.Species)
if (evo.Species != slot.Species)
return false;
if (evo.Form == slot.Form)
return true;

5
PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
View File

@@ -109,6 +109,7 @@ static Encounters8()
#endregion
#region Static Part 2
// Some of these may be crossover cases. For now, just log the locations they can show up in and re-categorize later.
new EncounterStatic8 { Species = 095, Level = 26, Location = 122, }, // Onix in the Rolling Fields (in a Wild Area)
new EncounterStatic8 { Species = 416, Level = 26, Location = 122, }, // Vespiquen in the Rolling Fields (in a Wild Area)
new EncounterStatic8S{ Species = 675, Level = 32, Locations = new[] {122, 124}}, // Pangoro in the Rolling Fields, in the Dappled Grove (in a Wild Area)
@@ -233,7 +234,7 @@ static Encounters8()
new EncounterStatic8 { Species = 344, Level = 36, Location = 124, }, // Claydol in the Dappled Grove (in a Wild Area)
new EncounterStatic8 { Species = 093, Level = 34, Location = 126, }, // Haunter at Watchtower Ruins (in a Wild Area)
new EncounterStatic8 { Species = 356, Level = 40, Location = 126, }, // Dusclops at Watchtower Ruins (in a Wild Area)
new EncounterStatic8 { Species = 362, Level = 40, Location = 126, }, // Glalie at Watchtower Ruins (in a Wild Area)
new EncounterStatic8S{ Species = 362, Level = 40, Locations = new[] {126, 130}, }, // Glalie at Watchtower Ruins (in a Wild Area) & at West Lake Axewell
new EncounterStatic8 { Species = 279, Level = 28, Location = 138, }, // Pelipper at North Lake Miloch (in a Wild Area)
new EncounterStatic8 { Species = 536, Level = 28, Location = 130, }, // Palpitoad at West Lake Axewell (in a Wild Area)
new EncounterStatic8 { Species = 660, Level = 28, Location = -1, }, // Diggersby
@@ -247,7 +248,7 @@ static Encounters8()
new EncounterStatic8 { Species = 558, Level = 34, Location = 134, }, // Crustle at South Lake Miloch (in a Wild Area)
new EncounterStatic8 { Species = 067, Level = 31, Location = 134, }, // Machoke at South Lake Miloch (in a Wild Area)
new EncounterStatic8 { Species = 426, Level = 31, Location = -1, }, // Drifblim
new EncounterStatic8 { Species = 435, Level = 36, Location = -1, }, // Skuntank
new EncounterStatic8 { Species = 435, Level = 36, Location = 138, }, // Skuntank at North Lake Miloch (in a Wild Area)
new EncounterStatic8 { Species = 537, Level = 36, Location = 124, }, // Seismitoad in the Dappled Grove (in a Wild Area)
new EncounterStatic8 { Species = 583, Level = 36, Location = -1, }, // Vanillish
new EncounterStatic8 { Species = 426, Level = 36, Location = -1, }, // Drifblim