diff --git a/assets/data/characters/pico.xml b/assets/data/characters/pico.xml
index d201bb55..514268d0 100644
--- a/assets/data/characters/pico.xml
+++ b/assets/data/characters/pico.xml
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/buildnumber.txt b/buildnumber.txt
index bb08106d..62cdfc6b 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-1800
+1803
\ No newline at end of file
diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx
index 39f05fa2..a798cc0f 100644
--- a/source/flx3d/Flx3DView.hx
+++ b/source/flx3d/Flx3DView.hx
@@ -98,6 +98,9 @@ class Flx3DView extends FlxView3D {
token = null;
}
}
+
+ public inline function addChild(c)
+ view.scene.addChild(c);
}
typedef ModelQueueItem = {
diff --git a/source/funkin/system/Conductor.hx b/source/funkin/system/Conductor.hx
index 180e3dab..72b8df78 100644
--- a/source/funkin/system/Conductor.hx
+++ b/source/funkin/system/Conductor.hx
@@ -145,6 +145,8 @@ class Conductor
if (FlxG.sound.music == null || !FlxG.sound.music.playing) {
speed = 1;
+ lastSongPos = FlxG.sound.music != null ? FlxG.sound.music.time : 0;
+ lastSongPosTime = Main.time;
return;
}
if (FlxG.state != null && FlxG.state is MusicBeatState && cast(FlxG.state, MusicBeatState).cancelConductorUpdate) return;
@@ -154,7 +156,7 @@ class Conductor
// update conductor
var timeUntilUpdate = -(lastSongPosTime - (lastSongPosTime = Main.time));
var elapsedAL = (lastSongPos - lastPos);
- speed = FlxMath.bound(FlxMath.lerp(speed, timeUntilUpdate / elapsedAL, timeUntilUpdate / 1000), 0.85, 1.15);
+ speed = FlxMath.bound(FlxMath.lerp(speed, timeUntilUpdate / elapsedAL, timeUntilUpdate / 1000), 0.925, 1.075);
songPosition = lastSongPos;
} else {
songPosition += elapsed * 1000 * speed;