gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into new-editors

Browse Source
This commit is contained in:
Ne_Eo
2024-09-04 14:00:56 +02:00
parent 2fdce35a40 b265b0abd5
commit 0d9b3ef161
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/game/PlayState.hx
+6 -4
View File
@@ -653,10 +653,12 @@ class PlayState extends MusicBeatState
chars.push(char);
}
var strOffset:Float = strumLine.strumLinePos == null ? (strumLine.type == 1 ? 0.75 : 0.25) : strumLine.strumLinePos;
var startingPos:FlxPoint = strumLine.strumPos == null ?
FlxPoint.get((FlxG.width * strOffset) - ((Note.swagWidth * (strumLine.strumScale == null ? 1 : strumLine.strumScale)) * 2), this.strumLine.y) :
FlxPoint.get(strumLine.strumPos[0] == 0 ? ((FlxG.width * strOffset) - ((Note.swagWidth * (strumLine.strumScale == null ? 1 : strumLine.strumScale)) * 2)) : strumLine.strumPos[0], strumLine.strumPos[1]);
var strOffset:Float = strumLine.strumLinePos != null ? strumLine.strumLinePos : (strumLine.type == 1 ? 0.75 : 0.25);
var strScale:Float = strumLine.strumScale != null ? strumLine.strumScale : 1;
var strXPos:Float = (FlxG.width * strOffset) - (Note.swagWidth * strScale * 2);
var startingPos:FlxPoint = strumLine.strumPos != null ?
FlxPoint.get(strumLine.strumPos[0] == 0 ? strXPos : strumLine.strumPos[0], strumLine.strumPos[1]) :
FlxPoint.get(strXPos, this.strumLine.y);
var strLine = new StrumLine(chars,
startingPos,
strumLine.strumScale == null ? 1 : strumLine.strumScale,
source/funkin/game/StrumLine.hx
+2 -1
View File
@@ -152,7 +152,8 @@ class StrumLine extends FlxTypedGroup<Strum> {
var scrollSpeed = strumLine.scrollSpeed;
if(scrollSpeed == null) if (PlayState.instance != null) scrollSpeed = PlayState.instance.scrollSpeed;
if(scrollSpeed == null) scrollSpeed = 1;
notes.limit = 1500 / scrollSpeed;
var limit = FlxG.height / 0.45;
notes.limit = limit / scrollSpeed;
}
public override function update(elapsed:Float) {