From 9d78db008d76e4d2c754e180e2d1b333520f121d Mon Sep 17 00:00:00 2001
From: Sofia <sofia@teascade.net>
Date: Fri, 24 Jul 2026 20:17:47 +0300
Subject: [PATCH] Add some rotation to shooting animation

---
 rust/src/player/mod.rs    | 16 ++++++++++++++--
 rust/src/player/weapon.rs | 13 +++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/rust/src/player/mod.rs b/rust/src/player/mod.rs
index bc35527..49fac41 100644
--- a/rust/src/player/mod.rs
+++ b/rust/src/player/mod.rs
@@ -305,14 +305,19 @@ impl IPlayer for LocalPlayer {
         if let Some(mut weapon) = self.get_weapon()
             && let Some(camera_origin) = &self.camera_origin
         {
-            weapon.dyn_bind_mut().shoot(
+            if weapon.dyn_bind_mut().shoot(
                 rid,
                 self.player_id.unwrap_or(0),
                 camera_origin.get_global_position(),
                 to,
                 camera_origin.get_global_basis().col_b(),
                 deal_damage,
-            )
+            ) {
+                weapon.set_rotation(Vector3::RIGHT * 0.3);
+                true
+            } else {
+                false
+            }
         } else {
             false
         }
@@ -551,6 +556,13 @@ impl ICharacterBody3D for LocalPlayer {
             } else {
                 (0., 0.)
             };
+            let done_cd_percent =
+                1. - (weapon.dyn_bind().get_remaining_cd() / weapon.dyn_bind().get_max_cd());
+            let new_weapon_rot = weapon
+                .get_rotation()
+                .lerp(Vector3::ZERO, 0.03 * done_cd_percent as f32);
+            weapon.set_rotation(new_weapon_rot);
+
             let prev_weapon_pos = weapon.get_position();
             let new_y = prev_weapon_pos.y.lerp(target_y as f32, 0.2);
             let new_x = prev_weapon_pos.x.lerp(target_x as f32, 0.2);
diff --git a/rust/src/player/weapon.rs b/rust/src/player/weapon.rs
index 4ae8967..d597206 100644
--- a/rust/src/player/weapon.rs
+++ b/rust/src/player/weapon.rs
@@ -23,6 +23,7 @@ pub trait Weapon {
         deal_damage: bool,
     ) -> bool;
     fn get_type(&self) -> WeaponType;
+    fn get_max_cd(&self) -> f64;
     fn get_remaining_cd(&self) -> f64;
     fn set_remaining_cd(&mut self, cd: f64);
 }
@@ -130,6 +131,10 @@ impl Weapon for Raygun {
         WeaponType::Raygun
     }
 
+    fn get_max_cd(&self) -> f64 {
+        self.cooldown
+    }
+
     fn get_remaining_cd(&self) -> f64 {
         self.cooldown_remaining
     }
@@ -230,6 +235,10 @@ impl Weapon for Shotgun {
         WeaponType::Shotgun
     }
 
+    fn get_max_cd(&self) -> f64 {
+        self.cooldown
+    }
+
     fn get_remaining_cd(&self) -> f64 {
         self.cooldown_remaining
     }
@@ -299,6 +308,10 @@ impl Weapon for BallWeapon {
         WeaponType::Ball
     }
 
+    fn get_max_cd(&self) -> f64 {
+        0.
+    }
+
     fn get_remaining_cd(&self) -> f64 {
         0.
     }