1 Commits

Author SHA1 Message Date
cfe154e754 fix: sound tweaks
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 2m31s
2025-08-03 15:27:43 +02:00
9 changed files with 64 additions and 30 deletions

View File

@ -2,7 +2,7 @@ extends RigidBody2D
@onready var area_2d: Area2D = $Area2D @onready var area_2d: Area2D = $Area2D
@onready var kill_after: Timer = $KillAfter @onready var kill_after: Timer = $KillAfter
@onready var kill_audio: AudioStreamPlayer = $KillAudio @onready var kill_audio: AudioStreamPlayer2D = $KillAudio
@export var speed = 100 @export var speed = 100
@export var rotation_speed = 1 @export var rotation_speed = 1

View File

@ -51,8 +51,9 @@ wait_time = 3.0
one_shot = true one_shot = true
ignore_time_scale = true ignore_time_scale = true
[node name="KillAudio" type="AudioStreamPlayer" parent="."] [node name="KillAudio" type="AudioStreamPlayer2D" parent="."]
stream = SubResource("AudioStreamRandomizer_l8mgh") stream = SubResource("AudioStreamRandomizer_l8mgh")
max_distance = 100.0
bus = &"SFX" bus = &"SFX"
[connection signal="body_entered" from="." to="." method="_on_body_entered"] [connection signal="body_entered" from="." to="." method="_on_body_entered"]

View File

@ -5,35 +5,41 @@ bus/1/name = &"SFX"
bus/1/solo = false bus/1/solo = false
bus/1/mute = false bus/1/mute = false
bus/1/bypass_fx = false bus/1/bypass_fx = false
bus/1/volume_db = -11.952 bus/1/volume_db = -12.4611
bus/1/send = &"Master" bus/1/send = &"Master"
bus/2/name = &"Ambiance" bus/2/name = &"Ambiance"
bus/2/solo = false bus/2/solo = false
bus/2/mute = false bus/2/mute = false
bus/2/bypass_fx = false bus/2/bypass_fx = false
bus/2/volume_db = -7.26851 bus/2/volume_db = -16.4004
bus/2/send = &"Master" bus/2/send = &"Master"
bus/3/name = &"Music" bus/3/name = &"Music"
bus/3/solo = false bus/3/solo = false
bus/3/mute = false bus/3/mute = false
bus/3/bypass_fx = false bus/3/bypass_fx = false
bus/3/volume_db = -8.00903 bus/3/volume_db = -16.4004
bus/3/send = &"Master" bus/3/send = &"Master"
bus/4/name = &"Gearup" bus/4/name = &"Gearup"
bus/4/solo = false bus/4/solo = false
bus/4/mute = false bus/4/mute = false
bus/4/bypass_fx = false bus/4/bypass_fx = false
bus/4/volume_db = -4.003 bus/4/volume_db = -6.25101
bus/4/send = &"Master" bus/4/send = &"Master"
bus/5/name = &"Steps" bus/5/name = &"Steps"
bus/5/solo = false bus/5/solo = false
bus/5/mute = false bus/5/mute = false
bus/5/bypass_fx = false bus/5/bypass_fx = false
bus/5/volume_db = -20.3684 bus/5/volume_db = -23.3524
bus/5/send = &"Master" bus/5/send = &"Master"
bus/6/name = &"Dialogue" bus/6/name = &"Dialogue"
bus/6/solo = false bus/6/solo = false
bus/6/mute = false bus/6/mute = false
bus/6/bypass_fx = false bus/6/bypass_fx = false
bus/6/volume_db = -15.1981 bus/6/volume_db = -10.9863
bus/6/send = &"Master" bus/6/send = &"Master"
bus/7/name = &"BadGuy"
bus/7/solo = false
bus/7/mute = false
bus/7/bypass_fx = false
bus/7/volume_db = -0.526013
bus/7/send = &"Master"

View File

