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

Flag East Gastrodon from Friend Safari... correctly

Browse Source 
Closes #2023
This commit is contained in:
Kurt 2018-06-21 20:26:21 -07:00
parent 8387da64fb
commit eb35d71fcc
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PKHeX.Core/Legality/Checks.cs
View File

@ -803,13 +803,14 @@ private void VerifyFormFriendSafari()
AddLine(Severity.Invalid, V64, CheckIdentifier.Form);
break;
case 710: // Pumpkaboo
case 711: // Goregeist
if (pkm.AltForm != 0) // Average
AddLine(Severity.Invalid, V6, CheckIdentifier.Form);
case 711 when pkm.AltForm != 0: // Goregeist Average
AddLine(Severity.Invalid, V6, CheckIdentifier.Form);
break;
case 586: // Sawsbuck
if (pkm.AltForm != 0)
AddLine(Severity.Invalid, V65, CheckIdentifier.Form);
case 423 when pkm.AltForm != 0: // Gastrodon West
AddLine(Severity.Invalid, V64, CheckIdentifier.Form);
break;
case 586 when pkm.AltForm != 0: // Sawsbuck
AddLine(Severity.Invalid, V65, CheckIdentifier.Form);
break;
}
}

2
PKHeX.Core/Legality/Encounters/Generator/EncounterSlotGenerator.cs
View File

@ -93,8 +93,6 @@ public static IEnumerable<EncounterSlot> GetValidFriendSafari(PKM pkm)
{
if (!pkm.XY || pkm.Met_Location != 148 || pkm.Met_Level != 30) // Friend Safari
return Enumerable.Empty<EncounterSlot>();
if (pkm.Species == 423 && pkm.AltForm != 0)
return Enumerable.Empty<EncounterSlot>();
var vs = EvolutionChain.GetValidPreEvolutions(pkm).Where(d => d.Level >= 30);
return vs.SelectMany(z => Encounters6.FriendSafari[z.Species]);
}