NOT DONE YET! gonna finish tomorrow

Assets/Resources/Sprites/Games/MannequinFactory/Animations/Hand/SlapJust.anim

@@ -20,15 +20,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: -2.8476, y: -0.83, z: 0}
-        inSlope: {x: Infinity, y: Infinity, z: Infinity}
-        outSlope: {x: Infinity, y: Infinity, z: Infinity}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.016666668
         value: {x: -5.94, y: -0.83, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -37,7 +28,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.15
+        time: 0.11666667
         value: {x: -2.8476, y: -0.83, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
@@ -54,7 +45,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: -1.82, y: 1.4, z: 0}
+        value: {x: -1.8948, y: 1.4, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -63,7 +54,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.016666668
-        value: {x: -1.8948, y: 1.4, z: 0}
+        value: {x: -1.82, y: 1.4, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -79,7 +70,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: 0, z: 0}
+        value: {x: -3.78, y: -0.3023, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -88,7 +79,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.016666668
-        value: {x: -3.78, y: -0.3023, z: 0}
+        value: {x: 0, y: 0, z: 0}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -105,7 +96,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0.8362, y: 0.8362, z: 0.8362}
+        value: {x: 0.49728265, y: 0.49728265, z: 1.014214}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -114,7 +105,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.016666668
-        value: {x: 0.49728265, y: 0.49728265, z: 1.014214}
+        value: {x: 0.8362, y: 0.8362, z: 0.8362}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -130,7 +121,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 1, y: 1, z: 1}
+        value: {x: 1.4350965, y: 1.1773702, z: 1.1773702}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -139,7 +130,7 @@ AnimationClip:
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 0.016666668
-        value: {x: 1.4350965, y: 1.1773702, z: 1.1773702}
+        value: {x: 1, y: 1, z: 1}
         inSlope: {x: Infinity, y: Infinity, z: Infinity}
         outSlope: {x: Infinity, y: Infinity, z: Infinity}
         tangentMode: 0
@@ -155,7 +146,7 @@ AnimationClip:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
-        time: 0
+        time: 0.016666668
         value: 1
         inSlope: Infinity
         outSlope: Infinity
@@ -184,7 +175,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -193,7 +184,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.016666668
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -221,7 +212,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -230,7 +221,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.016666668
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -247,10 +238,8 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: -1113193445, guid: 0ab4d532fd079014db979fbe1efcad1a, type: 3}
-    - time: 0.016666668
       value: {fileID: -1372447240, guid: 0ab4d532fd079014db979fbe1efcad1a, type: 3}
-    - time: 0.15
+    - time: 0.11666667
       value: {fileID: -1113193445, guid: 0ab4d532fd079014db979fbe1efcad1a, type: 3}
     attribute: m_Sprite
     path: Hand
@@ -327,7 +316,6 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: -1113193445, guid: 0ab4d532fd079014db979fbe1efcad1a, type: 3}
     - {fileID: -1372447240, guid: 0ab4d532fd079014db979fbe1efcad1a, type: 3}
     - {fileID: -1113193445, guid: 0ab4d532fd079014db979fbe1efcad1a, type: 3}
   m_AnimationClipSettings:
@@ -335,7 +323,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.16666667
+    m_StopTime: 0.13333334
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -356,15 +344,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -2.8476
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.016666668
         value: -5.94
         inSlope: Infinity
         outSlope: Infinity
@@ -373,7 +352,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.15
+        time: 0.11666667
         value: -2.8476
         inSlope: Infinity
         outSlope: Infinity
@@ -401,16 +380,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.016666668
+        time: 0.11666667
-        value: -0.83
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.15
         value: -0.83
         inSlope: Infinity
         outSlope: Infinity
@@ -438,16 +408,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.016666668
+        time: 0.11666667
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.15
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -466,7 +427,7 @@ AnimationClip:
       serializedVersion: 2
       m_Curve:
       - serializedVersion: 3
-        time: 0
+        time: 0.016666668
         value: 1
         inSlope: Infinity
         outSlope: Infinity
@@ -495,7 +456,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.8362
+        value: 0.49728265
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -504,7 +465,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: 0.49728265
+        value: 0.8362
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -523,7 +484,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.8362
+        value: 0.49728265
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -532,7 +493,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: 0.49728265
+        value: 0.8362
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -551,7 +512,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.8362
+        value: 1.014214
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -560,7 +521,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: 1.014214
+        value: 0.8362
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -579,7 +540,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: -1.82
+        value: -1.8948
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -588,7 +549,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: -1.8948
+        value: -1.82
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -663,7 +624,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -672,7 +633,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.016666668
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -700,7 +661,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: -3.78
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -709,7 +670,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: -3.78
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -728,7 +689,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: -0.3023
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -737,7 +698,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: -0.3023
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -784,7 +745,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -793,7 +754,7 @@ AnimationClip:
         outWeight: 0
       - serializedVersion: 3
         time: 0.016666668
