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

Initialize user deck in the proper request

Browse source
This commit is contained in:
Ethan O'Brien 2024-02-27 12:38:10 -06:00
parent 50c758195b
commit c787bec84e
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/router/lottery/mod.rs
View file

@ -75,7 +75,7 @@ fn get_random_cards(_count: i32) -> JsonValue {
let mut rv = array![]; let mut rv = array![];
for (_i, data) in random_master_ids.members().enumerate() { for (_i, data) in random_master_ids.members().enumerate() {
let to_push = object!{ let to_push = object!{
"id": format!("{}{}", data[0].to_string(), data[1].to_string()), "id": get_card_master_id(data[0].to_string(), data[1].to_string()),
"master_card_id": get_card_master_id(data[0].to_string(), data[1].to_string()), "master_card_id": get_card_master_id(data[0].to_string(), data[1].to_string()),
"master_lottery_item_id": data[0].clone(), "master_lottery_item_id": data[0].clone(),
"master_lottery_item_number": data[1].clone() "master_lottery_item_number": data[1].clone()
@ -102,7 +102,7 @@ pub fn lottery(req: HttpRequest, body: String) -> HttpResponse {
let item_id = (body["master_lottery_id"].to_string().parse::<i32>().unwrap() * 100) + 1; let item_id = (body["master_lottery_id"].to_string().parse::<i32>().unwrap() * 100) + 1;
//tutorial //tutorial
let new_card = object!{ let new_card = object!{
"id": 15500, "id": get_card_master_id(item_id.to_string(), String::from("1")),
"master_card_id": get_card_master_id(item_id.to_string(), String::from("1")), "master_card_id": get_card_master_id(item_id.to_string(), String::from("1")),
"master_lottery_item_id": item_id, "master_lottery_item_id": item_id,
"master_lottery_item_number": 1 "master_lottery_item_number": 1
@ -111,22 +111,18 @@ pub fn lottery(req: HttpRequest, body: String) -> HttpResponse {
} }
let mut new_cards = array![]; let mut new_cards = array![];
for (i, data) in cardstogive.members().enumerate() { for (_i, data) in cardstogive.members().enumerate() {
let to_push = object!{ let to_push = object!{
"id": data["id"].clone(), "id": data["id"].clone(),
"master_card_id": data["master_card_id"].clone(), "master_card_id": data["master_card_id"].clone(),
"exp": 0, "exp": 0,
"skill_exp":0, "skill_exp": 0,
"evolve":[], "evolve": [],
"created_date_time": global::timestamp() "created_date_time": global::timestamp()
}; };
user["card_list"].push(to_push.clone()).unwrap(); user["card_list"].push(to_push.clone()).unwrap();
new_cards.push(to_push).unwrap(); new_cards.push(to_push).unwrap();
if i < 9 {
user["deck_list"][0]["main_card_ids"][i] = data["id"].to_string().parse::<i32>().unwrap().into();
}
} }
user["deck_list"][0]["main_card_ids"][8] = cardstogive[9]["id"].to_string().parse::<i32>().unwrap().into();
userdata::save_acc(key, user); userdata::save_acc(key, user);

25
src/router/user.rs
View file

@ -1,5 +1,5 @@
use json; use json;
use json::object; use json::{array, object};
use crate::router::global; use crate::router::global;
use crate::encryption; use crate::encryption;
use actix_web::{HttpResponse, HttpRequest, http::header::HeaderValue}; use actix_web::{HttpResponse, HttpRequest, http::header::HeaderValue};
@ -70,6 +70,29 @@ pub fn initialize(req: HttpRequest, body: String) -> HttpResponse {
user["user"]["master_title_ids"][0] = masterid.into(); user["user"]["master_title_ids"][0] = masterid.into();
// User is rewarded with all base cards in the team they chose. This makes up their new deck_list
//nijigasaki for now
let cardstoreward = array![30010001, 30020001, 30030001, 30050001, 30060001, 30070001, 30080001, 30090001, 30100001, 30110001];
let ur = user["card_list"][user["card_list"].len() - 1]["id"].clone();
//todo - does the user have the char already?
for (i, data) in cardstoreward.members().enumerate() {
let to_push = object!{
"id": data.clone(),
"master_card_id": data.clone(),
"exp": 0,
"skill_exp": 0,
"evolve": [],
"created_date_time": global::timestamp()
};
user["card_list"].push(to_push.clone()).unwrap();
if i < 10 {
user["deck_list"][0]["main_card_ids"][i] = data.clone();
}
}
user["deck_list"][0]["main_card_ids"][4] = ur;
userdata::save_acc(key, user.clone()); userdata::save_acc(key, user.clone());
let resp = object!{ let resp = object!{