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

Move world id into a constant value

Browse source
This commit is contained in:
Joshua Goins 2025-03-08 23:40:58 -05:00
parent 0c5c784d0f
commit b127d44ddf
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bin/kawari-frontier.rs
View file

@ -59,8 +59,8 @@ async fn get_headline() -> Json<Headline> {
date: "".to_string(), date: "".to_string(),
id: "".to_string(), id: "".to_string(),
tag: "".to_string(), tag: "".to_string(),
title: "Test News Item".to_string(), title: "You are connected to Kawari".to_string(),
url: "".to_string(), url: "https://github.com/redstrate/Kawari".to_string(),
}], }],
pinned: vec![], pinned: vec![],
topics: vec![], topics: vec![],

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

@ -138,6 +138,10 @@ async fn send_account_list(socket: &mut WriteHalf<TcpStream>, state: &State) {
send_packet(socket, &[response_packet], state).await; send_packet(socket, &[response_packet], state).await;
} }
// TODO: make this configurable
// See https://ffxiv.consolegameswiki.com/wiki/Servers for a list of possible IDs
const WORLD_ID: u16 = 63;
async fn send_lobby_info(socket: &mut WriteHalf<TcpStream>, state: &State, sequence: u64) { async fn send_lobby_info(socket: &mut WriteHalf<TcpStream>, state: &State, sequence: u64) {
let timestamp: u32 = SystemTime::now() let timestamp: u32 = SystemTime::now()
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
@ -150,7 +154,7 @@ async fn send_lobby_info(socket: &mut WriteHalf<TcpStream>, state: &State, seque
// send them the character list // send them the character list
{ {
let mut servers = [Server { let mut servers = [Server {
id: 21, id: WORLD_ID,
index: 0, index: 0,
flags: 0, flags: 0,
icon: 0, icon: 0,
@ -214,8 +218,8 @@ 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: 21, server_id: WORLD_ID,
server_id1: 21, server_id1: WORLD_ID,
unk1: [0; 16], unk1: [0; 16],
character_name: "test".to_string(), character_name: "test".to_string(),
character_server_name: "test".to_string(), character_server_name: "test".to_string(),
@ -249,7 +253,7 @@ async fn send_lobby_info(socket: &mut WriteHalf<TcpStream>, state: &State, seque
days_subscribed: 0, days_subscribed: 0,
remaining_days: 0, remaining_days: 0,
days_to_next_rank: 0, days_to_next_rank: 0,
max_characters_on_world: 20, max_characters_on_world: 0,
unk8: 8, unk8: 8,
entitled_expansion: 4, entitled_expansion: 4,
characters: characters_in_packet, characters: characters_in_packet,