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:
Kurt 2024-04-28 16:44:28 -05:00
parent eb273d05a4
commit 9231f37be4

View file

@ -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))