Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25

first version

addons/maaacks_menus_template/base/scenes/menus/main_menu/main_menu.gd

@@ -6,11 +6,14 @@ extends Control
 @export var options_packed_scene : PackedScene
 @export var credits_packed_scene : PackedScene
 
+@onready var background_music_player: AudioStreamPlayer = $BackgroundMusicPlayer
+
 var options_scene
 var credits_scene
 var sub_menu
 
 func load_game_scene() -> void:
+	background_music_player.stop()
 	SceneLoader.load_scene(game_scene_path)
 
 func new_game() -> void:

assets/Audio/MUS_LVL1_intro.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cklwwfr8t6px6"
+path="res://.godot/imported/MUS_LVL1_intro.ogg-3e6e9b66588934674b604208ed7dbc50.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/Audio/MUS_LVL1_intro.ogg"
+dest_files=["res://.godot/imported/MUS_LVL1_intro.ogg-3e6e9b66588934674b604208ed7dbc50.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/Audio/MUS_LVL2_intro.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://cb40pasbhcfuq"
+path="res://.godot/imported/MUS_LVL2_intro.ogg-27002ff0e4a91789426ade7b2dbe8335.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/Audio/MUS_LVL2_intro.ogg"
+dest_files=["res://.godot/imported/MUS_LVL2_intro.ogg-27002ff0e4a91789426ade7b2dbe8335.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/Audio/MUS_LVL3_intro.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://b2n1oebsc28yt"
+path="res://.godot/imported/MUS_LVL3_intro.ogg-16ca681d3903628bcefc5e0d234cd3b8.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/Audio/MUS_LVL3_intro.ogg"
+dest_files=["res://.godot/imported/MUS_LVL3_intro.ogg-16ca681d3903628bcefc5e0d234cd3b8.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

assets/Audio/MUS_MENU_loop.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://c6n57rs4s1kqj"
+path="res://.godot/imported/MUS_MENU_loop.ogg-582a182b0e37c2cde78aa50257dc165a.oggvorbisstr"
+
+[deps]
+
+source_file="res://assets/Audio/MUS_MENU_loop.ogg"
+dest_files=["res://.godot/imported/MUS_MENU_loop.ogg-582a182b0e37c2cde78aa50257dc165a.oggvorbisstr"]
+
+[params]
+
+loop=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

assets/garance/EGJ-Bilboard.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d0m0siln45uyk"
+path="res://.godot/imported/EGJ-Bilboard.png-92fb77e628cff86a12793cb481c9dfc3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/garance/EGJ-Bilboard.png"
+dest_files=["res://.godot/imported/EGJ-Bilboard.png-92fb77e628cff86a12793cb481c9dfc3.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

assets/garance/EGJ-MurUni.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ebw4okpvcioc"
+path="res://.godot/imported/EGJ-MurUni.png-1e473768d3bca838d36aee5a34900282.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/garance/EGJ-MurUni.png"
+dest_files=["res://.godot/imported/EGJ-MurUni.png-1e473768d3bca838d36aee5a34900282.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

assets/garance/EGJ-TrapDoor.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://pc5817wfl1no"
+path="res://.godot/imported/EGJ-TrapDoor.png-4b40cb8e4fcb87241c8db0dc35e949f4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/garance/EGJ-TrapDoor.png"
+dest_files=["res://.godot/imported/EGJ-TrapDoor.png-4b40cb8e4fcb87241c8db0dc35e949f4.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

default_bus_layout.tres

@@ -5,35 +5,29 @@ bus/1/name = &"Cinematique"
 bus/1/solo = false
 bus/1/mute = false
 bus/1/bypass_fx = false
-bus/1/volume_db = 0.0
+bus/1/volume_db = -9.85181
 bus/1/send = &"Master"
-bus/2/name = &"Character"
+bus/2/name = &"VoiceOver"
 bus/2/solo = false
 bus/2/mute = false
 bus/2/bypass_fx = false
-bus/2/volume_db = 0.0
+bus/2/volume_db = -0.030508
 bus/2/send = &"Master"
-bus/3/name = &"VoiceOver"
+bus/3/name = &"UI"
 bus/3/solo = false
 bus/3/mute = false
 bus/3/bypass_fx = false
-bus/3/volume_db = 0.0
+bus/3/volume_db = -2.91905
 bus/3/send = &"Master"
-bus/4/name = &"UI"
+bus/4/name = &"Music"
 bus/4/solo = false
 bus/4/mute = false
 bus/4/bypass_fx = false
-bus/4/volume_db = 0.0
+bus/4/volume_db = -0.030508
 bus/4/send = &"Master"
-bus/5/name = &"Music"
+bus/5/name = &"Ambiance"
 bus/5/solo = false
 bus/5/mute = false
 bus/5/bypass_fx = false
-bus/5/volume_db = -5.32994
+bus/5/volume_db = 0.0
 bus/5/send = &"Master"
-bus/6/name = &"Ambiance"
-bus/6/solo = false
-bus/6/mute = false
-bus/6/bypass_fx = false
-bus/6/volume_db = 0.0
-bus/6/send = &"Master"

scenes/indoors/last.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=91 format=4 uid="uid://bnba2vd0m0qao"]
+[gd_scene load_steps=93 format=4 uid="uid://bnba2vd0m0qao"]
 
 [ext_resource type="Script" uid="uid://c232mm5h43ed4" path="res://scenes/indoors/last.gd" id="1_cad5s"]
 [ext_resource type="Resource" uid="uid://7bmpcn0dxwr8" path="res://scenes/player/base.tres" id="2_1lxr4"]
@@ -60,6 +60,7 @@
 [ext_resource type="AudioStream" uid="uid://d0lfg1am27eou" path="res://assets/Audio/VO_LVL3_B_09.ogg" id="51_s8chb"]
 [ext_resource type="AudioStream" uid="uid://c1wkrw3fdj2rr" path="res://assets/Audio/VO_LVL3_A_10.ogg" id="52_roruu"]
 [ext_resource type="AudioStream" uid="uid://cy0solmf5ni63" path="res://assets/Audio/VO_LVL3_B_10.ogg" id="53_w43jt"]
+[ext_resource type="AudioStream" uid="uid://b2n1oebsc28yt" path="res://assets/Audio/MUS_LVL3_intro.ogg" id="61_o22xi"]
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_nyh47"]
 texture = ExtResource("3_vefux")
@@ -2437,6 +2438,16 @@ streams_count = 2
 stream_0/stream = ExtResource("52_roruu")
 stream_1/stream = ExtResource("53_w43jt")
 
+[sub_resource type="AudioStreamInteractive" id="AudioStreamInteractive_xiu81"]
+clip_count = 2
+clip_0/name = &"Mus Lvl 3 Intro"
+clip_0/stream = ExtResource("61_o22xi")
+clip_0/auto_advance = 1
+clip_0/next_clip = 1
+clip_1/name = &"Mus Lvl 3 Loop"
+clip_1/stream = ExtResource("4_o1p8b")
+clip_1/auto_advance = 0
+
 [node name="Main" type="Node2D"]
 script = ExtResource("1_cad5s")
 "golé" = "uid://cgql2prrr5cj7"
@@ -2515,14 +2526,14 @@ position = Vector2(292, -17)
 sprite_frames = SubResource("SpriteFrames_fcj1w")
 animation = &"idle"
 autoplay = "idle"
-frame_progress = 0.457516
+frame_progress = 0.432269
 
 [node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="Hack"]
 position = Vector2(-11, 14)
 sprite_frames = SubResource("SpriteFrames_tnfmx")
 animation = &"idle"
 autoplay = "idle"
-frame_progress = 0.502363
+frame_progress = 0.477111
 
 [node name="StaticBody2D" type="StaticBody2D" parent="Hack"]
 
@@ -2616,6 +2627,7 @@ bus = &"Music"
 
 [node name="Interact" type="AudioStreamPlayer2D" parent="Player"]
 stream = ExtResource("15_7ac63")
+bus = &"UI"
 
 [node name="Lights" type="Node2D" parent="."]
 
@@ -2632,9 +2644,14 @@ position = Vector2(468, -6)
 texture = ExtResource("7_7ac63")
 
 [node name="TimerBetweenVO" type="Timer" parent="."]
-wait_time = 0.2
+wait_time = 4.0
 autostart = true
 
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = SubResource("AudioStreamInteractive_xiu81")
+autoplay = true
+bus = &"Music"
+
 [connection signal="event_confirmed" from="GetOutDoors/WrongDoor" to="." method="_on_wrong_door_event_triggered"]
 [connection signal="event_confirmed" from="GetOutDoors/RightDoor" to="." method="_on_right_door_event_triggered"]
 [connection signal="event_triggered" from="RightPrise" to="." method="_on_prise_interacted"]

template/scenes/menus/main_menu/main_menu_with_animations.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=18 format=3 uid="uid://ck5glr84c7e25"]
+[gd_scene load_steps=19 format=3 uid="uid://ck5glr84c7e25"]
 
 [ext_resource type="PackedScene" uid="uid://c6k5nnpbypshi" path="res://addons/maaacks_menus_template/base/scenes/menus/main_menu/main_menu.tscn" id="1_iaw2i"]
 [ext_resource type="Script" uid="uid://b45edjepvx1qx" path="res://template/scenes/menus/main_menu/main_menu_with_animations.gd" id="2_mcwxw"]
 [ext_resource type="PackedScene" uid="uid://cuyyhte8hennl" path="res://template/scenes/menus/options_menu/master_options_menu_with_tabs.tscn" id="3_p7afn"]
 [ext_resource type="PackedScene" uid="uid://b7v0tjak702f1" path="res://template/scenes/credits/scrollable_credits.tscn" id="4_tsej0"]
+[ext_resource type="AudioStream" uid="uid://c6n57rs4s1kqj" path="res://assets/Audio/MUS_MENU_loop.ogg" id="5_mcwxw"]
 
 [sub_resource type="Animation" id="1"]
 resource_name = "Intro"
@@ -366,7 +367,7 @@ anim_player = NodePath("../MenuAnimationPlayer")
 parameters/conditions/intro_done = false
 
 [node name="BackgroundMusicPlayer" parent="." index="3"]
-bus = &"Master"
+stream = ExtResource("5_mcwxw")
 
 [node name="VersionContainer" parent="VersionMargin" index="0"]
 modulate = Color(1, 1, 1, 0)