Merge branch 'fix-hit-window-fps-offset' of https://github.com/JackXson-Real/Funkin into fix-hit-window-fps-offset

Author: JackXson-Real

source/funkin/play/notes/Strumline.hx

@@ -47,6 +47,27 @@ class Strumline extends FlxSpriteGroup
 
   // Positional fixes for new strumline graphics.
   static final INITIAL_OFFSET:Float = -0.275 * STRUMLINE_SIZE;
+
+  /**
+   * Returns a dynamic offset for the strumline center based on FPS.
+   * The lower the FPS, the higher the hit window is offset.
+   */
+  function getDynamicOffset():Float {
+    var baseOffset:Float;
+    if (noteStyle != null && noteStyle.id != null && noteStyle.id.toLowerCase() == 'pixel') 
+    {
+      baseOffset = INITIAL_OFFSET + 5.0;
+    } 
+    else 
+    {
+      baseOffset = INITIAL_OFFSET + 10.0;
+    }
+    var fps = Preferences.framerate;
+    var maxOffset = (500 - 30) * 0.025;
+    var t = (500 - fps) / (500 - 30);
+    return baseOffset + maxOffset * t;
+  }
+  
   static final NUDGE:Float = 2.0;
 
   static final KEY_COUNT:Int = 4;
@@ -97,9 +118,9 @@ class Strumline extends FlxSpriteGroup
   /**
    * Reset the scroll speed to the current chart's scroll speed.
    */
-  public function resetScrollSpeed(?newScrollSpeed:Float):Void
+  public function resetScrollSpeed():Void
   {
-    scrollSpeed = newScrollSpeed ?? PlayState.instance?.currentChart?.scrollSpeed ?? 1.0;
+    scrollSpeed = PlayState.instance?.currentChart?.scrollSpeed ?? 1.0;
   }
 
   var _conductorInUse:Null<Conductor>;
@@ -184,7 +205,7 @@ class Strumline extends FlxSpriteGroup
 
   static final BACKGROUND_PAD:Int = 16;
 
-  public function new(noteStyle:NoteStyle, isPlayer:Bool, ?scrollSpeed:Float)
+  public function new(noteStyle:NoteStyle, isPlayer:Bool)
   {
     super();
 
@@ -236,13 +257,14 @@ class Strumline extends FlxSpriteGroup
     if (inArrowContorlSchemeMode && isPlayer) this.background.x -= 100;
     #end
     this.add(this.background);
+    strumlineScale = new FlxCallbackPoint(strumlineScaleCallback);
 
     strumlineScale = new FlxCallbackPoint(strumlineScaleCallback);
 
     this.refresh();
 
     this.onNoteIncoming = new FlxTypedSignal<NoteSprite->Void>();
-    resetScrollSpeed(scrollSpeed);
+    resetScrollSpeed();
 
     for (i in 0...KEY_COUNT)
     {
@@ -584,7 +606,7 @@ class Strumline extends FlxSpriteGroup
       if (note == null || !note.alive) continue;
       // Set the note's position.
       if (!customPositionData) note.y = this.y
-        - INITIAL_OFFSET
+        - getDynamicOffset()
         + GRhythmUtil.getNoteY(note.strumTime, scrollSpeed, isDownscroll, conductorInUse)
         + note.yOffset;
 
@@ -643,6 +665,8 @@ class Strumline extends FlxSpriteGroup
         if (holdNote.cover != null && isPlayer)
         {
           holdNote.cover.playEnd();
+          
+          trace("Sustain Note Splash Vibration");
         }
         else if (holdNote.cover != null)
         {
@@ -666,7 +690,7 @@ class Strumline extends FlxSpriteGroup
           if (isDownscroll)
           {
             holdNote.y = this.y
-              - INITIAL_OFFSET
+              - getDynamicOffset()
               + GRhythmUtil.getNoteY(holdNote.strumTime, scrollSpeed, isDownscroll, conductorInUse)
               - holdNote.height
               + STRUMLINE_SIZE / 2
@@ -675,7 +699,7 @@ class Strumline extends FlxSpriteGroup
           else
           {
             holdNote.y = this.y
-              - INITIAL_OFFSET
+              - getDynamicOffset()
               + GRhythmUtil.getNoteY(holdNote.strumTime, scrollSpeed, isDownscroll, conductorInUse)
               + yOffset
               + STRUMLINE_SIZE / 2
@@ -707,11 +731,18 @@ class Strumline extends FlxSpriteGroup
         {
           if (isDownscroll)
           {
-            holdNote.y = this.y - INITIAL_OFFSET - holdNote.height + STRUMLINE_SIZE / 2;
+            holdNote.y = this.y
+              - getDynamicOffset()
+              - holdNote.height
+              + STRUMLINE_SIZE / 2
+              + holdNote.yOffset;
           }
           else
           {
-            holdNote.y = this.y - INITIAL_OFFSET + STRUMLINE_SIZE / 2;
+            holdNote.y = this.y
+              - getDynamicOffset()
+              + STRUMLINE_SIZE / 2
+              + holdNote.yOffset;
           }
         }
       }
@@ -725,7 +756,7 @@ class Strumline extends FlxSpriteGroup
           if (isDownscroll)
           {
             holdNote.y = this.y
-              - INITIAL_OFFSET
+              - getDynamicOffset()
               + GRhythmUtil.getNoteY(holdNote.strumTime, scrollSpeed, isDownscroll, conductorInUse)
               - holdNote.height
               + STRUMLINE_SIZE / 2
@@ -734,7 +765,7 @@ class Strumline extends FlxSpriteGroup
           else
           {
             holdNote.y = this.y
-              - INITIAL_OFFSET
+              - getDynamicOffset()
               + GRhythmUtil.getNoteY(holdNote.strumTime, scrollSpeed, isDownscroll, conductorInUse)
               + STRUMLINE_SIZE / 2
               + holdNote.yOffset;