This repository has been archived by the owner on Sep 16, 2024. It is now read-only.
compatibility changes for dadbattle + philly #789
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
'Dad Battle' is now called 'Dad Battle' in game and uses 'dadbattle' as files 'Philly' is now called 'Philly Nice' in game and uses 'philly' as files
|
@theDetourist here ya go |
puyoxyz
suggested changes
Jun 8, 2021
source/FreeplayState.hx
Outdated
| @@ -202,13 +202,24 @@ class FreeplayState extends MusicBeatState | |||
|
|
|||
| if (accepted) | |||
| { | |||
| trace(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase()); | |||
| // pre lowercasing the song name | |||
| var songLowercase = switch (songs[curSelected].songName) | |||
There was a problem hiding this comment.
This switch case is hella wack you're repeating code and changing like one argument
Do something like this instead
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
switch (songLowercase) {
case 'dad-battle': songLowercase = 'dadbattle';
case 'philly-nice': songLowercase = 'philly';
}
source/Paths.hx
Outdated
| @@ -97,14 +97,30 @@ class Paths | |||
|
|
|||
| inline static public function voices(song:String) | |||
| { | |||
| song = StringTools.replace(song," ", "-"); | |||
| return 'songs:assets/songs/${song.toLowerCase()}/Voices.$SOUND_EXT'; | |||
| var songLowercase = switch (song) | |||
source/Paths.hx
Outdated
| } | ||
|
|
||
| inline static public function inst(song:String) | ||
| { | ||
| song = StringTools.replace(song," ", "-"); | ||
| return 'songs:assets/songs/${song.toLowerCase()}/Inst.$SOUND_EXT'; | ||
| var songLowercase = switch (song) |
source/PlayState.hx
Outdated
| @@ -1368,9 +1389,20 @@ class PlayState extends MusicBeatState | |||
|
|
|||
| var playerCounter:Int = 0; | |||
|
|
|||
| // pre lowercasing the song name (generateSong) | |||
| var songLowercase = switch (PlayState.SONG.song) | |||
source/PlayState.hx
Outdated
|
|
||
| if (SONG.song.toLowerCase() == 'eggnog') | ||
| // pre lowercasing the song name (endSong) | ||
| var songLowercase = switch (PlayState.SONG.song) |
source/Song.hx
Outdated
| var rawJson = Assets.getText(Paths.json(StringTools.replace(folder," ", "-").toLowerCase() + '/' + StringTools.replace(jsonInput," ", "-").toLowerCase())).trim(); | ||
| trace(jsonInput); | ||
| // pre lowercasing the folder name | ||
| var folderLowercase = switch (folder) |
|
sure, changes comin' right up |
"This switch case is hella wack you're repeating code and changing like one argument"
|
ok... wierd things are happening. |
|
ah ok I broke Freeplay, nothing I can't fix |
|
it just crashes when going into freeplay now.. and I'm too tired to fix it now :/ |
highscore would be compatible if the package wasn't changed to KadeDev's own
|
it works now tested it completely |
puyoxyz
approved these changes
Jun 9, 2021
| switch (songHighscore) { | ||
| case 'Dad-Battle': songHighscore = 'Dadbattle'; | ||
| case 'Philly-Nice': songHighscore = 'Philly'; | ||
| } |
There was a problem hiding this comment.
there has to be a less janky way to do this but this whole codebase is wack so whatever
|
just checked and remembered
|
isakube
approved these changes
Jun 9, 2021
|
yeah because I noticed it right when I commited... heh |
ActualMandM
suggested changes
Jun 10, 2021
|
@kadedev ?????????????????? |
|
sorryy!!! |
|
yeah it's only hardcoded because it's for compatibility |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes:
'Dad Battle' is now called 'Dad Battle' in game and uses 'dadbattle' as files
'Philly' is now called 'Philly Nice' in game and uses 'philly' as files (reverted #760 and instead fixed it better)