@ -17,6 +17,7 @@ extends Node
@export var start_with_left = false @export var start_with_left = false
@export var left_picture: Texture2D @export var left_picture: Texture2D
@export var right_picture: Texture2D @export var right_picture: Texture2D
@onready var dialogue_player: AudioStreamPlayer = $DialoguePlayer
signal dialogue_ended signal dialogue_ended
@ -96,7 +97,8 @@ func _on_next_letter() -> void:
ui_flicker_timer.stop() ui_flicker_timer.stop()
e_ui_button.visible = false e_ui_button.visible = false
next_label.visible = false next_label.visible = false
dialogue_player.pitch_scale = randf_range(5, 6)
dialogue_player.play()
var next_letter = current_dialogue_split.get(0) var next_letter = current_dialogue_split.get(0)
current_dialogue_split.remove_at(0) current_dialogue_split.remove_at(0)
current_dialogue += next_letter current_dialogue += next_letter

View File

@ -87,7 +87,7 @@ one_shot = true
stream = ExtResource("5_iblih") stream = ExtResource("5_iblih")
autoplay = true autoplay = true
max_distance = 400.0 max_distance = 400.0
bus = &"SFX" bus = &"BadGuy"
[connection signal="body_entered" from="TriggerHit" to="." method="_on_trigger_hit_body_entered"] [connection signal="body_entered" from="TriggerHit" to="." method="_on_trigger_hit_body_entered"]
[connection signal="timeout" from="TimeToFinishHit" to="." method="_on_time_to_finish_hit_timeout"] [connection signal="timeout" from="TimeToFinishHit" to="." method="_on_time_to_finish_hit_timeout"]

View File

@ -35,8 +35,8 @@ func _ready() -> void:
child.became_active.connect(on_camera_became_active) child.became_active.connect(on_camera_became_active)
ambiance.get_stream_playback().switch_to_clip_by_name("Start") ambiance.get_stream_playback().switch_to_clip_by_name("Start")
#opening_cutscene.play("opening_cutscene") opening_cutscene.play("opening_cutscene")
#opening_fade_to_black.visible = true opening_fade_to_black.visible = true
func on_camera_became_active(camera: SuperCamera): func on_camera_became_active(camera: SuperCamera):
active_camera = camera active_camera = camera
@ -59,6 +59,7 @@ func _process(delta: float) -> void:
func _on_start_dancing() -> void: func _on_start_dancing() -> void:
dance_cutscene.play("dance") dance_cutscene.play("dance")
ambiance.stop()
func restart_at_first_scene(): func restart_at_first_scene():
get_tree().change_scene_to_file("res://main.tscn") get_tree().change_scene_to_file("res://main.tscn")

View File

