From 0b1a67fc9c25178b6429c8ee70978ee29bc414f2 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 30 Mar 2025 09:35:53 -0400 Subject: [PATCH] Remove some hardcoded values in ActionResult --- src/bin/kawari-world.rs | 14 ++++---------- src/common/mod.rs | 2 +- src/world/lua.rs | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/bin/kawari-world.rs b/src/bin/kawari-world.rs index 8a181d1..70944fe 100644 --- a/src/bin/kawari-world.rs +++ b/src/bin/kawari-world.rs @@ -840,18 +840,12 @@ async fn main() { timestamp: timestamp_secs(), data: ServerZoneIpcData::ActionResult( ActionResult { - main_target: ObjectTypeId { - object_id: ObjectId(0x106ad804), - object_type: 0, - }, - target_id_again: ObjectTypeId { - object_id: ObjectId(0x106ad804), - object_type: 0, - }, - action_id: 31, + main_target: request.target, + target_id_again: request.target, + action_id: request.action_id, animation_lock_time: 0.6, rotation: connection.player_data.rotation, - action_animation_id: 31, + action_animation_id: request.action_id as u16, // assuming action id == animation id flag: 1, effect_count: effects_builder.effects.len() as u8, diff --git a/src/common/mod.rs b/src/common/mod.rs index 0d698be..1d78239 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -32,7 +32,7 @@ impl Default for ObjectId { // See https://github.com/aers/FFXIVClientStructs/blob/main/FFXIVClientStructs/FFXIV/Client/Game/Object/GameObject.cs#L158 #[binrw] #[brw(little)] -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct ObjectTypeId { pub object_id: ObjectId, #[brw(pad_after = 3)] diff --git a/src/world/lua.rs b/src/world/lua.rs index e7b3343..be9d343 100644 --- a/src/world/lua.rs +++ b/src/world/lua.rs @@ -1,4 +1,4 @@ -use mlua::{FromLua, Lua, MetaMethod, UserData, UserDataMethods, Value}; +use mlua::{FromLua, Lua, UserData, UserDataMethods, Value}; use crate::{ common::{ObjectId, ObjectTypeId, Position, timestamp_secs},