mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-22 20:13:06 +00:00
Move outbreak iteration after slots
essentially wild slots... can have wild marks like slots need to check before static encounters (cannot have marks)
This commit is contained in:
parent
eb273d05a4
commit
9231f37be4
1 changed files with 4 additions and 4 deletions
|
@ -110,6 +110,10 @@ public record struct EncounterEnumerator9(PKM Entity, EvoCriteria[] Chain, GameV
|
|||
case YieldState.Slot:
|
||||
if (TryGetNext<EncounterArea9, EncounterSlot9>(Encounters9.Slots))
|
||||
return true;
|
||||
Index = 0; State = YieldState.StaticOutbreak; goto case YieldState.StaticOutbreak;
|
||||
case YieldState.StaticOutbreak:
|
||||
if (TryGetNext(Encounters9.Outbreak))
|
||||
return true;
|
||||
Index = 0; goto case YieldState.SlotEnd;
|
||||
case YieldState.SlotEnd:
|
||||
if (!mustBeSlot)
|
||||
|
@ -156,10 +160,6 @@ public record struct EncounterEnumerator9(PKM Entity, EvoCriteria[] Chain, GameV
|
|||
case YieldState.StaticDist:
|
||||
if (TryGetNext(Encounters9.Dist))
|
||||
return true;
|
||||
Index = 0; State = YieldState.StaticOutbreak; goto case YieldState.StaticOutbreak;
|
||||
case YieldState.StaticOutbreak:
|
||||
if (TryGetNext(Encounters9.Outbreak))
|
||||
return true;
|
||||
Index = 0; State = YieldState.StaticMight; goto case YieldState.StaticMight;
|
||||
case YieldState.StaticMight:
|
||||
if (TryGetNext(Encounters9.Might))
|
||||
|
|
Loading…
Reference in a new issue