- add: mouse cmd packet handling

- add: change map handler
- update: logout handler to send the reply packet
- update: character id list change from u8 to u32

packet-service/src/handlers/character.rs

@@ -23,7 +23,7 @@ use tonic::{Code, Status};
 use tracing::{debug, error, info, warn};
 use utils::null_string::NullTerminatedString;
 
-fn convert_slot(slot: i32) -> srv_char_list_reply::EquippedPosition {
+pub(crate) fn convert_slot(slot: i32) -> srv_char_list_reply::EquippedPosition {
     match enums::EquippedPosition::from_i32(slot) {
         Some(enums::EquippedPosition::Goggles) => srv_char_list_reply::EquippedPosition::Googles,
         Some(enums::EquippedPosition::Helmet) => srv_char_list_reply::EquippedPosition::Helmet,
@@ -53,12 +53,12 @@ pub(crate) async fn handle_char_list_req(stream: &mut TcpStream, packet: Packet,
     let mut character_client = character_client.lock().await;
     let character_list = character_client.get_character_list(&user_id.to_string()).await?;
     let mut characters = vec![];
-    let mut character_id_list: Vec<u8> = Vec::new();
+    let mut character_id_list: Vec<u32> = Vec::new();
     for character in character_list.characters {
         let mut item_list: [EquippedItem; (MAX_VISIBLE_ITEMS as usize)] = core::array::from_fn(|i| EquippedItem::default());
 
         for item in character.items {
-            if item.slot < 10 {
+            if item.slot < MAX_VISIBLE_ITEMS as i32 {
                 let slot = convert_slot(item.slot) as usize;
                 item_list[slot] = EquippedItem {
                     id: item.item_id as u16,
@@ -133,7 +133,7 @@ pub(crate) async fn handle_delete_char_req(stream: &mut TcpStream, packet: Packe
 
     let mut user_id = 0;
     let session_id;
-    let mut character_id_list: Vec<u8> = Vec::new();
+    let mut character_id_list: Vec<u32> = Vec::new();
 
     if let Some(mut state) = connection_service.get_connection(&connection_id) {
         user_id = state.user_id.expect("Missing user id in connection state");
@@ -165,7 +165,7 @@ pub(crate) async fn handle_select_char_req(stream: &mut TcpStream, packet: Packe
     debug!("{:?}", request);
 
     let mut user_id = 0;
-    let mut character_id_list: Vec<u8> = Vec::new();
+    let mut character_id_list: Vec<u32> = Vec::new();
     if let Some(mut state) = connection_service.get_connection_mut(&connection_id) {
         user_id = state.user_id.expect("Missing user id in connection state");
         character_id_list = state.character_list.clone().expect("Missing character id list");
@@ -182,7 +182,7 @@ pub(crate) async fn handle_select_char_req(stream: &mut TcpStream, packet: Packe
     send_packet(stream, &response_packet).await?;
 
     let mut character_client = character_client.lock().await;
-    let character_data = character_client.get_character(&user_id.to_string(), character_id_list[request.char_id as usize]).await?;
+    let character_data = character_client.get_character(&user_id.to_string(), character_id_list[request.char_id as usize] as u8).await?;
 
     let character = character_data.character.unwrap_or_default();