Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 11:26:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

downscroll susnotes positioning

Browse source
This commit is contained in:
MtH 2021-03-31 19:11:05 +02:00
parent c6cc9a73de
commit 2d48435b3b
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
source/PlayState.hx
View file

@ -1620,7 +1620,7 @@ class PlayState extends MusicBeatState
} }
} }
while (unspawnNotes[0] != null &&unspawnNotes[0].strumTime - Conductor.songPosition < 1500 / SONG.speed) while (unspawnNotes[0] != null && unspawnNotes[0].strumTime - Conductor.songPosition < 1800 / SONG.speed)
{ {
var dunceNote:Note = unspawnNotes[0]; var dunceNote:Note = unspawnNotes[0];
notes.add(dunceNote); notes.add(dunceNote);
@ -1650,16 +1650,23 @@ class PlayState extends MusicBeatState
{ {
daNote.y = (strumLine.y + (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(SONG.speed, 2))); daNote.y = (strumLine.y + (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(SONG.speed, 2)));
if (daNote.isSustainNote if (daNote.isSustainNote)
&& (!daNote.mustPress || (daNote.wasGoodHit || (daNote.prevNote.wasGoodHit && !daNote.canBeHit)))
&& daNote.y - daNote.offset.y * daNote.scale.y + daNote.height >= strumLineMid)
{ {
// div by scale because cliprect is affected by scale i THINK if (daNote.animation.curAnim.name.endsWith("end") && daNote.prevNote != null)
var swagRect:FlxRect = new FlxRect(0, 0, daNote.width / daNote.scale.x, daNote.height / daNote.scale.y); daNote.y += daNote.prevNote.height;
else
daNote.y += daNote.height / daNote.scale.y;
swagRect.height = (strumLineMid - daNote.y) / daNote.scale.y; if ((!daNote.mustPress || (daNote.wasGoodHit || (daNote.prevNote.wasGoodHit && !daNote.canBeHit)))
swagRect.y = daNote.height / daNote.scale.y - swagRect.height; && daNote.y - daNote.offset.y * daNote.scale.y + daNote.height >= strumLineMid)
daNote.clipRect = swagRect; {
// div by scale because cliprect is affected by scale i THINK
var swagRect:FlxRect = new FlxRect(0, 0, daNote.width / daNote.scale.x, daNote.height / daNote.scale.y);
swagRect.height = (strumLineMid - daNote.y) / daNote.scale.y;
swagRect.y = daNote.height / daNote.scale.y - swagRect.height;
daNote.clipRect = swagRect;
}
} }
} }
else else