minor changes

assets/mac_10.tscn

@@ -413,7 +413,7 @@ audio_empty = NodePath("Audio/Empty")
 audio_reload = NodePath("Audio/Reload")
 
 [node name="mac10" parent="." index="0"]
-transform = Transform3D(-1.81e-06, 0, -0.5, 0, 0.5, 0, 0.5, 0, -1.81e-06, 0, 0, 0)
+transform = Transform3D(-1.086e-06, 0, -0.3, 0, 0.3, 0, 0.3, 0, -1.086e-06, 0, 0, 0)
 
 [node name="SpotLight3D" type="SpotLight3D" parent="mac10" index="0"]
 transform = Transform3D(-6.79394e-06, 0, 1.87678, 0, 1.87678, 0, -1.87677, 0, -6.79392e-06, -1.63231, 0, 5.90892e-06)

assets/player.tscn

@@ -56,7 +56,7 @@ current = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0341401, -0.111267)
 
 [node name="WeaponSpawner" type="Node3D" parent="Head/Camera3D/WeaponHolder"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.45, -0.202, -0.951)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.220071, -0.199195, -0.580209)
 
 [node name="AmmoCounter" type="Label" parent="Head/Camera3D"]
 offset_right = 3840.0
@@ -83,7 +83,7 @@ padding_amount = 0.025
 
 [node name="GunRay" type="RayCast3D" parent="Head/Camera3D" groups=["gun_ray"]]
 transform = Transform3D(0.977933, 0, -0.208919, 0, 1, 7.45058e-09, 0.208919, 0, 0.977933, 0, -0.197421, -0.129669)
-target_position = Vector3(0, 0, -1)
+target_position = Vector3(0, 0, -1.2)
 
 [node name="AudioListener3D" type="AudioListener3D" parent="Head/Camera3D"]
 transform = Transform3D(1, 0, 0, 0, 0.992332, 0.123601, 0, -0.123601, 0.992332, 0, -0.921646, -0.000722691)

assets/revolver_1.tscn

@@ -461,7 +461,7 @@ audio_empty = NodePath("Audio/Empty")
 audio_reload = NodePath("Audio/Reload")
 
 [node name="revolver1" parent="." index="0"]
-transform = Transform3D(-1.629e-06, 0.45, 0, -0.45, -1.629e-06, 0, 0, 0, 0.45, 0, 0, -0.073)
+transform = Transform3D(-1.086e-06, 0.3, 0, -0.3, -1.086e-06, 0, 0, 0, 0.3, 0, 0, -0.073)
 
 [node name="Chamber" parent="revolver1" index="0"]
 transform = Transform3D(1.19222e-07, 3.61999e-06, 1, 1, -3.61999e-06, -1.19209e-07, 3.61999e-06, 1, -3.61999e-06, -0.0143475, 0, -0.0849619)

scenes/test_level_2v2.tscn

@@ -420,6 +420,7 @@ gun_2 = ExtResource("3_gjst3")
 
 [node name="Player" parent="." instance=ExtResource("2_f87c2")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.0295, 1.4435, 21.1166)
+WALK_SPEED = 6.0
 weapon_sway_amount = 0.07
 weapon_rotation_amount = 0.07
 

scripts/LevelManager.gd

@@ -2,6 +2,7 @@ extends Node3D
 
 
 @export var player : Node
+@export var money = 250
 @export var gun_1 : Resource
 @export var gun_2 : Resource
 var held_guns = []
@@ -9,7 +10,6 @@ var ammo_current = [0,0]
 var ammo_reserve = [0,0]
 var guns_dict = {}
 var current_gun_index
-var money = 0
 
 # Called when the node enters the scene tree for the first time.
 func _ready():

scripts/gun.gd

@@ -113,7 +113,7 @@ func shoot(player,delta):
 			instance_casing.position = casing_ejector.global_position
 			instance_casing.transform.basis = casing_ejector.global_transform.basis
 			get_tree().get_root().add_child(instance_casing)
-			player.weapon_recoil()
+			player.weapon_recoil(delta)
 			if fire_mode != 0:
 				cycle_count -= 1
 

scripts/player.gd

@@ -48,6 +48,7 @@ var recoiling_fade = 0
 var bullet_destination
 var gun_fire_pitch_starting
 var current_weapon_index
+var recoiling = false
 
 # Slow Down Variables
 const SLOWSPEED = .2
@@ -172,8 +173,8 @@ func _physics_process(delta):
 	# Gun folding out of the way
 	if gun_ray.is_colliding() and !gun_ray.get_collider().is_in_group("player"):
 		#check distance to wall later ?
-		gun.rotation = lerp(gun.rotation, Vector3(1, 1, -.25), delta * 10)
-		gun.position = lerp(gun.position, Vector3(gun.start_position.x-.25,gun.start_position.y +.2,gun.start_position.z +.6),(delta*10))
+		gun.rotation = lerp(gun.rotation, Vector3(1, -1, -.25), delta * 10)
+		gun.position = lerp(gun.position, Vector3(gun.start_position.x+.25,gun.start_position.y +.2,gun.start_position.z +.6),(delta*10))
 		gun_folded = true
 	elif !gun_ray.is_colliding():
 		gun.rotation = lerp(gun.rotation, gun.start_rotation,delta*7)
@@ -201,6 +202,7 @@ func _physics_process(delta):
 	if Input.is_action_just_pressed("escape"):
 		get_tree().quit()
 	
+	
 	move_and_slide()
 	weapon_tilt(input_dir.x, delta)
 	weapon_sway(delta)
@@ -290,6 +292,6 @@ func weapon_bob(vel : float, delta):
 			weapon_holder.position.y = lerp(weapon_holder.position.y, def_weapon_holder_pos.y, .1 * delta)
 			weapon_holder.position.x = lerp(weapon_holder.position.x, def_weapon_holder_pos.x, .1 * delta)
 
-func weapon_recoil():
+func weapon_recoil(delta):
 	var recoil_to = camera.rotation.x + gun.recoil_amount
 	camera.rotation.x = clamp(lerp(camera.rotation.x,recoil_to, .05), deg_to_rad(-90), deg_to_rad(60))

scripts/revolver_1.gd

@@ -155,7 +155,7 @@ func fire(delta):
 	instance_bullet.player = player
 	instance_bullet.instance_bullethole = bullethole.instantiate()
 	get_tree().get_root().add_child(instance_bullet)
-	player.weapon_recoil()
+	player.weapon_recoil(delta)
 	chamber.rotate_object_local(Vector3(0,-1,0),deg_to_rad(60))
 
 

scripts/vendingmahcine.gd

@@ -24,6 +24,7 @@ func interact():
 		if level_control.money >= item_price:
 			level_control.money -= item_price
 			anim_player.play("vend")
+			label_3d.text = "vending..."
 		else:
 			var original_text = label_3d.text
 			label_3d.text = "too poor"

vendingmahcine.tscn

@@ -170,7 +170,7 @@ transform = Transform3D(1, 0, 0, 0, 0.63628, 0.771458, 0, -0.771458, 0.63628, -0
 shadow_enabled = true
 
 [node name="Label3D" type="Label3D" parent="." index="12"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.684768, 2.06592, 1.22063)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.66743, 2.06592, 1.22063)
 modulate = Color(0.642333, 0.82, 0, 1)
 outline_modulate = Color(0, 0, 0, 0)
 text = "$250"