From 1c1c731dd1adfe444f1b1d55624f9ea15ca5a5f9 Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Sat, 10 Jun 2023 23:00:30 -0400
Subject: [PATCH] add updater for marching orders turn

---
 .../Games/MarchingOrders/MarchingOrders.cs    | 33 +++++++++++++++----
 .../Scripts/Games/PajamaParty/PajamaParty.cs  |  2 +-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
index 8ac939e9..4cb921af 100644
--- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
+++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs
@@ -18,12 +18,38 @@ using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 
+using Jukebox;
+
 namespace HeavenStudio.Games.Loaders
 {
     using static Minigames;
     public static class AgbMarcherLoader
     {
-        public static Minigame AddGame(EventCaller eventCaller) {
+        public static Minigame AddGame(EventCaller eventCaller)
+        {
+            RiqEntity FaceTurnUpdater(string datamodel, RiqEntity entity)
+            {
+                if (datamodel == "marchingOrders/face turn")
+                {
+                    if (entity["type2"] == (int)MarchingOrders.FaceTurnLength.Normal)
+                    {
+                        entity.datamodel = "marchingOrders/faceTurn";
+                    }
+                    else
+                    {
+                        entity.datamodel = "marchingOrders/faceTurnFast";
+                    }
+                    entity.CreateProperty("direction", entity["type"]);
+                    entity.CreateProperty("point", false);
+
+                    entity.dynamicData.Remove("type");
+                    entity.dynamicData.Remove("type2");
+                    return entity;
+                }
+                return null;
+            }
+            RiqBeatmap.OnUpdateEntity += FaceTurnUpdater;
+
             return new Minigame("marchingOrders", "Marching Orders", "ffb108", false, false, new List<GameAction>()
                 {
                     new GameAction("bop", "Bop")
@@ -148,11 +174,6 @@ namespace HeavenStudio.Games.Loaders
                     new GameAction("face turn", "Direction to Turn (old)")
                     {
                         hidden = true,
-                        function = delegate {
-                            var e = eventCaller.currentEntity;
-                            MarchingOrders.instance.FaceTurn(e.beat, e["type"], e["type2"], false);
-                        },
-                        defaultLength = 4f,
                         parameters = new List<Param>()
                         {
                             new Param("type", MarchingOrders.Direction.Right, "Direction", "The direction the sergeant wants the cadets to face"),
diff --git a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs
index f6eeb838..b7e60fd6 100644
--- a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs
+++ b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs
@@ -33,7 +33,7 @@ namespace HeavenStudio.Games.Loaders
                     },
                     new GameAction("jump (back to front)", "Back to Front Jumps")
                     {
-                        function =delegate { PajamaParty.instance.DoFiveJump(eventCaller.currentEntity.beat); }, 
+                        function = delegate { PajamaParty.instance.DoFiveJump(eventCaller.currentEntity.beat); }, 
                         defaultLength = 4f, 
                         inactiveFunction = delegate { PajamaParty.WarnFiveJump(eventCaller.currentEntity.beat); }
                     },