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

cleaned up code

Browse Source 
"This switch case is hella wack you're repeating code and changing like one argument"
This commit is contained in:
Lucky56 2021-06-08 13:01:42 +02:00
parent 8ac6249e2b
commit e0620e8c12
No known key found for this signature in database
GPG Key ID: 19E3875EAD1F8B8F
4 changed files with 38 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/FreeplayState.hx
View File

@ -203,14 +203,10 @@ class FreeplayState extends MusicBeatState
if (accepted) if (accepted)
{ {
// pre lowercasing the song name // pre lowercasing the song name
var songLowercase = switch (songs[curSelected].songName) var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(songs[curSelected].songName," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice':
StringTools.replace(songs[curSelected].songName," Nice", "").toLowerCase();
default:
StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase();
} }
trace(songLowercase); trace(songLowercase);

24
source/Paths.hx
View File

@ -97,28 +97,20 @@ class Paths
inline static public function voices(song:String) inline static public function voices(song:String)
{ {
var songLowercase = switch (song) var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(song," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice':
StringTools.replace(song," Nice", "").toLowerCase();
default:
StringTools.replace(song," ", "-").toLowerCase();
} }
return 'songs:assets/songs/${songLowercase}/Voices.$SOUND_EXT'; return 'songs:assets/songs/${songLowercase}/Voices.$SOUND_EXT';
} }
inline static public function inst(song:String) inline static public function inst(song:String)
{ {
var songLowercase = switch (song) var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(song," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice':
StringTools.replace(song," Nice", "").toLowerCase();
default:
StringTools.replace(song," ", "-").toLowerCase();
} }
return 'songs:assets/songs/${songLowercase}/Inst.$SOUND_EXT'; return 'songs:assets/songs/${songLowercase}/Inst.$SOUND_EXT';
} }

62
source/PlayState.hx
View File

@ -237,14 +237,10 @@ class PlayState extends MusicBeatState
repReleases = 0; repReleases = 0;
// pre lowercasing the song name (create) // pre lowercasing the song name (create)
var songLowercase = switch (PlayState.SONG.song) var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice':
StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
default:
StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
} }
#if windows #if windows
@ -1083,14 +1079,10 @@ class PlayState extends MusicBeatState
senpaiEvil.screenCenter(); senpaiEvil.screenCenter();
// pre lowercasing the song name (schoolIntro) // pre lowercasing the song name (schoolIntro)
var songLowercase = switch (PlayState.SONG.song) var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice':
StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
default:
StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
} }
if (songLowercase == 'roses' || songLowercase == 'thorns') if (songLowercase == 'roses' || songLowercase == 'thorns')
{ {
@ -1390,14 +1382,10 @@ class PlayState extends MusicBeatState
var playerCounter:Int = 0; var playerCounter:Int = 0;
// pre lowercasing the song name (generateSong) // pre lowercasing the song name (generateSong)
var songLowercase = switch (PlayState.SONG.song) var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice':
StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
default:
StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
} }
// Per song offset check // Per song offset check
#if windows #if windows
@ -2531,26 +2519,18 @@ class PlayState extends MusicBeatState
trace('LOADING NEXT SONG'); trace('LOADING NEXT SONG');
// pre lowercasing the next story song name // pre lowercasing the next story song name
var nextSongLowercase = switch (PlayState.storyPlaylist[0]) var songLowercase = StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(PlayState.storyPlaylist[0]," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice': }
StringTools.replace(PlayState.storyPlaylist[0]," Nice", "").toLowerCase();
default:
StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase();
}
trace(nextSongLowercase + difficulty); trace(nextSongLowercase + difficulty);
// pre lowercasing the song name (endSong) // pre lowercasing the song name (endSong)
var songLowercase = switch (PlayState.SONG.song) var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
{ switch (songLowercase) {
case 'Dad Battle': case 'dad-battle': songLowercase = 'dadbattle';
StringTools.replace(PlayState.SONG.song," ", "").toLowerCase(); case 'philly-nice': songLowercase = 'philly';
case 'Philly Nice':
StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
default:
StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
} }
if (songLowercase == 'eggnog') if (songLowercase == 'eggnog')
{ {

14
source/Song.hx
View File

@ -48,15 +48,11 @@ class Song
{ {
trace(jsonInput); trace(jsonInput);
// pre lowercasing the folder name // pre lowercasing the folder name
var folderLowercase = switch (folder) var folderLowercase = StringTools.replace(folder, " ", "-").toLowerCase();
{ switch (folderLowercase) {
case 'Dad Battle': case 'dad-battle': folderLowercase = 'dadbattle';
StringTools.replace(folder," ", "").toLowerCase(); case 'philly-nice': folderLowercase = 'philly';
case 'Philly Nice': }
StringTools.replace(folder," Nice", "").toLowerCase();
default:
StringTools.replace(folder," ", "-").toLowerCase();
}
// pre lowercasing the jsonInput name // pre lowercasing the jsonInput name
var jsonInputLowercase = folderLowercase + StringTools.replace(jsonInput,folder.toLowerCase(), "").toLowerCase(); var jsonInputLowercase = folderLowercase + StringTools.replace(jsonInput,folder.toLowerCase(), "").toLowerCase();