Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-06 05:27:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update wild/egg generators for totem cases

Browse Source 
so wonky edge cases
This commit is contained in:
Kurt 2017-11-14 08:43:04 -08:00
parent c5cd6728fe
commit 5e6b2f43c2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PKHeX.Core/Legality/Encounters/EncounterGenerator.cs
View File

@ -626,7 +626,7 @@ private static IEnumerable<EncounterSlot> GetFilteredSlots67(PKM pkm, IReadOnlyC
if (AlolanVariantEvolutions12.Contains(species)) // match form if same species, else form 0.
slotdata = encounterSlots.Where(slot => species == slot.Species ? slot.Form == form : slot.Form == 0);
else if (WildForms.Contains(species) || AlolanOriginForms.Contains(species)) // match slot form
else if (ShouldMatchSlotForm()) // match slot form
slotdata = encounterSlots.Where(slot => slot.Form == form);
else
slotdata = encounterSlots; // no form checking
@ -645,13 +645,15 @@ private static IEnumerable<EncounterSlot> GetFilteredSlots67(PKM pkm, IReadOnlyC
if (species == slotMax.Species ? slotMax.Form == form : slotMax.Form == 0)
yield return GetPressureSlot(slotMax, pkm);
}
else if (WildForms.Contains(species) || AlolanOriginForms.Contains(species)) // match slot form
else if (ShouldMatchSlotForm()) // match slot form
{
if (slotMax.Form == form)
yield return GetPressureSlot(slotMax, pkm);
}
else
yield return GetPressureSlot(slotMax, pkm);
bool ShouldMatchSlotForm() => WildForms.Contains(species) || AlolanOriginForms.Contains(species) || FormConverter.IsTotemForm(species, form);
}
private static IEnumerable<EncounterSlot> GetFilteredSlots6DexNav(PKM pkm, int lvl, IReadOnlyCollection<EncounterSlot> encounterSlots, int fluteBoost)
{
@ -1351,6 +1353,8 @@ private static IEnumerable<EncounterEgg> GenerateEggs(PKM pkm)
{
if (NoHatchFromEgg.Contains(pkm.Species))
yield break;
if (FormConverter.IsTotemForm(pkm.Species, pkm.AltForm, pkm.GenNumber))
yield break; // no totem eggs
int gen = pkm.GenNumber;
// version is a true indicator for all generation 3-5 origins