mirror of
https://github.com/doukutsu-rs/doukutsu-rs
synced 2024-09-29 21:49:33 +00:00
Removed extra song from jukebox
This commit is contained in:
parent
c0efcbef71
commit
ad2beacf40
|
@ -66,7 +66,13 @@ impl Scene for JukeboxScene {
|
||||||
self.controller.add(state.settings.create_player1_controller());
|
self.controller.add(state.settings.create_player1_controller());
|
||||||
self.controller.add(state.settings.create_player2_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 =
|
let mut soundtrack_entries =
|
||||||
state.constants.soundtracks.iter().filter(|s| s.available).map(|s| s.name.to_owned()).collect_vec();
|
state.constants.soundtracks.iter().filter(|s| s.available).map(|s| s.name.to_owned()).collect_vec();
|
||||||
|
|
|
@ -120,7 +120,7 @@ impl Season {
|
||||||
Season::Halloween
|
Season::Halloween
|
||||||
} else if (now.month() == 12 && now.day() > 23) || (now.month() == 0 && now.day() < 7) {
|
} else if (now.month() == 12 && now.day() > 23) || (now.month() == 0 && now.day() < 7) {
|
||||||
Season::Christmas
|
Season::Christmas
|
||||||
} else if (now.month() == 4 && now.day() == 29) {
|
} else if now.month() == 4 && now.day() == 29 {
|
||||||
Season::PixelBirthday
|
Season::PixelBirthday
|
||||||
} else {
|
} else {
|
||||||
Season::None
|
Season::None
|
||||||
|
|
Loading…
Reference in a new issue