Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix

assets

@@ -1 +1 @@
-Subproject commit 962130b2243a839106607d08a11599b1857bf8b3
+Subproject commit 783f22e741c85223da7f3f815b28fc4c6f240cbc

docs/Funkin' Debug Hotkeys.md

@@ -1,31 +1,31 @@
 # Funkin' Debug Hotkeys
 
-`F4` (EVERYWHERE) - Leave Current State and move to Main Menu
+Most of this functionality is only available on debug builds of the game!
-`F5` (EVERYWHERE) - Hot Reload Data Files
 
-`Y` (Title Screen) - WOAH
+## Any State
+- `F2`: ***OVERLAY***: Enables the Flixel debug overlay, which has partial support for scripting.
+- `F3`: ***SCREENSHOT***: Takes a screenshot of the game and saves it to the local `screenshots` directory. Works outside of debug builds too!
+- `F4`: ***EJECT***: Forcibly switch state to the Main Menu (with no extra transition). Useful if you're stuck in a level and you need to get out!
+- `F5`: ***HOT RELOAD***: Forcibly reload the game's scripts and data files, then restart the current state. If any files in the `assets` folder have been modified, the game should process the changes for you! NOTE: Known bug, this does not reset song charts or song scripts, but it should reset everything else (such as stage layout data and character animation data).
+- `CTRL-SHIFT-L`: ***FORCE CRASH***: Immediately crash the game with a detailed crash log and a stack trace.
 
-`~` (Main Menu) - Access Debug Menu
+## **Play State**
+- `H`: ***HIDE UI***: Makes the user interface invisible. Works in Pause Menu, great for screenshots.
+- `1`: ***END SONG***: Immediately ends the song and moves to Results Screen on Freeplay, or next song on Story Mode.
+- `2`: ***GAIN HEALTH***: Debug function, add 10% to the player's health.
+- `3`: ***LOSE HEALTH***: Debug function, subtract 5% to the player's health.
+- `9`: NEATO!
+- `PAGEUP` (MacOS: `Fn-Up`): ***FORWARDS TIME TRAVEL****: Move forward by 2 sections. Hold SHIFT to move forward by 20 sections instead.
+- `PAGEDOWN` (MacOS: `Fn-Down`): ***BACKWARDS TIME TRAVEL****: Move backward by 2 sections. Hold SHIFT to move backward by 20 sections instead.
 
-`U` (Play) - Open Stage Editor State
+## **Freeplay State**
-`H` (Play) - Show/Hide HUD
+- `F` (Freeplay Menu) - Move to Favorites
-`1` (Play) - End Song
+- `Q` (Freeplay Menu) - Back one category
-`2` (Play) - Add 10% Health
+- `E` (Freeplay Menu) - Forward one category
-`3` (Play) - Subtract 5% Health
-`7` (Play) - (NOT WORKING) Open Chart Editor
-`8` (Play) - Open Animation Editor
-`9` (Play) - (Easter Egg) Classic Health Icon
-`PGUP`/`Fn+Up` (Play) - Skip Forward In Time
-`PGDN`/`Fn+Down` (Play) - 🦃 That's right, we're going to go BACK IN TIME
 
-`F` (Freeplay Menu) - Move to Favorites
+## **Title State**
-`P` (Freeplay Menu) - Switch to Pico (probably doesn't work)
+- `Y` - WOAH
-`T` (Freeplay Menu) - Start typing in search bar
-`Q` (Freeplay Menu) - Back one letter
-`E` (Freeplay Menu) - Forward one letter
 
-`Arrows` (Stage Editor) - Move Prop
+## **Main Menu**
-`Ctrl-Z` (Stage Editor) - Undo
+- `~`: ***DEBUG****: Opens a menu to access the Chart Editor and other work-in-progress editors. Rebindable in the options menu.
-`Y` (Stage Editor) - Leave Stage Editor
+- `CTRL-ALT-SHIFT-W`: ***ALL ACCESS***: Unlocks all songs in Freeplay. Only available on debug builds.
-
-`H` (Pause Menu) - Hide the Pause Menu UI (good for screenshots!)

hmm.json

@@ -49,7 +49,7 @@
       "name": "funkin.vis",
       "type": "git",
       "dir": null,
-      "ref": "98c9db09f0bbfedfe67a84538a5814aaef80bdea",
+      "ref": "2aa654b974507ab51ab1724d2d97e75726fd7d78",
       "url": "https://github.com/FunkinCrew/funkVis"
     },
     {

source/funkin/input/Controls.hx

@@ -527,6 +527,14 @@ class Controls extends FlxActionSet
           action.inputs[i].inputID = toAdd;
         }
         hasReplaced = true;
