From 4fd73d201f926cdf80d9bf7d1fa80a6b829a4ef2 Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Mon, 26 Sep 2022 20:37:55 -0400 Subject: [PATCH] Remove unused GBLZero PogoType This was implemented because Niantic messed up some GBL encounters in the past, but it was fixed quick enough for it to not matter for legality, so no encounters actually use this PogoType. Also rename GBLDay => GBLD to match other PogoTypes for consistency across enum names. --- .../EncounterSlot/GO/EncounterSlot8GO.cs | 2 -- .../EncounterSlot/GO/EncounterSlotGO.cs | 21 +---------------- .../Encounters/EncounterSlot/GO/PogoType.cs | 22 +++--------------- .../legality/wild/encounter_go_home.pkl | Bin 88792 -> 89168 bytes .../legality/wild/encounter_go_lgpe.pkl | Bin 20232 -> 20320 bytes 5 files changed, 4 insertions(+), 41 deletions(-) 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 c0e5018492e8b110ee193c9931a3c1d781365d06..b79edea6e8887125e1526b7dcc46eb5cdab2c0be 100644 GIT binary patch delta 4371 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 ax1LcI>N88;57S*ipzn0R-pV+3eB>9W;dWX8 delta 549 zcmW;JJ1j$S6vy%3l}bBwXrj0%isE{d>;0zU{Ynf5gTc^2qNAaMq?H&dF*IQ?h!_kV zDrwTy(81WDqoKo17&;gX1_OyN!{^@r{Xfn*|8t!?BXwt_iwUbnir^j|zjT0Sn6=V1 ziip%nQKaCjXAg2nnNk7%1}WYsJ)ne8lQfGH6c7wZ*=E+@X^~Db+De{QCFBGpZ=1A@ z8@%ACUAn|OLLCIb8$uyzuam=FQW6#TyQM>9;k6_i4uU<>EnK})40a!J@q`L|VW}KW zNc#gM#xuU*AC&qL!{^`F=Eg&kHB3RsjY#QH0^xQH<8*04`hY!2a-2_5