fix some bugs
This commit is contained in:
parent
f55c2c14d8
commit
b4ba8403e0
@ -84,6 +84,9 @@ class KadeEngineData
|
|||||||
if (FlxG.save.data.camzoom == null)
|
if (FlxG.save.data.camzoom == null)
|
||||||
FlxG.save.data.camzoom = true;
|
FlxG.save.data.camzoom = true;
|
||||||
|
|
||||||
|
if (FlxG.save.data.scoreScreen == null)
|
||||||
|
FlxG.save.data.scoreScreen = true;
|
||||||
|
|
||||||
Conductor.recalculateTimings();
|
Conductor.recalculateTimings();
|
||||||
PlayerSettings.player1.controls.loadKeyBinds();
|
PlayerSettings.player1.controls.loadKeyBinds();
|
||||||
KeyBinds.keyCheck();
|
KeyBinds.keyCheck();
|
||||||
|
@ -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
|
class FPSCapOption extends Option
|
||||||
|
@ -57,7 +57,8 @@ class OptionsMenu extends MusicBeatState
|
|||||||
#end
|
#end
|
||||||
new FlashingLightsOption("Toggle flashing lights that can cause epileptic seizures and strain."),
|
new FlashingLightsOption("Toggle flashing lights that can cause epileptic seizures and strain."),
|
||||||
new WatermarkOption("Enable and disable all watermarks from the engine."),
|
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")
|
||||||
])
|
])
|
||||||
|
|
||||||
];
|
];
|
||||||
|
@ -2713,7 +2713,7 @@ class PlayState extends MusicBeatState
|
|||||||
private function popUpScore(daNote:Note):Void
|
private function popUpScore(daNote:Note):Void
|
||||||
{
|
{
|
||||||
var noteDiff:Float = -(daNote.strumTime - Conductor.songPosition);
|
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');
|
// boyfriend.playAnim('hey');
|
||||||
vocals.volume = 1;
|
vocals.volume = 1;
|
||||||
var placement:String = Std.string(combo);
|
var placement:String = Std.string(combo);
|
||||||
@ -3286,7 +3286,7 @@ class PlayState extends MusicBeatState
|
|||||||
remove(boyfriend);
|
remove(boyfriend);
|
||||||
remove(dad);
|
remove(dad);
|
||||||
add(videoSprite);
|
add(videoSprite);
|
||||||
add(gf);
|
add(gf);
|
||||||
add(boyfriend);
|
add(boyfriend);
|
||||||
add(dad);
|
add(dad);
|
||||||
|
|
||||||
@ -3311,8 +3311,13 @@ class PlayState extends MusicBeatState
|
|||||||
misses++;
|
misses++;
|
||||||
|
|
||||||
if (daNote != null)
|
if (daNote != null)
|
||||||
|
{
|
||||||
if (!loadRep)
|
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 noteDiff:Float = Math.abs(daNote.strumTime - Conductor.songPosition);
|
||||||
//var wife:Float = EtternaFunctions.wife3(noteDiff, FlxG.save.data.etternaMode ? 1 : 1.7);
|
//var wife:Float = EtternaFunctions.wife3(noteDiff, FlxG.save.data.etternaMode ? 1 : 1.7);
|
||||||
|
@ -110,7 +110,6 @@ class Ratings
|
|||||||
if (FlxG.save.data.botplay && !PlayState.loadRep)
|
if (FlxG.save.data.botplay && !PlayState.loadRep)
|
||||||
return "sick"; // FUNNY
|
return "sick"; // FUNNY
|
||||||
|
|
||||||
trace(noteDiff);
|
|
||||||
|
|
||||||
var rating = checkRating(noteDiff,customTimeScale);
|
var rating = checkRating(noteDiff,customTimeScale);
|
||||||
|
|
||||||
|
@ -180,6 +180,8 @@ class ResultsScreen extends FlxSubState
|
|||||||
{
|
{
|
||||||
music.fadeOut(0.3);
|
music.fadeOut(0.3);
|
||||||
|
|
||||||
|
PlayState.loadRep = false;
|
||||||
|
PlayState.rep = null;
|
||||||
|
|
||||||
if (PlayState.isStoryMode)
|
if (PlayState.isStoryMode)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user