@ -1287,23 +1287,47 @@ clip_3/name = &"Cave"
clip_3/stream = ExtResource("32_htxhm") clip_3/stream = ExtResource("32_htxhm")
clip_3/auto_advance = 0 clip_3/auto_advance = 0
_transitions = { _transitions = {
Vector2i(0, 0): {
"fade_beats": 1.0,
"fade_mode": 3,
"from_time": 0,
"to_time": 0
},
Vector2i(0, 1): { Vector2i(0, 1): {
"fade_beats": 1.0, "fade_beats": 1.0,
"fade_mode": 3, "fade_mode": 3,
"from_time": 0, "from_time": 0,
"to_time": 1 "to_time": 1
}, },
Vector2i(1, 1): {
"fade_beats": 1.0,
"fade_mode": 3,
"from_time": 0,
"to_time": 0
},
Vector2i(1, 2): { Vector2i(1, 2): {
"fade_beats": 1.0, "fade_beats": 1.0,
"fade_mode": 3, "fade_mode": 3,
"from_time": 0, "from_time": 0,
"to_time": 1 "to_time": 1
}, },
Vector2i(2, 2): {
"fade_beats": 1.0,
"fade_mode": 3,
"from_time": 0,
"to_time": 0
},
Vector2i(2, 3): { Vector2i(2, 3): {
"fade_beats": 1.0, "fade_beats": 1.0,
"fade_mode": 3, "fade_mode": 3,
"from_time": 0, "from_time": 0,
"to_time": 1 "to_time": 1
},
Vector2i(3, 3): {
"fade_beats": 1.0,
"fade_mode": 3,
"from_time": 0,
"to_time": 0
} }
} }
@ -1450,7 +1474,7 @@ collision_mask = 4
shape = SubResource("RectangleShape2D_w48qg") shape = SubResource("RectangleShape2D_w48qg")
[node name="ArrowSpawner" parent="." instance=ExtResource("15_vivmo")] [node name="ArrowSpawner" parent="." instance=ExtResource("15_vivmo")]
position = Vector2(3392, -8) position = Vector2(3391, -11.485)
[node name="TriggerSecondNPCDialogue" type="Area2D" parent="."] [node name="TriggerSecondNPCDialogue" type="Area2D" parent="."]
position = Vector2(3455, -11) position = Vector2(3455, -11)
@ -1508,10 +1532,11 @@ autoplay = "default"
frame_progress = 0.37434 frame_progress = 0.37434
[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="Armoire"] [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="Armoire"]
position = Vector2(0, 17)
stream = ExtResource("19_0odxb") stream = ExtResource("19_0odxb")
autoplay = true autoplay = true
max_distance = 400.0 max_distance = 400.0
bus = &"SFX" bus = &"BadGuy"
[node name="Firewall" type="AnimatedSprite2D" parent="."] [node name="Firewall" type="AnimatedSprite2D" parent="."]
position = Vector2(5386, -32) position = Vector2(5386, -32)
@ -1521,13 +1546,13 @@ autoplay = "idle"
frame_progress = 0.470971 frame_progress = 0.470971
[node name="Skeleton" parent="." instance=ExtResource("19_d13ii")] [node name="Skeleton" parent="." instance=ExtResource("19_d13ii")]
position = Vector2(3753, -16) position = Vector2(3764, -16)
[node name="Skeleton2" parent="." instance=ExtResource("19_d13ii")] [node name="Skeleton2" parent="." instance=ExtResource("19_d13ii")]
position = Vector2(3822, -16) position = Vector2(3841, -16)
[node name="Skeleton3" parent="." instance=ExtResource("19_d13ii")] [node name="Skeleton3" parent="." instance=ExtResource("19_d13ii")]
position = Vector2(3935, -16) position = Vector2(3934, -16)
[node name="TriggerFinalDialogue" type="Area2D" parent="."] [node name="TriggerFinalDialogue" type="Area2D" parent="."]
position = Vector2(5178, -11) position = Vector2(5178, -11)

View File

