add attack requiring air FD info

super-continent · Nov 29, 2024 · 589aaf8 · 589aaf8
1 parent 0ec6d8e
commit 589aaf8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/WEBSOCKETS_INFO.md b/WEBSOCKETS_INFO.md
@@ -175,6 +175,7 @@ hit_type: HitType,
 was_blocked: bool,
 attack_level: usize,
 attack_guard_type: GuardType,
+attack_needs_air_fd: bool,
 damage: usize,
 attacker: ObjectId,
 attacker_state: String,

diff --git a/src/game/offset.rs b/src/game/offset.rs
@@ -146,6 +146,7 @@ offset_struct! {
         x_position @ 0x24C: i32,
         y_position @ 0x250: i32,
         attack_level @ 0x450: u32,
+        attack_info_bitfield @ 0x458: u32,
         attack_guard_type @ 0x57C: GuardType,
         recieved_hit_type @ 0x990: u32,
         health @ 0x9CC: i32,

diff --git a/src/websockets.rs b/src/websockets.rs
@@ -196,6 +196,7 @@ pub struct HitInfo {
     was_blocked: bool,
     attack_level: u32,
     attack_guard_type: GuardType,
+    attack_needs_air_fd: bool,
     damage: i32,
     attacker: ObjectId,
     attacker_state: String,
@@ -643,6 +644,7 @@ pub unsafe fn game_loop_hook_websockets() {
                 victim: hit_event.victim_id,
                 attack_level: attack_lvl,
                 attack_guard_type: attacker.attack_guard_type(),
+                attack_needs_air_fd: attacker.attack_info_bitfield() & 0x100000 != 0,
                 damage,
                 attacker: hit_event.attacker_id,
                 attacker_state,