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

Revise alola champ ribbon check

Browse Source
This commit is contained in:
Kurt
2022-08-12 10:16:12 -07:00
parent 5f3516c3ce
commit 3cccb3a9cd
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifier.cs
View File

@@ -166,8 +166,9 @@ private static IEnumerable<RibbonResult> GetInvalidRibbons(PKM pk, EvolutionHist
}
if (pk is IRibbonSetCommon7 s7)
{
bool inhabited7 = gen <= 7 && !pk.GG;
if (!inhabited7 && enc is not IRibbonSetCommon7 { RibbonChampionAlola: true })
bool inhabited7 = evos.HasVisitedGen7;
bool alolaValid = GetIsAlolaChampValid(s7, enc, inhabited7);
if (!alolaValid)
yield return new RibbonResult(nameof(s7.RibbonChampionAlola));
if (!inhabited7 || !IsAllowedBattleFrontier(pk.Species))
@@ -198,6 +199,18 @@ private static IEnumerable<RibbonResult> GetInvalidRibbons(PKM pk, EvolutionHist
}
}
private static bool GetIsAlolaChampValid(IRibbonSetCommon7 s7, IEncounterTemplate enc, bool inhabited7)
{
// If the encounter comes with the ribbon, it must have the ribbon.
if (enc is IRibbonSetCommon7 { RibbonChampionAlola: true })
return s7.RibbonChampionAlola;
// If it has visited, it can be either state.
if (inhabited7)
return true;
// If it has not visited, it must not have it.
return !s7.RibbonChampionAlola;
}
private static bool IsRibbonValidEffort(PKM pk, EvolutionHistory evos, int gen) => gen switch
{
5 when pk.Format == 5 => false,