-        value: 1
+        value: 0
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -812,7 +773,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 1.4350965
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -821,7 +782,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: 1.4350965
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -840,7 +801,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 1.1773702
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -849,7 +810,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: 1.1773702
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -868,7 +829,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 1.1773702
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103
@@ -877,7 +838,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.016666668
-        value: 1.1773702
+        value: 1
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 103

Assets/Scripts/Games/MannequinFactory/MannequinFactory.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using HeavenStudio.Util;
+using HeavenStudio.InputSystem;
 using UnityEngine;
 using TMPro;
 using DG.Tweening;
@@ -15,32 +16,41 @@ namespace HeavenStudio.Games.Loaders
                 new GameAction("headOut", "Send Head Out")
                 {
                     function = delegate {
-                        var e = eventCaller.currentEntity;
+                        if (eventCaller.gameManager.minigameObj.TryGetComponent(out MannequinFactory instance)) {
-                        MannequinFactory.instance.HeadOut(e.beat, 1);
+                            var e = eventCaller.currentEntity;
+                            instance.HeadOut(e.beat, 1);
+                        }
                     }, 
                     defaultLength = 7,
                 },
                 new GameAction("misalignedHeadOut", "Send Misaligned Head Out")
                 {
                     function = delegate {
-                        var e = eventCaller.currentEntity;
+                        if (eventCaller.gameManager.minigameObj.TryGetComponent(out MannequinFactory instance)) {
-                        MannequinFactory.instance.HeadOut(e.beat, 2);
+                            var e = eventCaller.currentEntity;
+                            instance.HeadOut(e.beat, 2);
+                        }
                     }, 
                     defaultLength = 7,
                 },
                 new GameAction("randomHeadOut", "Send Random Head Out")
                 {
                     function = delegate {
-                        var e = eventCaller.currentEntity;
+                        if (eventCaller.gameManager.minigameObj.TryGetComponent(out MannequinFactory instance)) {
-                        MannequinFactory.instance.HeadOut(e.beat, 0);
+                            var e = eventCaller.currentEntity;
+                            instance.HeadOut(e.beat, 0);
+                        }
                     }, 
                     defaultLength = 7,
                 },
                 new GameAction("changeText", "Change Text")
                 {
                     function = delegate {
-                        MannequinFactory.instance.SignText.text = eventCaller.currentEntity["text"];
+                        if (eventCaller.gameManager.minigameObj.TryGetComponent(out MannequinFactory instance)) {
-                    }, 
+                            var e = eventCaller.currentEntity;
+                            instance.SignText.text = eventCaller.currentEntity["text"];
+                        }
+                    },
                     defaultLength = 0.5f,
                     parameters = new List<Param>()
                     {
@@ -50,23 +60,26 @@ namespace HeavenStudio.Games.Loaders
                 new GameAction("bgColor", "Change Background Color")
                 {
                     function = delegate {
-                        var e = eventCaller.currentEntity;
+                        if (eventCaller.gameManager.minigameObj.TryGetComponent(out MannequinFactory instance)) {
-                        MannequinFactory.instance.BackgroundColor(e.beat, e.length, e["colorStart"], e["colorEnd"], e["ease"]);
+                            var e = eventCaller.currentEntity;
+                            instance.BackgroundColor(e.beat, e.length, e["colorStart"], e["colorEnd"], e["ease"]);
+                        }
                     },
                     parameters = new List<Param>()
                     {
                         new Param("colorStart", new Color(0.97f, 0.94f, 0.51f, 1f), "Start Color", "The color to start fading from."),
                         new Param("colorEnd",   new Color(0.97f, 0.94f, 0.51f, 1f), "End Color", "The color to end the fade."),
                         new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "The ease to use for color fade", new() {
-                            new Param.CollapseParam(x => (int)x != (int)Util.EasingFunction.Ease.Instant, new[] { "colorEnd" }),
+                            new Param.CollapseParam((x, _) => (int)x != (int)Util.EasingFunction.Ease.Instant, new[] { "colorStart" }),
                         }),
                     },
                     resizable = true
                 },
-            },
+            }
-            new List<string>() {"agb", "normal"},
+            // ,
-            "agbmannequin", "en",
+            // new List<string>() {"agb", "normal"},
-            new List<string>() {}
+            // "agbmannequin", "en",
+            // new List<string>() {}
             );
         }
     }
@@ -86,8 +99,32 @@ namespace HeavenStudio.Games
         public TMP_Text SignText;
         public GameObject MannequinHeadObject;
 
