Add ability check for wild pokemon

This commit is contained in:
Kaphotics
2016-03-13 16:42:03 -07:00
parent 0d81fd2d09
commit c1f5c450c2

View File

@@ -149,8 +149,6 @@ public static LegalityCheck verifyEncounter(PK6 pk)
return new LegalityCheck(Severity.Invalid, "Invalid location for hatched egg.");
}
if (Legal.getWildEncounterValid(pk))
return new LegalityCheck(Severity.Valid, "Valid encounter at location.");
EncounterStatic z = Legal.getStaticEncounter(pk);
if (z != null)
@@ -162,6 +160,13 @@ public static LegalityCheck verifyEncounter(PK6 pk)
// Not Implemented: In-Game Trades
if (Legal.getWildEncounterValid(pk))
{
var lc = Legal.ValidMet_AO.Contains(pk.Met_Location)
? new LegalityCheck(Severity.Valid, "Valid encounter at location.")
: new LegalityCheck(Severity.Invalid, "Hidden ability on valid encounter.");
return lc;
}
return new LegalityCheck(Severity.Invalid, "Not a valid encounter.");
}
public static LegalityCheck[] verifyMoves(PK6 pk6)