Moveset generator tweaks, dexnav move logic

PKHeX.Core/Editing/Applicators/MoveSetApplicator.cs

@@ -79,6 +79,19 @@ namespace PKHeX.Core
             if (encounter is IRelearn r && r.Relearn.Count > 0)
                 return r.Relearn;
 
+            if (enc is EncounterSlot6AO {CanDexNav: true} dn)
+            {
+                var moves = legal.Info.Moves;
+                for (int i = 0; i < moves.Length; i++)
+                {
+                    if (moves[i].Valid)
+                        continue;
+
+                    var move = legal.pkm.GetMove(i);
+                    if (dn.CanBeDexNavMove(move))
+                        return new[] { move, 0, 0, 0 };
+                }
+            }
             return m;
         }
     }

PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot6AO.cs

@@ -23,8 +23,7 @@ namespace PKHeX.Core
             var pk6 = (PK6)pk;
             if (CanDexNav)
             {
-                var baseSpec = EvoBase.GetBaseSpecies(pk);
+                var eggMoves = GetDexNavMoves();
-                var eggMoves = MoveEgg.GetEggMoves(pk.PersonalInfo, baseSpec.Species, baseSpec.Form, Version, 6);
                 if (eggMoves.Length > 0)
                     pk6.RelearnMove1 = eggMoves[Util.Rand.Next(eggMoves.Length)];
             }
@@ -45,5 +44,18 @@ namespace PKHeX.Core
         }
 
         protected override HiddenAbilityPermission IsHiddenAbilitySlot() => CanDexNav || Area.Type == SlotType.Horde ? HiddenAbilityPermission.Possible : HiddenAbilityPermission.Never;
+
+        private int[] GetDexNavMoves()
+        {
+            var et = EvolutionTree.GetEvolutionTree(6);
+            var sf = et.GetBaseSpeciesForm(Species, Form);
+            return MoveEgg.GetEggMoves(6, sf & 0x7FF, sf >> 11, Version);
+        }
+
+        public bool CanBeDexNavMove(int move)
+        {
+            var baseEgg = GetDexNavMoves();
+            return System.Array.IndexOf(baseEgg, move) >= 0;
+        }
     }
 }

PKHeX.Core/Legality/Encounters/Generator/Moveset/EncounterMovesetGenerator.cs

@@ -189,7 +189,7 @@ namespace PKHeX.Core
             return moves;
         }
 
-        private static IEnumerable<IEncounterable> GetPossibleOfType(PKM pk, IReadOnlyCollection<int> needs, GameVersion version, EncounterOrder type, IReadOnlyList<EvoCriteria> chain)
+        private static IEnumerable<IEncounterable> GetPossibleOfType(PKM pk, IReadOnlyList<int> needs, GameVersion version, EncounterOrder type, IReadOnlyList<EvoCriteria> chain)
         {
             return type switch
             {
@@ -340,7 +340,7 @@ namespace PKHeX.Core
         /// <param name="needs">Moves which cannot be taught by the player.</param>
         /// <param name="chain">Origin possible evolution chain</param>
         /// <returns>A consumable <see cref="IEncounterable"/> list of possible encounters.</returns>
-        private static IEnumerable<EncounterSlot> GetSlots(PKM pk, IReadOnlyCollection<int> needs, IReadOnlyList<EvoCriteria> chain)
+        private static IEnumerable<EncounterSlot> GetSlots(PKM pk, IReadOnlyList<int> needs, IReadOnlyList<EvoCriteria> chain)
         {
             var slots = EncounterSlotGenerator.GetPossible(pk, chain);
             foreach (var slot in slots)
@@ -354,7 +354,10 @@ namespace PKHeX.Core
                     continue;
                 }
 
-                if (slot is IMoveset m && needs.Except(m.Moves).Any())
+                if (slot is IMoveset m && !needs.Except(m.Moves).Any())
+                    yield return slot;
+
+                if (needs.Count == 1 && slot is EncounterSlot6AO {CanDexNav: true} dn && dn.CanBeDexNavMove(needs[0]))
                     yield return slot;
             }
         }

PKHeX.Core/Legality/Evolutions/EvolutionTree.cs

@@ -231,6 +231,18 @@ namespace PKHeX.Core
                 yield return s;
         }
 
+        public int GetBaseSpeciesForm(int species, int form, int skip = 0)
+        {
+            var chain = GetEvolutionsAndPreEvolutions(species, form);
+            foreach (var c in chain)
+            {
+                if (skip == 0)
+                    return c;
+                skip--;
+            }
+            return species | (form << 11);
+        }
+
         /// <summary>
         /// Gets all species the <see cref="species"/>-<see cref="form"/> can evolve from, yielded in order of increasing evolution stage.
         /// </summary>