Merge branch 'develop'

Author: scriptsengineer

abilities/crouch_ability_3d.gd

@@ -18,6 +18,7 @@ class_name CrouchAbility3D
 ## Collider height when crouch deactived
 @export var default_height := 2.0
 
+var crouch_factor : float
 
 ## Applies slow if crouch is enabled
 func get_speed_modifier() -> float:
@@ -33,4 +34,5 @@ func apply(velocity: Vector3, speed : float, is_on_floor : bool, direction : Vec
 	elif not head_check.is_colliding():
 		collision.shape.height += delta * 8
 	collision.shape.height = clamp(collision.shape.height , height_in_crouch, default_height)
+	crouch_factor = (default_height - height_in_crouch) - (collision.shape.height - height_in_crouch)/ (default_height - height_in_crouch)
 	return velocity

audios/audio_interact.gd

@@ -0,0 +1,18 @@
+extends Resource
+class_name AudioInteract
+
+## Resource that stores data by controller actions.
+
+## Jump Audio
+@export var jump_audio : AudioStream
+
+## Landed Audio
+@export var landed_audio : AudioStream
+
+## Step Audios
+@export var step_audios: Array[AudioStream]
+
+
+## Get random step audio from list
+func random_step() -> AudioStream:
+	return step_audios[randi() % step_audios.size()]

audios/character_audios.tscn

@@ -0,0 +1,95 @@
+extends Node3D
+class_name CharacterAudios3D
+
+## Script that plays sounds based on player actions.
+## Using an [AudioInteract] array synchronized with physic_materials array to 
+## identify different sound structures for each type of physical material.
+
+@onready var step_stream: AudioStreamPlayer3D = get_node(NodePath("Step"))
+@onready var land_stream: AudioStreamPlayer3D = get_node(NodePath("Land"))
+@onready var jump_stream: AudioStreamPlayer3D = get_node(NodePath("Jump"))
+@onready var crouch_stream: AudioStreamPlayer3D = get_node(NodePath("Crouch"))
+@onready var uncrouch_stream: AudioStreamPlayer3D = get_node(NodePath("Uncrouch"))
+@onready var raycast: RayCast3D = get_node(NodePath("Detect Ground"))
+@onready var character_body: CharacterBody3D = get_node(NodePath(".."))
+@onready var character_controller: CharacterController3D = get_node(NodePath(".."))
+
+## Default audio interact used
+@export var audio_interact : Resource
+
+## List of [PhysicsMaterial] synchronized with the [AudioInteract] list
+@export var physic_materials : Array[PhysicsMaterial]
+
+## List of [AudioInteract] synchronized with the [PhysicsMaterial] list
+@export var audio_interacts : Array[Resource]
+
+## Specific case of audio interact that occurs when we are in the water
+@export var water_audio_interact : Resource
+
+func _ready():
+	pass
+	character_controller.stepped.connect(_on_controller_stepped.bind())
+	character_controller.crouched.connect(_on_controller_crouched.bind())
+	character_controller.jumped.connect(_on_controller_jumped.bind())
+	character_controller.landed.connect(_on_controller_landed.bind())
+	character_controller.uncrouched.connect(_on_controller_uncrouched.bind())
+	character_controller.entered_the_water.connect(_on_controller_entered_the_water.bind())
+	character_controller.exit_the_water.connect(_on_controller_exit_the_water.bind())
+
+func _on_controller_jumped():
+	jump_stream.stream = audio_interact.jump_audio
+	jump_stream.play()
+	
+
+func _on_controller_landed():
+	_get_audio_interact()
+	land_stream.stream = audio_interact.landed_audio
+	land_stream.play()
+	
+
+func _on_controller_stepped():
+	var collision = raycast.get_collider()
+	_get_audio_interact_of_object(collision)
+	step_stream.stream = audio_interact.random_step()
+	step_stream.play()
+	
+	
+func _get_audio_interact():
+	var k_col = character_body.get_last_slide_collision()
+	if k_col != null:
+		var collision = k_col.get_collider(0)
+		_get_audio_interact_of_object(collision)
+	
+	
+func _get_audio_interact_of_object(collision):
+	if character_controller.is_on_water():
+		audio_interact = water_audio_interact
+		return
+	if !collision:
+		return
+	if not "physics_material_override" in collision:
+		return
+	var mat = collision.physics_material_override
+	if mat:
+		var i = physic_materials.rfind(mat)
+		if i != -1:
+			audio_interact = audio_interacts[i]
+
+
+func _on_controller_crouched():
+	crouch_stream.play()
+
+
+func _on_controller_uncrouched():
+	uncrouch_stream.play()
+
+
+func _on_controller_entered_the_water():
+	audio_interact = water_audio_interact
+	land_stream.stream = audio_interact.landed_audio
+	land_stream.play()
+
+
+func _on_controller_exit_the_water():
+	jump_stream.stream = audio_interact.jump_audio
+	jump_stream.play()

audios/character_audios_3d.gd

@@ -68,74 +68,74 @@ signal stopped_floating
 ## Controller Gravity Multiplier
 ## The higher the number, the faster the controller will fall to the ground and 
 ## your jump will be shorter.
-@export var gravity_multiplier := 3.0
+@export var gravity_multiplier : float = 3.0
 
 ## Controller base speed
 ## Note: this speed is used as a basis for abilities to multiply their 
 ## respective values, changing it will have consequences on [b]all abilities[/b]
 ## that use velocity.
-@export var speed := 10
+@export var speed : float = 10.0
 
 ## Time for the character to reach full speed
-@export var acceleration := 8
+@export var acceleration : float = 8.0
 
 ## Time for the character to stop walking
-@export var deceleration := 10
+@export var deceleration : float = 10.0
 
 ## Sets control in the air
-@export var air_control := 0.3
+@export var air_control : float = 0.3
 
 
 @export_group("Sprint")
 
 ## Speed to be multiplied when active the ability
-@export var sprint_speed_multiplier := 1.6
+@export var sprint_speed_multiplier : float = 1.6
 
 
 @export_group("Footsteps")
 
 ## Maximum counter value to be computed one step
-@export var step_lengthen := 0.7
+@export var step_lengthen : float = 0.7
 
 ## Value to be added to compute a step, each frame that the character is walking this value 
 ## is added to a counter
-@export var step_interval := 6.0
+@export var step_interval : float = 6.0
 
 
 @export_group("Crouch")
 
 ## Collider height when crouch actived
-@export var height_in_crouch := 1.0
+@export var height_in_crouch : float = 1.0
 
 ## Speed multiplier when crouch is actived
-@export var crouch_speed_multiplier := 0.7
+@export var crouch_speed_multiplier : float = 0.7
 
 
 @export_group("Jump")
 
 ## Jump/Impulse height
-@export var jump_height := 10
+@export var jump_height : float = 10.0
 
 
 @export_group("Fly")
 
 ## Speed multiplier when fly mode is actived
-@export var fly_mode_speed_modifier := 2
+@export var fly_mode_speed_modifier : float = 2.0
 
 
 @export_group("Swim")
 
 ## Minimum height for [CharacterController3D] to be completely submerged in water.
-@export var submerged_height := 0.36
+@export var submerged_height : float = 0.36
 
 ## Minimum height for [CharacterController3D] to be float in water.
-@export var floating_height := 0.75
+@export var floating_height : float = 0.75
 
 ## Speed multiplier when floating water
-@export var on_water_speed_multiplier := 0.75
+@export var on_water_speed_multiplier : float = 0.75
 
 ## Speed multiplier when submerged water
-@export var submerged_speed_multiplier := 0.5
+@export var submerged_speed_multiplier : float = 0.5
 
 
 @export_group("Abilities")
@@ -155,7 +155,7 @@ var _step_cycle : float = 0
 var _next_step : float = 0
 
 ## Character controller horizontal speed.
-var _horizontal_velocity
+var _horizontal_velocity : Vector3
 
 ## Base transform node to direct player movement
 ## Used to differentiate fly mode/swim moves from regular character movement.
@@ -189,7 +189,7 @@ var _direction_base_node : Node3D
 @onready var swim_ability: SwimAbility3D = get_node(NodePath("Swim Ability 3D"))
 
 ## Stores normal speed
-@onready var _normal_speed: int = speed
+@onready var _normal_speed : float = speed
 
 ## True if in the last frame it was on the ground
 var _last_is_on_floor := false
@@ -220,7 +220,7 @@ func move(_delta: float, input_axis := Vector2.ZERO, input_jump := false, input_
 	jump_ability.set_active(input_jump and is_on_floor() and not head_check.is_colliding())
 	walk_ability.set_active(not is_fly_mode() and not swim_ability.is_floating())
 	crouch_ability.set_active(input_crouch and is_on_floor() and not is_floating() and not is_submerged() and not is_fly_mode())
-	sprint_ability.set_active(input_sprint and is_on_floor() and  input_axis.x >= 0.5 and !is_crouching() and not is_fly_mode() and not swim_ability.is_floating() and not swim_ability.is_submerged())
+	sprint_ability.set_active(input_sprint and is_on_floor() and  input_axis.y >= 0.5 and !is_crouching() and not is_fly_mode() and not swim_ability.is_floating() and not swim_ability.is_submerged())
 
 	var multiplier = 1.0
 	for ability in _abilities:
@@ -321,7 +321,7 @@ func _start_variables():
 
 func _check_landed():
 	if is_on_floor() and not _last_is_on_floor:
-		emit_signal("landed")
+		_on_landed()
 		_reset_step()
 	_last_is_on_floor = is_on_floor()
 
@@ -334,13 +334,13 @@ func _check_step(_delta):
 func _direction_input(input : Vector2, input_down : bool, input_up : bool, aim_node : Node3D) -> Vector3:
 	_direction = Vector3()
 	var aim = aim_node.get_global_transform().basis
-	if input.x >= 0.5:
+	if input.y >= 0.5:
 		_direction -= aim.z
-	if input.x <= -0.5:
-		_direction += aim.z
 	if input.y <= -0.5:
+		_direction += aim.z
+	if input.x <= -0.5:
 		_direction -= aim.x
-	if input.y >= 0.5:
+	if input.x >= 0.5:
 		_direction += aim.x
 	# NOTE: For free-flying and swimming movements
 	if is_fly_mode() or is_floating():
@@ -395,6 +395,10 @@ func _on_jumped():
 	emit_signal("jumped")
 
 
+func _on_landed():
+	emit_signal("landed")
+
+
 func _on_swim_ability_emerged():
 	emit_signal("emerged")
 

core/character_controller_3d.gd

@@ -55,7 +55,7 @@ var speed : float = 0
 var original_position : Vector3
 
 ## Store original rotation of head for headbob reference
-var original_rotation : Vector3
+var original_rotation : Quaternion
 
 ## Actual cycle x of step headbob
 var cycle_position_x: float = 0
@@ -69,7 +69,7 @@ var step_interval: float = 0
 
 func _ready():
 	original_position = head.position
-	original_rotation = head.rotation
+	original_rotation = head.quaternion
 
 
 ## Setup bob with bob base interval
@@ -96,10 +96,10 @@ func head_bob_process(horizontal_velocity:Vector3, input_axis:Vector2, is_sprint
 	if is_sprint:
 		input_axis *= 2
 	if rotation_to_move:
-		new_rotation += _head_bob_rotation(input_axis.x, input_axis.y, _delta)	
+		new_rotation += _head_bob_rotation(input_axis.y, input_axis.x, _delta)	
 
 	head.position = new_position
-	head.rotation = new_rotation
+	head.quaternion = new_rotation
 
 
 ## Apply headbob jump
@@ -114,9 +114,10 @@ func reset_cycles():
 	cycle_position_y = 0
 
 
-func _head_bob_rotation(x, z, _delta) -> Vector3:
-	var target_rotation = Vector3(x * angle_limit_for_rotation, 0.0, -z * angle_limit_for_rotation)
-	return lerp(head.rotation, target_rotation, speed_rotation * _delta)
+func _head_bob_rotation(x, z, _delta) -> Quaternion:
+	var target_rotation : Quaternion
+	target_rotation.from_euler(Vector3(x * angle_limit_for_rotation, 0.0, -z * angle_limit_for_rotation))
+	return lerp(head.quaternion, target_rotation, speed_rotation * _delta)
 
 
 func _do_head_bob(speed: float, delta: float) -> Vector3: