phantop
/
doukutsu-rs
mirror of https://github.com/doukutsu-rs/doukutsu-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed extra song from jukebox

This commit is contained in:
dawnDus 2022-03-13 18:06:08 -04:00
parent c0efcbef71
commit ad2beacf40
No known key found for this signature in database
GPG Key ID: 972AABDE81848F21
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/scene/jukebox_scene.rs
View File

@ -66,7 +66,13 @@ impl Scene for JukeboxScene {
self.controller.add(state.settings.create_player1_controller());
self.controller.add(state.settings.create_player2_controller());
self.song_list = state.constants.music_table.iter().filter(|song| !song.contains("fanfale")).cloned().collect();
self.song_list = state
.constants
.music_table
.iter()
.filter(|song| !song.contains("fanfale") && !song.contains("ika"))
.cloned()
.collect();
let mut soundtrack_entries =
state.constants.soundtracks.iter().filter(|s| s.available).map(|s| s.name.to_owned()).collect_vec();

2
src/shared_game_state.rs
View File

@ -120,7 +120,7 @@ impl Season {
Season::Halloween
} else if (now.month() == 12 && now.day() > 23) || (now.month() == 0 && now.day() < 7) {
Season::Christmas
} else if (now.month() == 4 && now.day() == 29) {
} else if now.month() == 4 && now.day() == 29 {
Season::PixelBirthday
} else {
Season::None