From 636736c3faedc0d3c9bf3664b0e1f787cb393e55 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 21 Mar 2018 17:30:19 -0700 Subject: [PATCH] Add g3 safari ball wild deferrals Pineco is valid but also can be sourced to altering cave similar for sandslash Thanks theSlayer! --- .../Encounters/Generator/EncounterGenerator.cs | 10 ++++++++++ .../028 ★ - Sandslash - 583900000000.pk7 | Bin 0 -> 232 bytes .../204 - クヌギダマ - 4CF0E7EAFE99.pk7 | Bin 0 -> 232 bytes 3 files changed, 10 insertions(+) create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/028 ★ - Sandslash - 583900000000.pk7 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/204 - クヌギダマ - 4CF0E7EAFE99.pk7 diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs index f7723627e..4afe8a35a 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterGenerator.cs @@ -301,6 +301,11 @@ private static IEnumerable GenerateRawEncounters4(PKM pkm, Legal deferred.AddLast(z); continue; } + if (safari != z.Type.HasFlag(SlotType.Safari)) + { + deferred.AddLast(z); + continue; + } var frame = slots.FirstOrDefault(s => s.IsSlotCompatibile(z, pkm)); if (frame != null || pkm.Species == 201) // Unown -- don't really care to figure this out @@ -338,6 +343,11 @@ private static IEnumerable GenerateRawEncounters3(PKM pkm, Legal var slots = FrameFinder.GetFrames(info.PIDIV, pkm).ToList(); foreach (var z in GetValidWildEncounters(pkm)) { + if (safari != z.Type.HasFlag(SlotType.Safari)) + { + deferred.Enqueue(z); + continue; + } var frame = slots.FirstOrDefault(s => s.IsSlotCompatibile(z, pkm)); if (frame != null) yield return z; diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/028 ★ - Sandslash - 583900000000.pk7 b/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/028 ★ - Sandslash - 583900000000.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..e6aa06baf3350da2b1747980f6afbbb2b346b848 GIT binary patch literal 232 zcmZQz00GMg86e5Tz`}4Kl!1YR5iAH2AP9mP5*hLsQW%OEa)7L2h77olSqx_xj2JI5 z@QZMXzy-mKT3s1N_5VTtU4hW=KdKy%2eTb2;l{wo!U9+12WO!(+~5L&%$z{BVX3GL K13M!V#1{a6#t|6+ literal 0 HcmV?d00001 diff --git a/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/204 - クヌギダマ - 4CF0E7EAFE99.pk7 b/Tests/PKHeX.Tests/Legality/Legal/Generation 7 Transfer/204 - クヌギダマ - 4CF0E7EAFE99.pk7 new file mode 100644 index 0000000000000000000000000000000000000000..5f94bfaeeaccaa4808b981278cfbbb228eaaf686 GIT binary patch literal 232 zcmbRF@6~e#h7Uex7#J9S#kB10n90Dv%E-Vl6DTeQ6e9%I8=Ns%XK=vao&mbb3I-L1 zrwpYGtRfm*sB+spndH>}2mN;iLcjm0azGx?c4Xkjz{tV|7kFv#+TbLHT_9;UxEeub RQ6Sr}lvRm=nUM)%9sm$YAJPB- literal 0 HcmV?d00001