Change Marcher March and Beat

Change the March and Beat of Marcher, to fix input dropping and make the inputs more consistent overall

Assets/Scripts/AppInfo.cs

@@ -2,8 +2,8 @@ using System;
 
 public static class AppInfo {
     //--- AutoGenerated.begin
-    public const string Version = "0.0.1024";
-    public static readonly DateTime Date = new DateTime(2022, 12, 05, 20, 58, 15, 925, DateTimeKind.Utc);
+    public const string Version = "0.0.1025";
+    public static readonly DateTime Date = new DateTime(2022, 12, 06, 02, 51, 39, 874, DateTimeKind.Utc);
     //--- AutoGenerated.end
 }
 

Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs

@@ -105,7 +105,10 @@ namespace HeavenStudio.Games
         private int marchOtherCount;
         private int marchPlayerCount;
         private int turnLength;
-        private float nextMarch;
+        private bool marchSuru;
+        private bool beatSuru;
+        private float marchTsugi;
+        private float beatTsugi;
 
         private string fastTurn;
         
@@ -185,33 +188,16 @@ namespace HeavenStudio.Games
         void Update()
         {
             var cond = Conductor.instance;
-            if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1))
+            var currBeat = cond.songPositionInBeats;
+
+            if (marchSuru && (int) currBeat <= marching.length)
             {
-                if (cond.songPositionInBeats >= bop.startBeat && cond.songPositionInBeats < bop.startBeat + bop.length)
-                {
-                    if (!(cond.songPositionInBeats >= noBop.startBeat && cond.songPositionInBeats < noBop.startBeat + noBop.length))
-                        Cadet1.DoScaledAnimationAsync("Bop", 0.5f);
-                        Cadet2.DoScaledAnimationAsync("Bop", 0.5f);
-                        Cadet3.DoScaledAnimationAsync("Bop", 0.5f);
-                        CadetPlayer.DoScaledAnimationAsync("Bop", 0.5f);
-                }
+                CadetsMarch(marchTsugi + (int) currBeat, marching.length);
             }
-            
-            if (cond.ReportBeat(ref marching.lastReportedBeat, bop.startBeat % 1))
+            if (beatSuru && (int) currBeat <= bop.length)
             {
-                if (cond.songPositionInBeats >= marching.startBeat && cond.songPositionInBeats < marching.startBeat + marching.length)
-                {
-                    marchOtherCount += 1;
-                    var marchOtherAnim = (marchOtherCount % 2 != 0 ? "MarchR" : "MarchL");
-
-                    Jukebox.PlayOneShotGame("marchingOrders/step1");
-                    Cadet1.DoScaledAnimationAsync(marchOtherAnim, 0.5f);
-                    Cadet2.DoScaledAnimationAsync(marchOtherAnim, 0.5f);
-                    Cadet3.DoScaledAnimationAsync(marchOtherAnim, 0.5f);
-                    ScheduleInput(cond.songPositionInBeats - 1f, 1f, InputType.STANDARD_DOWN, MarchHit, GenericMiss, MarchEmpty);
-                }
+                Bop(beatTsugi + (int) currBeat, bop.length);
             }
-
             if (PlayerInput.Pressed() && !IsExpectingInputNow())
             {
                 Jukebox.PlayOneShot("miss");
@@ -240,12 +226,34 @@ namespace HeavenStudio.Games
         {
             bop.length = length;
             bop.startBeat = beat;
+            beatSuru = true;
+            beatTsugi += 1f;
+
+            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate { Cadet1.DoScaledAnimationAsync("Bop", 0.5f); }),
+                new BeatAction.Action(beat, delegate { Cadet2.DoScaledAnimationAsync("Bop", 0.5f); }),
+                new BeatAction.Action(beat, delegate { Cadet3.DoScaledAnimationAsync("Bop", 0.5f); }),
+                new BeatAction.Action(beat, delegate { CadetPlayer.DoScaledAnimationAsync("Bop", 0.5f); }),
+            });
         }
 
         public void CadetsMarch(float beat, float length)
         {
             marching.length = length;
             marching.startBeat = beat;
+            marchOtherCount += 1;
+            marchSuru = true;
+            marchTsugi += 1f;
+            var marchOtherAnim = (marchOtherCount % 2 != 0 ? "MarchR" : "MarchL");
+
+            BeatAction.New(gameObject, new List<BeatAction.Action>()
+            {
+                new BeatAction.Action(beat, delegate { Cadet1.DoScaledAnimationAsync(marchOtherAnim, 0.5f); }),
+                new BeatAction.Action(beat, delegate { Cadet2.DoScaledAnimationAsync(marchOtherAnim, 0.5f); }),
+                new BeatAction.Action(beat, delegate { Cadet3.DoScaledAnimationAsync(marchOtherAnim, 0.5f); }),
+                new BeatAction.Action(beat, delegate { ScheduleInput(beat - 1f, 1f, InputType.STANDARD_DOWN, MarchHit, GenericMiss, MarchEmpty);})
+            });
         }
         
         public void SargeAttention(float beat)

ProjectSettings/ProjectSettings.asset

@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.0.1024
+  bundleVersion: 0.0.1025
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -156,11 +156,11 @@ PlayerSettings:
   applicationIdentifier:
     Standalone: com.Megaminerzero.HeavenStudio
   buildNumber:
-    Standalone: 1024
+    Standalone: 1025
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
-  AndroidBundleVersionCode: 1024
+  AndroidBundleVersionCode: 1025
   AndroidMinSdkVersion: 19
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1