ethanaobrien/ew
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew.git synced 2025-05-13 11:37:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly check full combo

Browse source
This commit is contained in:
Ethan O'Brien 2024-05-03 14:14:30 -05:00
parent 22ebd8056f
commit d6b87ac3ce
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/router/live.rs
View file

@ -310,7 +310,7 @@ fn get_live_mission_info(id: i64) -> JsonValue {
MISSION_REWARD_DATA[id.to_string()].clone() MISSION_REWARD_DATA[id.to_string()].clone()
} }
fn get_live_mission_completed_ids(user: &JsonValue, live_id: i64, score: i64, combo: i64, clear_count: i64, level: i64, full_combo: bool) -> Option<JsonValue> { fn get_live_mission_completed_ids(user: &JsonValue, live_id: i64, score: i64, combo: i64, clear_count: i64, level: i64) -> Option<JsonValue> {
let live_info = get_live_info(live_id); let live_info = get_live_info(live_id);
let mut out = array![]; let mut out = array![];
let combo_info = get_live_combo_info(live_info["masterMusicId"].as_i64()?); let combo_info = get_live_combo_info(live_info["masterMusicId"].as_i64()?);
@ -328,7 +328,7 @@ fn get_live_mission_completed_ids(user: &JsonValue, live_id: i64, score: i64, co
} }
}, },
3 => { 3 => {
if full_combo && data["level"].as_i64()? == level { if combo_info["valueList"][3].as_i64()? <= combo && data["level"].as_i64()? == level {
out.push(data["id"].as_i32()?).ok()?; out.push(data["id"].as_i32()?).ok()?;
} }
}, },
@ -383,8 +383,7 @@ pub fn end(req: HttpRequest, body: String) -> HttpResponse {
live_completed(body["master_live_id"].as_i64().unwrap(), body["level"].as_i32().unwrap(), false, body["live_score"]["score"].as_i64().unwrap(), user["user"]["id"].as_i64().unwrap()); live_completed(body["master_live_id"].as_i64().unwrap(), body["level"].as_i32().unwrap(), false, body["live_score"]["score"].as_i64().unwrap(), user["user"]["id"].as_i64().unwrap());
let is_full_combo = (body["live_score"]["good"].as_i32().unwrap() + body["live_score"]["bad"].as_i32().unwrap() + body["live_score"]["miss"].as_i32().unwrap()) == 0; let missions = get_live_mission_completed_ids(&user, body["master_live_id"].as_i64().unwrap(), body["live_score"]["score"].as_i64().unwrap(), body["live_score"]["max_combo"].as_i64().unwrap(), live["clear_count"].as_i64().unwrap(), body["level"].as_i64().unwrap()).unwrap_or(array![]);
let missions = get_live_mission_completed_ids(&user, body["master_live_id"].as_i64().unwrap(), body["live_score"]["score"].as_i64().unwrap(), body["live_score"]["max_combo"].as_i64().unwrap(), live["clear_count"].as_i64().unwrap(), body["level"].as_i64().unwrap(), is_full_combo).unwrap_or(array![]);
update_live_mission_data(&mut user, &object!{ update_live_mission_data(&mut user, &object!{
master_live_id: body["master_live_id"].as_i64().unwrap(), master_live_id: body["master_live_id"].as_i64().unwrap(),
@ -438,7 +437,7 @@ pub fn skip(req: HttpRequest, body: String) -> HttpResponse {
} }
}, false); }, false);
let missions = get_live_mission_completed_ids(&user, body["master_live_id"].as_i64().unwrap(), live["high_score"].as_i64().unwrap(), live["max_combo"].as_i64().unwrap(), live["clear_count"].as_i64().unwrap(), live["level"].as_i64().unwrap(), false).unwrap_or(array![]); let missions = get_live_mission_completed_ids(&user, body["master_live_id"].as_i64().unwrap(), live["high_score"].as_i64().unwrap(), live["max_combo"].as_i64().unwrap(), live["clear_count"].as_i64().unwrap(), live["level"].as_i64().unwrap()).unwrap_or(array![]);
update_live_mission_data(&mut user, &object!{ update_live_mission_data(&mut user, &object!{
master_live_id: body["master_live_id"].as_i64().unwrap(), master_live_id: body["master_live_id"].as_i64().unwrap(),