Misc cleanup

Add PCD fixed PID check
improve PID matching for CXD pkm
hide no-pidiv match seed (00000000)
fix matching fateful for wild pokespot pkm
don't generate eggs for c/xd

PKHeX.Core/Legality/Analysis.cs

@@ -352,7 +352,7 @@ namespace PKHeX.Core
 
             lines.AddRange(br);
             lines.Add(string.Format(V195, EncounterName));
-            var pidiv = MethodFinder.Analyze(pkm);
+            var pidiv = info.PIDIV ?? MethodFinder.Analyze(pkm);
             if (pidiv != null)
             {
                 if (!pidiv.NoSeed)

PKHeX.Core/Legality/Checks.cs

@@ -78,15 +78,20 @@ namespace PKHeX.Core
             if (pkm.GenNumber >= 6 && pkm.PID == pkm.EncryptionConstant)
                 AddLine(Severity.Invalid, V208, CheckIdentifier.PID); // better to flag than 1:2^32 odds since RNG is not feasible to yield match
 
-            if (EncounterMatch is EncounterStatic s)
+            switch (EncounterMatch)
             {
+                case EncounterStatic s:
                     if (s.Shiny != null && (bool)s.Shiny ^ pkm.IsShiny)
                         AddLine(Severity.Invalid, V209, CheckIdentifier.Shiny);
-            }
+                    break;
-            else if (EncounterMatch is EncounterSlot w)
+                case EncounterSlot w:
-            {
                     if (pkm.IsShiny && w.Type == SlotType.HiddenGrotto)
                         AddLine(Severity.Invalid, V221, CheckIdentifier.Shiny);
+                    break;
+                case PCD d: // fixed PID
+                    if (d.Gift.PK.PID != 1 && pkm.EncryptionConstant != d.Gift.PK.PID)
+                        AddLine(Severity.Invalid, V410, CheckIdentifier.Shiny);
+                    break;
             }
         }
         private void verifyECPIDWurmple()
@@ -150,9 +155,9 @@ namespace PKHeX.Core
                 if (pk.Length > (lang == 2 ? 10 : 5))
                     AddLine(Severity.Invalid, V1, CheckIdentifier.Nickname);
             }
-            else if (Type == typeof(MysteryGift))
+            else if (EncounterMatch is MysteryGift m)
             {
-                if (pkm.IsNicknamed && (!(EncounterMatch as MysteryGift)?.IsEgg ?? false))
+                if (pkm.IsNicknamed && !m.IsEgg)
                     AddLine(Severity.Fishy, V0, CheckIdentifier.Nickname);
             }
 
@@ -803,26 +808,10 @@ namespace PKHeX.Core
 
         private void verifyCXD()
         {
-            if (EncounterMatch is EncounterSlot w) // pokespot
+            if (EncounterMatch is EncounterStatic)
-            {
+                verifyCXDStarterCorrelation(info.PIDIV);
-                // find origin info, if nothing returned then the PID is unobtainable
-                var slot = w.SlotNumber;
-                var pidiv = MethodFinder.getPokeSpotSeeds(pkm, slot);
-                if (!pidiv.Any())
-                    AddLine(Severity.Invalid, V400, CheckIdentifier.PID);
-            }
-            else if (Type == typeof (EncounterStatic))
-            {
-                var pidiv = MethodFinder.Analyze(pkm);
-                if (pidiv == null || pidiv.Type != PIDType.CXD)
-                    AddLine(Severity.Invalid, V400, CheckIdentifier.PID);
-                else // Starters have a correlation to the Trainer ID numbers
-                    verifyCXDStarterCorrelation(pidiv);
-            }
             else if (pkm.WasEgg) // can't obtain eggs in CXD
-            {
                 AddLine(Severity.Invalid, V80, CheckIdentifier.Encounter); // invalid encounter
-            }
 
             if (pkm.OT_Gender == 1)
                 AddLine(Severity.Invalid, V407, CheckIdentifier.Trainer);
@@ -973,15 +962,19 @@ namespace PKHeX.Core
         }
         private void verifyAbility5(int[] abilities)
         {
-            if (EncounterMatch is EncounterSlot w)
+            switch (EncounterMatch)
             {
+                case PGF g:
+                    verifyAbilityMG456(abilities, g.AbilityType);
+                    break;
+
+                case EncounterSlot w:
                     // Hidden Abilities for Wild Encounters are only available at a Hidden Grotto
                     bool grotto = w.Type == SlotType.HiddenGrotto;
                     if (pkm.AbilityNumber == 4 ^ grotto)
                         AddLine(Severity.Invalid, grotto ? V217 : V108, CheckIdentifier.Ability);
+                    break;
             }
-            else if (Type == typeof(MysteryGift))
-                verifyAbilityMG456(abilities, ((PGF)EncounterMatch).AbilityType);
         }
         private void verifyAbility6(int[] abilities)
         {
@@ -991,8 +984,8 @@ namespace PKHeX.Core
                 if (!valid)
                     AddLine(Severity.Invalid, V300, CheckIdentifier.Ability);
             }
