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
 
@@ -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()

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

world_assets/bubbles.tres

@@ -1,8 +1,10 @@
-[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://tyrwsjeq31vu"]
+[gd_resource type="TileSet" load_steps=11 format=3 uid="uid://tyrwsjeq31vu"]
 
 [ext_resource type="Texture2D" uid="uid://cjo4jkl6vrlnr" path="res://world_assets/stringstar fields/background_0.png" id="1_oufsv"]
 [ext_resource type="Texture2D" uid="uid://867g736r74nf" path="res://world_assets/Cave/mainlev_build.png" id="2_01dhf"]
 [ext_resource type="Texture2D" uid="uid://cmfneyajqyim4" path="res://world_assets/oak_woods/oak_woods_tileset.png" id="3_01dhf"]
+[ext_resource type="Texture2D" uid="uid://bwccijuqq2uxj" path="res://world_assets/oak_woods/background/background_layer_3.png" id="4_i4k15"]
+[ext_resource type="Texture2D" uid="uid://bs66qg0effkb5" path="res://world_assets/stringstar fields/background_2.png" id="5_dsouv"]
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_i4k15"]
 texture = ExtResource("1_oufsv")
@@ -1520,7 +1522,217 @@ texture = ExtResource("3_01dhf")
 29:21/0 = 0
 30:21/0 = 0
 
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_h1iwu"]
+texture = ExtResource("4_i4k15")
+0:0/0 = 0
+1:0/0 = 0
+2:0/0 = 0
+3:0/0 = 0
+4:0/0 = 0
+5:0/0 = 0
+6:0/0 = 0
+7:0/0 = 0
+8:0/0 = 0
+9:0/0 = 0
+10:0/0 = 0
+11:0/0 = 0
+12:0/0 = 0
+13:0/0 = 0
+14:0/0 = 0
+15:0/0 = 0
+16:0/0 = 0
+17:0/0 = 0
+18:0/0 = 0
+19:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+2:1/0 = 0
+3:1/0 = 0
+4:1/0 = 0
+5:1/0 = 0
+6:1/0 = 0
+7:1/0 = 0
+8:1/0 = 0
+9:1/0 = 0
+10:1/0 = 0
+11:1/0 = 0
+12:1/0 = 0
+13:1/0 = 0
+14:1/0 = 0
+15:1/0 = 0
+16:1/0 = 0
+17:1/0 = 0
+18:1/0 = 0
+19:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+2:2/0 = 0
+4:2/0 = 0
+5:2/0 = 0
+6:2/0 = 0
+7:2/0 = 0
+8:2/0 = 0
+9:2/0 = 0
+10:2/0 = 0
+11:2/0 = 0
+12:2/0 = 0
+13:2/0 = 0
+14:2/0 = 0
+15:2/0 = 0
+16:2/0 = 0
+17:2/0 = 0
+18:2/0 = 0
+19:2/0 = 0
+0:3/0 = 0
+5:3/0 = 0
+6:3/0 = 0
+7:3/0 = 0
+8:3/0 = 0
+9:3/0 = 0
+10:3/0 = 0
+11:3/0 = 0
+12:3/0 = 0
+16:3/0 = 0
+17:3/0 = 0
+18:3/0 = 0
+19:3/0 = 0
+5:4/0 = 0
+6:4/0 = 0
+7:4/0 = 0
+8:4/0 = 0
+9:4/0 = 0
+10:4/0 = 0
+11:4/0 = 0
+17:4/0 = 0
+18:4/0 = 0
+19:4/0 = 0
+7:5/0 = 0
+8:5/0 = 0
+9:5/0 = 0
+10:5/0 = 0
+16:5/0 = 0
+17:5/0 = 0
+18:5/0 = 0
+19:5/0 = 0
+0:6/0 = 0
+7:6/0 = 0
+8:6/0 = 0
+9:6/0 = 0
+10:6/0 = 0
+17:6/0 = 0
+18:6/0 = 0
+19:6/0 = 0
+7:7/0 = 0
+8:7/0 = 0
+9:7/0 = 0
+10:7/0 = 0
+16:7/0 = 0
+17:7/0 = 0
+18:7/0 = 0
+19:7/0 = 0
+0:8/0 = 0
+7:8/0 = 0
+8:8/0 = 0
+9:8/0 = 0
+10:8/0 = 0
+16:8/0 = 0
+17:8/0 = 0
+18:8/0 = 0
+19:8/0 = 0
+0:9/0 = 0
+1:9/0 = 0
+2:9/0 = 0
+3:9/0 = 0
+4:9/0 = 0
+5:9/0 = 0
+6:9/0 = 0
+7:9/0 = 0
+8:9/0 = 0
+9:9/0 = 0
+10:9/0 = 0
+11:9/0 = 0
+12:9/0 = 0
+13:9/0 = 0
+14:9/0 = 0
+15:9/0 = 0
+16:9/0 = 0
+17:9/0 = 0
+18:9/0 = 0
+19:9/0 = 0
+0:10/0 = 0
+1:10/0 = 0
+2:10/0 = 0
+3:10/0 = 0
+4:10/0 = 0
+5:10/0 = 0
+6:10/0 = 0
+7:10/0 = 0
+8:10/0 = 0
+9:10/0 = 0
+10:10/0 = 0
+11:10/0 = 0
+12:10/0 = 0
+13:10/0 = 0
+14:10/0 = 0
+15:10/0 = 0
+16:10/0 = 0
+17:10/0 = 0
+18:10/0 = 0
+19:10/0 = 0
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_q6ngd"]
+texture = ExtResource("5_dsouv")
+15:7/0 = 0
+16:7/0 = 0
+0:8/0 = 0
+1:8/0 = 0
+2:8/0 = 0
+4:8/0 = 0
+5:8/0 = 0
+13:8/0 = 0
+14:8/0 = 0
+15:8/0 = 0
+16:8/0 = 0
+17:8/0 = 0
+0:9/0 = 0
+1:9/0 = 0
+2:9/0 = 0
+3:9/0 = 0
+4:9/0 = 0
+5:9/0 = 0
+6:9/0 = 0
+7:9/0 = 0
+9:9/0 = 0
+10:9/0 = 0
+11:9/0 = 0
+12:9/0 = 0
+13:9/0 = 0
+14:9/0 = 0
+15:9/0 = 0
+16:9/0 = 0
+17:9/0 = 0
+0:10/0 = 0
+1:10/0 = 0
+2:10/0 = 0
+3:10/0 = 0
+4:10/0 = 0
+5:10/0 = 0
+6:10/0 = 0
+7:10/0 = 0
+8:10/0 = 0
+9:10/0 = 0
+10:10/0 = 0
+11:10/0 = 0
+12:10/0 = 0
+13:10/0 = 0
+14:10/0 = 0
+15:10/0 = 0
+16:10/0 = 0
+17:10/0 = 0
+
 [resource]
 sources/0 = SubResource("TileSetAtlasSource_i4k15")
 sources/1 = SubResource("TileSetAtlasSource_dsouv")
 sources/2 = SubResource("TileSetAtlasSource_nwg7v")
+sources/3 = SubResource("TileSetAtlasSource_h1iwu")
+sources/4 = SubResource("TileSetAtlasSource_q6ngd")

world_assets/light.webp.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ct4s44kkdg8eh"
+path="res://.godot/imported/light.webp-50bb55d00a8b3a29138779420ca586be.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://world_assets/light.webp"
+dest_files=["res://.godot/imported/light.webp-50bb55d00a8b3a29138779420ca586be.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