cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-26 06:09:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #504 from FunkinCrew/bugfix/monday-fixes

Browse source 
Bugfix/monday fixes
This commit is contained in:
Cameron Taylor 2024-04-23 04:08:23 -04:00 committed by GitHub
parent ab336f07af 46f2dec672
commit ed0cfc36fb
4 changed files with 51 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit daf702a6ec8b60f1922261872cc74eb107fece06 Subproject commit 9676d494146008bb99cd718fadffa3610a659ad4

3
source/funkin/play/ResultState.hx
View file

@ -64,6 +64,9 @@ class ResultState extends MusicBeatSubState
loop: resultsVariation != SHIT 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! // TEMP-ish, just used to sorta "cache" the 3000x3000 image!
var cacheBullShit:FlxSprite = new FlxSprite().loadGraphic(Paths.image("resultScreen/soundSystem")); var cacheBullShit:FlxSprite = new FlxSprite().loadGraphic(Paths.image("resultScreen/soundSystem"));
add(cacheBullShit); add(cacheBullShit);

21
source/funkin/ui/story/StoryMenuState.hx
View file

@ -344,6 +344,17 @@ class StoryMenuState extends MusicBeatState
changeDifficulty(0); 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) if (controls.UI_RIGHT)
{ {
rightDifficultyArrow.animation.play('press'); rightDifficultyArrow.animation.play('press');
@ -362,16 +373,6 @@ class StoryMenuState extends MusicBeatState
leftDifficultyArrow.animation.play('idle'); 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) if (FlxG.keys.justPressed.TAB && modeText.visible)
{ {
switchMode(!displayingModdedLevels); switchMode(!displayingModdedLevels);

36
source/funkin/util/FlxTweenUtil.hx Normal file
View file

@ -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);
}
}