Fix pre-Alola form check

#377
This commit is contained in:
Kurt
2016-11-13 21:54:11 -08:00
parent d237b64e1a
commit 7aab746901

View File

@@ -1366,7 +1366,7 @@ private void verifyForm()
break;
}
if (pkm.Format >= 7 && pkm.AltForm != 0 && Legal.AlolanOriginForms.Contains(pkm.Species))
if (pkm.Format >= 7 && pkm.GenNumber < 7 && pkm.AltForm != 0 && Legal.AlolanOriginForms.Contains(pkm.Species))
{ AddLine(Severity.Invalid, "Form cannot be obtained for pre-Alola generation games.", CheckIdentifier.Form); return; }
if (pkm.AltForm > 0 && new[] {Legal.BattleForms, Legal.BattleMegas, Legal.BattlePrimals}.Any(arr => arr.Contains(pkm.Species)))
{ AddLine(Severity.Invalid, "Form cannot exist outside of a battle.", CheckIdentifier.Form); return; }