From fc00ce0fb2db6937ad4e7a1503d69d571b66c063 Mon Sep 17 00:00:00 2001 From: derek Date: Wed, 6 Nov 2024 14:38:15 -0600 Subject: [PATCH] fixed the recoil jiggle --- assets/mac_10.tscn | 3 ++- assets/revolver_1.tscn | 5 ++--- scripts/recoil.gd | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/mac_10.tscn b/assets/mac_10.tscn index 9f16ea2..0df4663 100644 --- a/assets/mac_10.tscn +++ b/assets/mac_10.tscn @@ -404,7 +404,8 @@ _data = { [node name="mac10" node_paths=PackedStringArray("flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")] script = ExtResource("2_tskiy") gun_name = "Mac 10" -recoil_amount = Vector3(0.05, 0.05, 0.05) +fov_zoom_amt = 0.995 +recoil_amount = Vector3(0.02, 0.05, 0.05) max_ammo = 20 bullet_damage = 2 bullet_speed = 1500 diff --git a/assets/revolver_1.tscn b/assets/revolver_1.tscn index afec8c9..e11968a 100644 --- a/assets/revolver_1.tscn +++ b/assets/revolver_1.tscn @@ -1067,10 +1067,9 @@ _data = { [node name="revolver1" node_paths=PackedStringArray("chamber", "casing0", "casing1", "casing2", "casing3", "casing4", "casing5", "casing_spawn0", "casing_spawn1", "casing_spawn2", "casing_spawn3", "casing_spawn4", "casing_spawn5", "bullet0", "bullet1", "bullet2", "bullet3", "bullet4", "bullet5", "anim_player", "barrel_raycast", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_i5f84")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0718293, 0) script = ExtResource("2_7rsti") -gun_name = "Ye Ol' Revolver" +gun_name = ".44 Galore" fire_mode = 1 -fov_zoom_amt = 0.97 -recoil_amount = Vector3(0.5, 0.1, 0.1) +recoil_amount = Vector3(0.25, 0.1, 0.1) max_ammo = 6 bullet_damage = 5 bullet_force_mod = 10 diff --git a/scripts/recoil.gd b/scripts/recoil.gd index 3e6c13d..ca31805 100644 --- a/scripts/recoil.gd +++ b/scripts/recoil.gd @@ -5,7 +5,6 @@ var speed : float = 10 var current_rotation : Vector3 var target_rotation : Vector3 -var head_current_rotation : float var gun_recoil_target_rotation : float = 0 var gun_recoil @@ -24,11 +23,11 @@ func _process(delta: float) -> void: basis = Quaternion.from_euler(current_rotation) #Handle Gun Recoil - head_current_rotation = lerp(head_current_rotation, gun_recoil_target_rotation, delta * 10) - gun_recoil = lerp(head_current_rotation,gun_recoil_target_rotation, delta * snap_amount) + gun_recoil = lerp(0.0,gun_recoil_target_rotation, delta * 30) head.rotation.x = clamp(head.rotation.x + gun_recoil, deg_to_rad(-90), deg_to_rad(85)) gun_recoil_target_rotation -= gun_recoil + func add_recoil(recoil_amount,snap_change,speed_change) -> void: #set to provided snap/speed changes snap_amount = snap_change