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

Check battleversion state for past-gen master rank ribbon

Browse Source
This commit is contained in:
Kurt
2020-06-19 21:24:58 -05:00
parent c0ee00cb7a
commit 69dbde1bb4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,7 @@ private static IEnumerable<RibbonResult> GetInvalidRibbons(PKM pkm, int gen)
if (pkm is IRibbonSetCommon8 s8)
{
bool inhabited8 = gen <= 8;
var iterate = inhabited8 ? GetInvalidRibbons8Any(pkm, s8) : GetInvalidRibbonsNone(s8.RibbonBits(), s8.RibbonNames());
var iterate = inhabited8 ? GetInvalidRibbons8Any(pkm, s8, gen) : GetInvalidRibbonsNone(s8.RibbonBits(), s8.RibbonNames());
foreach (var z in iterate)
yield return z;
}
@@ -363,7 +363,7 @@ private static IEnumerable<RibbonResult> GetInvalidRibbons7Any(PKM pkm, IRibbonS
}
}
private static IEnumerable<RibbonResult> GetInvalidRibbons8Any(PKM pkm, IRibbonSetCommon8 s8)
private static IEnumerable<RibbonResult> GetInvalidRibbons8Any(PKM pkm, IRibbonSetCommon8 s8, int gen)
{
if (!pkm.InhabitedGeneration(8) || !((PersonalInfoSWSH)PersonalTable.SWSH[pkm.Species]).IsPresentInGame)
{
@@ -382,7 +382,8 @@ private static IEnumerable<RibbonResult> GetInvalidRibbons8Any(PKM pkm, IRibbonS
yield return new RibbonResult(nameof(s8.RibbonChampionGalar));
// Legends cannot compete in Ranked, thus cannot reach Master Rank and obtain the ribbon.
if (s8.RibbonMasterRank && Legal.Legends.Contains(pkm.Species))
// Past gen Pokemon can get the ribbon only if they've been reset.
if (s8.RibbonMasterRank && (Legal.Legends.Contains(pkm.Species) || gen != 8 && pkm is IBattleVersion v && v.BattleVersion == 0))
yield return new RibbonResult(nameof(s8.RibbonMasterRank));
}
}