From ceac1c6129a48b1bd31212e2cf240f540f38a7a2 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Thu, 17 Jun 2021 06:00:18 +0200 Subject: [PATCH 1/7] CoolUtil gets used more --- source/CoolUtil.hx | 6 +++--- source/FreeplayState.hx | 10 +--------- source/LoadReplayState.hx | 2 +- source/PauseSubState.hx | 2 +- source/PlayState.hx | 12 ++---------- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/source/CoolUtil.hx b/source/CoolUtil.hx index 92cc2c0..24dc749 100644 --- a/source/CoolUtil.hx +++ b/source/CoolUtil.hx @@ -6,11 +6,11 @@ using StringTools; class CoolUtil { - public static var difficultyArray:Array = ['EASY', "NORMAL", "HARD"]; + public static var difficultyArray:Array = ['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 diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 4fcc985..a46f108 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -244,15 +244,7 @@ class FreeplayState extends MusicBeatState intendedScore = Highscore.getScore(songHighscore, curDifficulty); #end - switch (curDifficulty) - { - case 0: - diffText.text = "EASY"; - case 1: - diffText.text = 'NORMAL'; - case 2: - diffText.text = "HARD"; - } + diffText.text = CoolUtil.difficultyFromInt(curDifficulty).toUpperCase(); } function changeSelection(change:Int = 0) diff --git a/source/LoadReplayState.hx b/source/LoadReplayState.hx index afcdfd4..8c3af52 100644 --- a/source/LoadReplayState.hx +++ b/source/LoadReplayState.hx @@ -54,7 +54,7 @@ class LoadReplayState extends MusicBeatState var string:String = controlsStrings[i]; actualNames[i] = 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) diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx index ab9b1a2..ee72f18 100644 --- a/source/PauseSubState.hx +++ b/source/PauseSubState.hx @@ -52,7 +52,7 @@ class PauseSubState extends MusicBeatSubstate add(levelInfo); 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.setFormat(Paths.font('vcr.ttf'), 32); levelDifficulty.updateHitbox(); diff --git a/source/PlayState.hx b/source/PlayState.hx index 2562965..3b500ac 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -255,15 +255,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; @@ -965,7 +957,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); From f2dd0339f41bbec997b7445c221c9c39e464e77d Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Thu, 17 Jun 2021 14:37:49 +0200 Subject: [PATCH 2/7] remove ugly pixels on week 6 --- assets/preload/images/storymenu/week6.png | Bin 6998 -> 8345 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/preload/images/storymenu/week6.png b/assets/preload/images/storymenu/week6.png index 8a45fb52e0fc17b780ba8438b43817c552f05970..fca67f0212a8cb3b13815bf6545f092733835c90 100644 GIT binary patch literal 8345 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 Date: Thu, 17 Jun 2021 18:08:52 +0200 Subject: [PATCH 3/7] songName on SongPosBar is now relative to how long the song name is --- source/PlayState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 3b500ac..44f6b8a 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -933,7 +933,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 (FlxG.save.data.downscroll) songName.y -= 3; songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); @@ -1346,7 +1346,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 (FlxG.save.data.downscroll) songName.y -= 3; songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); From 6d94b65b67c72a6eec030f1096408f3bde50d5f3 Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:53:51 +0200 Subject: [PATCH 4/7] fix little thing --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 44f6b8a..7a6a460 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -933,7 +933,7 @@ class PlayState extends MusicBeatState songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); add(songPosBar); - var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - (SONG.song.length * 5)),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 (FlxG.save.data.downscroll) songName.y -= 3; songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); From 859530f5f427471b0cb8273ff6a8c7fcd5b06364 Mon Sep 17 00:00:00 2001 From: ACardboardBox <81185552+ACardboardBox1@users.noreply.github.com> Date: Fri, 18 Jun 2021 16:34:19 -0400 Subject: [PATCH 5/7] Update MainMenuState.hx --- source/MainMenuState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 2815cfd..3972147 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -165,7 +165,7 @@ class MainMenuState extends MusicBeatState { if (optionShit[curSelected] == 'donate') { - fancyOpenURL("https://www.kickstarter.com/projects/funkin/friday-night-funkin-the-full-ass-game"); + fancyOpenURL("https://ninja-muffin24.itch.io/funkin"); } else { From fc5f5f6218c7091ccab837aa92f0916f9e1cf9d2 Mon Sep 17 00:00:00 2001 From: Sector03 <61670787+Sector03@users.noreply.github.com> Date: Sun, 20 Jun 2021 02:08:57 -0400 Subject: [PATCH 6/7] result screen loop fix if result screen was turned off and played under freeplay it would load up the playstate again instead of sending the player directly back to the freeplay menu --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 538a67a..29227ed 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2697,7 +2697,7 @@ class PlayState extends MusicBeatState if (FlxG.save.data.scoreScreen) openSubState(new ResultsScreen()); else - FlxG.switchState(new PlayState()); + FlxG.switchState(new FreeplayState()); } } } From 1d73a920d0866a3a584983745010a78635f38dcf Mon Sep 17 00:00:00 2001 From: Lucky56 <55949451+Lucky-56@users.noreply.github.com> Date: Sun, 20 Jun 2021 09:39:12 +0200 Subject: [PATCH 7/7] little crucial fix --- source/ResultsScreen.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ResultsScreen.hx b/source/ResultsScreen.hx index 2c8e258..c2b3129 100644 --- a/source/ResultsScreen.hx +++ b/source/ResultsScreen.hx @@ -137,7 +137,7 @@ class ResultsScreen extends FlxSubState mean = HelperFunctions.truncateFloat(mean / PlayState.rep.replay.songNotes.length,2); - settingsText = new FlxText(20,FlxG.height + 50,0,'SF: ${PlayState.rep.replay.sf} | Ratio (SA/GA): ${Math.round(sicks)}:1 ${Math.round(goods)}:1 | Mean: ${mean}ms | Played on ${PlayState.SONG.song} ${CoolUtil.difficultyString()}'); + settingsText = new FlxText(20,FlxG.height + 50,0,'SF: ${PlayState.rep.replay.sf} | Ratio (SA/GA): ${Math.round(sicks)}:1 ${Math.round(goods)}:1 | Mean: ${mean}ms | Played on ${PlayState.SONG.song} ${CoolUtil.difficultyFromInt(PlayState.storyDifficulty).toUpperCase()}'); settingsText.size = 16; settingsText.setBorderStyle(FlxTextBorderStyle.OUTLINE,FlxColor.BLACK,2,1); settingsText.color = FlxColor.WHITE;