Raven/osirose-new
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 6 Releases Wiki Activity

- add: Character service now loads the data from the database and sends it in the character list packet

Browse Source 
- add: character id list to the connection state for tracking the real character database id's for when the client requests actions on the character
- fix: sql error when trying to create a character
This commit is contained in:
raven
2025-01-07 22:16:47 -05:00
parent cb6ee657f0
commit db868cc1ac
9 changed files with 117 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packet-service/src/connection_state.rs
View File

@@ -5,6 +5,7 @@ pub struct ConnectionState {
pub user_id: Option<i32>,
pub session_id: Option<String>,
pub character_id: Option<i8>,
pub character_list: Option<Vec<u8>>,
pub additional_data: HashMap<String, String>, // Flexible data storage
}
@@ -14,6 +15,7 @@ impl ConnectionState {
user_id: None,
session_id: None,
character_id: None,
character_list: None,
additional_data: HashMap::new(),
}
}

19
packet-service/src/enums.rs
View File

@@ -55,6 +55,25 @@ pub(crate) enum EquippedPosition {
Earing,
MaxEquipItems,
}
impl EquippedPosition {
pub(crate) fn from_i32(value: i32) -> Option<EquippedPosition> {
match value {
1 => Some(EquippedPosition::Goggles),
2 => Some(EquippedPosition::Helmet),
3 => Some(EquippedPosition::Armor),
4 => Some(EquippedPosition::Backpack),
5 => Some(EquippedPosition::Gauntlet),
6 => Some(EquippedPosition::Boots),
7 => Some(EquippedPosition::WeaponR),
8 => Some(EquippedPosition::WeaponL),
9 => Some(EquippedPosition::Necklace),
10 => Some(EquippedPosition::Ring),
11 => Some(EquippedPosition::Earing),
_ => None,
}
}
}
#[repr(u8)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]

44
packet-service/src/handlers/character.rs
View File

@@ -15,12 +15,27 @@ use tracing::{debug, error, info, warn};
use crate::auth_client::AuthClient;
use crate::character_client::CharacterClient;
use crate::connection_service::ConnectionService;
use crate::enums;
use crate::packets::cli_create_char_req::CliCreateCharReq;
use crate::packets::cli_delete_char_req::CliDeleteCharReq;
use crate::packets::cli_select_char_req::CliSelectCharReq;
use crate::packets::srv_create_char_reply::SrvCreateCharReply;
use crate::packets::srv_delete_char_reply::SrvDeleteCharReply;
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,
Some(enums::EquippedPosition::Armor) => srv_char_list_reply::EquippedPosition::Armor,
Some(enums::EquippedPosition::Backpack) => srv_char_list_reply::EquippedPosition::Backpack,
Some(enums::EquippedPosition::Gauntlet) => srv_char_list_reply::EquippedPosition::Gauntlet,
Some(enums::EquippedPosition::Boots) => srv_char_list_reply::EquippedPosition::Boots,
Some(enums::EquippedPosition::WeaponR) => srv_char_list_reply::EquippedPosition::WeaponR,
Some(enums::EquippedPosition::WeaponL) => srv_char_list_reply::EquippedPosition::WeaponL,
_ => srv_char_list_reply::EquippedPosition::MaxItems
}
}
pub(crate) async fn handle_char_list_req(stream: &mut TcpStream, packet: Packet, character_client: Arc<Mutex<CharacterClient>>, connection_service: Arc<ConnectionService>, connection_id: String) -> Result<(), Box<dyn Error + Send + Sync>> {
use crate::packets::srv_char_list_reply::*;
let request = CliCharListReq::decode(packet.payload.as_slice());
@@ -38,21 +53,22 @@ pub(crate) async fn handle_char_list_req(stream: &mut TcpStream, packet: Packet,
let character_list = character_client.get_character_list(&user_id.to_string()).await?;
debug!("{:?}", character_list.characters);
let mut characters = vec![];
let mut character_id_list:Vec<u8> = 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());
{
let mut index = 0;
let _ = character.items.iter().map(|item| {
item_list[index] = EquippedItem {
id: item.id as u16,
for item in character.items {
if item.slot < 10 {
let slot = convert_slot(item.slot) as usize;
item_list[slot] = EquippedItem {
id: item.item_id as u16,
gem_opt: item.gem_option as u16,
socket: item.socket as i8,
grade: item.grade as u8,
};
index = index + 1;
});
}
}
debug!("Item list is created as: {:?}", item_list);
let character_info = CharInfo {
name: NullTerminatedString(character.name),
@@ -65,9 +81,14 @@ pub(crate) async fn handle_char_list_req(stream: &mut TcpStream, packet: Packet,
hair: character.looks.unwrap().hair as u32,
items: item_list,
};
character_id_list.push(character.character_id.parse().unwrap());
characters.push(character_info);
}
if let Some(mut state) = connection_service.get_connection_mut(&connection_id) {
state.character_list = Some(character_id_list); // Save the real character id's for later as the client sends what is selected from 0 index. It does not use the real character idss
}
debug!("{:?}", characters);
let data = SrvCharListReply { characters };
let response_packet = Packet::new(PacketType::PakccCharListReply, &data)?;
@@ -114,13 +135,16 @@ 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();
if let Some(mut state) = connection_service.get_connection(&connection_id) {
user_id = state.user_id.expect("Missing user id in connection state");
session_id = state.session_id.expect("Missing session id in connection state");
character_id_list = state.character_list.expect("Missing character id list");
}
let mut character_client = character_client.lock().await;
let delete_response = character_client.delete_character(&user_id.to_string(), &request.char_id.to_string()).await?;
let delete_response = character_client.delete_character(&user_id.to_string(), &character_id_list[request.char_id as usize].to_string()).await?;
let character_name = request.name;
let data = SrvDeleteCharReply { remaining_time: delete_response.remaining_time as u32, name: character_name };
@@ -137,13 +161,15 @@ 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();
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");
state.character_id = Some(request.char_id as i8);
}
let mut character_client = character_client.lock().await;
let character_data = character_client.get_character(&user_id.to_string(), request.char_id).await?;
let character_data = character_client.get_character(&user_id.to_string(), character_id_list[request.char_id as usize]).await?;
let mut equipped_item_list: [EquippedItem; (MAX_VISIBLE_ITEMS as usize)] = core::array::from_fn(|i| EquippedItem::default());
let mut effect_list: [StatusEffect; (MAX_STATUS_EFFECTS as usize)] = core::array::from_fn(|i| StatusEffect::default());
let mut hotbar_list: [HotbarItem; (MAX_HOTBAR_ITEMS as usize)] = core::array::from_fn(|i| HotbarItem::default());