Skip to content

Commit 31edf20

Browse files
committed
Update 25.12.21
Moves one of the Evolution deferral checks to the encounter template where it triggers; no other encounter case will trip that check so it's OK to move it there. One less thing for every other encounter to check. Revises the "met date present but no met location" to only flag if the encounter was matched to something. It'll already yell at mismatched encounters, no need to pile on more. The check only exists for eggs (no location).
1 parent 7d1bcfa commit 31edf20

File tree

7 files changed

+25
-7
lines changed

7 files changed

+25
-7
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>25.12.15</Version>
3+
<Version>25.12.21</Version>
44
<LangVersion>13</LangVersion>
55
<Nullable>enable</Nullable>
66
<NeutralLanguage>en</NeutralLanguage>

PKHeX.Core/Legality/Encounters/Templates/Gen5/EncounterSlot5.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ public EncounterMatchRating GetMatchRating(PKM pk)
113113
bool isHidden = pk.AbilityNumber == 4;
114114
if (isHidden && this.IsPartialMatchHidden(pk.Species, Species))
115115
return EncounterMatchRating.PartialMatch;
116+
117+
// B2/W2 Vespiquen (Level 24 both evolutions available at same location)
118+
// Bigender->Fixed (non-Genderless) destination species, accounting for PID-Gender relationship
119+
if (Species == (int)Core.Species.Combee && pk.Species == (int)Core.Species.Vespiquen && (pk.EncryptionConstant & 0xFF) >= 0x1F) // Combee->Vespiquen Invalid Evolution
120+
return EncounterMatchRating.DeferredErrors;
116121
if (IsDeferredHiddenAbility(isHidden))
117122
return EncounterMatchRating.Deferred;
118123
return EncounterMatchRating.Match;

PKHeX.Core/Legality/Encounters/Verifiers/EvolutionVerifier.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ private static bool IsValidEvolution(PKM pk, EvolutionHistory history, IEncounte
5252
if (!EvolutionHistory.HasVisited(original, encSpecies))
5353
return false;
5454

55-
// Bigender->Fixed (non-Genderless) destination species, accounting for PID-Gender relationship
56-
if (curSpecies == (int)Species.Vespiquen && enc.Generation < 6 && (pk.EncryptionConstant & 0xFF) >= 0x1F) // Combee->Vespiquen Invalid Evolution
57-
return false;
58-
5955
return true;
6056
}
6157
}

PKHeX.Core/Legality/Verifiers/MiscVerifier.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private static void VerifyDateValues(LegalityAnalysis data, PKM pk)
131131
if (pk.MetDate is null)
132132
data.AddLine(GetInvalid(Memory, DateCalendarInvalidMet));
133133
}
134-
else
134+
else if (data.EncounterMatch is not EncounterInvalid)
135135
{
136136
if (pk.MetMonth != 0 || pk.MetDay != 0 || pk.MetYear != 0)
137137
data.AddLine(GetInvalid(Memory, DateCalendarInvalidMet));
1.01 KB
Binary file not shown.
52 Bytes
Binary file not shown.

PKHeX.WinForms/Resources/text/changelog.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
11
PKHeX - By Kaphotics
22
http://projectpokemon.org/pkhex/
33

4-
25/12/15 - New Update:
4+
25/12/21 - New Update:
5+
- Note: This will be the last release on .NET 9; future releases will be on .NET 10
6+
- Legality: Misc fixes for parsing forms/evolutions in Z-A.
7+
- Fixed: Gen9a evolutions that require a move are now checked more accurately when evolutions have less learnset restrictions.
8+
- Fixed: Gen9a Morpeko-Hangry in-party now flagged if it hasn't been able to learn Aura Wheel yet.
9+
- Fixed: Gen9a Tatsugiri/Magearna/Meowstic-Mega are now checked properly when in-party.
10+
- Fixed: Gen9a Baxcaliburite now released, can exist in inventory/held. Removed Cherish Ball from Allowed items list.
11+
- Fixed: Gen9a Rotom form changing with Plus moves/move count now recognized correctly.
12+
- Fixed: Gen9a Raichu-Alola alpha move now recognized correctly.
13+
- Fixed: Gen9a Farfetch'd/Sirfetch'd now allow form argument.
14+
- Fixed: Gen9a Gimmighoul Coin can no longer be held (matches game restrictions).
15+
- Fixed: Gen9a Primal Orbs can no longer be traded (matches game restrictions).
16+
- Fixed: Gen9a encounter templates without specified moves will now initialize the moveset in the correct order, rather than reversed.
17+
- Added: Donut editor now shows star count, flavor icon, and auto calculates more properties. Thanks @ilmakio & @RandomGuy155 !
18+
- Fixed: Gen9a TM collection button now only returns the count of TMs not yet collected, not the total count of collectible.
19+
- Fixed: Gen9a TMs added in DLC now indicate the correct item name string in the Inventory Editor.
20+
21+
25/12/15 - New Update: (105489) [12006971]
522
- Legality: Improved location ID detection of wild encounters, should work for 99.9%.
623
- - Crossovers are not currently handled for detecting location IDs. Generating from encounter template is 100% legal.
724
- Added: Gen9a Donut editor. Can randomize, clone, fill, export, import, and manually edit individual donuts. Thanks @Lusamine & @sora10pls !

0 commit comments

Comments
 (0)