From 8387da64fbd87934fa83671352445b3a75fcd042 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 21 Jun 2018 20:22:14 -0700 Subject: [PATCH] Disallow East Gastrodon friendsafari Closes #2023 --- .../Generator/EncounterSlotGenerator.cs | 2 ++ .../AltForm/423-01 - Gastrodon - 6CE785FF60E2.pk7 | Bin 0 -> 232 bytes 2 files changed, 2 insertions(+) create mode 100644 Tests/PKHeX.Tests/Legality/Illegal/AltForm/423-01 - Gastrodon - 6CE785FF60E2.pk7 diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs index 5e1bd2eee..aeaf86f63 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs @@ -93,6 +93,8 @@ public static IEnumerable GetValidFriendSafari(PKM pkm) { if (!pkm.XY || pkm.Met_Location != 148 || pkm.Met_Level != 30) // Friend Safari return Enumerable.Empty(); + if (pkm.Species == 423 && pkm.AltForm != 0) + return Enumerable.Empty(); var vs = EvolutionChain.GetValidPreEvolutions(pkm).Where(d => d.Level >= 30); return vs.SelectMany(z => Encounters6.FriendSafari[z.Species]); } diff --git a/Tests/PKHeX.Tests/Legality/Illegal/AltForm/423-01 - Gastrodon - 6CE785FF60E2.pk7 b/Tests/PKHeX.Tests/Legality/Illegal/AltForm/423-01 - Gastrodon - 6CE785FF60E2.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..ec0b1b3227f0c936ca23fff024e2fe5d031e88c2 GIT binary patch literal 232 zcmaEq@V}LT;d#z-Mg|5p=l!e|nG6g?ObiT4Pgeyna|rnUaR}#QzysVF5*dmaN*Ib5 z@)=TqI1jFN72{im4-85ST>Py3a6vHR|NsB?0Sw*@9t^1r5vWoi9?&Joz>R^Cg&8go n!jK8HCl$^|Fd7+{6=fMfDg}7BfaDYg7C8n9Lk>ouZx|Q={HGdR literal 0 HcmV?d00001