From 9c8652c0f7db94563ba4f56d7819ba96a0ed5b3d Mon Sep 17 00:00:00 2001 From: CharlesCatYT <62410083+CharlesCatYT@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:42:37 +0000 Subject: [PATCH] hello guys --- source/funkin/CoolUtil.hx | 2 ++ source/funkin/play/stage/Bopper.hx | 16 +--------------- source/funkin/ui/options/PreferencesMenu.hx | 4 ++-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/source/funkin/CoolUtil.hx b/source/funkin/CoolUtil.hx index d733c49839..1b99789fdb 100644 --- a/source/funkin/CoolUtil.hx +++ b/source/funkin/CoolUtil.hx @@ -10,6 +10,8 @@ import flixel.tweens.FlxEase; import flixel.math.FlxPoint; import flixel.math.FlxMath; +using StringTools; + /** * Utility functions, most that aren't in the OG game, can be used for scripts maybe. */ diff --git a/source/funkin/play/stage/Bopper.hx b/source/funkin/play/stage/Bopper.hx index 57f4443024..7c88173794 100644 --- a/source/funkin/play/stage/Bopper.hx +++ b/source/funkin/play/stage/Bopper.hx @@ -187,33 +187,21 @@ class Bopper extends StageProp implements IPlayStateScriptedClass public function dance(forceRestart:Bool = false):Void { if (this.animation == null) - { return; - } if (shouldAlternate == null) - { update_shouldAlternate(); - } if (shouldAlternate) { if (hasDanced) - { - trace('DanceRight (alternate)'); playAnimation('danceRight$idleSuffix', forceRestart); - } else - { - trace('DanceLeft (alternate)'); playAnimation('danceLeft$idleSuffix', forceRestart); - } hasDanced = !hasDanced; } else - { playAnimation('idle$idleSuffix', forceRestart); - } } public function hasAnimation(id:String):Bool @@ -271,10 +259,8 @@ class Bopper extends StageProp implements IPlayStateScriptedClass this.animation.play(correctName, restart, reversed, 0); if (ignoreOther) - { canPlayOtherAnims = false; - } - + applyAnimationOffsets(correctName); } diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx index 313390a514..95b534d1d5 100644 --- a/source/funkin/ui/options/PreferencesMenu.hx +++ b/source/funkin/ui/options/PreferencesMenu.hx @@ -54,9 +54,9 @@ class PreferencesMenu extends Page Preferences.ghostTapping = value; }, Preferences.ghostTapping); #if !web - createPrefItemNumber('FPS Cap', 'The framerate that the game is running on', function(value:Float) { + createPrefItemNumber('FPS Cap', 'The cap of the framerate that the game is running on', function(value:Float) { Preferences.framerate = Std.int(value); - }, null, Preferences.framerate, 60, 360, 1, 0); + }, null, Preferences.framerate, 12, 360, 1, 0); #end createPrefItemCheckbox('Naughtiness', 'Toggle displaying raunchy content', function(value:Bool):Void { Preferences.naughtyness = value;