+      } else if (input.device == KEYBOARD && input.inputID == toAdd) {
+        // This key is already bound!
+        if (hasReplaced) {
+          // Remove the duplicate keybind, don't replace.
+          action.inputs.remove(input);
+        } else {
+          hasReplaced = true;
+        }
       }
     }
 
@@ -989,6 +997,7 @@ class Controls extends FlxActionSet
     for (control in Control.createAll())
     {
       var inputs:Array<Int> = Reflect.field(data, control.getName());
+      inputs = inputs.unique();
       if (inputs != null)
       {
         if (inputs.length == 0) {
@@ -1038,7 +1047,11 @@ class Controls extends FlxActionSet
       var inputs = getInputsFor(control, device);
       isEmpty = isEmpty && inputs.length == 0;
 
-      if (inputs.length == 0) inputs = [FlxKey.NONE];
+      if (inputs.length == 0) {
+        inputs = [FlxKey.NONE];
+      } else {
+        inputs = inputs.unique();
+      }
 
       Reflect.setField(data, control.getName(), inputs);
     }

source/funkin/play/GameOverSubState.hx

@@ -83,6 +83,8 @@ class GameOverSubState extends MusicBeatSubState
 
   var isChartingMode:Bool = false;
 
+  var mustNotExit:Bool = false;
+
   var transparent:Bool;
 
   static final CAMERA_ZOOM_DURATION:Float = 0.5;
@@ -240,7 +242,7 @@ class GameOverSubState extends MusicBeatSubState
     }
 
     // KEYBOARD ONLY: Return to the menu when pressing the assigned key.
-    if (controls.BACK)
+    if (controls.BACK && !mustNotExit)
     {
       blueballed = false;
       PlayState.instance.deathCounter = 0;

source/funkin/play/PlayState.hx

@@ -2548,6 +2548,13 @@ class PlayState extends MusicBeatSubState
 
     // Redirect to the chart editor playing the current song.
     if (controls.DEBUG_CHART)
+    {
+      if (isChartingMode)
+      {
+        if (FlxG.sound.music != null) FlxG.sound.music.pause(); // Don't reset song position!
+        this.close(); // This only works because PlayState is a substate!
+      }
+      else
       {
         disableKeys = true;
         persistentUpdate = false;
@@ -2556,6 +2563,7 @@ class PlayState extends MusicBeatSubState
             targetSongId: currentSong.id,
           }));
       }
+    }
     #end
 
     #if (debug || FORCE_DEBUG_VERSION)

source/funkin/play/event/PlayAnimationSongEvent.hx

@@ -31,25 +31,13 @@ class PlayAnimationSongEvent extends SongEvent
 
     switch (targetName)
     {
-      case 'boyfriend':
+      case 'boyfriend' | 'bf' | 'player':
         trace('Playing animation $anim on boyfriend.');
         target = PlayState.instance.currentStage.getBoyfriend();
-      case 'bf':
+      case 'dad' | 'opponent':
-        trace('Playing animation $anim on boyfriend.');
-        target = PlayState.instance.currentStage.getBoyfriend();
-      case 'player':
-        trace('Playing animation $anim on boyfriend.');
-        target = PlayState.instance.currentStage.getBoyfriend();
-      case 'dad':
         trace('Playing animation $anim on dad.');
         target = PlayState.instance.currentStage.getDad();
-      case 'opponent':
+      case 'girlfriend' | 'gf':
-        trace('Playing animation $anim on dad.');
-        target = PlayState.instance.currentStage.getDad();
-      case 'girlfriend':
-        trace('Playing animation $anim on girlfriend.');
-        target = PlayState.instance.currentStage.getGirlfriend();
-      case 'gf':
         trace('Playing animation $anim on girlfriend.');
         target = PlayState.instance.currentStage.getGirlfriend();
       default:

source/funkin/play/notes/Strumline.hx

@@ -576,6 +576,8 @@ class Strumline extends FlxSpriteGroup
       note.holdNoteSprite.hitNote = true;
       note.holdNoteSprite.missedNote = false;
       note.holdNoteSprite.alpha = 1.0;
+
+      note.holdNoteSprite.sustainLength = (note.holdNoteSprite.strumTime + note.holdNoteSprite.fullSustainLength) - conductorInUse.songPosition;
     }
   }
 

