From 77a16e7baae1ab7203791b2616bc445d195e5040 Mon Sep 17 00:00:00 2001
From: Kenney <mail@kenney.nl>
Date: Mon, 16 Oct 2023 13:53:33 +0200
Subject: [PATCH] Progress

---
 objects/enemy.gd  | 8 +-------
 objects/player.gd | 2 +-
 scripts/audio.gd  | 4 ----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/objects/enemy.gd b/objects/enemy.gd
index 30ef97a..1350223 100644
--- a/objects/enemy.gd
+++ b/objects/enemy.gd
@@ -13,7 +13,6 @@ var destroyed := false
 
 # When ready, save the initial position
 
-
 func _ready():
 	target_position = position
 
@@ -26,10 +25,8 @@ func _process(delta):
 
 	position = target_position
 
-
 # Take damage from player
 
-
 func damage(amount):
 	Audio.play("sounds/enemy_hurt.ogg")
 
@@ -38,20 +35,16 @@ func damage(amount):
 	if health <= 0 and !destroyed:
 		destroy()
 
-
 # Destroy the enemy when out of health
 
-
 func destroy():
 	Audio.play("sounds/enemy_destroy.ogg")
 
 	destroyed = true
 	queue_free()
 
-
 # Shoot when timer hits 0
 
-
 func _on_timer_timeout():
 	raycast.force_raycast_update()
 
@@ -59,6 +52,7 @@ func _on_timer_timeout():
 		var collider = raycast.get_collider()
 
 		if collider.has_method("damage"):  # Raycast collides with player
+			
 			# Play muzzle flash animation(s)
 
 			muzzle_a.frame = 0
diff --git a/objects/player.gd b/objects/player.gd
index e31a307..7923aae 100644
--- a/objects/player.gd
+++ b/objects/player.gd
@@ -78,7 +78,7 @@ func _physics_process(delta):
 	camera.rotation.x = lerp_angle(camera.rotation.x, rotation_target.x, delta * 25)
 	rotation.y = lerp_angle(rotation.y, rotation_target.y, delta * 25)
 	
-	container.position = lerp(container.position, container_offset - (applied_velocity / 30), delta * 10)
+	container.position = lerp(container.position, container_offset - (basis.inverse() * applied_velocity / 30), delta * 10)
 	
 	# Movement sound
 	
diff --git a/scripts/audio.gd b/scripts/audio.gd
index a1a0d8d..ee64cfd 100644
--- a/scripts/audio.gd
+++ b/scripts/audio.gd
@@ -8,7 +8,6 @@ var bus = "master"
 var available = []  # The available players.
 var queue = []  # The queue of sounds to play.
 
-
 func _ready():
 	for i in num_players:
 		var p = AudioStreamPlayer.new()
@@ -20,16 +19,13 @@ func _ready():
 		p.finished.connect(_on_stream_finished.bind(p))
 		p.bus = bus
 
-
 func _on_stream_finished(stream):
 	available.append(stream)
 
-
 func play(sound_path):  # Path (or multiple, separated by commas)
 	var sounds = sound_path.split(",")
 	queue.append("res://" + sounds[randi() % sounds.size()].strip_edges())
 
-
 func _process(_delta):
 	if not queue.is_empty() and not available.is_empty():
 		available[0].stream = load(queue.pop_front())