-        public static MannequinFactory instance;
+        protected static bool IA_PadLeft(out double dt)
-        
+        {
+            return PlayerInput.GetPadDown(InputController.ActionsPad.Left, out dt);
+        }
+        protected static new bool IA_TouchFlick(out double dt)
+        {
+            return PlayerInput.GetTouchUp(InputController.ActionsTouch.Tap, out dt) && PlayerInput.GetFlick(out _)
+                    && !instance.IsExpectingInputNow(InputAction_Second);
+        }
+        protected static bool IA_TouchPress(out double dt)
+        {
+            return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)// && !PlayerInput.GetFlick(out _)
+                    && !instance.IsExpectingInputNow(InputAction_First);
+        }
+
+        public static PlayerInput.InputAction InputAction_First =
+            new("AgbMannequinFactoryTouchFirst", new int[] { IAPressCat, IAPressCat, IAPressCat },
+            IA_PadLeft, IA_TouchFlick, IA_Empty);
+
+        public static PlayerInput.InputAction InputAction_Second =
+            new("AgbMannequinFactoryTouchSecond", new int[] { IAPressCat, IAPressCat, IAPressCat },
+            IA_PadBasicPress, IA_TouchPress, IA_Empty);
+
+        // awww man a static instance 😢
+        private static MannequinFactory instance;
+
         private void Awake()
         {
             instance = this;
@@ -95,22 +132,41 @@ namespace HeavenStudio.Games
 
         private void Update()
         {
-            if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN))
+            bool touch = PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch;
+            if (PlayerInput.GetIsAction(InputAction_First) && (!IsExpectingInputNow(InputAction_First) || (touch && !IsExpectingInputNow(InputAction_First) && !IsExpectingInputNow(InputAction_Second))))
             {
-                StampAnim.DoScaledAnimationAsync("StampEmpty");
+                HandAnim.DoScaledAnimationAsync("SlapEmpty", 0.3f);
             }
 
-            if (PlayerInput.Pressed(true) && PlayerInput.GetSpecificDirection(3) && !IsExpectingInputNow(InputType.DIRECTION_LEFT_DOWN)) 
+            if (PlayerInput.GetIsAction(InputAction_Second) && (!IsExpectingInputNow(InputAction_Second) || (touch && !IsExpectingInputNow(InputAction_First) && !IsExpectingInputNow(InputAction_Second))))
             {
-                HandAnim.DoScaledAnimationAsync("SlapEmpty");
+                StampAnim.DoScaledAnimationAsync("StampEmpty", 0.3f);
             }
 
             BackgroundColorUpdate();
         }
 
-        public void HeadOut(double beat, int cueType)
+        public override void OnGameSwitch(double beat)
         {
-            if (cueType == 0) cueType = UnityEngine.Random.Range(1, 3);
+            var events = gameManager.Beatmap.Entities.FindAll(e => e.datamodel.Split('/')[0] == "mannequinFactory");
+
+            foreach (var item in events.FindAll(e => e.datamodel is "headOut" or "misalignedHeadOut" or "randomHeadOut"))
+            {
+                
+            }
+
+            var bg = events.FindLast(e => e.datamodel == "mannequinFactory/bgColor" && e.beat < beat);
+            if (bg != null) {
+                BackgroundColor(bg.beat, bg.length, bg["colorStart"], bg["colorEnd"], bg["ease"]);
+            } else {
+                Color color = new Color(0.97f, 0.94f, 0.51f, 1f);
+                BackgroundColor(0, 0, color, color, (int)EasingFunction.Ease.Instant);
+            }
+        }
+
+        public static void HeadOutSFX(double beat, int cueType)
+        {
+            if (cueType == 0) cueType = Random.Range(1, 3);
             var sfx = new List<MultiSound.Sound>() {
                 new MultiSound.Sound("mannequinFactory/drum", beat      ),
                 new MultiSound.Sound("mannequinFactory/drum", beat + 0.5),
@@ -128,8 +184,12 @@ namespace HeavenStudio.Games
                 });
             }
             MultiSound.Play(sfx.ToArray(), forcePlay: true);
+        }
 
+        public void HeadOut(double beat, int cueType)
+        {
             MannequinHead head = Instantiate(MannequinHeadObject, transform).GetComponent<MannequinHead>();
+            head.game = this;
             head.startBeat = beat;
             head.needClap = cueType == 2;
         }
@@ -161,24 +221,5 @@ namespace HeavenStudio.Games
             colorEnd = colorEndSet;
             colorEase = (Util.EasingFunction.Ease)ease;
         }