@ -21,7 +21,7 @@ var gravity_modifier = 1
@onready var base: AnimatedSprite2D = $Base @onready var base: AnimatedSprite2D = $Base
var current_sprite: AnimatedSprite2D var current_sprite: AnimatedSprite2D
var is_in_cutscene = false # back to true on build var is_in_cutscene = true # back to true on build
var current_animation = "idle" var current_animation = "idle"
var is_hitting = false var is_hitting = false

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=90 format=3 uid="uid://yvp44oauis4n"] [gd_scene load_steps=91 format=3 uid="uid://yvp44oauis4n"]
[ext_resource type="Script" uid="uid://c1fqj3lba7wik" path="res://player/player.gd" id="1_yw30f"] [ext_resource type="Script" uid="uid://c1fqj3lba7wik" path="res://player/player.gd" id="1_yw30f"]
[ext_resource type="Texture2D" uid="uid://cjruk5xlt3tyn" path="res://ennemy/MechantVol.png" id="2_ebec5"] [ext_resource type="Texture2D" uid="uid://cjruk5xlt3tyn" path="res://ennemy/MechantVol.png" id="2_ebec5"]
@ -11,6 +11,7 @@
[ext_resource type="Texture2D" uid="uid://dsxvqsh3umw01" path="res://player/assets/RunCycle.png" id="5_boad6"] [ext_resource type="Texture2D" uid="uid://dsxvqsh3umw01" path="res://player/assets/RunCycle.png" id="5_boad6"]
[ext_resource type="PackedScene" uid="uid://djwoetcyvvofc" path="res://damageable/damageable.tscn" id="5_g6k8r"] [ext_resource type="PackedScene" uid="uid://djwoetcyvvofc" path="res://damageable/damageable.tscn" id="5_g6k8r"]
[ext_resource type="Shape2D" uid="uid://6rhdwj5jxbxn" path="res://player/player_collision.tres" id="5_qjkh3"] [ext_resource type="Shape2D" uid="uid://6rhdwj5jxbxn" path="res://player/player_collision.tres" id="5_qjkh3"]
[ext_resource type="Texture2D" uid="uid://bhrqdo0cadpf4" path="res://player/assets/IdleArmes.png" id="6_s7qer"]
[ext_resource type="Texture2D" uid="uid://dw6tn0grt2ajc" path="res://player/assets/WalkCycle.png" id="10_yllr7"] [ext_resource type="Texture2D" uid="uid://dw6tn0grt2ajc" path="res://player/assets/WalkCycle.png" id="10_yllr7"]
[ext_resource type="PackedScene" uid="uid://7sqwi3lygb1u" path="res://damageable/hitbox.tscn" id="11_2ieo8"] [ext_resource type="PackedScene" uid="uid://7sqwi3lygb1u" path="res://damageable/hitbox.tscn" id="11_2ieo8"]
[ext_resource type="AudioStream" uid="uid://cw85p1vga71gf" path="res://world_assets/audio/443275__loscolt890__regularfootstep001.wav" id="14_32hag"] [ext_resource type="AudioStream" uid="uid://cw85p1vga71gf" path="res://world_assets/audio/443275__loscolt890__regularfootstep001.wav" id="14_32hag"]
@ -184,13 +185,13 @@ region = Rect2(128, 0, 32, 32)
atlas = ExtResource("4_8t03j") atlas = ExtResource("4_8t03j")
region = Rect2(160, 0, 32, 32) region = Rect2(160, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_2ieo8"] [sub_resource type="AtlasTexture" id="AtlasTexture_j3r50"]
atlas = ExtResource("2_hg6s5") atlas = ExtResource("6_s7qer")
region = Rect2(96, 0, 32, 32) region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ebec5"] [sub_resource type="AtlasTexture" id="AtlasTexture_utr5e"]
atlas = ExtResource("2_hg6s5") atlas = ExtResource("6_s7qer")
region = Rect2(288, 0, 32, 32) region = Rect2(32, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_yllr7"] [sub_resource type="AtlasTexture" id="AtlasTexture_yllr7"]
atlas = ExtResource("2_hg6s5") atlas = ExtResource("2_hg6s5")
@ -325,10 +326,10 @@ animations = [{
}, { }, {
"frames": [{ "frames": [{
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_2ieo8") "texture": SubResource("AtlasTexture_j3r50")
}, { }, {
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_ebec5") "texture": SubResource("AtlasTexture_utr5e")
}], }],
"loop": true, "loop": true,
"name": &"idle", "name": &"idle",
@ -611,10 +612,8 @@ autoplay = "power_up"
visible = false visible = false
position = Vector2(0, -16) position = Vector2(0, -16)
sprite_frames = SubResource("SpriteFrames_jfgyi") sprite_frames = SubResource("SpriteFrames_jfgyi")
animation = &"hit" animation = &"idle"
autoplay = "idle" autoplay = "idle"
frame = 5
frame_progress = 1.0
[node name="Shield" type="AnimatedSprite2D" parent="."] [node name="Shield" type="AnimatedSprite2D" parent="."]
visible = false visible = false