From d17639f956f7cbaf4e402f039c08bd753475c1cb Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 9 Feb 2022 19:21:45 -0800
Subject: [PATCH] Add alpha move for encounter slots

oops
Closes #3427
---
 .../Editing/Applicators/MoveApplicator.cs     | 14 ++---------
 .../EncounterSlot/EncounterSlot8a.cs          |  6 ++++-
 .../EncounterStatic/EncounterStatic8a.cs      |  6 ++++-
 PKHeX.Core/PKM/PKM.cs                         | 23 +++++++++++++++++++
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/PKHeX.Core/Editing/Applicators/MoveApplicator.cs b/PKHeX.Core/Editing/Applicators/MoveApplicator.cs
index 9239daaf6..6f3a435dc 100644
--- a/PKHeX.Core/Editing/Applicators/MoveApplicator.cs
+++ b/PKHeX.Core/Editing/Applicators/MoveApplicator.cs
@@ -75,16 +75,6 @@ public static void SetMaximumPPCurrent(this PKM pk, IReadOnlyList<int> moves)
         /// </summary>
         /// <param name="pk">Pokémon to modify.</param>
         /// <param name="index">Move PP to refresh.</param>
-        public static void SetSuggestedMovePP(this PKM pk, int index)
-        {
-            switch (index)
-            {
-                case 0: pk.Move1_PP = pk.GetMovePP(pk.Move1, pk.Move1_PPUps); return;
-                case 1: pk.Move2_PP = pk.GetMovePP(pk.Move2, pk.Move2_PPUps); return;
-                case 2: pk.Move3_PP = pk.GetMovePP(pk.Move3, pk.Move3_PPUps); return;
-                case 3: pk.Move4_PP = pk.GetMovePP(pk.Move4, pk.Move4_PPUps); return;
-                default: throw new ArgumentOutOfRangeException(nameof(index));
-            }
-        }
+        public static void SetSuggestedMovePP(this PKM pk, int index) => pk.HealPPIndex(index);
     }
-}
\ No newline at end of file
+}
diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs
index f96547bd2..f82cf1f00 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs
@@ -37,7 +37,11 @@ protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteri
             if (pk is IScaledSize s)
                 s.HeightScalar = s.WeightScalar = byte.MaxValue;
             if (Type is not SlotType.Landmark && pk is PA8 pa)
-                pa.SetMasteryFlagMove(pa.AlphaMove = pa.GetRandomAlphaMove());
+            {
+                var extra = pa.AlphaMove = pa.GetRandomAlphaMove();
+                pa.SetMasteryFlagMove(extra);
+                pk.PushMove(extra);
+            }
         }
         if (pk is IScaledSizeValue v)
         {
diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8a.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8a.cs
index 2323bcb3c..ff77de5ac 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8a.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8a.cs
@@ -53,7 +53,11 @@ protected override void ApplyDetails(ITrainerInfo sav, EncounterCriteria criteri
             pa.SetMasteryFlags();
             pa.HeightScalarCopy = pa.HeightScalar;
             if (IsAlpha)
-                pa.SetMasteryFlagMove(pa.AlphaMove = pa.GetRandomAlphaMove());
+            {
+                var extra = pa.AlphaMove = pa.GetRandomAlphaMove();
+                pa.SetMasteryFlagMove(extra);
+                pk.PushMove(extra);
+            }
         }
 
         pk.SetRandomEC();
diff --git a/PKHeX.Core/PKM/PKM.cs b/PKHeX.Core/PKM/PKM.cs
index 30ab18d52..687f5adde 100644
--- a/PKHeX.Core/PKM/PKM.cs
+++ b/PKHeX.Core/PKM/PKM.cs
@@ -415,6 +415,20 @@ public int[] Moves
             set => SetMoves(value);
         }
 
+        public void PushMove(int move)
+        {
+            if (move == 0 || (uint)move >= MaxMoveID)
+                return;
+
+            var ct = MoveCount;
+            if (ct == 4)
+                ct = 0;
+            SetMove(ct, move);
+            HealPPIndex(ct);
+        }
+
+        public int MoveCount => Convert.ToInt32(Move1 != 0) + Convert.ToInt32(Move2 != 0) + Convert.ToInt32(Move3 != 0) + Convert.ToInt32(Move4 != 0);
+
         public void SetMoves(IReadOnlyList<int> value)
         {
             Move1 = value.Count > 0 ? value[0] : 0;
@@ -740,6 +754,15 @@ public void HealPP()
             Move4_PP = GetMovePP(Move4, Move4_PPUps);
         }
 
+        public int HealPPIndex(int index) => index switch
+        {
+            0 => Move1_PP = GetMovePP(Move1, Move1_PPUps),
+            1 => Move2_PP = GetMovePP(Move2, Move2_PPUps),
+            2 => Move3_PP = GetMovePP(Move3, Move3_PPUps),
+            3 => Move4_PP = GetMovePP(Move4, Move4_PPUps),
+            _ => throw new ArgumentOutOfRangeException(nameof(index)),
+        };
+
         /// <summary>
         /// Enforces that Party Stat values are present.
         /// </summary>