From 356455ba29b3321ab8938604f8af248818a8cb3b Mon Sep 17 00:00:00 2001
From: derek <derek@scfilmvideo.com>
Date: Mon, 22 Jul 2024 17:04:04 -0500
Subject: [PATCH] quick tweaks

---
 scenes/test_level_2v2.tscn | 5 +++--
 scripts/bullet.gd          | 2 ++
 scripts/gun.gd             | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scenes/test_level_2v2.tscn b/scenes/test_level_2v2.tscn
index b732807..78318bf 100644
--- a/scenes/test_level_2v2.tscn
+++ b/scenes/test_level_2v2.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=52 format=3 uid="uid://dyop6vk3rgkkb"]
+[gd_scene load_steps=53 format=3 uid="uid://dyop6vk3rgkkb"]
 
 [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"]
 [ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"]
 [ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_6rjit"]
 [ext_resource type="PackedScene" uid="uid://drwae3loscbw7" path="res://assets/player.tscn" id="2_f87c2"]
+[ext_resource type="PackedScene" uid="uid://b5eclfg0cmmal" path="res://assets/revolver_1.tscn" id="3_sxsd3"]
 [ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="4_8nxyr"]
 [ext_resource type="PackedScene" uid="uid://dws2vwfxubqvb" path="res://assets/cannon.tscn" id="5_28rul"]
 [ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"]
@@ -422,10 +423,10 @@ player = NodePath("Player")
 money = 10
 health = 10
 gun_1 = ExtResource("2_6rjit")
+gun_2 = ExtResource("3_sxsd3")
 
 [node name="Player" parent="." instance=ExtResource("2_f87c2")]
 transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166)
-AUDIO = false
 weapon_sway_amount = 0.07
 weapon_rotation_amount = 0.07
 
diff --git a/scripts/bullet.gd b/scripts/bullet.gd
index 93b8d23..be2e950 100644
--- a/scripts/bullet.gd
+++ b/scripts/bullet.gd
@@ -8,6 +8,7 @@ var instance_bullethole
 var bullet_force_mod = 1.0
 var distance_from_player
 var player_position
+var player_velocity
 
 @onready var mesh = $gunbullet1
 @onready var ray = $RayCast3D
@@ -40,6 +41,7 @@ func _ready():
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
 	position += transform.basis * Vector3(0, 0, -bullet_speed) * delta
+	print(player_velocity)
 	rotation.x = clamp(rotation.x - delta * bullet_drop,deg_to_rad(-90),deg_to_rad(90))
 	
 	distance_from_player = abs(self.global_position - player_position)
diff --git a/scripts/gun.gd b/scripts/gun.gd
index 74de354..9ba0712 100644
--- a/scripts/gun.gd
+++ b/scripts/gun.gd
@@ -100,6 +100,7 @@ func shoot(delta):
 			else:
 				instance_bullet.transform.basis = barrel_raycast.global_transform.basis	
 			instance_bullet.bullet_speed = bullet_speed
+			instance_bullet.player_velocity = player.velocity.length()
 			instance_bullet.bullet_drop = bullet_drop
 			instance_bullet.random_spread_amt = random_spread_amt
 			instance_bullet.bullet_damage = bullet_damage