-            else if (Type == typeof(MysteryGift))
+            else if (EncounterMatch is WC6 g)
-                verifyAbilityMG456(abilities, ((WC6)EncounterMatch).AbilityType);
+                verifyAbilityMG456(abilities, g.AbilityType);
             else if (Legal.Ban_NoHidden6.Contains(pkm.SpecForm) && pkm.AbilityNumber == 4)
                 AddLine(Severity.Invalid, V112, CheckIdentifier.Ability);
         }
@@ -1001,12 +994,11 @@ namespace PKHeX.Core
             if (EncounterMatch is EncounterSlot slot && pkm.AbilityNumber == 4)
             {
                 bool valid = slot.Type == SlotType.SOS;
-
                 if (!valid)
                     AddLine(Severity.Invalid, V111, CheckIdentifier.Ability);
             }
-            else if (Type == typeof(MysteryGift))
+            else if (EncounterMatch is WC7 g)
-                verifyAbilityMG456(abilities, ((WC7)EncounterMatch).AbilityType);
+                verifyAbilityMG456(abilities, g.AbilityType);
             else if (Legal.Ban_NoHidden7.Contains(pkm.SpecForm) && pkm.AbilityNumber == 4)
                 AddLine(Severity.Invalid, V112, CheckIdentifier.Ability);
         }
@@ -1055,9 +1047,9 @@ namespace PKHeX.Core
                 verifyBallEquals(l.Ball);
                 return;
             }
-            if (Type == typeof (EncounterTrade))
+            if (EncounterMatch is EncounterTrade t)
             {
-                verifyBallEquals(4); // Pokeball
+                verifyBallEquals(t.Ball); // Pokeball
                 return;
             }
 
@@ -1576,15 +1568,15 @@ namespace PKHeX.Core
                 // Undocumented, uncommon, and insignificant -- don't bother.
                 return;
             }
-            if (MatchedType == typeof(WC6))
+            if (EncounterMatch is WC6 wc6)
             {
-                WC6 g = EncounterMatch as WC6;
+                var g = wc6;
                 verifyOTMemoryIs(new[] {g.OT_Memory, g.OT_Intensity, g.OT_TextVar, g.OT_Feeling});
                 return;
             }
-            if (MatchedType == typeof(WC7))
+            if (EncounterMatch is WC7 wc7)
             {
-                WC7 g = EncounterMatch as WC7;
+                var g = wc7;
                 verifyOTMemoryIs(new[] {g.OT_Memory, g.OT_Intensity, g.OT_TextVar, g.OT_Feeling});
                 return;
             }
@@ -1989,8 +1981,9 @@ namespace PKHeX.Core
                 { AddLine(Severity.Invalid, V374, CheckIdentifier.Misc); }
             }
 
-            if (Encounter.Valid)
+            if (!Encounter.Valid)
-            {
+                return;
+
             if (EncounterMatch is MysteryGift g)
             {
                 bool fatefulValid = false;
@@ -2034,6 +2027,13 @@ namespace PKHeX.Core
                 else if (pkm.FatefulEncounter && !shadow)
                     AddLine(Severity.Invalid, V325, CheckIdentifier.Fateful);
             }
+            else if (EncounterMatch is EncounterSlot && pkm.Version == 15) // pokespot pkm
+            {
+                if (pkm.FatefulEncounter)
+                    AddLine(Severity.Valid, V323, CheckIdentifier.Fateful);
+                else
+                    AddLine(Severity.Invalid, V324, CheckIdentifier.Fateful);
+            }
             else if (pkm.FatefulEncounter)
                 AddLine(Severity.Invalid, V325, CheckIdentifier.Fateful);
                 
@@ -2060,7 +2060,6 @@ namespace PKHeX.Core
                 }
             }
         }
