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

Continued refinements

Browse Source
This commit is contained in:
Kurt
2020-11-13 08:20:51 -08:00
parent 67a796e982
commit 5e22c119be
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Areas/EncounterArea8g.cs
View File

@@ -53,7 +53,7 @@ private static IEnumerable<EncounterSlot> GetSlots(EncounterArea8g area, int max
continue;
if (IsDisallowedDuplicateForm(species, f))
continue;
bool lgpe = (species <= 151 || species == 808 || species == 809) && ptGG[species].HasForme(f);
bool lgpe = (species <= 151 || species == 808 || species == 809) && (f == 0 || ptGG[species].HasForme(f));
var game = lgpe ? GameVersion.GG : GameVersion.SWSH;
yield return GetSlot(area, species, f, game);
}
@@ -68,7 +68,7 @@ private static IEnumerable<EncounterSlot> GetSlots(EncounterArea8g area, int max
continue;
if (IsDisallowedDuplicateForm(species, f))
continue;
bool lgpe = species <= 151 && ptGG[species].HasForme(f);
bool lgpe = species <= 151 && (f == 0 || ptGG[species].HasForme(f));
var game = lgpe ? GameVersion.GG : GameVersion.USUM;
yield return GetSlot(area, species, f, game);
}

2
PKHeX.Core/Legality/Encounters/Data/EncountersGO.cs
View File

@@ -793,7 +793,7 @@ public static bool IsShinyValid(int species, int form, Ball ball)
return true;
}
return UnavailableShiny.Contains(sf);
return !UnavailableShiny.Contains(sf);
}
}
}