diff --git a/src/bin/kawari-lobby.rs b/src/bin/kawari-lobby.rs index 5331f5f..a68d74f 100644 --- a/src/bin/kawari-lobby.rs +++ b/src/bin/kawari-lobby.rs @@ -170,7 +170,7 @@ async fn send_lobby_info(socket: &mut WriteHalf, state: &State, seque .unwrap(); let mut packets = Vec::new(); - // send them the character list + // send them the server list { let mut servers = [Server { id: WORLD_ID, @@ -292,12 +292,12 @@ async fn send_lobby_info(socket: &mut WriteHalf, state: &State, seque id: 0, content_id: 11111111111111111, index: 0, - server_id: WORLD_ID, - server_id1: WORLD_ID, unk1: [0; 16], + origin_server_id: WORLD_ID, + current_server_id: WORLD_ID, character_name: "test".to_string(), - character_server_name: WORLD_NAME.to_string(), - character_server_name1: WORLD_NAME.to_string(), + origin_server_name: WORLD_NAME.to_string(), + current_server_name: WORLD_NAME.to_string(), character_detail_json: select_data.to_json(), unk2: [0; 20], }]; @@ -327,8 +327,8 @@ async fn send_lobby_info(socket: &mut WriteHalf, state: &State, seque days_subscribed: 5, remaining_days: 5, days_to_next_rank: 0, - max_characters_on_world: 0, unk8: 8, + max_characters_on_world: 2, entitled_expansion: 4, characters: characters_in_packet, } diff --git a/src/ipc.rs b/src/ipc.rs index bad630f..fd2e563 100644 --- a/src/ipc.rs +++ b/src/ipc.rs @@ -59,9 +59,8 @@ pub struct CharacterDetails { pub content_id: u64, #[brw(pad_after = 4)] pub index: u32, - // TODO: lol? why is there server_id1? - pub server_id: u16, - pub server_id1: u16, + pub origin_server_id: u16, + pub current_server_id: u16, pub unk1: [u8; 16], #[bw(pad_size_to = 32)] #[br(count = 32)] @@ -72,12 +71,12 @@ pub struct CharacterDetails { #[br(count = 32)] #[br(map = read_string)] #[bw(map = write_string)] - pub character_server_name: String, + pub origin_server_name: String, #[bw(pad_size_to = 32)] #[br(count = 32)] #[br(map = read_string)] #[bw(map = write_string)] - pub character_server_name1: String, + pub current_server_name: String, #[bw(pad_size_to = 1024)] #[br(count = 1024)] #[br(map = read_string)]