From bcb7135940ea2c7ab4cedce1b104c0432a79bdfe Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Mon, 6 May 2024 13:20:51 -0400 Subject: [PATCH] Add handling for Wonder Ticket Poipole See https://github.com/projectpokemon/PoGoEncTool/commit/1ec0f91e08485e37d82cab4b9a0da0a21fbdee07 --- .../Encounters/Templates/GO/PogoType.cs | 35 +++++++++++------- .../legality/wild/encounter_go_home.pkl | Bin 132056 -> 132056 bytes .../legality/wild/encounter_go_lgpe.pkl | Bin 28784 -> 28784 bytes 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs b/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs index 0498c9bad..d24ca36f7 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs @@ -30,32 +30,40 @@ public enum PogoType : byte /// Mythical Pokémon captured after completing Field Research. ResearchM, /// Mythical Pokémon captured after completing Field Research. Only Poké Balls can be used. - ResearchP, + ResearchMP, /// Ultra Beasts captured after completing Field Research. Only Beast Balls can be used. ResearchUB, /// Mythical Pokémon captured after completing Field Research. No HUD is visible during these encounters. - /// Under normal circumstances, only Poké Balls can be used, but Great Balls and Ultra Balls can be used with the Remember Last-Used Poké Ball setting. + /// + /// Under normal circumstances, only Poké Balls can be used, but Great Balls and Ultra Balls can be used with the Remember Last-Used Poké Ball setting. + /// This was rendered unusable as of version 0.277.3. + /// + ResearchMH, + /// Pokémon captured after completing Field Research. No HUD is visible during these encounters. + /// + /// The encounter defaults to the player's stock of Poké Balls. If they have none, it falls back to Great Balls, and then to Ultra Balls. + /// If the player has no Poké Balls, Great Balls, or Ultra Balls, the HUD fails to load in any Poké Ball at all, even if they have a Master Ball. + /// ResearchNH, /// Pokémon captured from the GO Battle League. GBL = 30, /// 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. + /// Pokémon captured from the GO Battle League during GO Battle Day events. Excludes Legendary Pokémon, Mythical Pokémon, and Ultra Beasts. GBLD, /// Pokémon captured after defeating members of Team GO Rocket. Must be Purified before transferring to Pokémon HOME. /// Pokémon with this can not be moved to . Shadow = 40, - /// - /// Pokémon captured from Special Research or Timed Research with a Premier Ball. - /// + /// Pokémon captured from Special Research or Timed Research with a Premier Ball. /// - /// Niantic pushed release 0.269 on April 22, 2023, which contained an issue with the Remember Last-Used Poké Ball setting. + /// Niantic released version 0.269.0 on April 22, 2023, which contained an issue with the Remember Last-Used Poké Ball setting. /// This allowed for Premier Balls obtained from Raid Battles to be remembered on all future encounters. - /// The moment the Premier Ball touched the floor or a wild Pokémon, the encounter would end, except if it was from a Special Research and Timed Research encounter. + /// The moment the Premier Ball touched the floor or a wild Pokémon, the encounter would end, except if it was from a Special Research, Timed Research, or Collection Challenge encounter. /// This made it possible for over 300 species of Pokémon to be obtainable in a Poké Ball they were never meant to be captured in. + /// This bug was fixed with the release of version 0.269.2. /// Research269 = 200, Research269M, @@ -79,8 +87,9 @@ public static class PogoTypeExtensions PogoType.RaidS => 20, PogoType.Research => 15, PogoType.ResearchM => 15, - PogoType.ResearchP => 15, + PogoType.ResearchMP => 15, PogoType.ResearchUB => 15, + PogoType.ResearchMH => 15, PogoType.ResearchNH => 15, PogoType.GBL => 20, PogoType.GBLM => 20, @@ -101,8 +110,8 @@ public static class PogoTypeExtensions PogoType.Wild => 0, PogoType.RaidM => 10, PogoType.ResearchM => 10, - PogoType.ResearchP => 10, - PogoType.ResearchNH => 10, + PogoType.ResearchMP => 10, + PogoType.ResearchMH => 10, PogoType.GBLM => 10, PogoType.GBLD => 0, PogoType.Research269M => 10, @@ -131,7 +140,7 @@ public static bool IsBallValid(this PogoType encounterType, Ball ball) public static bool IsMasterBallUsable(this PogoType encounterType) => encounterType switch { PogoType.Egg or PogoType.EggS => false, - PogoType.ResearchP or PogoType.ResearchUB or PogoType.ResearchNH => false, + PogoType.ResearchMP or PogoType.ResearchUB or PogoType.ResearchMH or PogoType.ResearchNH => false, _ => true, }; @@ -148,7 +157,7 @@ public static bool IsBallValid(this PogoType encounterType, Ball ball) PogoType.RaidM => Ball.Premier, PogoType.RaidUB => Ball.Beast, PogoType.RaidS => Ball.Premier, - PogoType.ResearchP => Ball.Poke, + PogoType.ResearchMP => Ball.Poke, PogoType.ResearchUB => Ball.Beast, PogoType.Shadow => Ball.Premier, PogoType.Research269 => Ball.Premier, diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index bdfe08c989fc2d9a2f373d10ea6e7a151ae79524..4929de10545516feb5080fe8ac305e9678fb4be8 100644 GIT binary patch delta 50 zcmcc7&T*riV}n(mI5+bP_C`h~rYGz?Tu;~=H8@zFumi=K1M{{A<}uoJF-mTq@PpBV F8vv=A5ODwi delta 50 zcmcc7&T*riV}n(mxHR`O_C`h~rYGz?Tu;~=H8@zFumi=K1M{{A<}uoJF^X)T@PpBV F8vw4C5SRb} diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl index 0780510b34184b6d9863d66b83bf00d00fa0ad61..9af64a6ac190f6113c2cd72e60a844940d629690 100644 GIT binary patch delta 28 jcmezHfbqiv#tl_@yxhz$*c%x+Se~#0S)1GQUNQmzu#*c$ delta 28 jcmezHfbqiv#tl_@ywcpy*c%x+Se~#0S)1GQUNQmzvd0T@