Add g3 safari ball wild deferrals

Pineco is valid but also can be sourced to altering cave
similar for sandslash
Thanks theSlayer!
This commit is contained in:
Kurt 2018-03-21 17:30:19 -07:00
parent f103a84fbd
commit 636736c3fa
3 changed files with 10 additions and 0 deletions

View File

@ -301,6 +301,11 @@ private static IEnumerable<IEncounterable> 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<IEncounterable> 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;