diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 072effb86c0..903898c72a2 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -436,10 +436,11 @@ class FreeplayState extends MusicBeatState }); } var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty); + var songLowercase:String = Paths.formatToSongPath(songs[curSelected].songName); #if desktop if(instPlaying != curSelected) { - if(sys.FileSystem.exists(Paths.inst(poop + '/' + poop)) || sys.FileSystem.exists(Paths.json(poop + '/' + poop)) || sys.FileSystem.exists(Paths.modsJson(poop + '/' + poop))) + if(sys.FileSystem.exists(Paths.inst(songLowercase + '/' + poop)) || sys.FileSystem.exists(Paths.json(songLowercase + '/' + poop)) || sys.FileSystem.exists(Paths.modsJson(songLowercase + '/' + poop))) playSong(); else songJsonPopup(); @@ -447,7 +448,7 @@ class FreeplayState extends MusicBeatState #else if(instPlaying != curSelected) { - if(OpenFlAssets.exists(Paths.inst(poop + '/' + poop)) || OpenFlAssets.exists(Paths.json(poop + '/' + poop))) + if(OpenFlAssets.exists(Paths.inst(songLowercase + '/' + poop)) || OpenFlAssets.exists(Paths.json(songLowercase + '/' + poop))) playSong(); else songJsonPopup(); diff --git a/source/Note.hx b/source/Note.hx index 73c74fd9dcf..f711601748d 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -22,7 +22,6 @@ typedef EventNote = { class Note extends FlxSprite { - public var extraData:Map = []; public var row:Int = 0; public var strumTime:Float = 0; diff --git a/source/PlayState.hx b/source/PlayState.hx index d962c82422c..c513bd2a44d 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1963,16 +1963,22 @@ class PlayState extends MusicBeatState } if (ClientPrefs.showcaseMode && !ClientPrefs.charsAndBG) { - hitTxt = new FlxText(STRUM_X + (FlxG.width / 2) - 248, 20, 10000, "test", 42); - hitTxt.setFormat(Paths.font("vcr.ttf"), 42, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + //hitTxt = new FlxText(STRUM_X + (FlxG.width / 2) - 248, 20, 10000, "test", 42); + hitTxt = new FlxText(0, 20, 10000, "test", 42); + hitTxt.setFormat(Paths.font("vcr.ttf"), 42, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); hitTxt.scrollFactor.set(); hitTxt.borderSize = 2; hitTxt.visible = true; hitTxt.cameras = [camHUD]; - hitTxt.alignment = FlxTextAlign.CENTER; // center the text - hitTxt.screenCenter(X); + //hitTxt.alignment = FlxTextAlign.LEFT; // center the text + //hitTxt.screenCenter(X); hitTxt.screenCenter(Y); add(hitTxt); + var chromaScreen = new FlxSprite(-5000, -2000).makeGraphic(Std.int(FlxG.width * 2), Std.int(FlxG.height * 2), FlxColor.GREEN); + chromaScreen.scrollFactor.set(0, 0); + chromaScreen.scale.set(3, 3); + chromaScreen.updateHitbox(); + add(chromaScreen); } if (ClientPrefs.hudType == 'Kade Engine') diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx index 252dcc77f29..c8ceebcd195 100644 --- a/source/editors/ChartingState.hx +++ b/source/editors/ChartingState.hx @@ -3206,7 +3206,7 @@ class ChartingState extends MusicBeatState sectionBeats: getSectionBeats(), bpm: _song.bpm, changeBPM: false, - mustHitSection: true, + mustHitSection: _song.notes[curSec].mustHitSection, gfSection: false, sectionNotes: [], typeOfSection: 0,