diff --git a/buildnumber.txt b/buildnumber.txt index 99a80b18..6efa8688 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1418 \ No newline at end of file +1420 \ No newline at end of file diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index 1484e7d3..caad6a45 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -66,6 +66,7 @@ class Note extends FlxSprite public var noteType(get, null):String; @:dox(hide) public var __strumCameras:Array = null; + @:dox(hide) public var __noteAngle:Float = 0; private function get_noteType() { if (PlayState.instance == null) return null; @@ -167,7 +168,7 @@ class Note extends FlxSprite rotOffset.y += 2; if (negativeScroll) offset.y *= -1; - if (angleOffsets && Std.int(angle % 360) != 0) { + if (angleOffsets && Std.int(__noteAngle % 360) != 0) { // get default values var oldOffset = FlxPoint.get(offset.x, offset.y); var oldOrigin = FlxPoint.get(origin.x, origin.y); diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index df8c3e55..182bfa0c 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1437,7 +1437,6 @@ class PlayState extends MusicBeatState override function beatHit(curBeat:Int) { super.beatHit(curBeat); - scripts.call("beatHit", [curBeat]); if (camZoomingInterval < 1) camZoomingInterval = 1; if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < 1.35 && curBeat % camZoomingInterval == 0) @@ -1456,6 +1455,8 @@ class PlayState extends MusicBeatState { gf.dance(); } + + scripts.call("beatHit", [curBeat]); } public var curLight:Int = 0; diff --git a/source/funkin/game/Strum.hx b/source/funkin/game/Strum.hx index 2b2ca241..ab33a111 100644 --- a/source/funkin/game/Strum.hx +++ b/source/funkin/game/Strum.hx @@ -55,7 +55,7 @@ class Strum extends FlxSprite { daNote.scrollFactor.set(scrollFactor.x, scrollFactor.y); - var noteAngle = getNotesAngle(daNote); + var noteAngle = daNote.__noteAngle = getNotesAngle(daNote); daNote.angle = daNote.isSustainNote ? noteAngle : angle; if (Std.int(noteAngle % 360) != 0) { var noteAngleCos = Math.cos(noteAngle / 180 * Math.PI);