ethanaobrien/ew
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: ethanaobrien:38d395d9a6a70064050ce54fa56867d20d6e7793
Branches Tags
ethanaobrien:main
..
compare: ethanaobrien:d4a43d9ef24b846b18475300305e129a5050ac8c
Branches Tags
ethanaobrien:main

No commits in common. "38d395d9a6a70064050ce54fa56867d20d6e7793" and "d4a43d9ef24b846b18475300305e129a5050ac8c" have entirely different histories.
38d395d9a6 ... d4a43d9ef2

1 changed files with 4 additions and 9 deletions
Show stats Expand all files Collapse all files

13
src/router/event.rs
View file

@ -14,11 +14,6 @@ fn get_event_data(key: &str, event_id: u32) -> JsonValue {
let is_star_event = STAR_EVENT_IDS.contains(&event_id); let is_star_event = STAR_EVENT_IDS.contains(&event_id);
//println!("is_star_event: {}, {}", is_star_event, event_id); //println!("is_star_event: {}, {}", is_star_event, event_id);
// Broken event data.. Should no longer be possible.
if is_star_event && event[event_id.to_string()]["star_event"]["star_music_list"].len() > 5 {
event.remove(&event_id.to_string());
}
if event[event_id.to_string()].is_empty() { if event[event_id.to_string()].is_empty() {
event[event_id.to_string()] = json::parse(&include_file!("src/router/userdata/new_user_event.json")).unwrap(); event[event_id.to_string()] = json::parse(&include_file!("src/router/userdata/new_user_event.json")).unwrap();
if is_star_event { if is_star_event {
@ -64,15 +59,15 @@ fn switch_music(event: &mut JsonValue, index: i32) {
return; return;
} }
let mut i: i32 = -1; let mut i = 0;
for (j, live) in event["star_event"]["star_music_list"].members().enumerate() { for (j, live) in event["star_event"]["star_music_list"].members().enumerate() {
if live["position"] == index { if live["position"] == index {
i = j as i32; i = j;
break; break;
} }
} }
if i >= 0 { if i != 0 {
event["star_event"]["star_music_list"].array_remove(i as usize); event["star_event"]["star_music_list"].array_remove(i);
} }
let random_song = get_random_song(); let random_song = get_random_song();