diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlot8GO.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlot8GO.cs index 8ca4bf14d..0ab71de3c 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlot8GO.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlot8GO.cs @@ -167,8 +167,6 @@ private bool IsMatchPartial(PKM pk) return true; if (!GetIVsAboveMinimum(pk)) return true; - if (!GetIVsBelowMaximum(pk)) - return true; // Eevee & Glaceon have different base friendships. Make sure if it is invalid that we yield the other encounter before. if (pk.OT_Friendship != OT_Friendship) diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs index 460f2055e..aaeb89281 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs @@ -94,7 +94,7 @@ protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteri pk.MetDate = GetRandomValidDate(); if (Gender != Gender.Random) pk.Gender = (int)Gender; - pk.SetRandomIVsGO(Type.GetMinIV(), Type.GetMaxIV()); + pk.SetRandomIVsGO(Type.GetMinIV()); } public bool GetIVsAboveMinimum(PKM pk) @@ -105,14 +105,6 @@ public bool GetIVsAboveMinimum(PKM pk) return GetIVsAboveMinimum(pk, min); } - public bool GetIVsBelowMaximum(PKM pk) - { - int max = Type.GetMaxIV(); - if (max == 15) - return true; - return GetIVsBelowMaximum(pk, max); - } - private static bool GetIVsAboveMinimum(PKM pk, int min) { if (pk.IV_ATK >> 1 < min) // ATK @@ -122,21 +114,10 @@ private static bool GetIVsAboveMinimum(PKM pk, int min) return pk.IV_HP >> 1 >= min; // HP } - private static bool GetIVsBelowMaximum(PKM pk, int max) - { - if (pk.IV_ATK >> 1 > max) // ATK - return false; - if (pk.IV_DEF >> 1 > max) // DEF - return false; - return pk.IV_HP >> 1 <= max; // HP - } - public bool GetIVsValid(PKM pk) { if (!GetIVsAboveMinimum(pk)) return false; - if (!GetIVsBelowMaximum(pk)) - return false; // HP * 2 | 1 -> HP // ATK * 2 | 1 -> ATK&SPA diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs index 447107963..83bd42bee 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/PogoType.cs @@ -34,10 +34,7 @@ public enum PogoType : byte /// Mythical Pokémon captured from the GO Battle League. GBLM, /// Pokémon captured from the GO Battle League during GO Battle Day, excluding Legendary and Mythical Pokémon. - /// On GO Battle Day (September 18, 2021), IV floor and ceiling were both temporarily set to 0 for non-Legendary encounters. This was fixed at 14:43 UTC (September 17, 2021). - GBLZero, - /// Pokémon captured from the GO Battle League during GO Battle Day, excluding Legendary and Mythical Pokémon. - GBLDay, + GBLD, /// Pokémon captured after defeating members of Team GO Rocket. Must become Purified before transferring to Pokémon HOME. /// Pokémon with this can not be moved to . @@ -61,8 +58,7 @@ public static class PogoTypeExtensions PogoType.ResearchUB => 15, PogoType.GBL => 20, PogoType.GBLM => 20, - PogoType.GBLZero => 20, - PogoType.GBLDay => 20, + PogoType.GBLD => 20, PogoType.Shadow => 8, _ => 1, }; @@ -79,22 +75,10 @@ public static class PogoTypeExtensions PogoType.ResearchM => 10, PogoType.ResearchP => 10, PogoType.GBLM => 10, - PogoType.GBLZero => 0, - PogoType.GBLDay => 0, + PogoType.GBLD => 0, _ => 1, }; - /// - /// Gets the minimum IVs (relative to GO's 0-15) the must have. - /// - /// Descriptor indicating how the Pokémon was encountered in GO. - /// Required minimum IV (0-15) - public static int GetMaxIV(this PogoType encounterType) => encounterType switch - { - PogoType.GBLZero => 0, - _ => 15, - }; - /// /// Checks if the is valid for the . /// diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index c0e501849..b79edea6e 100644 Binary files a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl and b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl differ diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl index 1c51f5b4c..f49ba4895 100644 Binary files a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl and b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl differ