-
-        //call this in OnPlay(double beat) and OnGameSwitch(double beat)
-        private void PersistColor(double beat)
-        {
-            var bg = GameManager.instance.Beatmap.Entities.FindLast(c => c.beat < beat && c.datamodel == "mannequinFactory/bgColor");
-            if (bg != null) {
-                BackgroundColor(bg.beat, bg.length, bg["colorStart"], bg["colorEnd"], bg["ease"]);
-            }
-        }
-
-        public override void OnPlay(double beat)
-        {
-            PersistColor(beat);
-        }
-
-        public override void OnGameSwitch(double beat)
-        {
-            PersistColor(beat);
-        }
     }
 }

Assets/Scripts/Games/MannequinFactory/MannequinHead.cs

@@ -19,11 +19,11 @@ namespace HeavenStudio.Games.Scripts_MannequinFactory
 
         int turnStatus;
 
-        private MannequinFactory game;
+        public MannequinFactory game;
         
         private void Awake()
         {
-            game = MannequinFactory.instance;
+
         }
 
         private void Start() 
@@ -35,15 +35,21 @@ namespace HeavenStudio.Games.Scripts_MannequinFactory
                 new BeatAction.Action(startBeat + 1, delegate { headAnim.DoScaledAnimationAsync("Move1", 0.3f); }),
                 new BeatAction.Action(startBeat + 3, delegate { headAnim.DoScaledAnimationAsync("Move2", 0.3f); }),
                 new BeatAction.Action(startBeat + 4, delegate {
-                    if (turnStatus == 1) game.ScheduleInput(startBeat, 5, InputType.STANDARD_DOWN, StampJust, StampMiss, Nothing);
+                    if (turnStatus == 1) {
-                    else game.ScheduleUserInput(startBeat, 5, InputType.STANDARD_DOWN, StampUnJust, StampMiss, Nothing);
+                        game.ScheduleInput(startBeat, 5, MannequinFactory.InputAction_Second, StampJust, StampMiss, Nothing);
+                    } else {
+                        game.ScheduleUserInput(startBeat, 5, MannequinFactory.InputAction_Second, StampUnJust, StampMiss, Nothing);
+                    }
                 }),
             });
-            if (needClap) SoundByte.PlayOneShotGame("mannequinFactory/whoosh", beat: startBeat + 3);
-            SoundByte.PlayOneShotGame("mannequinFactory/whoosh", beat: startBeat + 5);
 
-            if (needClap) game.ScheduleInput(startBeat, 3, InputType.DIRECTION_LEFT_DOWN, ClapJust, ClapMiss, Nothing);
+            if (needClap) {
-            else      game.ScheduleUserInput(startBeat, 3, InputType.DIRECTION_LEFT_DOWN, ClapUnJust, ClapMiss, Nothing);
+                game.ScheduleInput(startBeat, 3, MannequinFactory.InputAction_First, ClapJust, ClapMiss, Nothing);
+                SoundByte.PlayOneShotGame("mannequinFactory/whoosh", beat: startBeat + 3);
+            } else {
+                game.ScheduleUserInput(startBeat, 3, MannequinFactory.InputAction_First, ClapUnJust, ClapMiss, Nothing);
+                SoundByte.PlayOneShotGame("mannequinFactory/whoosh", beat: startBeat + 5);
+            }   
         }
 
         void ClapJust(PlayerActionEvent caller, float state)
@@ -65,7 +71,7 @@ namespace HeavenStudio.Games.Scripts_MannequinFactory
         {
             turnStatus++;
             SoundByte.PlayOneShotGame("mannequinFactory/slap");
-            game.HandAnim.DoScaledAnimationAsync("SlapJust");
+            game.HandAnim.DoScaledAnimationAsync("SlapJust", 0.3f);
             headAnim.Play("Slapped", 0, 0);
         }
 
@@ -75,7 +81,7 @@ namespace HeavenStudio.Games.Scripts_MannequinFactory
         {
             if (state >= 1f || state <= -1f) SoundByte.PlayOneShot("nearMiss");
             headAnim.DoScaledAnimationAsync("Stamp", 0.3f);
-            game.StampAnim.DoScaledAnimationAsync("StampJust", 0.2f);
+            game.StampAnim.DoScaledAnimationAsync("StampJust", 0.3f);
             SoundByte.PlayOneShotGame("mannequinFactory/eyes");
             eyesSr.gameObject.SetActive(true);
         }

Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs

@@ -266,6 +266,17 @@ namespace HeavenStudio
                 Debug.LogWarning("Game loader NtrBackbeatLoader failed!");
             }
 
+            Debug.Log("Running game loader AgbMannequinFactoryLoader");
+            game = AgbMannequinFactoryLoader.AddGame(eventCaller);
+            if (game != null)
+            {
+                eventCaller.minigames.Add(game.name, game);
+            }
+            else
+            {
+                Debug.LogWarning("Game loader AgbMannequinFactoryLoader failed!");
+            }
+
             Debug.Log("Running game loader AgbMarcherLoader");
             game = AgbMarcherLoader.AddGame(eventCaller);
             if (game != null)