redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-04-23 23:57:46 +00:00
Code Activity

Add better names for origin/destination world fields

Browse source
This commit is contained in:
Joshua Goins 2025-03-09 10:39:46 -04:00
parent 2649985b32
commit 26e22843c5
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bin/kawari-lobby.rs
View file

@ -170,7 +170,7 @@ async fn send_lobby_info(socket: &mut WriteHalf<TcpStream>, state: &State, seque
.unwrap(); .unwrap();
let mut packets = Vec::new(); let mut packets = Vec::new();
// send them the character list // send them the server list
{ {
let mut servers = [Server { let mut servers = [Server {
id: WORLD_ID, id: WORLD_ID,
@ -292,12 +292,12 @@ async fn send_lobby_info(socket: &mut WriteHalf<TcpStream>, state: &State, seque
id: 0, id: 0,
content_id: 11111111111111111, content_id: 11111111111111111,
index: 0, index: 0,
server_id: WORLD_ID,
server_id1: WORLD_ID,
unk1: [0; 16], unk1: [0; 16],
origin_server_id: WORLD_ID,
current_server_id: WORLD_ID,
character_name: "test".to_string(), character_name: "test".to_string(),
character_server_name: WORLD_NAME.to_string(), origin_server_name: WORLD_NAME.to_string(),
character_server_name1: WORLD_NAME.to_string(), current_server_name: WORLD_NAME.to_string(),
character_detail_json: select_data.to_json(), character_detail_json: select_data.to_json(),
unk2: [0; 20], unk2: [0; 20],
}]; }];
@ -327,8 +327,8 @@ async fn send_lobby_info(socket: &mut WriteHalf<TcpStream>, state: &State, seque
days_subscribed: 5, days_subscribed: 5,
remaining_days: 5, remaining_days: 5,
days_to_next_rank: 0, days_to_next_rank: 0,
max_characters_on_world: 0,
unk8: 8, unk8: 8,
max_characters_on_world: 2,
entitled_expansion: 4, entitled_expansion: 4,
characters: characters_in_packet, characters: characters_in_packet,
} }

9
src/ipc.rs
View file

@ -59,9 +59,8 @@ pub struct CharacterDetails {
pub content_id: u64, pub content_id: u64,
#[brw(pad_after = 4)] #[brw(pad_after = 4)]
pub index: u32, pub index: u32,
// TODO: lol? why is there server_id1? pub origin_server_id: u16,
pub server_id: u16, pub current_server_id: u16,
pub server_id1: u16,
pub unk1: [u8; 16], pub unk1: [u8; 16],
#[bw(pad_size_to = 32)] #[bw(pad_size_to = 32)]
#[br(count = 32)] #[br(count = 32)]
@ -72,12 +71,12 @@ pub struct CharacterDetails {
#[br(count = 32)] #[br(count = 32)]
#[br(map = read_string)] #[br(map = read_string)]
#[bw(map = write_string)] #[bw(map = write_string)]
pub character_server_name: String, pub origin_server_name: String,
#[bw(pad_size_to = 32)] #[bw(pad_size_to = 32)]
#[br(count = 32)] #[br(count = 32)]
#[br(map = read_string)] #[br(map = read_string)]
#[bw(map = write_string)] #[bw(map = write_string)]
pub character_server_name1: String, pub current_server_name: String,
#[bw(pad_size_to = 1024)] #[bw(pad_size_to = 1024)]
#[br(count = 1024)] #[br(count = 1024)]
#[br(map = read_string)] #[br(map = read_string)]