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

CoolUtil gets used more

Browse Source
This commit is contained in:
Lucky56 2021-06-17 06:00:18 +02:00
parent 19134e6694
commit ceac1c6129
No known key found for this signature in database
GPG Key ID: 19E3875EAD1F8B8F
5 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/CoolUtil.hx
View File

@ -6,11 +6,11 @@ using StringTools;
class CoolUtil class CoolUtil
{ {
public static var difficultyArray:Array<String> = ['EASY', "NORMAL", "HARD"]; public static var difficultyArray:Array<String> = ['Easy', "Normal", "Hard"];
public static function difficultyString():String public static function difficultyFromInt(difficulty:Int):String
{ {
return difficultyArray[PlayState.storyDifficulty]; return difficultyArray[difficulty];
} }
public static function coolTextFile(path:String):Array<String> public static function coolTextFile(path:String):Array<String>

10
source/FreeplayState.hx
View File

@ -244,15 +244,7 @@ class FreeplayState extends MusicBeatState
intendedScore = Highscore.getScore(songHighscore, curDifficulty); intendedScore = Highscore.getScore(songHighscore, curDifficulty);
#end #end
switch (curDifficulty) diffText.text = CoolUtil.difficultyFromInt(curDifficulty).toUpperCase();
{
case 0:
diffText.text = "EASY";
case 1:
diffText.text = 'NORMAL';
case 2:
diffText.text = "HARD";
}
} }
function changeSelection(change:Int = 0) function changeSelection(change:Int = 0)

2
source/LoadReplayState.hx
View File

@ -54,7 +54,7 @@ class LoadReplayState extends MusicBeatState
var string:String = controlsStrings[i]; var string:String = controlsStrings[i];
actualNames[i] = string; actualNames[i] = string;
var rep:Replay = Replay.LoadReplay(string); var rep:Replay = Replay.LoadReplay(string);
controlsStrings[i] = string.split("time")[0] + " " + (rep.replay.songDiff == 2 ? "HARD" : rep.replay.songDiff == 1 ? "EASY" : "NORMAL"); controlsStrings[i] = string.split("time")[0] + " " + CoolUtil.difficultyFromInt(rep.replay.songDiff).toUpperCase();
} }
if (controlsStrings.length == 0) if (controlsStrings.length == 0)

2
source/PauseSubState.hx
View File

@ -52,7 +52,7 @@ class PauseSubState extends MusicBeatSubstate
add(levelInfo); add(levelInfo);
var levelDifficulty:FlxText = new FlxText(20, 15 + 32, 0, "", 32); var levelDifficulty:FlxText = new FlxText(20, 15 + 32, 0, "", 32);
levelDifficulty.text += CoolUtil.difficultyString(); levelDifficulty.text += CoolUtil.difficultyFromInt(PlayState.storyDifficulty).toUpperCase();
levelDifficulty.scrollFactor.set(); levelDifficulty.scrollFactor.set();
levelDifficulty.setFormat(Paths.font('vcr.ttf'), 32); levelDifficulty.setFormat(Paths.font('vcr.ttf'), 32);
levelDifficulty.updateHitbox(); levelDifficulty.updateHitbox();

12
source/PlayState.hx
View File

@ -255,15 +255,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;
@ -965,7 +957,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);