Improve scope animation while firing in ADS

timmybo5 · Sep 13, 2023 · 74dfb0d · 74dfb0d
1 parent 37de22b
commit 74dfb0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/code/swb_base/ViewModelBase.cs b/code/swb_base/ViewModelBase.cs
@@ -170,7 +170,7 @@ private void HandleWalkAnimation()
         else if (localVel.x < 0.0f)
             yaw = 3.0f * (localVel.x / maxWalkSpeed);
 
-        // Check if firing
+        // Check if ADS & firing
         if (weapon.IsZooming && weapon.TimeSincePrimaryAttack < 0.1f)
         {
             targetVectorRot -= new Vector3(0, 0, roll);

diff --git a/code/swb_base/ui/SniperScope.cs b/code/swb_base/ui/SniperScope.cs
@@ -45,6 +45,10 @@ public override void Tick()
         // Show when zooming
         Style.Opacity = !weapon.IsScoped ? 0 : 1;
 
+        // Check if ADS & firing
+        if (weapon.IsZooming && weapon.TimeSincePrimaryAttack < 0.1f)
+            return;
+
         // Movement impact
         var velocityJump = player.Velocity.z * 0.02f;
         var velocityMove = (Math.Abs(player.Velocity.y) + Math.Abs(player.Velocity.x)) * 0.005f;