From 8fdcb634f0a62b907d3f2dc8e973f73872acc6ee Mon Sep 17 00:00:00 2001 From: sora10pls <17801814+sora10pls@users.noreply.github.com> Date: Sat, 17 Aug 2024 13:58:04 -0400 Subject: [PATCH] GO: Add handling for WCS 2024 timed research encs https://github.com/projectpokemon/PoGoEncTool/commit/f2296ccedb8a464170f91a0adcffa8a01287e152 update pickles because Necrozma encounter types had to be incremented by one --- .../Encounters/Templates/GO/PogoType.cs | 7 ++++++- .../legality/wild/encounter_go_home.pkl | Bin 136256 -> 137388 bytes .../legality/wild/encounter_go_lgpe.pkl | Bin 29544 -> 29600 bytes 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs b/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs index cfbb73785..bcf8118d2 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/GO/PogoType.cs @@ -48,6 +48,10 @@ public enum PogoType : byte /// ResearchNH, + /// Pokémon captured after completing Field Research. + /// Unlike standard Field Research encounters, these are lowered to Level 10. + Research10, + /// Pokémon captured after completing Field Research. /// Unlike standard Field Research encounters, these are boosted to Level 20. Research20, @@ -101,6 +105,7 @@ public static class PogoTypeExtensions PogoType.ResearchUB => 15, PogoType.ResearchMH => 15, PogoType.ResearchNH => 15, + PogoType.Research10 => 10, PogoType.Research20 => 20, PogoType.ResearchUB20 => 20, PogoType.GBL => 20, @@ -151,7 +156,7 @@ public static class PogoTypeExtensions /// True if valid, false if invalid. public static bool IsMasterBallUsable(this PogoType encounterType) => encounterType switch { - PogoType.Egg or PogoType.EggS => false, + PogoType.Egg or PogoType.EggS => false, PogoType.ResearchMP or PogoType.ResearchUB or PogoType.ResearchMH or PogoType.ResearchNH or PogoType.ResearchUB20 => false, _ => true, }; diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index 1574df534442d3667bda28fdc391bb0861e70553..69c1c18236ec3af74858649c5fa03d768e250b21 100644 GIT binary patch delta 6996 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 D0{>XW delta 5666 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 diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl index 125f205143c3e2c512359eb1200ad5bc0b779d76..e3168b0c18aa83712fd660e71c68044fcb4f8635 100644 GIT binary patch delta 739 zcmaLUKTH#07{~EnPh+b&Vv`;MT5H8BX8=L1im^(?D&;=}QH-FCqMll{ZVpXa69)%| zCUszNsEGrECM0EGaA06?U~pjQz<>+h;NZ|02L`?{Fgkqh&wFp5_xC(?*FB|Qo`RFJ z1Jb-DS+&vvR-pq@0jn6UlM?k(70V5hb5Keil73??D4B<)ab)ogiI6k{^N7@eX;@+D zGt8q>9{xsY1rx`VlO3Tb{vmjrXSAGZW0_S{AieHdEAl1Pn5WC2ROHwq(IwF@Tjtb&er0=L= zv6If?6h!nYLAG@94bC;D0sA^l+@Jv@yJ-f0U?ph;GdV7?9>#}iFJtK=L_Y>NXi(A+ zqsE&NseY7VSj3l`QfZ6>Z!wA6ydyJCNEGf!zPnQU1e3x1B)`AM=}*0>1)E2zZ#SNP{8MU zYmwh)nrmM2>#ecZ_jCIxZJw6fK}h2ZknfAcnz# zpeVdgA=pF~6AvUu9mQY^ z2_NTrDfmd*X&^rQjZz9ZWSS`8agySmkOVPr(=jeWG}9q{gS(R=@f}%Q2{Vl(hoUYL;HaD6F9_6wUg>KeiE!|e z;s*ExgS<4vGsK4(`77zeYdS-GgziQu3ZrkNpJPmGoMaOeHOc!^bURI+2veKkIsCIy zSDHf(J#VGGIfBnikp<3Ct{3V49pgsmJ%z^T7GIX6Ps@CY73mk&K2nUmTQFHqjV0^1yVeS~d+hVJ^{dwB{xf@Z Hz*~6