From 2296eb86055eb43f298a42b44e774c4dd059bcd9 Mon Sep 17 00:00:00 2001 From: Derek Date: Sat, 3 Aug 2024 15:55:03 -0500 Subject: [PATCH] gun movement and swing tweaks --- assets/player.tscn | 1 + scripts/player.gd | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/assets/player.tscn b/assets/player.tscn index 60403fe..6ad90ac 100644 --- a/assets/player.tscn +++ b/assets/player.tscn @@ -40,6 +40,7 @@ dead_player = ExtResource("2_4hoys") SENSITIVITY = 0.008 BOB_AMP = 0.085 weapon_holder = NodePath("Head/Camera3D/WeaponHolder") +weapon_sway_amount = 0.5 [node name="MeshInstance3D" type="MeshInstance3D" parent="."] visible = false diff --git a/scripts/player.gd b/scripts/player.gd index 57ac52d..2bc083c 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -303,12 +303,12 @@ func _on_pick_up_magnet_body_entered(body): func weapon_tilt(input_x, delta): if weapon_holder: - weapon_holder.rotation.z = lerp(weapon_holder.rotation.z, -input_x * weapon_rotation_amount * 10, 10 * delta) + weapon_holder.rotation.z = lerp(weapon_holder.rotation.z, -input_x * weapon_rotation_amount * 10, 4 * delta) func weapon_sway(delta): mouse_input = lerp(mouse_input, Vector2.ZERO, 10 * delta) - weapon_holder.rotation.x = lerp(weapon_holder.rotation.x, mouse_input.y * weapon_rotation_amount, 5 * delta) - weapon_holder.rotation.y = lerp(weapon_holder.rotation.y, mouse_input.x * weapon_rotation_amount, 5 * delta) + weapon_holder.rotation.x = lerp(weapon_holder.rotation.x, mouse_input.y * weapon_sway_amount, 10 * delta) + weapon_holder.rotation.y = lerp(weapon_holder.rotation.y, mouse_input.x * weapon_sway_amount, 10 * delta) func weapon_bob(vel : float, delta): if weapon_holder: