From e4aa16f396ca960452f5486e4ee73d14f1c4061e Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 16 Jul 2018 21:53:46 -0700 Subject: [PATCH] Fill out gen5 hidden ability banlist now flags gen5 contrary serperior ;) --- PKHeX.Core/Legality/Tables5.cs | 52 ++++++++++++++++++ .../Legality/Verifiers/AbilityVerifier.cs | 6 +- ...97 - Serperior - gen5 HA not available.pk7 | Bin 0 -> 232 bytes 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 Tests/PKHeX.Tests/Legality/Illegal/Misc/497 - Serperior - gen5 HA not available.pk7 diff --git a/PKHeX.Core/Legality/Tables5.cs b/PKHeX.Core/Legality/Tables5.cs index a8427af78..b0bfe5576 100644 --- a/PKHeX.Core/Legality/Tables5.cs +++ b/PKHeX.Core/Legality/Tables5.cs @@ -176,12 +176,15 @@ namespace PKHeX.Core /// internal static readonly HashSet Ban_BreedHidden5 = new HashSet { + // Only males distributed; unable to pass to offspring 001, // Bulbasaur 004, // Charmander 007, // Squirtle + 128, // Tauros 152, // Chikorita 155, // Cyndaquil 158, // Totodile + 236, // Tyrogue 252, // Treecko 255, // Torchic 258, // Mudkip @@ -191,6 +194,55 @@ namespace PKHeX.Core 511, // Pansage 513, // Pansear 515, // Panpour + 574, // Gothita + + // Genderless; unable to pass to offspring + 081, // Magnemite + 100, // Voltorb + 120, // Staryu + 132, // Ditto... can't breed anyway. + 137, // Porygon + 302, // Sableye + 374, // Beldum + 436, // Bronzor + 622, // Golett + + // Not available at all + 092, // Gastly + 109, // Koffing + 200, // Misdreavus + 201, // Unown + 287, // Slakoth + 311, // Plusle + 311, // Minun + 337, // Lunatone + 338, // Solrock + 343, // Baltoy + 351, // Castform + 352, // Kecleon + 355, // Duskull + 358, // Chimecho + 420, // Cherrim + 433, // Chingling + 479, // Rotom + 489, // Phione + 495, // Snivy + 498, // Tepig + 501, // Oshawott + 538, // Throh + 539, // Sawk + 561, // Sigilyph + 562, // Yamask + 566, // Archen + 570, // Zorua + 597, // Ferroseed + 599, // Klink + 602, // Tynamo + 607, // Litwick + 615, // Cryogonal + 627, // Rufflet + 633, // Deino + 636, // Larvesta }; } } diff --git a/PKHeX.Core/Legality/Verifiers/AbilityVerifier.cs b/PKHeX.Core/Legality/Verifiers/AbilityVerifier.cs index 3c8c1667e..0efb02a63 100644 --- a/PKHeX.Core/Legality/Verifiers/AbilityVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/AbilityVerifier.cs @@ -229,10 +229,8 @@ namespace PKHeX.Core break; case EncounterEgg e when pkm.AbilityNumber == 4: - // Hidden Abilities for some are unbreedable (male only distribution) - if (Legal.MixedGenderBreeding.Contains(e.Species) || Legal.FixedGenderFromBiGender.Contains(e.Species)) - break; // from female - if (pkm.PersonalInfo.OnlyMale || Legal.Ban_BreedHidden5.Contains(e.Species)) + // Hidden Abilities for some are unbreedable or unreleased + if (Legal.Ban_BreedHidden5.Contains(e.Species)) return GetInvalid(V112); break; } diff --git a/Tests/PKHeX.Tests/Legality/Illegal/Misc/497 - Serperior - gen5 HA not available.pk7 b/Tests/PKHeX.Tests/Legality/Illegal/Misc/497 - Serperior - gen5 HA not available.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..8e36e6b8d17298905b33972f7c6a6097b05983cf GIT binary patch literal 232 zcmY#-x+;KyVZzIgj0_BH&ih$KbOadcSQr?Tfa1&ygh4PvDnk)N0hr8W$Op1v;1oj@ zV-4e0MlMz^R+t!sj=EMVl87pV%mcav6)>_O3