Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-14 00:07:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update EncounterGenerator6.cs

Browse source 
Closes #3153
wc6 is the only one with deferred cards that matter
This commit is contained in:
Kurt 2021-02-16 07:35:55 -08:00
parent f63654d5ae
commit f5b47f9116
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator6.cs
View file

@ -16,11 +16,33 @@ namespace PKHeX.Core
int ctr = 0;
var chain = EncounterOrigin.GetOriginChain(pkm);
IEncounterable? deferred = null;
IEncounterable? partial = null;
if (pkm.WasEvent || pkm.WasEventEgg || pkm.WasLink)
{
foreach (var z in GetValidGifts(pkm, chain))
{ yield return z; ++ctr; }
if (ctr != 0) yield break;
{
var match = z.GetMatchRating(pkm);
switch (match)
{
case Match: yield return z; ++ctr; break;
case Deferred: deferred ??= z; break;
case PartialMatch: partial ??= z; break;
}
}
if (ctr != 0)
{
if (deferred != null)
yield return deferred;
if (partial != null)
yield return partial;
}
yield break;
}
if (pkm.WasBredEgg)
@ -30,9 +52,6 @@ namespace PKHeX.Core
if (ctr == 0) yield break;
}
IEncounterable? deferred = null;
IEncounterable? partial = null;
foreach (var z in GetValidStaticEncounter(pkm, chain))
{
var match = z.GetMatchRating(pkm);