Merge pull request #958 from Lucky-56/un-revert
revert Kade's (unintentional) reverts
This commit is contained in:
commit
ddf2567032
@ -276,15 +276,7 @@ class PlayState extends MusicBeatState
|
||||
|
||||
#if windows
|
||||
// Making difficulty text for Discord Rich Presence.
|
||||
switch (storyDifficulty)
|
||||
{
|
||||
case 0:
|
||||
storyDifficultyText = "Easy";
|
||||
case 1:
|
||||
storyDifficultyText = "Normal";
|
||||
case 2:
|
||||
storyDifficultyText = "Hard";
|
||||
}
|
||||
storyDifficultyText = CoolUtil.difficultyFromInt(storyDifficulty);
|
||||
|
||||
iconRPC = SONG.player2;
|
||||
|
||||
@ -966,7 +958,7 @@ class PlayState extends MusicBeatState
|
||||
songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME);
|
||||
add(songPosBar);
|
||||
|
||||
var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16);
|
||||
var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - (SONG.song.length * 5),songPosBG.y,0,SONG.song, 16);
|
||||
if (PlayStateChangeables.useDownscroll)
|
||||
songName.y -= 3;
|
||||
songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
|
||||
@ -990,7 +982,7 @@ class PlayState extends MusicBeatState
|
||||
add(healthBar);
|
||||
|
||||
// Add Kade Engine watermark
|
||||
kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + (Main.watermarks ? " - KE " + MainMenuState.kadeEngineVer : ""), 16);
|
||||
kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + CoolUtil.difficultyFromInt(storyDifficulty) + (Main.watermarks ? " - KE " + MainMenuState.kadeEngineVer : ""), 16);
|
||||
kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
|
||||
kadeEngineWatermark.scrollFactor.set();
|
||||
add(kadeEngineWatermark);
|
||||
@ -1385,7 +1377,7 @@ class PlayState extends MusicBeatState
|
||||
songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME);
|
||||
add(songPosBar);
|
||||
|
||||
var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16);
|
||||
var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - (SONG.song.length * 5),songPosBG.y,0,SONG.song, 16);
|
||||
if (PlayStateChangeables.useDownscroll)
|
||||
songName.y -= 3;
|
||||
songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
|
||||
@ -2709,7 +2701,7 @@ class PlayState extends MusicBeatState
|
||||
if (FlxG.save.data.scoreScreen)
|
||||
openSubState(new ResultsScreen());
|
||||
else
|
||||
FlxG.switchState(new PlayState());
|
||||
FlxG.switchState(new FreeplayState());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user