diff --git a/source/KadeEngineData.hx b/source/KadeEngineData.hx index 39275f3..0a8204d 100644 --- a/source/KadeEngineData.hx +++ b/source/KadeEngineData.hx @@ -84,6 +84,9 @@ class KadeEngineData if (FlxG.save.data.camzoom == null) FlxG.save.data.camzoom = true; + if (FlxG.save.data.scoreScreen == null) + FlxG.save.data.scoreScreen = true; + Conductor.recalculateTimings(); PlayerSettings.player1.controls.loadKeyBinds(); KeyBinds.keyCheck(); diff --git a/source/Options.hx b/source/Options.hx index 114e431..4ed6a5f 100644 --- a/source/Options.hx +++ b/source/Options.hx @@ -338,6 +338,27 @@ class FPSOption extends Option } } +class ScoreScreen extends Option +{ + public function new(desc:String) + { + super(); + description = desc; + } + + public override function press():Bool + { + FlxG.save.data.scoreScreen = !FlxG.save.data.scoreScreen; + return true; + } + + private override function updateDisplay():String + { + return (FlxG.save.data.scoreScreen ? "Show Score Screen" : "No Score Screen"); + } +} + + class FPSCapOption extends Option diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx index 3e91002..28aa34b 100644 --- a/source/OptionsMenu.hx +++ b/source/OptionsMenu.hx @@ -57,7 +57,8 @@ class OptionsMenu extends MusicBeatState #end new FlashingLightsOption("Toggle flashing lights that can cause epileptic seizures and strain."), new WatermarkOption("Enable and disable all watermarks from the engine."), - new BotPlay("Showcase your charts and mods with autoplay.") + new BotPlay("Showcase your charts and mods with autoplay."), + new ScoreScreen("Show the score screen after the end of a song") ]) ]; diff --git a/source/PlayState.hx b/source/PlayState.hx index 2a57d3a..bb16a36 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2713,7 +2713,7 @@ class PlayState extends MusicBeatState private function popUpScore(daNote:Note):Void { var noteDiff:Float = -(daNote.strumTime - Conductor.songPosition); - var wife:Float = EtternaFunctions.wife3(noteDiff, Conductor.timeScale); + var wife:Float = EtternaFunctions.wife3(-noteDiff, Conductor.timeScale); // boyfriend.playAnim('hey'); vocals.volume = 1; var placement:String = Std.string(combo); @@ -3286,7 +3286,7 @@ class PlayState extends MusicBeatState remove(boyfriend); remove(dad); add(videoSprite); - add(gf); + add(gf); add(boyfriend); add(dad); @@ -3311,8 +3311,13 @@ class PlayState extends MusicBeatState misses++; if (daNote != null) + { if (!loadRep) - saveNotes.push([daNote.strumTime,daNote.sustainLength,daNote.noteData,166 * Math.floor((PlayState.rep.replay.sf / 60) * 1000) / 166]); + saveNotes.push([daNote.strumTime,0,direction,166 * Math.floor((PlayState.rep.replay.sf / 60) * 1000) / 166]); + } + else + if (!loadRep) + saveNotes.push([Conductor.songPosition,0,direction,166 * Math.floor((PlayState.rep.replay.sf / 60) * 1000) / 166]); //var noteDiff:Float = Math.abs(daNote.strumTime - Conductor.songPosition); //var wife:Float = EtternaFunctions.wife3(noteDiff, FlxG.save.data.etternaMode ? 1 : 1.7); diff --git a/source/Ratings.hx b/source/Ratings.hx index 7221a35..92b0ee5 100644 --- a/source/Ratings.hx +++ b/source/Ratings.hx @@ -109,8 +109,7 @@ class Ratings if (FlxG.save.data.botplay && !PlayState.loadRep) return "sick"; // FUNNY - - trace(noteDiff); + var rating = checkRating(noteDiff,customTimeScale); diff --git a/source/ResultsScreen.hx b/source/ResultsScreen.hx index eaba8a8..3e81402 100644 --- a/source/ResultsScreen.hx +++ b/source/ResultsScreen.hx @@ -180,7 +180,9 @@ class ResultsScreen extends FlxSubState { music.fadeOut(0.3); - + PlayState.loadRep = false; + PlayState.rep = null; + if (PlayState.isStoryMode) { FlxG.sound.playMusic(Paths.music('freakyMenu'));