From 3ea44b5eb05de4f69c53d2374900d881f618a68d Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 15 Jan 2024 22:50:37 -0800 Subject: [PATCH] Allow Gourmand mark on Eggs Flag it if it's affixed though. --- PKHeX.Core/Legality/Verifiers/MarkVerifier.cs | 6 ++++++ .../Legality/Verifiers/Ribbons/RibbonVerifierMark9.cs | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs b/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs index d16eb2fcd..b19f7664e 100644 --- a/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MarkVerifier.cs @@ -22,6 +22,12 @@ public override void Verify(LegalityAnalysis data) VerifyMarksPresent(data, m); VerifyAffixedRibbonMark(data, m); + if (pk.IsEgg && pk is IRibbonSetAffixed a && a.AffixedRibbon != -1) + { + // Disallow affixed values on eggs. + var affix = (RibbonIndex)a.AffixedRibbon; + data.AddLine(GetInvalid(string.Format(LRibbonMarkingAffixedF_0, GetRibbonNameSafe(affix)))); + } // Some encounters come with a fixed Mark, and we've not yet checked if it's missing. if (data.EncounterMatch is IEncounterMarkExtra extra && extra.IsMissingExtraMark(pk, out var missing)) diff --git a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifierMark9.cs b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifierMark9.cs index 0c4fe1e82..4c973c70e 100644 --- a/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifierMark9.cs +++ b/PKHeX.Core/Legality/Verifiers/Ribbons/RibbonVerifierMark9.cs @@ -31,8 +31,9 @@ public static void ParseEgg(this IRibbonSetMark9 r, ref RibbonResultList list) { if (r.RibbonMarkAlpha) list.Add(MarkAlpha); - if (r.RibbonMarkGourmand) - list.Add(MarkGourmand); + // Can apply to eggs if in party. Just can't affix. + // if (r.RibbonMarkGourmand) + // list.Add(MarkGourmand); if (r.RibbonMarkItemfinder) list.Add(MarkItemfinder); if (r.RibbonMarkJumbo)