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

clean up code a bit

Browse Source
This commit is contained in:
Lucky56
2021-06-11 13:18:33 +02:00
parent 17db8031c5
commit e664da2e36
3 changed files with 43 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/FreeplayState.hx
View File

@ -202,27 +202,20 @@ class FreeplayState extends MusicBeatState
if (accepted) if (accepted)
{ {
// pre lowercasing the song name (update) // adjusting the song name to be compatible
var songLowercase = StringTools.replace(songs[curSelected].songName, " ", "-").toLowerCase(); var songFormat = StringTools.replace(songs[curSelected].songName, " ", "-");
switch (songLowercase) { switch (songFormat) {
case 'dad-battle': songLowercase = 'dadbattle'; case 'Dad-Battle': songFormat = 'Dadbattle';
case 'philly-nice': songLowercase = 'philly'; case 'Philly-Nice': songFormat = 'Philly';
}
// adjusting the highscore song name to be compatible (update)
// would read original scores if we didn't change packages
var songHighscore = StringTools.replace(songs[curSelected].songName, " ", "-");
switch (songHighscore) {
case 'Dad-Battle': songHighscore = 'Dadbattle';
case 'Philly-Nice': songHighscore = 'Philly';
} }
trace(songLowercase); trace(songs[curSelected].songName);
var poop:String = Highscore.formatSong(songHighscore, curDifficulty); var poop:String = Highscore.formatSong(songFormat, curDifficulty);
trace(poop); trace(poop);
PlayState.SONG = Song.loadFromJson(poop, songLowercase); PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName);
PlayState.isStoryMode = false; PlayState.isStoryMode = false;
PlayState.storyDifficulty = curDifficulty; PlayState.storyDifficulty = curDifficulty;
PlayState.storyWeek = songs[curSelected].week; PlayState.storyWeek = songs[curSelected].week;

64
source/PlayState.hx
View File

@ -309,7 +309,7 @@ class PlayState extends MusicBeatState
persistentDraw = true; persistentDraw = true;
if (SONG == null) if (SONG == null)
SONG = Song.loadFromJson('tutorial'); SONG = Song.loadFromJson('tutorial', 'tutorial');
Conductor.mapBPMChanges(SONG); Conductor.mapBPMChanges(SONG);
Conductor.changeBPM(SONG.bpm); Conductor.changeBPM(SONG.bpm);
@ -345,9 +345,8 @@ class PlayState extends MusicBeatState
} }
//defaults if no stage was found in chart //defaults if no stage was found in chart
var stageCheck:String = 'stage'; var stageCheck:String = 'stage';
//i should check if its stage (but this is when none is found in chart anyway)
if (SONG.stage == null) { if (SONG.stage == null) {
switch(storyWeek) switch(storyWeek)
{ {
@ -356,6 +355,7 @@ class PlayState extends MusicBeatState
case 4: stageCheck = 'limo'; case 4: stageCheck = 'limo';
case 5: if (songLowercase == 'winter-horrorland') {stageCheck = 'mallEvil';} else {stageCheck = 'mall';} case 5: if (songLowercase == 'winter-horrorland') {stageCheck = 'mallEvil';} else {stageCheck = 'mall';}
case 6: if (songLowercase == 'thorns') {stageCheck = 'schoolEvil';} else {stageCheck = 'school';} case 6: if (songLowercase == 'thorns') {stageCheck = 'schoolEvil';} else {stageCheck = 'school';}
//i should check if its stage (but this is when none is found in chart anyway)
} }
} else {stageCheck = SONG.stage;} } else {stageCheck = SONG.stage;}
@ -1093,17 +1093,11 @@ class PlayState extends MusicBeatState
senpaiEvil.updateHitbox(); senpaiEvil.updateHitbox();
senpaiEvil.screenCenter(); senpaiEvil.screenCenter();
// pre lowercasing the song name (schoolIntro) if (PlayState.SONG.song.toLowerCase() == 'roses' || PlayState.SONG.song.toLowerCase() == 'thorns')
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
switch (songLowercase) {
case 'dad-battle': songLowercase = 'dadbattle';
case 'philly-nice': songLowercase = 'philly';
}
if (songLowercase == 'roses' || songLowercase == 'thorns')
{ {
remove(black); remove(black);
if (songLowercase == 'thorns') if (PlayState.SONG.song.toLowerCase() == 'thorns')
{ {
add(red); add(red);
} }
@ -1123,7 +1117,7 @@ class PlayState extends MusicBeatState
{ {
inCutscene = true; inCutscene = true;
if (songLowercase == 'thorns') if (PlayState.SONG.song.toLowerCase() == 'thorns')
{ {
add(senpaiEvil); add(senpaiEvil);
senpaiEvil.alpha = 0; senpaiEvil.alpha = 0;
@ -1396,14 +1390,15 @@ class PlayState extends MusicBeatState
var playerCounter:Int = 0; var playerCounter:Int = 0;
// pre lowercasing the song name (generateSong)
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
switch (songLowercase) {
case 'dad-battle': songLowercase = 'dadbattle';
case 'philly-nice': songLowercase = 'philly';
}
// Per song offset check // Per song offset check
#if windows #if windows
// pre lowercasing the song name (generateSong)
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
switch (songLowercase) {
case 'dad-battle': songLowercase = 'dadbattle';
case 'philly-nice': songLowercase = 'philly';
}
var songPath = 'assets/data/' + songLowercase + '/'; var songPath = 'assets/data/' + songLowercase + '/';
for(file in sys.FileSystem.readDirectory(songPath)) for(file in sys.FileSystem.readDirectory(songPath))
@ -2532,30 +2527,20 @@ class PlayState extends MusicBeatState
} }
else else
{ {
var difficulty:String = "";
// adjusting the song name to be compatible
var songFormat = StringTools.replace(PlayState.storyPlaylist[0], " ", "-");
switch (songFormat) {
case 'Dad-Battle': songFormat = 'Dadbattle';
case 'Philly-Nice': songFormat = 'Philly';
}
if (storyDifficulty == 0) var poop:String = Highscore.formatSong(songFormat, storyDifficulty);
difficulty = '-easy';
if (storyDifficulty == 2)
difficulty = '-hard';
trace('LOADING NEXT SONG'); trace('LOADING NEXT SONG');
// pre lowercasing the next story song name trace(poop);
var nextSongLowercase = StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase();
switch (nextSongLowercase) {
case 'dad-battle': nextSongLowercase = 'dadbattle';
case 'philly-nice': nextSongLowercase = 'philly';
}
trace(nextSongLowercase + difficulty);
// pre lowercasing the song name (endSong) if (PlayState.storyPlaylist[0].toLowerCase() == 'eggnog')
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
switch (songLowercase) {
case 'dad-battle': songLowercase = 'dadbattle';
case 'philly-nice': songLowercase = 'philly';
}
if (songLowercase == 'eggnog')
{ {
var blackShit:FlxSprite = new FlxSprite(-FlxG.width * FlxG.camera.zoom, var blackShit:FlxSprite = new FlxSprite(-FlxG.width * FlxG.camera.zoom,
-FlxG.height * FlxG.camera.zoom).makeGraphic(FlxG.width * 3, FlxG.height * 3, FlxColor.BLACK); -FlxG.height * FlxG.camera.zoom).makeGraphic(FlxG.width * 3, FlxG.height * 3, FlxColor.BLACK);
@ -2570,7 +2555,8 @@ class PlayState extends MusicBeatState
FlxTransitionableState.skipNextTransOut = true; FlxTransitionableState.skipNextTransOut = true;
prevCamFollow = camFollow; prevCamFollow = camFollow;
PlayState.SONG = Song.loadFromJson(nextSongLowercase + difficulty, PlayState.storyPlaylist[0]);
PlayState.SONG = Song.loadFromJson(poop, PlayState.storyPlaylist[0]);
FlxG.sound.music.stop(); FlxG.sound.music.stop();
LoadingState.loadAndSwitchState(new PlayState()); LoadingState.loadAndSwitchState(new PlayState());

20
source/StoryMenuState.hx
View File

@ -285,19 +285,19 @@ class StoryMenuState extends MusicBeatState
PlayState.isStoryMode = true; PlayState.isStoryMode = true;
selectedWeek = true; selectedWeek = true;
var diffic = "";
switch (curDifficulty)
{
case 0:
diffic = '-easy';
case 2:
diffic = '-hard';
}
PlayState.storyDifficulty = curDifficulty; PlayState.storyDifficulty = curDifficulty;
PlayState.SONG = Song.loadFromJson(StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase() + diffic, StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase()); // adjusting the song name to be compatible
var songFormat = StringTools.replace(PlayState.storyPlaylist[0], " ", "-");
switch (songFormat) {
case 'Dad-Battle': songFormat = 'Dadbattle';
case 'Philly-Nice': songFormat = 'Philly';
}
var poop:String = Highscore.formatSong(songFormat, curDifficulty);
PlayState.SONG = Song.loadFromJson(poop, PlayState.storyPlaylist[0]);
PlayState.storyWeek = curWeek; PlayState.storyWeek = curWeek;
PlayState.campaignScore = 0; PlayState.campaignScore = 0;
new FlxTimer().start(1, function(tmr:FlxTimer) new FlxTimer().start(1, function(tmr:FlxTimer)