diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs index c9c7c3ccd..3aabe325d 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs @@ -21,7 +21,7 @@ namespace PKHeX.Core public virtual int Location { get; set; } public int Ability { get; set; } - public virtual Shiny Shiny { get; set; } = Shiny.Random; + public Shiny Shiny { get; set; } = Shiny.Random; public int Gender { get; set; } = -1; public int EggLocation { get; set; } public Nature Nature { get; set; } = Nature.Random; diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic5N.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic5N.cs index 1a358286d..5775bd946 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic5N.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic5N.cs @@ -3,10 +3,13 @@ internal sealed class EncounterStatic5N : EncounterStatic5 { public readonly uint PID; - public override Shiny Shiny { get; set; } = Shiny.FixedValue; public const bool NSparkle = true; - internal EncounterStatic5N(uint pid) => PID = pid; + internal EncounterStatic5N(uint pid) + { + Shiny = Shiny.FixedValue; + PID = pid; + } protected override void SetPINGA(PKM pk, EncounterCriteria criteria) { diff --git a/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs b/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs index 0041006b0..7a01057cd 100644 --- a/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/PIDVerifier.cs @@ -51,7 +51,7 @@ namespace PKHeX.Core break; // Forced PID or generated without an encounter - if (s is EncounterStatic5N || (s is EncounterStatic5 s5 && s5.Roaming) || s.Shiny == Shiny.Never) + if (s is EncounterStatic5 s5 && (s5.Roaming || s5.Shiny != Shiny.Random)) break; VerifyG5PID_IDCorrelation(data); break; diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 5/612 ★ - Haxorus - A1AC5BB800F7.pk5 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 5/612 ★ - Haxorus - A1AC5BB800F7.pk5 new file mode 100644 index 000000000..db5c45424 Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 5/612 ★ - Haxorus - A1AC5BB800F7.pk5 differ