diff --git a/source/meta/data/ClientPrefs.hx b/source/meta/data/ClientPrefs.hx index ad67dc40..e7631907 100644 --- a/source/meta/data/ClientPrefs.hx +++ b/source/meta/data/ClientPrefs.hx @@ -60,7 +60,12 @@ class ClientPrefs { 'instakill' => false, 'practice' => false, 'botplay' => false, - 'opponentplay' => false + 'opponentplay' => false, + 'randommode' => false, + 'flip' => false, + 'stairmode' => false, + 'wavemode' => false, + 'onekey' => false ]; public static var comboOffset:Array = [0, 0, 0, 0, 0, 0]; diff --git a/source/meta/data/WeekData.hx b/source/meta/data/WeekData.hx index 126b7554..57a0115a 100644 --- a/source/meta/data/WeekData.hx +++ b/source/meta/data/WeekData.hx @@ -74,20 +74,10 @@ class WeekData { return weekFile; } - // HELP: Is there any way to convert a WeekFile to WeekData without having to put all variables there manually? I'm kind of a noob in haxe lmao public function new(weekFile:WeekFile, fileName:String) { - songs = weekFile.songs; - weekCharacters = weekFile.weekCharacters; - weekBackground = weekFile.weekBackground; - weekBefore = weekFile.weekBefore; - storyName = weekFile.storyName; - weekName = weekFile.weekName; - freeplayColor = weekFile.freeplayColor; - startUnlocked = weekFile.startUnlocked; - hiddenUntilUnlocked = weekFile.hiddenUntilUnlocked; - hideStoryMode = weekFile.hideStoryMode; - hideFreeplay = weekFile.hideFreeplay; - difficulties = weekFile.difficulties; + for (field in Reflect.fields(weekFile)) { + Reflect.setProperty(this, field, Reflect.getProperty(weekFile, field)); + } this.fileName = fileName; } diff --git a/source/meta/substate/ResultsSubState.hx b/source/meta/substate/ResultsSubState.hx index 1549939b..d50ba47d 100644 --- a/source/meta/substate/ResultsSubState.hx +++ b/source/meta/substate/ResultsSubState.hx @@ -49,6 +49,7 @@ class ResultsSubState extends MusicBeatSubstate { persistentUpdate = true; + FlxG.sound.music.fadeIn(4, 0, 0.7); FlxG.sound.playMusic(Paths.music('breakfast'), 1); bg = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK); @@ -68,7 +69,7 @@ class ResultsSubState extends MusicBeatSubstate titleTxt.updateHitbox(); add(titleTxt); - resultsTxt = new FlxText(0, 0, 0, + resultsTxt = new FlxText(titleTxt.x, 0, 0, 'Sicks: ' + sick + '\nGoods: ' + good + '\nBads: ' + bad @@ -80,7 +81,6 @@ class ResultsSubState extends MusicBeatSubstate resultsTxt.setFormat("VCR OSD Mono", 45, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); resultsTxt.screenCenter(XY); resultsTxt.updateHitbox(); - resultsTxt.x = titleTxt.x; add(resultsTxt); if (ClientPrefs.scoreTxtType != 'Simple')