source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx

@@ -67,7 +67,7 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
 
     var charGrid = new Grid();
     charGrid.columns = 5;
-    charGrid.width = 100;
+    charGrid.width = this.width;
     charSelectScroll.addComponent(charGrid);
 
     var charIds:Array<String> = CharacterDataParser.listCharacterIds();

source/funkin/ui/freeplay/FreeplayState.hx

@@ -733,8 +733,8 @@ class FreeplayState extends MusicBeatSubState
       }
     }
 
-    lerpScore = MathUtil.coolLerp(lerpScore, intendedScore, 0.2);
+    lerpScore = MathUtil.smoothLerp(lerpScore, intendedScore, elapsed, 0.5);
-    lerpCompletion = MathUtil.coolLerp(lerpCompletion, intendedCompletion, 0.9);
+    lerpCompletion = MathUtil.smoothLerp(lerpCompletion, intendedCompletion, elapsed, 0.5);
 
     if (Math.isNaN(lerpScore))
     {
@@ -923,6 +923,7 @@ class FreeplayState extends MusicBeatSubState
 
     if (controls.BACK)
     {
+      busy = true;
       FlxTween.globalManager.clear();
       FlxTimer.globalManager.clear();
       dj.onIntroDone.removeAll();

source/funkin/ui/mainmenu/MainMenuState.hx

@@ -139,10 +139,6 @@ class MainMenuState extends MusicBeatState
 
     resetCamStuff();
 
-    subStateClosed.add(_ -> {
-      resetCamStuff();
-    });
-
     subStateOpened.add(sub -> {
       if (Type.getClass(sub) == FreeplayState)
       {

source/funkin/ui/title/TitleState.hx

@@ -283,6 +283,7 @@ class TitleState extends MusicBeatState
 
     if (FlxG.keys.justPressed.Y)
     {
+      FlxTween.cancelTweensOf(FlxG.stage.window, ['x', 'y']);
       FlxTween.tween(FlxG.stage.window, {x: FlxG.stage.window.x + 300}, 1.4, {ease: FlxEase.quadInOut, type: PINGPONG, startDelay: 0.35});
       FlxTween.tween(FlxG.stage.window, {y: FlxG.stage.window.y + 100}, 0.7, {ease: FlxEase.quadInOut, type: PINGPONG});
     }

source/funkin/ui/transition/LoadingState.hx

@@ -162,7 +162,9 @@ class LoadingState extends MusicBeatSubState
     {
       targetShit = FlxMath.remapToRange(callbacks.numRemaining / callbacks.length, 1, 0, 0, 1);
 
-      loadBar.scale.x = FlxMath.lerp(loadBar.scale.x, targetShit, 0.50);
+      var lerpWidth:Int = Std.int(FlxMath.lerp(loadBar.width, FlxG.width * targetShit, 0.2));
+      loadBar.setGraphicSize(lerpWidth, loadBar.height);
+      loadBar.updateHitbox();
       FlxG.watch.addQuick('percentage?', callbacks.numRemaining / callbacks.length);
     }
 

source/funkin/util/logging/CrashHandler.hx

@@ -141,7 +141,9 @@ class CrashHandler
 
     fullContents += '\n';
 
-    fullContents += 'Flixel Current State: ${Type.getClassName(Type.getClass(FlxG.state))}\n';
+    var currentState = FlxG.state != null ? Type.getClassName(Type.getClass(FlxG.state)) : 'No state loaded';
+
+    fullContents += 'Flixel Current State: ${currentState}\n';
 
     fullContents += '\n';