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

Fix raichu-a banned evolution in g7 s/m

Browse Source 
add a comment and parenthesis in something unrelated

Closes #2807 ty @MichiS97 !
This commit is contained in:
Kurt 2020-04-06 08:10:49 -07:00
parent 270d984130
commit fdc174ea99
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PKHeX.Core/Legality/Evolutions/EvolutionTree.cs
View File

@ -167,7 +167,7 @@ private IReadOnlyList<EvolutionMethod[]> GetEntries(IReadOnlyList<byte[]> data)
private void FixEvoTreeSM()
{
// Sun/Moon lack Ultra's Kantonian evolution methods.
BanEvo((int)Species.Raichu, 1, pkm => pkm.IsUntraded && pkm.SM);
BanEvo((int)Species.Raichu, 0, pkm => pkm.IsUntraded && pkm.SM);
BanEvo((int)Species.Marowak, 0, pkm => pkm.IsUntraded && pkm.SM);
BanEvo((int)Species.Raichu, 0, pkm => pkm.IsUntraded && pkm.SM);
}
@ -175,8 +175,9 @@ private void FixEvoTreeSM()
private void FixEvoTreeSS()
{
// Gigantamax Pikachu, Meowth-0, and Eevee are prevented from evolving.
// Raichu cannot be evolved to the Alolan variant at this time.
BanEvo((int)Species.Raichu, 0, pkm => pkm is IGigantamax g && g.CanGigantamax);
BanEvo((int)Species.Raichu, 1, pkm => pkm is IGigantamax g && g.CanGigantamax || pkm.Gen8 || pkm.GG);
BanEvo((int)Species.Raichu, 1, pkm => (pkm is IGigantamax g && g.CanGigantamax) || pkm.Gen8 || pkm.GG);
BanEvo((int)Species.Persian, 0, pkm => pkm is IGigantamax g && g.CanGigantamax);
BanEvo((int)Species.Weezing, 0, pkm => pkm.Gen8);