Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-19 13:14:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

can spin wahoo! also merge fixes hehe

Browse source
This commit is contained in:
Cameron Taylor 2023-01-05 23:37:08 -05:00
parent 7f9171203a
commit 968c5b7a50
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/funkin/FreeplayState.hx
View file

@ -411,19 +411,21 @@ class FreeplayState extends MusicBeatSubstate
// fp.updateScore(0); // fp.updateScore(0);
new FlxTimer().start((1 / 24) * i, function(doShit) var maxTimer:Float = Math.min(i, 4);
new FlxTimer().start((1 / 24) * maxTimer, function(doShit)
{ {
funnyMenu.doJumpIn = true; funnyMenu.doJumpIn = true;
}); });
new FlxTimer().start((0.09 * i) + 0.85, function(lerpTmr) new FlxTimer().start((0.09 * maxTimer) + 0.85, function(lerpTmr)
{ {
funnyMenu.doLerp = true; funnyMenu.doLerp = true;
}); });
if (!force) if (!force)
{ {
new FlxTimer().start(((0.20 * i) / (1 + i)) + 0.75, function(swagShi) new FlxTimer().start(((0.20 * maxTimer) / (1 + maxTimer)) + 0.75, function(swagShi)
{ {
funnyMenu.songText.visible = true; funnyMenu.songText.visible = true;
funnyMenu.alpha = 1; funnyMenu.alpha = 1;

5
source/funkin/play/PlayState.hx
View file

@ -1820,7 +1820,7 @@ class PlayState extends MusicBeatState
var daBPM:Float = currentSong.bpm; var daBPM:Float = currentSong.bpm;
var daPos:Float = 0; var daPos:Float = 0;
for (i in 0...(Std.int(curStep / 16 + sec))) for (i in 0...(Std.int(Conductor.currentStep / 16 + sec)))
{ {
var section = SongLoad.getSong()[i]; var section = SongLoad.getSong()[i];
if (section == null) if (section == null)
@ -1833,7 +1833,8 @@ class PlayState extends MusicBeatState
} }
Conductor.songPosition = FlxG.sound.music.time = daPos; Conductor.songPosition = FlxG.sound.music.time = daPos;
Conductor.songPosition += Conductor.offset; Conductor.songPosition += Conductor.offset;
updateCurStep(); // updateCurStep();
Conductor.update(Conductor.songPosition);
resyncVocals(); resyncVocals();
} }
#end #end

11
source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx
View file

@ -2,21 +2,10 @@ package funkin.ui.stageBuildShit;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.input.mouse.FlxMouseEvent; import flixel.input.mouse.FlxMouseEvent;
<<<<<<< HEAD
import flixel.input.mouse.FlxMouseEventManager;
=======
>>>>>>> origin/feature/week-4-gameplay
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import funkin.play.PlayState; import funkin.play.PlayState;
<<<<<<< HEAD
import funkin.play.stage.StageData.StageDataParser;
import funkin.play.stage.StageData; import funkin.play.stage.StageData;
import haxe.ui.RuntimeComponentBuilder; import haxe.ui.RuntimeComponentBuilder;
import haxe.ui.containers.VBox;
=======
import funkin.play.stage.StageData;
import haxe.ui.RuntimeComponentBuilder;
>>>>>>> origin/feature/week-4-gameplay
import haxe.ui.core.Component; import haxe.ui.core.Component;
import openfl.events.Event; import openfl.events.Event;
import openfl.events.IOErrorEvent; import openfl.events.IOErrorEvent;