From db10037ff1b8454943d3e313268ab7cd69b917b1 Mon Sep 17 00:00:00 2001
From: derek <derek@scfilmvideo.com>
Date: Wed, 2 Oct 2024 16:22:28 -0500
Subject: [PATCH] finishing up and merging to main

---
 project.godot            |  2 +-
 scripts/AmmoCounter.gd   |  2 +-
 scripts/player.gd        |  2 +-
 scripts/weapon_recoil.gd | 11 +++++++++++
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 scripts/weapon_recoil.gd

diff --git a/project.godot b/project.godot
index 4f9264a..f21d6b1 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="First Person Test"
-run/main_scene="res://scenes/test_level_2v2.tscn"
+run/main_scene="res://scenes/test_level_2v2NOENEMIES.tscn"
 config/features=PackedStringArray("4.3", "Forward Plus")
 config/icon="res://icon.svg"
 
diff --git a/scripts/AmmoCounter.gd b/scripts/AmmoCounter.gd
index c819e19..acc8863 100644
--- a/scripts/AmmoCounter.gd
+++ b/scripts/AmmoCounter.gd
@@ -4,7 +4,7 @@ const ASPECT_RATIO_STD = .5625 #9/16 for standard ratio
 @export var padding_amount = .05 #multiplied by screen size
 @onready var level_control = get_tree().current_scene
 @onready var player = get_tree().current_scene.player
-@onready var gun_anim = $"../gun/GunAnims"
+
 var gun_index
 
 # Called when the node enters the scene tree for the first time.
diff --git a/scripts/player.gd b/scripts/player.gd
index dcfc716..3a91610 100644
--- a/scripts/player.gd
+++ b/scripts/player.gd
@@ -315,7 +315,7 @@ func weapon_tilt(input_x, delta):
 	if weapon_holder:
 		weapon_holder.rotation.z = lerp(weapon_holder.rotation.z, -input_x * weapon_rotation_amount * 10, 4 * delta)
 	if camera:
-		camera.rotation.z = lerp(camera.rotation.z, -input_x * .1, 5 * delta)
+		camera.rotation.z = lerp(camera.rotation.z, -input_x * .075, 5 * delta)
 
 func weapon_sway(delta):
 	mouse_input = lerp(mouse_input, Vector2.ZERO, 10 * delta)
diff --git a/scripts/weapon_recoil.gd b/scripts/weapon_recoil.gd
new file mode 100644
index 0000000..d4554c9
--- /dev/null
+++ b/scripts/weapon_recoil.gd
@@ -0,0 +1,11 @@
+extends Node3D
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta: float) -> void:
+	pass