From ba9db5ae99ccb1df945eae817dd8cec5ecd5ed36 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 21 Nov 2021 17:31:45 -0800 Subject: [PATCH] Ban ball inheritance for bdsp fossils --- .../Legality/Verifiers/Ball/BallBreedLegality.cs | 16 ++++++++++++++-- .../Legality/Verifiers/Ball/BallVerifier.cs | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/Ball/BallBreedLegality.cs b/PKHeX.Core/Legality/Verifiers/Ball/BallBreedLegality.cs index a8572e5cd..53fa336a8 100644 --- a/PKHeX.Core/Legality/Verifiers/Ball/BallBreedLegality.cs +++ b/PKHeX.Core/Legality/Verifiers/Ball/BallBreedLegality.cs @@ -985,7 +985,7 @@ internal static class BallBreedLegality }; /// - /// All egg species that can inherit a Safar Ball when bred in BD/SP. + /// All egg species that can inherit a Safari Ball when bred in BD/SP. /// internal static readonly HashSet InheritSafari_BDSP = new() { @@ -1012,5 +1012,17 @@ internal static class BallBreedLegality (int)Wooper, (int)Yanma, }; + + internal static readonly HashSet BanInheritedBall_BDSP = new() + { + // Gen1 Fossils + (int)Aerodactyl, (int)Omanyte, (int)Kabuto, + // Gen3 Fossils + (int)Lileep, (int)Anorith, + // Gen4 Fossils + (int)Cranidos, (int)Shieldon, + + (int)Phione, + }; } -} \ No newline at end of file +} diff --git a/PKHeX.Core/Legality/Verifiers/Ball/BallVerifier.cs b/PKHeX.Core/Legality/Verifiers/Ball/BallVerifier.cs index b17584732..c035432a5 100644 --- a/PKHeX.Core/Legality/Verifiers/Ball/BallVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/Ball/BallVerifier.cs @@ -257,7 +257,7 @@ private CheckResult VerifyBallEggGen7(LegalityAnalysis data) private CheckResult VerifyBallEggGen8BDSP(LegalityAnalysis data) { int species = data.EncounterMatch.Species; - if (species is (int)Species.Phione) + if (BallBreedLegality.BanInheritedBall_BDSP.Contains(species)) return VerifyBallEquals(data, (int)Poke); if (data.pkm.Ball == (int)Safari)