2 Commits

Author SHA1 Message Date
4c581b140c message
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 2m27s
2025-08-03 19:01:55 +02:00
a37c803963 fix: mix
Some checks failed
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) Failing after 2m32s
2025-08-03 18:43:40 +02:00
3 changed files with 57 additions and 13 deletions

View File

@ -5,13 +5,13 @@ 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 = -12.4611 bus/1/volume_db = -19.6683
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 = -16.4004 bus/2/volume_db = -15.795
bus/2/send = &"Master" bus/2/send = &"Master"
bus/3/name = &"Music" bus/3/name = &"Music"
bus/3/solo = false bus/3/solo = false
@ -29,13 +29,13 @@ 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 = -23.3524 bus/5/volume_db = -29.2359
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 = -10.9863 bus/6/volume_db = -8.39524
bus/6/send = &"Master" bus/6/send = &"Master"
bus/7/name = &"BadGuy" bus/7/name = &"BadGuy"
bus/7/solo = false bus/7/solo = false

View File

@ -28,6 +28,7 @@ var active_camera: SuperCamera
@onready var trigger_second_npc_dialogue: Area2D = $TriggerSecondNPCDialogue @onready var trigger_second_npc_dialogue: Area2D = $TriggerSecondNPCDialogue
@onready var trigger_npc_first_dialogue: Area2D = $TriggerNPCFirstDialogue @onready var trigger_npc_first_dialogue: Area2D = $TriggerNPCFirstDialogue
@onready var trigger_final_dialogue: Area2D = $TriggerFinalDialogue @onready var trigger_final_dialogue: Area2D = $TriggerFinalDialogue
@onready var ending: ColorRect = $Ending
@onready var ambiance: AudioStreamPlayer = $Ambiance @onready var ambiance: AudioStreamPlayer = $Ambiance
@ -54,6 +55,7 @@ func _process(delta: float) -> void:
bubbles_interior.global_position.x = active_camera.global_position.x bubbles_interior.global_position.x = active_camera.global_position.x
choices_container.global_position.x = active_camera.global_position.x - 100 choices_container.global_position.x = active_camera.global_position.x - 100
opening_fade_to_black.global_position.x = active_camera.global_position.x - 320.0 opening_fade_to_black.global_position.x = active_camera.global_position.x - 320.0
ending.global_position.x = active_camera.global_position.x - 320.0
background_far.global_position.x = active_camera.global_position.x * parallax_far background_far.global_position.x = active_camera.global_position.x * parallax_far
background_middle.global_position.x = active_camera.global_position.x * parallax_middle background_middle.global_position.x = active_camera.global_position.x * parallax_middle

View File

@ -879,6 +879,18 @@ tracks/2/keys = {
"update": 0, "update": 0,
"values": [0.0] "values": [0.0]
} }
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Ending:visible")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [false]
}
[sub_resource type="Animation" id="Animation_2cqfq"] [sub_resource type="Animation" id="Animation_2cqfq"]
resource_name = "dance" resource_name = "dance"
@ -972,12 +984,9 @@ tracks/6/path = NodePath(".")
tracks/6/interp = 1 tracks/6/interp = 1
tracks/6/loop_wrap = true tracks/6/loop_wrap = true
tracks/6/keys = { tracks/6/keys = {
"times": PackedFloat32Array(8), "times": PackedFloat32Array(),
"transitions": PackedFloat32Array(1), "transitions": PackedFloat32Array(),
"values": [{ "values": []
"args": [],
"method": &"restart_at_first_scene"
}]
} }
tracks/7/type = "method" tracks/7/type = "method"
tracks/7/imported = false tracks/7/imported = false
@ -1012,10 +1021,22 @@ tracks/9/path = NodePath("DanceMusic:volume_db")
tracks/9/interp = 1 tracks/9/interp = 1
tracks/9/loop_wrap = true tracks/9/loop_wrap = true
tracks/9/keys = { tracks/9/keys = {
"times": PackedFloat32Array(0, 2.99, 6, 8), "times": PackedFloat32Array(0, 2.99, 6),
"transitions": PackedFloat32Array(1, 1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1),
"update": 0, "update": 0,
"values": [0.0, 0.0, 0.0, -80.0] "values": [0.0, 0.0, 0.0]
}
tracks/10/type = "value"
tracks/10/imported = false
tracks/10/enabled = true
tracks/10/path = NodePath("Ending:visible")
tracks/10/interp = 1
tracks/10/loop_wrap = true
tracks/10/keys = {
"times": PackedFloat32Array(0, 0.0333333, 6.06667),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 1,
"values": [false, false, true]
} }
[sub_resource type="AnimationLibrary" id="AnimationLibrary_yaehf"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_yaehf"]
@ -1790,6 +1811,27 @@ offset_right = 320.0
offset_bottom = 136.0 offset_bottom = 136.0
color = Color(0, 0, 0, 0) color = Color(0, 0, 0, 0)
[node name="Ending" type="ColorRect" parent="."]
visible = false
custom_minimum_size = Vector2(640, 360)
offset_left = -320.0
offset_top = -224.0
offset_right = 320.0
offset_bottom = 136.0
color = Color(0, 0, 0, 1)
[node name="CenterContainer" type="CenterContainer" parent="Ending"]
custom_minimum_size = Vector2(640, 320)
layout_mode = 0
offset_right = 40.0
offset_bottom = 40.0
[node name="Label" type="Label" parent="Ending/CenterContainer"]
layout_mode = 2
text = "You broke the cycle of violence!"
horizontal_alignment = 1
vertical_alignment = 1
[node name="FinalCutscene" type="AnimationPlayer" parent="."] [node name="FinalCutscene" type="AnimationPlayer" parent="."]
root_node = NodePath("../FinalCinematic") root_node = NodePath("../FinalCinematic")
libraries = { libraries = {