From c1f5c450c2e54a9fb66dec48a90a2b41cd349409 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sun, 13 Mar 2016 16:42:03 -0700 Subject: [PATCH] Add ability check for wild pokemon --- Legality/Checks.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Legality/Checks.cs b/Legality/Checks.cs index e56cca88f..09d4ec9b0 100644 --- a/Legality/Checks.cs +++ b/Legality/Checks.cs @@ -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)