Gameplay: Fix locked hold giving miss early

Arcthesia · Jul 27, 2024 · 938ba93 · 938ba93
1 parent 2bbe2a4
commit 938ba93
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Assets/Scripts/Gameplay/Data/Events/Hold.cs b/Assets/Scripts/Gameplay/Data/Events/Hold.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using ArcCreate.Gameplay.Judgement;
-using ArcCreate.Gameplay.Render;
 using ArcCreate.Utility;
 using ArcCreate.Utility.Extension;
 using UnityEngine;
@@ -21,6 +20,8 @@ public class Hold : LongNote, ILongNote, ILaneTapJudgementReceiver, ILaneHoldJud
 
         public int Lane { get; set; }
 
+        public bool IsLocked => locked;
+
         public override ArcEvent Clone()
         {
             return new Hold()
@@ -241,7 +242,7 @@ public void ProcessLaneHoldJudgement(bool isExpired, bool isJudgement, GroupProp
                 holdHighlightRequestSent = false;
             }
 
-            if (locked || isExpired)
+            if (isExpired)
             {
                 longParticleUntil = int.MinValue;
                 highlight = false;

diff --git a/Assets/Scripts/Gameplay/Judgement/Input/TouchInputHandler.cs b/Assets/Scripts/Gameplay/Judgement/Input/TouchInputHandler.cs
@@ -128,7 +128,7 @@ public void HandleLaneHoldRequests(int currentTiming, UnorderedList<LaneHoldJudg
                 {
                     LaneHoldJudgementRequest req = requests[i];
 
-                    if (currentTiming < req.StartAtTiming)
+                    if (currentTiming < req.StartAtTiming || req.Receiver.IsLocked)
                     {
                         continue;
                     }

diff --git a/Assets/Scripts/Gameplay/Judgement/Request/LaneHoldJudgementRequest.cs b/Assets/Scripts/Gameplay/Judgement/Request/LaneHoldJudgementRequest.cs
@@ -9,7 +9,7 @@ public struct LaneHoldJudgementRequest
         public int AutoAtTiming;
         public int Lane;
         public bool IsJudgement;
-        public ILaneHoldJudgementReceiver Receiver;
+        public Hold Receiver;
         public GroupProperties Properties;
     }
 }