From 0316404f46fe74544f5589b8a01a109fa8f5cc54 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 21 Jan 2025 22:40:45 -0600 Subject: [PATCH] Fix ageto antishiny recognition Must have been omitted in the refactor while we're here, revise the other gift3's to be records for the autogen'd ToString --- .../Encounters/Templates/Gen3/Colo/EncounterGift3Colo.cs | 2 +- .../Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3.cs | 2 +- .../Encounters/Templates/Gen3/Gifts/EncounterGift3JPN.cs | 2 +- .../Encounters/Templates/Gen3/Gifts/EncounterGift3NY.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Colo/EncounterGift3Colo.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Colo/EncounterGift3Colo.cs index 27b19676a..2464ef533 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Colo/EncounterGift3Colo.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Colo/EncounterGift3Colo.cs @@ -150,7 +150,7 @@ private bool IsMatchPartial(PKM pk) } #endregion - public bool IsCompatible(PIDType type, PKM pk) => type is PIDType.CXD; + public bool IsCompatible(PIDType type, PKM pk) => type is PIDType.CXD or PIDType.CXDAnti; public PIDType GetSuggestedCorrelation() => PIDType.CXD; diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3.cs index 440b7f8a5..d988f4eb1 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3.cs @@ -8,7 +8,7 @@ namespace PKHeX.Core; /// /// Generation 3 Event Gift /// -public sealed class EncounterGift3 : IEncounterable, IEncounterMatch, IMoveset, IFatefulEncounterReadOnly, +public sealed record EncounterGift3 : IEncounterable, IEncounterMatch, IMoveset, IFatefulEncounterReadOnly, IRibbonSetEvent3, IRandomCorrelationEvent3, IFixedTrainer, IMetLevel { public ushort Species { get; } diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3JPN.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3JPN.cs index 8a1814400..05d227da2 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3JPN.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3JPN.cs @@ -6,7 +6,7 @@ namespace PKHeX.Core; /// Generation 3 Event Gift /// /// Specialized for the PCJP gift distribution machines. -public sealed class EncounterGift3JPN(ushort Species, Distribution3JPN Distribution) +public sealed record EncounterGift3JPN(ushort Species, Distribution3JPN Distribution) : IEncounterable, IEncounterMatch, IRandomCorrelationEvent3, IFixedTrainer { public ushort Species { get; } = Species; diff --git a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3NY.cs b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3NY.cs index 37b575789..12ccfcfc0 100644 --- a/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3NY.cs +++ b/PKHeX.Core/Legality/Encounters/Templates/Gen3/Gifts/EncounterGift3NY.cs @@ -7,7 +7,7 @@ namespace PKHeX.Core; /// Generation 3 Event Gift /// /// Specialized for the PCNY gift distribution machines. -public sealed class EncounterGift3NY(ushort Species, Distribution3NY Distribution, byte Level, Moveset Moves) +public sealed record EncounterGift3NY(ushort Species, Distribution3NY Distribution, byte Level, Moveset Moves) : IEncounterable, IEncounterMatch, IRandomCorrelationEvent3, IFixedTrainer, IMoveset { public ushort Species { get; } = Species;