From d3d577a9c230b4131490c0fac63b504757f9d979 Mon Sep 17 00:00:00 2001
From: derek <derek@scfilmvideo.com>
Date: Mon, 21 Oct 2024 16:42:23 -0500
Subject: [PATCH] started working on bullets

---
 levels/blockout_3.tscn | 30 +++++++++++++++---------------
 project.godot          |  2 +-
 scripts/bullet.gd      |  2 +-
 scripts/player.gd      |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/levels/blockout_3.tscn b/levels/blockout_3.tscn
index b31869e..43c1b8e 100644
--- a/levels/blockout_3.tscn
+++ b/levels/blockout_3.tscn
@@ -286,21 +286,6 @@ data = PackedVector3Array(-2.375, 3.4025, 0.125, 2.375, 3.4025, 0.125, -2.375, -
 [sub_resource type="BoxMesh" id="BoxMesh_fd2rc"]
 size = Vector3(4.75, 6.805, 0.25)
 
-[sub_resource type="Animation" id="Animation_jmej3"]
-resource_name = "open"
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath(".:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Vector3(4.43091, 3.29403, -50.9568), Vector3(4.43091, 9.85387, -50.9568)]
-}
-
 [sub_resource type="Animation" id="Animation_w5uyq"]
 length = 0.001
 tracks/0/type = "value"
@@ -331,6 +316,21 @@ tracks/0/keys = {
 "values": [Vector3(4.43091, 9.85387, -50.9568), Vector3(4.43091, 3.29403, -50.9568)]
 }
 
+[sub_resource type="Animation" id="Animation_jmej3"]
+resource_name = "open"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector3(4.43091, 3.29403, -50.9568), Vector3(4.43091, 9.85387, -50.9568)]
+}
+
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_pobrj"]
 _data = {
 "RESET": SubResource("Animation_w5uyq"),
diff --git a/project.godot b/project.godot
index 90d4f1f..148b782 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="First Person Test"
-run/main_scene="res://levels/blockout_3.tscn"
+run/main_scene="res://assets/blockout_2.tscn"
 config/features=PackedStringArray("4.3", "Forward Plus")
 config/icon="res://icon.svg"
 
diff --git a/scripts/bullet.gd b/scripts/bullet.gd
index 43c96a0..f7c3eb4 100644
--- a/scripts/bullet.gd
+++ b/scripts/bullet.gd
@@ -39,7 +39,7 @@ func _ready():
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
+func _physics_process(delta):
 	position += transform.basis * Vector3(0, 0, -bullet_speed) * delta
 	rotation.x = clamp(rotation.x - delta * bullet_drop,deg_to_rad(-90),deg_to_rad(90))
 	
diff --git a/scripts/player.gd b/scripts/player.gd
index 1339392..4812c09 100644
--- a/scripts/player.gd
+++ b/scripts/player.gd
@@ -178,8 +178,8 @@ func _physics_process(delta):
 				velocity.x = lerp(velocity.x, direction.x * speed, delta * 6.5)
 		#movement in air
 		else:
-			velocity.x = lerp(velocity.x, direction.x * speed, delta * 3)
-			velocity.z = lerp(velocity.z, direction.z * speed, delta * 3)
+			velocity.x = lerp(velocity.x, direction.x * speed, delta * 6.5)
+			velocity.z = lerp(velocity.z, direction.z * speed, delta * 6.5)
 		
 		# Head bob
 		t_bob += delta * velocity.length() * float(is_on_floor())