diff --git a/assets b/assets index daf702a6e..9676d4941 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit daf702a6ec8b60f1922261872cc74eb107fece06 +Subproject commit 9676d494146008bb99cd718fadffa3610a659ad4 diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx index 591020955..acce8645a 100644 --- a/source/funkin/play/ResultState.hx +++ b/source/funkin/play/ResultState.hx @@ -64,6 +64,9 @@ class ResultState extends MusicBeatSubState loop: resultsVariation != SHIT }); + // Reset the camera zoom on the results screen. + FlxG.camera.zoom = 1.0; + // TEMP-ish, just used to sorta "cache" the 3000x3000 image! var cacheBullShit:FlxSprite = new FlxSprite().loadGraphic(Paths.image("resultScreen/soundSystem")); add(cacheBullShit); diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx index 5881ef624..d4ffa961d 100644 --- a/source/funkin/ui/story/StoryMenuState.hx +++ b/source/funkin/ui/story/StoryMenuState.hx @@ -344,6 +344,17 @@ class StoryMenuState extends MusicBeatState changeDifficulty(0); } + // TODO: Querying UI_RIGHT_P (justPressed) after UI_RIGHT always returns false. Fix it! + if (controls.UI_RIGHT_P) + { + changeDifficulty(1); + } + + if (controls.UI_LEFT_P) + { + changeDifficulty(-1); + } + if (controls.UI_RIGHT) { rightDifficultyArrow.animation.play('press'); @@ -362,16 +373,6 @@ class StoryMenuState extends MusicBeatState leftDifficultyArrow.animation.play('idle'); } - if (controls.UI_RIGHT_P) - { - changeDifficulty(1); - } - - if (controls.UI_LEFT_P) - { - changeDifficulty(-1); - } - if (FlxG.keys.justPressed.TAB && modeText.visible) { switchMode(!displayingModdedLevels); diff --git a/source/funkin/util/FlxTweenUtil.hx b/source/funkin/util/FlxTweenUtil.hx new file mode 100644 index 000000000..57c8f0cfe --- /dev/null +++ b/source/funkin/util/FlxTweenUtil.hx @@ -0,0 +1,36 @@ +package funkin.util; + +import flixel.addons.plugin.taskManager.FlxTask; +import flixel.tweens.FlxTween; +import flixel.tweens.FlxEase; + +class FlxTweenUtil +{ + public static function pauseTween(tween:FlxTween):Void + { + if (tween != null) + { + tween.active = false; + } + } + + public static function resumeTween(tween:FlxTween):Void + { + if (tween != null) + { + tween.active = true; + } + } + + public static function pauseTweensOf(Object:Dynamic, ?FieldPaths:Array<String>):Void + { + @:privateAccess + FlxTween.globalManager.forEachTweensOf(Object, FieldPaths, pauseTween); + } + + public static function resumeTweensOf(Object:Dynamic, ?FieldPaths:Array<String>):Void + { + @:privateAccess + FlxTween.globalManager.forEachTweensOf(Object, FieldPaths, resumeTween); + } +}