AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #958 from Lucky-56/un-revert

Browse Source 
revert Kade's (unintentional) reverts
This commit is contained in:
Kade M 2021-06-21 01:09:02 -07:00 committed by GitHub
commit ddf2567032
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/PlayState.hx
View File

@ -276,15 +276,7 @@ class PlayState extends MusicBeatState
#if windows #if windows
// Making difficulty text for Discord Rich Presence. // Making difficulty text for Discord Rich Presence.
switch (storyDifficulty) storyDifficultyText = CoolUtil.difficultyFromInt(storyDifficulty);
{
case 0:
storyDifficultyText = "Easy";
case 1:
storyDifficultyText = "Normal";
case 2:
storyDifficultyText = "Hard";
}
iconRPC = SONG.player2; iconRPC = SONG.player2;
@ -966,7 +958,7 @@ class PlayState extends MusicBeatState
songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME);
add(songPosBar); 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) if (PlayStateChangeables.useDownscroll)
songName.y -= 3; songName.y -= 3;
songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); 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(healthBar);
// Add Kade Engine watermark // 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.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
kadeEngineWatermark.scrollFactor.set(); kadeEngineWatermark.scrollFactor.set();
add(kadeEngineWatermark); add(kadeEngineWatermark);
@ -1385,7 +1377,7 @@ class PlayState extends MusicBeatState
songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME);
add(songPosBar); 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) if (PlayStateChangeables.useDownscroll)
songName.y -= 3; songName.y -= 3;
songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); 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) if (FlxG.save.data.scoreScreen)
openSubState(new ResultsScreen()); openSubState(new ResultsScreen());
else else
FlxG.switchState(new PlayState()); FlxG.switchState(new FreeplayState());
} }
} }
} }