From 57292b23c8f25bbf79fab6772964d7dbd40800f8 Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Sun, 1 Oct 2023 09:17:51 -0400 Subject: [PATCH] Update Master Rank Ribbon check for Regulation E Sinnoh starters permitted, Kitakami dex permitted, Legendary/Mythical still disallowed. Also check for Battle Version on GO8 encounters in SWSH, which while are Gen 8 encounters, require Battle Version since they didn't originate from SWSH. --- PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs index ff174a723..80f21f167 100644 --- a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs +++ b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonRules.cs @@ -105,7 +105,8 @@ public static bool IsRibbonValidMasterRank(PKM pk, IEncounterTemplate enc, Evolu /// private static bool IsRibbonValidMasterRankSWSH(PKM pk, IEncounterTemplate enc) { - if (enc.Generation < 8 && pk is IBattleVersion { BattleVersion: 0 }) + // Transfers from prior games, as well as from GO, require the battle-ready symbol in order to participate in Ranked. + if (enc.Generation < 8 || enc.Version == GameVersion.GO && pk is IBattleVersion { BattleVersion: 0 }) return false; // GO transfers: Capture date is global time, and not console changeable. @@ -134,13 +135,6 @@ private static bool IsRibbonValidMasterRankSV(ISpeciesForm pk) return false; if (SpeciesCategory.IsMythical(species)) return false; - - // DLC 1: Teal Mask Additions - if (species is (>= (int)Turtwig and <= (int)Empoleon)) - return false; - var pi = PersonalTable.SV.GetFormEntry(species, pk.Form); - if (pi.DexPaldea == 0 && pi.DexKitakami != 0) - return false; return true; }