From c5d35fbce5ed71bc14d4112963b329e7ffc74428 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 21 Jul 2023 12:24:31 -0700 Subject: [PATCH] Handle Volt Tackle for HOME sharing GetAllMoves --- PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs | 4 ++++ PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs | 4 ++++ PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs | 4 ++++ PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs | 4 ++++ PKHeX.Core/Legality/LearnSource/Group/LearnGroupHOME.cs | 4 +++- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs index c382ed94f..9fa74c97a 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8.cs @@ -150,6 +150,10 @@ public void GetAllMoves(Span result, PKM pk, EvolutionHistory history, IEn foreach (var evo in evos) GetAllMoves(result, pk, evo, types, option); + + var home = LearnGroupHOME.Instance; + if (option != LearnOption.HOME && home.HasVisited(pk, history)) + home.GetAllMoves(result, pk, history, enc, types); } private static void GetAllMoves(Span result, PKM pk, EvoCriteria evo, MoveSourceType types, LearnOption option) diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs index c577d6f04..f52c58277 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8a.cs @@ -56,6 +56,10 @@ public void GetAllMoves(Span result, PKM pk, EvolutionHistory history, IEn foreach (var evo in history.Gen8a) GetAllMoves(result, pk, evo, types, option); + + var home = LearnGroupHOME.Instance; + if (option != LearnOption.HOME && home.HasVisited(pk, history)) + home.GetAllMoves(result, pk, history, enc, types); } private static void GetAllMoves(Span result, PKM pk, EvoCriteria evo, MoveSourceType types, LearnOption option) diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs index 3a7a42543..ac6b29793 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup8b.cs @@ -97,6 +97,10 @@ public void GetAllMoves(Span result, PKM pk, EvolutionHistory history, IEn foreach (var evo in history.Gen8b) GetAllMoves(result, pk, evo, types, option); + + var home = LearnGroupHOME.Instance; + if (option != LearnOption.HOME && home.HasVisited(pk, history)) + home.GetAllMoves(result, pk, history, enc, types); } private static void GetAllMoves(Span result, PKM pk, EvoCriteria evo, MoveSourceType types, LearnOption option) diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs index 6ec1da255..bb507aafa 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroup9.cs @@ -121,6 +121,10 @@ public void GetAllMoves(Span result, PKM pk, EvolutionHistory history, IEn foreach (var evo in evos) GetAllMoves(result, pk, evo, types, option); + + var home = LearnGroupHOME.Instance; + if (option != LearnOption.HOME && home.HasVisited(pk, history)) + home.GetAllMoves(result, pk, history, enc, types); } private static void GetAllMoves(Span result, PKM pk, EvoCriteria evo, MoveSourceType types, LearnOption option) diff --git a/PKHeX.Core/Legality/LearnSource/Group/LearnGroupHOME.cs b/PKHeX.Core/Legality/LearnSource/Group/LearnGroupHOME.cs index e0fe90278..9486dd292 100644 --- a/PKHeX.Core/Legality/LearnSource/Group/LearnGroupHOME.cs +++ b/PKHeX.Core/Legality/LearnSource/Group/LearnGroupHOME.cs @@ -277,7 +277,9 @@ private static void LoopMerge(Span result, PKM pk, ReadOnlySpan