diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs index 10098f9ac..0095e4e6e 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs @@ -10,21 +10,24 @@ public enum PogoType : byte Wild, Egg, - /// Raid Boss, requires Lv. 15 and IV=1 - Raid15 = 10, - /// Raid Boss, requires Lv. 20 and IV=10 - Raid20, + /// Raid Boss, requires Lv. 20 and IV = 1 + Raid = 10, + /// Raid Boss (Mythical), requires Lv. 20 and IV = 10 + RaidM, - /// Field Research, requires Lv. 15 and IV=1 - Field15 = 20, - /// Field Research, requires Lv. 15 and IV=10 (Mythicals) - FieldM, - /// Field Research, requires Lv. 15 and IV=10 (Mythicals, Poké Ball only) - FieldP, - /// Field Research, requires Lv. 20 and IV=10 (GBL Mythicals) - Field20, + /// Field Research Reward, requires Lv. 15 and IV = 1 + Research = 20, + /// Field Research Reward (Mythical), requires Lv. 15 and IV = 10 + ResearchM, + /// Field Research Reward, requires Lv. 15 and IV = 10 (Poké Ball only) + ResearchP, - /// Purified, requires Lv. 8 and IV=1 (Premier Ball) + /// GO Battle League Reward, requires Lv. 20 and IV = 1 + GBL, + /// GO Battle League Reward (Mythical), requires Lv. 20 and IV = 10 + GBLM, + + /// Purified, requires Lv. 8 and IV = 1 (Premier Ball only) Shadow = 30, } @@ -36,12 +39,13 @@ public static class PogoTypeExtensions /// Descriptor indicating how the Pokémon was encountered in GO. public static int GetMinLevel(this PogoType encounterType) => encounterType switch { - PogoType.Raid15 => 15, - PogoType.Raid20 => 20, - PogoType.Field15 => 15, - PogoType.FieldM => 15, - PogoType.FieldP => 15, - PogoType.Field20 => 20, + PogoType.Raid => 20, + PogoType.RaidM => 20, + PogoType.Research => 15, + PogoType.ResearchM => 15, + PogoType.ResearchP => 15, + PogoType.GBL => 20, + PogoType.GBLM => 20, PogoType.Shadow => 8, _ => 1, }; @@ -54,10 +58,10 @@ public static class PogoTypeExtensions public static int GetMinIV(this PogoType encounterType) => encounterType switch { PogoType.Wild => 0, - PogoType.Raid20 => 10, - PogoType.FieldM => 10, - PogoType.FieldP => 10, - PogoType.Field20 => 10, + PogoType.RaidM => 10, + PogoType.ResearchM => 10, + PogoType.ResearchP => 10, + PogoType.GBLM => 10, _ => 1, }; @@ -83,9 +87,9 @@ public static bool IsBallValid(this PogoType encounterType, Ball ball) public static Ball GetValidBall(this PogoType encounterType) => encounterType switch { PogoType.Egg => Ball.Poke, - PogoType.FieldP => Ball.Poke, - PogoType.Raid15 => Ball.Premier, - PogoType.Raid20 => Ball.Premier, + PogoType.Raid => Ball.Premier, + PogoType.RaidM => Ball.Premier, + PogoType.ResearchP => Ball.Poke, PogoType.Shadow => Ball.Premier, _ => Ball.None, // Poke, Great, Ultra };