From fdc174ea99edcc681a7f2fb15c00ae9c8cd6c79b Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 6 Apr 2020 08:10:49 -0700 Subject: [PATCH] Fix raichu-a banned evolution in g7 s/m add a comment and parenthesis in something unrelated Closes #2807 ty @MichiS97 ! --- PKHeX.Core/Legality/Evolutions/EvolutionTree.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs index eb191bb80..0ed25ba2c 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs @@ -167,7 +167,7 @@ private IReadOnlyList GetEntries(IReadOnlyList 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);