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

Update EncountersGO.cs

Browse Source
This commit is contained in:
Kurt
2020-11-12 20:50:39 -08:00
parent 01c597cba7
commit 3e4d685d37
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -704,24 +704,6 @@ internal static class EncountersGO
(int)Darkrai,
};
private static readonly HashSet<int> ShinyBan_LGPE = new HashSet<int>
{
(int)Spearow, (int)Fearow,
(int)Paras, (int)Parasect,
(int)Slowpoke, (int)Slowbro,
(int)Hitmonlee, (int)Hitmonchan,
(int)Goldeen, (int)Seaking,
(int)Ditto,
(int)Snorlax,
};
private static readonly HashSet<int> ShinyBan = new HashSet<int>(ShinyBan_LGPE)
{
(int)Mew,
// ??
};
internal static readonly EncounterArea7g[] SlotsGO_GG = EncounterArea7g.GetArea(RequireLevelIV_Raid15_1_LGPE);
internal static readonly EncounterArea8g[] SlotsGO = EncounterArea8g.GetArea(MaxSpeciesID_GO_HOME, DisallowedSpecies, ExtraSpecies);
@@ -741,7 +723,7 @@ internal static bool IsBallValid(int species, int form, Ball ball)
if (RequireLevelIV_Egg1_1.Contains(sf) || RequireLevelIV_EggShiny1_1.Contains(sf))
return ball == Ball.Poke;
return ball <= Ball.Ultra;
return Ball.Ultra <= ball && ball <= Ball.Poke;
}
internal static int GetMinLevel(int species, int form)
@@ -784,7 +766,7 @@ public static bool IsShinyValid(int species, int form, Ball pkmBall)
if (pkmBall == Ball.Premier)
return false;
return ShinyBan.Contains(sf);
return UnavailableShiny.Contains(sf);
}
}
}