diff --git a/gameserver/src/net/handlers/inventory.json b/gameserver/src/net/handlers/inventory.json index 1970d69..0a6d5c3 100644 --- a/gameserver/src/net/handlers/inventory.json +++ b/gameserver/src/net/handlers/inventory.json @@ -1,4 +1,5 @@ [ {"tid": 23002, "rank": 3, "exp": 0, "unique_id": 57, "promotion": 6, "level": 75, "base_avatar_id": 0, "is_protected": true}, - {"tid": 23015, "rank": 4, "exp": 0, "unique_id": 58, "promotion": 6, "level": 80, "base_avatar_id": 0, "is_protected": true} + {"tid": 23015, "rank": 4, "exp": 0, "unique_id": 58, "promotion": 6, "level": 80, "base_avatar_id": 0, "is_protected": true}, + {"tid": 23015, "rank": 4, "exp": 0, "unique_id": 59, "promotion": 6, "level": 79, "base_avatar_id": 0, "is_protected": true} ] diff --git a/gameserver/src/net/handlers/inventory.rs b/gameserver/src/net/handlers/inventory.rs index 4aff84b..a3175ca 100644 --- a/gameserver/src/net/handlers/inventory.rs +++ b/gameserver/src/net/handlers/inventory.rs @@ -15,14 +15,19 @@ pub async fn on_get_bag_cs_req(session: &PlayerSession, _: &GetBagCsReq) -> Resu // Extract ranks let r1: u32 = json_value[0]["rank"].as_i64().expect("Failed to get rank for Equipment1") as u32; let r2: u32 = json_value[1]["rank"].as_i64().expect("Failed to get rank for Equipment2") as u32; + let r3: u32 = json_value[2]["rank"].as_i64().expect("Failed to get rank for Equipment2") as u32; let t1: u32 = json_value[0]["tid"].as_i64().expect("Failed") as u32; let t2: u32 = json_value[1]["tid"].as_i64().expect("Failed") as u32; + let t3: u32 = json_value[2]["tid"].as_i64().expect("Failed") as u32; let l1: u32 = json_value[0]["level"].as_i64().expect("Failed") as u32; let l2: u32 = json_value[1]["level"].as_i64().expect("Failed") as u32; + let l3: u32 = json_value[2]["level"].as_i64().expect("Failed") as u32; let ip1: u32 = json_value[0]["is_protected"].as_i64().expect("Failed") as u32; let ip2: u32 = json_value[1]["is_protected"].as_i64().expect("Failed") as u32; + let ip3: u32 = json_value[2]["is_protected"].as_i64().expect("Failed") as u32; let p1: u32 = json_value[0]["promotion"].as_i64().expect("Failed") as u32; let p2: u32 = json_value[1]["promotion"].as_i64().expect("Failed") as u32; + let p3: u32 = json_value[2]["promotion"].as_i64().expect("Failed") as u32; //let e_rank3: u32 = json_value[2]["rank"].as_i64().expect("Failed to get rank for Equipment3") as u32; session .send( @@ -35,7 +40,7 @@ pub async fn on_get_bag_cs_req(session: &PlayerSession, _: &GetBagCsReq) -> Resu equipment_list: vec![ Equipment {tid: t1, rank: r1, exp: 0, unique_id: 57, promotion: p1, level: l1, base_avatar_id: 0, is_protected: ip1, ..Default::default()}, Equipment {tid: t2, rank: r2, exp: 0, unique_id: 58, promotion: p2, level: l2, base_avatar_id: 0, is_protected: ip2, ..Default::default()}, - Equipment {tid: 23024, rank: 5, exp: 0, unique_id: 59, promotion: 6, level: 80, base_avatar_id: 0, is_protected: true, ..Default::default()}, + Equipment {tid: t3, rank: r3, exp: 0, unique_id: 59, promotion: p3, level: l3, base_avatar_id: 0, is_protected: ip3, ..Default::default()}, Equipment {tid: 23024, rank: 5, exp: 0, unique_id: 60, promotion: 6, level: 80, base_avatar_id: 0, is_protected: true, ..Default::default()}, Equipment {tid: 23024, rank: 5, exp: 0, unique_id: 61, promotion: 6, level: 80, base_avatar_id: 0, is_protected: true, ..Default::default()}, Equipment {tid: 23024, rank: 5, exp: 0, unique_id: 62, promotion: 6, level: 80, base_avatar_id: 0, is_protected: true, ..Default::default()},