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

Correct switched types logic

Browse source
This commit is contained in:
Ethan O'Brien 2024-05-02 21:47:59 -05:00
parent c1a8923f9a
commit 6903265ed5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/router/live.rs
View file

@ -306,7 +306,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(live_id: i64, score: i64, combo: i64, clear_count: i64, level: String, full_combo: bool) -> Option<JsonValue> { fn get_live_mission_completed_ids(live_id: i64, score: i64, combo: i64, clear_count: i64, level: i64, full_combo: bool) -> Option<JsonValue> {
let live_info = get_live_info(live_id); let live_info = get_live_info(live_id);
let mut rv = array![]; let mut rv = 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()?);
@ -319,12 +319,12 @@ fn get_live_mission_completed_ids(live_id: i64, score: i64, combo: i64, clear_co
} }
}, },
2 => { 2 => {
if full_combo && data["value"].to_string() == level { if combo_info["valueList"][data["value"].to_string().parse::<usize>().ok()?].as_i64()? <= combo {
rv.push(data["id"].as_i32()?).ok()?; rv.push(data["id"].as_i32()?).ok()?;
} }
}, },
3 => { 3 => {
if combo_info["valueList"][data["level"].as_usize()? - 1].as_i64()? <= combo { if full_combo && data["level"].as_i64()? == level {
rv.push(data["id"].as_i32()?).ok()?; rv.push(data["id"].as_i32()?).ok()?;
} }
}, },
@ -369,7 +369,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 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(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"].to_string(), is_full_combo).unwrap_or(array![]); let missions = get_live_mission_completed_ids(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(),
@ -423,7 +423,7 @@ pub fn skip(req: HttpRequest, body: String) -> HttpResponse {
} }
}, false); }, false);
let missions = get_live_mission_completed_ids(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"].to_string(), false).unwrap_or(array![]); let missions = get_live_mission_completed_ids(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![]);
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(),