fix: mix

# Conflicts:
#	main.tscn

.gitea/workflows/main.yaml

@@ -69,10 +69,6 @@ jobs:
           mkdir -v -p build/mac
           godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
           zip -r Mac.zip build/mac
-      - name: Web Build
-        run: |
-          mkdir -v -p build/web
-          godot --headless --verbose --export-release "Web" build/web/index.html
           
       - name: Upload to Itch
         uses: KikimoraGames/itch-publish@v0.0.3
@@ -101,12 +97,3 @@ jobs:
           buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
           gameData: Mac.zip
           buildChannel: mac
-      - name: Upload to Itch
-        uses: KikimoraGames/itch-publish@v0.0.3
-        with:
-          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
-          itchUsername: ${{ env.ITCHIO_USERNAME }}
-          itchGameId: ${{ env.ITCHIO_GAMEID }}
-          buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
-          gameData: build/web
-          buildChannel: web

default_bus_layout.tres

@@ -5,13 +5,13 @@ bus/1/name = &"SFX"
 bus/1/solo = false
 bus/1/mute = false
 bus/1/bypass_fx = false
-bus/1/volume_db = -12.4611
+bus/1/volume_db = -19.6683
 bus/1/send = &"Master"
 bus/2/name = &"Ambiance"
 bus/2/solo = false
 bus/2/mute = false
 bus/2/bypass_fx = false
-bus/2/volume_db = -16.4004
+bus/2/volume_db = -15.795
 bus/2/send = &"Master"
 bus/3/name = &"Music"
 bus/3/solo = false
@@ -29,13 +29,13 @@ bus/5/name = &"Steps"
 bus/5/solo = false
 bus/5/mute = false
 bus/5/bypass_fx = false
-bus/5/volume_db = -23.3524
+bus/5/volume_db = -29.2359
 bus/5/send = &"Master"
 bus/6/name = &"Dialogue"
 bus/6/solo = false
 bus/6/mute = false
 bus/6/bypass_fx = false
-bus/6/volume_db = -10.9863
+bus/6/volume_db = -8.39524
 bus/6/send = &"Master"
 bus/7/name = &"BadGuy"
 bus/7/solo = false

main.gd

@@ -25,6 +25,11 @@ var active_camera: SuperCamera
 @onready var red_hood_cutscene: AnimationPlayer = $RedHoodCutscene
 @onready var final_cutscene: AnimationPlayer = $FinalCutscene
 
+@onready var trigger_second_npc_dialogue: Area2D = $TriggerSecondNPCDialogue
+@onready var trigger_npc_first_dialogue: Area2D = $TriggerNPCFirstDialogue
+@onready var trigger_final_dialogue: Area2D = $TriggerFinalDialogue
+
+
 @onready var ambiance: AudioStreamPlayer = $Ambiance
 var ambiance_stream: AudioStreamInteractive
 
@@ -35,8 +40,8 @@ func _ready() -> void:
 			child.became_active.connect(on_camera_became_active)
 	
 	ambiance.get_stream_playback().switch_to_clip_by_name("Start")
-	# opening_cutscene.play("opening_cutscene")
-	# opening_fade_to_black.visible = true
+	opening_cutscene.play("opening_cutscene")
+	opening_fade_to_black.visible = true
 
 func on_camera_became_active(camera: SuperCamera):
 	active_camera = camera
@@ -77,10 +82,11 @@ func _on_trigger_second_npc_dialogue_body_entered(body: Node2D) -> void:
 
 func _on_red_hood_sword_dialogue_dialogue_ended() -> void:
 	red_hood_cutscene.play("flee")
-
+	trigger_second_npc_dialogue.queue_free()
 
 func _on_final_armor_dialogue_ended() -> void:
 	red_hood_cutscene.play("final")
+	trigger_final_dialogue.queue_free()
 
 
 func _on_final_cinematic_body_entered(body: Node2D) -> void:
@@ -97,3 +103,7 @@ func _on_squelettes_ambiance_body_entered(body: Node2D) -> void:
 
 func _on_cave_ambiance_body_entered(body: Node2D) -> void:
 	ambiance.get_stream_playback().switch_to_clip_by_name("Cave")
+
+
+func _on_npc_shield_dialogue_dialogue_ended() -> void:
+	trigger_npc_first_dialogue.queue_free()

player/player.gd

@@ -21,7 +21,7 @@ var gravity_modifier = 1
 @onready var base: AnimatedSprite2D = $Base
 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 is_hitting = false

titre.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://de45rawq81ac3"
+path="res://.godot/imported/titre.png-f119b5c75de12716d18d55c28b58e543.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://titre.png"
+dest_files=["res://.godot/imported/titre.png-f119b5c75de12716d18d55c28b58e543.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1