diff --git a/Directory.Build.props b/Directory.Build.props index 66eb28cfd..39df1d39f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 25.12.15 + 25.12.21 13 enable en diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs index a286ca884..0ac4e9a42 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs @@ -113,6 +113,11 @@ public EncounterMatchRating GetMatchRating(PKM pk) bool isHidden = pk.AbilityNumber == 4; if (isHidden && this.IsPartialMatchHidden(pk.Species, Species)) return EncounterMatchRating.PartialMatch; + + // B2/W2 Vespiquen (Level 24 both evolutions available at same location) + // Bigender->Fixed (non-Genderless) destination species, accounting for PID-Gender relationship + if (Species == (int)Core.Species.Combee && pk.Species == (int)Core.Species.Vespiquen && (pk.EncryptionConstant & 0xFF) >= 0x1F) // Combee->Vespiquen Invalid Evolution + return EncounterMatchRating.DeferredErrors; if (IsDeferredHiddenAbility(isHidden)) return EncounterMatchRating.Deferred; return EncounterMatchRating.Match; diff --git a/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs b/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs index 6deefedcb..cbc55b986 100644 --- a/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs +++ b/PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs @@ -52,10 +52,6 @@ private static bool IsValidEvolution(PKM pk, EvolutionHistory history, IEncounte if (!EvolutionHistory.HasVisited(original, encSpecies)) return false; - // Bigender->Fixed (non-Genderless) destination species, accounting for PID-Gender relationship - if (curSpecies == (int)Species.Vespiquen && enc.Generation < 6 && (pk.EncryptionConstant & 0xFF) >= 0x1F) // Combee->Vespiquen Invalid Evolution - return false; - return true; } } diff --git a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs index 61758fd82..b6ef17879 100644 --- a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs @@ -131,7 +131,7 @@ private static void VerifyDateValues(LegalityAnalysis data, PKM pk) if (pk.MetDate is null) data.AddLine(GetInvalid(Memory, DateCalendarInvalidMet)); } - else + else if (data.EncounterMatch is not EncounterInvalid) { if (pk.MetMonth != 0 || pk.MetDay != 0 || pk.MetYear != 0) data.AddLine(GetInvalid(Memory, DateCalendarInvalidMet)); diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index 426bee617..c5f8eaddb 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 96739904c..931296d68 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 diff --git a/PKHeX.WinForms/Resources/text/changelog.txt b/PKHeX.WinForms/Resources/text/changelog.txt index 749ce6e64..e26b419b5 100644 --- a/PKHeX.WinForms/Resources/text/changelog.txt +++ b/PKHeX.WinForms/Resources/text/changelog.txt @@ -1,7 +1,24 @@ PKHeX - By Kaphotics http://projectpokemon.org/pkhex/ -25/12/15 - New Update: +25/12/21 - New Update: + - Note: This will be the last release on .NET 9; future releases will be on .NET 10 + - Legality: Misc fixes for parsing forms/evolutions in Z-A. + - Fixed: Gen9a evolutions that require a move are now checked more accurately when evolutions have less learnset restrictions. + - Fixed: Gen9a Morpeko-Hangry in-party now flagged if it hasn't been able to learn Aura Wheel yet. + - Fixed: Gen9a Tatsugiri/Magearna/Meowstic-Mega are now checked properly when in-party. + - Fixed: Gen9a Baxcaliburite now released, can exist in inventory/held. Removed Cherish Ball from Allowed items list. + - Fixed: Gen9a Rotom form changing with Plus moves/move count now recognized correctly. + - Fixed: Gen9a Raichu-Alola alpha move now recognized correctly. + - Fixed: Gen9a Farfetch'd/Sirfetch'd now allow form argument. + - Fixed: Gen9a Gimmighoul Coin can no longer be held (matches game restrictions). + - Fixed: Gen9a Primal Orbs can no longer be traded (matches game restrictions). + - Fixed: Gen9a encounter templates without specified moves will now initialize the moveset in the correct order, rather than reversed. + - Added: Donut editor now shows star count, flavor icon, and auto calculates more properties. Thanks @ilmakio & @RandomGuy155 ! + - Fixed: Gen9a TM collection button now only returns the count of TMs not yet collected, not the total count of collectible. + - Fixed: Gen9a TMs added in DLC now indicate the correct item name string in the Inventory Editor. + +25/12/15 - New Update: (105489) [12006971] - Legality: Improved location ID detection of wild encounters, should work for 99.9%. - - Crossovers are not currently handled for detecting location IDs. Generating from encounter template is 100% legal. - Added: Gen9a Donut editor. Can randomize, clone, fill, export, import, and manually edit individual donuts. Thanks @Lusamine & @sora10pls !