-        }
         private void verifyVersionEvolution()
         {
             if (pkm.Format < 7)

PKHeX.Core/Legality/Encounters/EncounterFinder.cs

@@ -50,7 +50,7 @@ namespace PKHeX.Core
                     {
                         if (encounter.PeekIsNext())
                             continue;
-                        info.Parse.Add(new CheckResult(Severity.Invalid, "PID Type Mismatch", CheckIdentifier.PID));
+                        info.Parse.Add(new CheckResult(Severity.Invalid, V411, CheckIdentifier.PID));
                     }
 
                     // Encounter Passes

PKHeX.Core/Legality/Encounters/EncounterGenerator.cs

@@ -54,6 +54,8 @@ namespace PKHeX.Core
             var deferred = new List<IEncounterable>();
             foreach (var z in GenerateRawEncounters3(pkm))
             {
+                if (z is EncounterSlot w && pkm.Version == 15)
+                    info.PIDIV = MethodFinder.getPokeSpotSeeds(pkm, w.SlotNumber).FirstOrDefault() ?? info.PIDIV; 
                 if (info.PIDIV.Type.IsCompatible3(z, pkm))
                     yield return z;
                 else
@@ -243,6 +245,9 @@ namespace PKHeX.Core
             foreach (var z in getValidStaticEncounter(pkm))
                 yield return z;
 
+            if (pkm.Version == 15)
+                yield break; // no eggs in C/XD
+
             foreach (var z in generateEggs(pkm))
                 yield return z;
         }

PKHeX.Core/Legality/LegalityCheckStrings.cs

@@ -403,6 +403,8 @@ namespace PKHeX.Core
         public static string V407 {get; set;} = "OT from Colosseum/XD cannot be female.";
         public static string V408 {get; set;} = "Female OT from Generation 1/2 is invalid.";
         public static string V409 {get; set;} = "Mystery Gift shiny mismatch.";
+        public static string V410 {get; set;} = "Mystery Gift fixed PID mismatch.";
+        public static string V411 {get; set;} = "Encounter Type PID mismatch.";
         #endregion
 
     }

PKHeX.Core/Legality/RNG/MethodFinder.cs

@@ -55,7 +55,7 @@ namespace PKHeX.Core
             if (getBACDMatch(pk, pid, IVs, out pidiv))
                 return pidiv;
 
-            return new PIDIV {Type=PIDType.None}; // no match
+            return new PIDIV {Type=PIDType.None, NoSeed=true}; // no match
         }
 
         private static bool getLCRNGMatch(uint top, uint bot, uint[] IVs, out PIDIV pidiv)
@@ -504,7 +504,7 @@ namespace PKHeX.Core
                     if ((s>>16)%3 != 0) // can't activate even if generous
                         continue;
                 }
-                yield return new PIDIV {OriginSeed = s, RNG = RNG.XDRNG, Type = PIDType.None};
+                yield return new PIDIV {OriginSeed = s, RNG = RNG.XDRNG, Type = PIDType.PokeSpot};
             }
         }
 
@@ -517,10 +517,12 @@ namespace PKHeX.Core
                 case EncounterStaticShadow _:
                     return val == PIDType.CXD;
                 case EncounterStatic s:
+                    if (pkm.Version == 15)
+                        return val == PIDType.CXD;
                     return s.Roaming ? val == PIDType.Method_1_Roamer : MethodH.Any(z => z == val);
                 case EncounterSlot w:
                     if (pkm.Version == 15)
-                        return val == PIDType.CXD;
+                        return val == PIDType.PokeSpot;
                     return (w.Species == 201 ? MethodH_Unown : MethodH).Any(z => z == val);
                 default:
                     return val == PIDType.None;

PKHeX.Core/Legality/RNG/PIDType.cs

@@ -57,6 +57,7 @@
         // XDRNG Based
         CXD,
         Channel,
+        PokeSpot,
 
         // ARNG Based
         G4MGAntiShiny,

PKHeX.Core/Legality/Structures/EncounterTrade.cs

@@ -23,6 +23,7 @@
         public int OTGender = -1;
         public bool EggEncounter => false;
         public bool EvolveOnTrade = false;
+        public int Ball = 4;
 
         public string Name => "In-game Trade";