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

Add zygarde forme change->core ability in gen7

Browse Source 
Closes #868
This commit is contained in:
Kurt
2017-02-20 21:19:25 -08:00
parent 36624e14e9
commit 8136d33c15
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PKHeX/Legality/Core.cs
View File

@@ -302,7 +302,7 @@ internal static EncounterStatic getValidStaticEncounter(PKM pkm, bool gen1Encoun
continue;
if (e.Gender != -1 && e.Gender != pkm.Gender)
continue;
if (e.Form != pkm.AltForm && !FormChange.Contains(pkm.Species) && !e.SkipFormCheck)
if (e.Form != pkm.AltForm && !e.SkipFormCheck && !getCanFormChange(pkm, e.Species))
continue;
// Defer to EC/PID check
@@ -450,7 +450,7 @@ private static IEnumerable<MysteryGift> getMatchingWC6(PKM pkm, IEnumerable<Myst
if (wc.EncryptionConstant != 0 && wc.EncryptionConstant != pkm.EncryptionConstant) continue;
if (wc.Language != 0 && wc.Language != pkm.Language) continue;
}
if (wc.Form != pkm.AltForm && vs.All(dl => !FormChange.Contains(dl.Species)) && !getHasEvolvedFormChange(pkm)) continue;
if (wc.Form != pkm.AltForm && vs.All(dl => !getCanFormChange(pkm, dl.Species))) continue;
if (wc.MetLocation != pkm.Met_Location) continue;
if (wc.EggLocation != pkm.Egg_Location) continue;
if (wc.Level != pkm.Met_Level) continue;
@@ -498,7 +498,7 @@ private static IEnumerable<MysteryGift> getMatchingWC7(PKM pkm, IEnumerable<Myst
if (wc.EncryptionConstant != 0 && wc.EncryptionConstant != pkm.EncryptionConstant) continue;
if (wc.Language != 0 && wc.Language != pkm.Language) continue;
}
if (wc.Form != pkm.AltForm && vs.All(dl => !FormChange.Contains(dl.Species)) && getHasEvolvedFormChange(pkm)) continue;
if (wc.Form != pkm.AltForm && vs.All(dl => !getCanFormChange(pkm, dl.Species))) continue;
if (wc.MetLocation != pkm.Met_Location) continue;
if (wc.EggLocation != pkm.Egg_Location) continue;
if (wc.MetLevel != pkm.Met_Level) continue;
@@ -647,6 +647,16 @@ internal static bool getEvolutionValid(PKM pkm)
return curr.Count() >= poss.Count() - 1;
return curr.Count() >= poss.Count();
}
internal static bool getCanFormChange(PKM pkm, int species)
{
if (FormChange.Contains(species))
return true;
if (getHasEvolvedFormChange(pkm))
return true;
if (pkm.Species == 718 && pkm.InhabitedGeneration(7) && pkm.AltForm > 1)
return true;
return false;
}
internal static EncounterArea getCaptureLocation(PKM pkm)
{