redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-06-21 07:27:45 +00:00
Code Activity

Run cargo fmt

Browse source
This commit is contained in:
Joshua Goins 2025-06-19 16:01:16 -04:00
parent efdec9b4c5
commit 2dc3a899bb
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,8 +80,7 @@ async fn main() {
let Ok(login_reply) = reqwest::get(format!( let Ok(login_reply) = reqwest::get(format!(
"http://{}/_private/service_accounts?sid={}", "http://{}/_private/service_accounts?sid={}",
config.login.server_name, config.login.server_name, session_id
session_id
)) ))
.await .await
else { else {

4
src/ipc/zone/actor_control.rs
View file

@ -69,12 +69,12 @@ pub enum ActorControlCategory {
insufficient_gil: u32, insufficient_gil: u32,
aetheryte_id: u32, aetheryte_id: u32,
}, },
#[brw(magic=0x1Bu16)] #[brw(magic = 0x1Bu16)]
Flee { Flee {
#[brw(pad_before = 2)] // padding #[brw(pad_before = 2)] // padding
speed: u16, speed: u16,
}, },
#[brw(magic=0x386u16)] #[brw(magic = 0x386u16)]
SetFestival { SetFestival {
#[brw(pad_before = 2)] // padding #[brw(pad_before = 2)] // padding
festival1: u32, // Multiple festivals can be set at the same time. festival1: u32, // Multiple festivals can be set at the same time.

21
src/world/lua.rs
View file

@ -6,8 +6,8 @@ use crate::{
write_quantized_rotation, write_quantized_rotation,
}, },
ipc::zone::{ ipc::zone::{
ActionEffect, DamageElement, DamageKind, DamageType, EffectKind, EventScene, ActionEffect, ActorControlCategory, ActorControlSelf, DamageElement, DamageKind,
ServerZoneIpcData, ServerZoneIpcSegment, Warp, ActorControlSelf, ActorControlCategory DamageType, EffectKind, EventScene, ServerZoneIpcData, ServerZoneIpcSegment, Warp,
}, },
opcodes::ServerZoneIpcType, opcodes::ServerZoneIpcType,
packet::{PacketSegment, SegmentData, SegmentType}, packet::{PacketSegment, SegmentData, SegmentType},
@ -38,7 +38,13 @@ impl LuaPlayer {
self.queued_segments.push(segment); self.queued_segments.push(segment);
} }
fn create_segment_target(&mut self, op_code: ServerZoneIpcType, data: ServerZoneIpcData, source_actor: u32, target_actor: u32) { fn create_segment_target(
&mut self,
op_code: ServerZoneIpcType,
data: ServerZoneIpcData,
source_actor: u32,
target_actor: u32,
) {
let ipc = ServerZoneIpcSegment { let ipc = ServerZoneIpcSegment {
op_code, op_code,
timestamp: timestamp_secs(), timestamp: timestamp_secs(),
@ -55,7 +61,12 @@ impl LuaPlayer {
} }
fn create_segment_self(&mut self, op_code: ServerZoneIpcType, data: ServerZoneIpcData) { fn create_segment_self(&mut self, op_code: ServerZoneIpcType, data: ServerZoneIpcData) {
self.create_segment_target(op_code, data, self.player_data.actor_id, self.player_data.actor_id); self.create_segment_target(
op_code,
data,
self.player_data.actor_id,
self.player_data.actor_id,
);
} }
fn send_message(&mut self, message: &str) { fn send_message(&mut self, message: &str) {
@ -111,7 +122,7 @@ impl LuaPlayer {
festival1, festival1,
festival2, festival2,
festival3, festival3,
festival4 festival4,
}, },
}); });