diff --git a/src/router/items.rs b/src/router/items.rs index 66e7f61..85af59c 100644 --- a/src/router/items.rs +++ b/src/router/items.rs @@ -24,6 +24,18 @@ pub fn remove_gems(user: &mut JsonValue, amount: i64) { user["gem"]["total"] = (free + paid).into(); } +pub fn remove_paid_gems(user: &mut JsonValue, amount: i64) { + let free = user["gem"]["free"].as_i64().unwrap(); + let mut paid = user["gem"]["charge"].as_i64().unwrap(); + + paid -= amount; + if paid < 0 { + paid = 0; + } + user["gem"]["charge"] = paid.into(); + user["gem"]["total"] = (free + paid).into(); +} + pub fn get_region(headers: &HeaderMap) -> bool { let blank_header = HeaderValue::from_static(""); let asset_version = headers.get("aoharu-asset-version").unwrap_or(&blank_header).to_str().unwrap_or(""); @@ -110,6 +122,8 @@ pub fn use_item(item: &JsonValue, multiplier: i64, user: &mut JsonValue) { // Is anything really ever free...? } else if item["consumeType"] == 1 { remove_gems(user, item["amount"].as_i64().unwrap()); + } else if item["consumeType"] == 2 { + remove_paid_gems(user, item["amount"].as_i64().unwrap()); } else if item["consumeType"] == 4 { use_itemm(item["value"].as_i64().unwrap(), item["amount"].as_i64().unwrap() * multiplier, user); } else { diff --git a/src/router/lottery.rs b/src/router/lottery.rs index c42419b..8ed67a3 100644 --- a/src/router/lottery.rs +++ b/src/router/lottery.rs @@ -118,12 +118,7 @@ pub fn lottery_post(req: HttpRequest, body: String) -> Option { consumeType: price["consumeType"].clone() }, 1, &mut user); - let mut count = price["count"].as_usize().unwrap(); - - // This is a temporary easter egg, not meant to stay - if lottery_id == 4110044 { - count = 30; - } + let count = price["count"].as_usize().unwrap(); let cardstogive = get_random_cards(lottery_id, count);