18 Commits

Author SHA1 Message Date
4344a43e02 Last scene layout
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 11s
Create tag and build when new code gets to main / Export (push) Successful in 2m37s
2025-06-29 13:41:24 +02:00
dbf2092411 Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 12s
Create tag and build when new code gets to main / Export (push) Successful in 2m42s
2025-06-29 13:36:48 +02:00
6440cb26a9 fix: lvl 2 progression 2025-06-29 13:34:11 +02:00
ca5fb354c0 Buildings autour (seulement mur)
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 11s
Create tag and build when new code gets to main / Export (push) Successful in 2m44s
2025-06-29 13:03:57 +02:00
00ef11d3fb Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 11s
Create tag and build when new code gets to main / Export (push) Successful in 2m47s
2025-06-29 12:45:15 +02:00
3564825cd1 feat: music 2025-06-29 12:44:43 +02:00
1057d2d81b et l'import
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) Has been cancelled
2025-06-29 12:44:17 +02:00
3f5156a48b Asset billboard Onid 2025-06-29 12:44:03 +02:00
a271dc1d36 feat: some crowd 2025-06-29 12:26:30 +02:00
5b37da17e0 fix: some lights on lvl 1
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 2m33s
2025-06-29 12:11:11 +02:00
9b781ac431 Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 13s
Create tag and build when new code gets to main / Export (push) Successful in 2m33s
2025-06-29 12:02:41 +02:00
42fa5edecf feat: lvl2 decor 2025-06-29 12:02:37 +02:00
d478f81fc0 Déco scène 1 (buildings fond)
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) Has been cancelled
2025-06-29 12:01:04 +02:00
84cf2d3131 Asset mur uni 2025-06-29 11:28:33 +02:00
12cd9a5232 Déco scène 1 2025-06-29 11:27:45 +02:00
c12009c6d5 Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25
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 2m30s
2025-06-29 10:41:32 +02:00
2eab16feab feat: tableau 2025-06-29 10:41:26 +02:00
62afaea51d trap door import
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 2m34s
2025-06-29 10:33:12 +02:00
26 changed files with 1127 additions and 87 deletions

View File

@ -6,11 +6,15 @@ extends Control
@export var options_packed_scene : PackedScene @export var options_packed_scene : PackedScene
@export var credits_packed_scene : PackedScene @export var credits_packed_scene : PackedScene
@onready var background_music_player: AudioStreamPlayer = $BackgroundMusicPlayer
@onready var audio_stream_player: AudioStreamPlayer = $AudioStreamPlayer
var options_scene var options_scene
var credits_scene var credits_scene
var sub_menu var sub_menu
func load_game_scene() -> void: func load_game_scene() -> void:
audio_stream_player.stop()
SceneLoader.load_scene(game_scene_path) SceneLoader.load_scene(game_scene_path)
func new_game() -> void: func new_game() -> void:
@ -73,6 +77,7 @@ func _ready() -> void:
_add_or_hide_options() _add_or_hide_options()
_add_or_hide_credits() _add_or_hide_credits()
_hide_new_game_if_unset() _hide_new_game_if_unset()
audio_stream_player.play()
func _on_new_game_button_pressed() -> void: func _on_new_game_button_pressed() -> void:
new_game() new_game()

Binary file not shown.

View File

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

Binary file not shown.

Binary file not shown.

View File

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

Binary file not shown.

Binary file not shown.

View File

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

Binary file not shown.

Binary file not shown.

View File

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

View File

@ -13,7 +13,7 @@ dest_files=["res://.godot/imported/VO_LVL2_A_01.ogg-5e256a802dfbbccf6953e19606ab
[params] [params]
loop=false loop=false
loop_offset=0 loop_offset=0.0
bpm=0 bpm=0.0
beat_count=0 beat_count=0
bar_beats=4 bar_beats=4

Binary file not shown.

BIN
assets/garance/EGJ-Bilboard.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

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

BIN
assets/garance/EGJ-MurUni.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

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

View File

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

View File

@ -5,35 +5,29 @@ bus/1/name = &"Cinematique"
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 = 0.0 bus/1/volume_db = -9.85181
bus/1/send = &"Master" bus/1/send = &"Master"
bus/2/name = &"Character" bus/2/name = &"VoiceOver"
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 = 0.0 bus/2/volume_db = -0.030508
bus/2/send = &"Master" bus/2/send = &"Master"
bus/3/name = &"VoiceOver" bus/3/name = &"UI"
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 = 0.0 bus/3/volume_db = -2.91905
bus/3/send = &"Master" bus/3/send = &"Master"
bus/4/name = &"UI" bus/4/name = &"Music"
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 = 0.0 bus/4/volume_db = -0.030508
bus/4/send = &"Master" bus/4/send = &"Master"
bus/5/name = &"Music" bus/5/name = &"Ambiance"
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 = -5.32994 bus/5/volume_db = 0.0
bus/5/send = &"Master" 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"

View File

@ -26,6 +26,11 @@ var current_info = 0
@onready var vo_player_12: AudioStreamPlayer2D = $RightDoor/VOPlayer12 @onready var vo_player_12: AudioStreamPlayer2D = $RightDoor/VOPlayer12
var vo_players: Array[AudioStreamPlayer2D] = [] var vo_players: Array[AudioStreamPlayer2D] = []
var currently_playing: AudioStreamPlayer2D
var already_played_batch_1 = false
var already_played_batch_2 = false
var already_played_batch_3 = false
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready() -> void: func _ready() -> void:
GUIDE.enable_mapping_context(base_mode) GUIDE.enable_mapping_context(base_mode)
@ -34,10 +39,12 @@ func _ready() -> void:
vo_players.append(vo_player_2) vo_players.append(vo_player_2)
vo_players.append(vo_player_3) vo_players.append(vo_player_3)
vo_players.append(vo_player_4) vo_players.append(vo_player_4)
vo_players.append(vo_player_5) vo_players.append(vo_player_5)
vo_players.append(vo_player_6) vo_players.append(vo_player_6)
vo_players.append(vo_player_7) vo_players.append(vo_player_7)
vo_players.append(vo_player_8) vo_players.append(vo_player_8)
vo_players.append(vo_player_9) vo_players.append(vo_player_9)
vo_players.append(vo_player_10) vo_players.append(vo_player_10)
vo_players.append(vo_player_11) vo_players.append(vo_player_11)
@ -49,7 +56,6 @@ func _on_interactible_triggered(event_id: String) -> void:
if vies == 0: if vies == 0:
SceneLoader.load_scene(golé) SceneLoader.load_scene(golé)
func _on_wrong_door_event_triggered(event_id: String) -> void: func _on_wrong_door_event_triggered(event_id: String) -> void:
SceneLoader.load_scene(golé) SceneLoader.load_scene(golé)
@ -59,18 +65,107 @@ func _on_right_door_event_triggered(event_id: String) -> void:
func _on_timer_between_vo_timeout() -> void: func _on_timer_between_vo_timeout() -> void:
if is_interjection_next: if currently_playing == null or not currently_playing.playing:
currently_playing = vo_interjection
vo_interjection.play() vo_interjection.play()
is_interjection_next = not is_interjection_next
return return
if current_info >= len(vo_players):
return
vo_players[current_info].play()
current_info += 1
is_interjection_next = not is_interjection_next
func _on_door_event_triggered(event_id: String) -> void: func _on_door_event_triggered(event_id: String) -> void:
interact.play() interact.play()
func _on_first_batch_trigger_body_entered(body: Node2D) -> void:
if body.name != "Player":
return
if already_played_batch_1:
return
already_played_batch_1 = true
if currently_playing != null:
currently_playing.stop()
currently_playing = vo_player_1
vo_player_1.play()
func _on_vo_player_1_finished() -> void:
currently_playing = vo_player_2
vo_player_2.play()
func _on_vo_player_2_finished() -> void:
currently_playing = vo_player_3
vo_player_3.play()
func _on_vo_player_3_finished() -> void:
currently_playing.stop()
func _on_first_batch_trigger_2_body_entered(body: Node2D) -> void:
if body.name != "Player":
return
if already_played_batch_2:
return
already_played_batch_2 = true
currently_playing.stop()
currently_playing = vo_player_4
vo_player_4.play()
func _on_vo_player_4_finished() -> void:
currently_playing = vo_player_5
vo_player_5.play()
func _on_vo_player_5_finished() -> void:
currently_playing = vo_player_6
vo_player_6.play()
func _on_vo_player_6_finished() -> void:
currently_playing = vo_player_7
vo_player_7.play()
func _on_vo_player_7_finished() -> void:
currently_playing.stop()
func _on_first_batch_trigger_3_body_entered(body: Node2D) -> void:
if body.name != "Player":
return
if already_played_batch_3:
return
already_played_batch_3 = true
currently_playing.stop()
currently_playing = vo_player_8
vo_player_8.play()
func _on_vo_player_8_finished() -> void:
currently_playing = vo_player_9
vo_player_9.play()
func _on_vo_player_9_finished() -> void:
currently_playing = vo_player_10
vo_player_10.play()
func _on_vo_player_10_finished() -> void:
currently_playing = vo_player_11
vo_player_11.play()
func _on_vo_player_11_finished() -> void:
currently_playing = vo_player_12
vo_player_12.play()
func _on_vo_player_12_finished() -> void:
currently_playing.stop()
func _on_vo_interjection_finished() -> void:
currently_playing.stop()

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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="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="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://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="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"] [sub_resource type="Animation" id="1"]
resource_name = "Intro" resource_name = "Intro"
@ -365,9 +366,6 @@ tree_root = SubResource("AnimationNodeStateMachine_vikuh")
anim_player = NodePath("../MenuAnimationPlayer") anim_player = NodePath("../MenuAnimationPlayer")
parameters/conditions/intro_done = false parameters/conditions/intro_done = false
[node name="BackgroundMusicPlayer" parent="." index="3"]
bus = &"Master"
[node name="VersionContainer" parent="VersionMargin" index="0"] [node name="VersionContainer" parent="VersionMargin" index="0"]
modulate = Color(1, 1, 1, 0) modulate = Color(1, 1, 1, 0)
@ -407,4 +405,8 @@ text = "CREDITS"
[node name="ExitButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="4"] [node name="ExitButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="4"]
text = "EXIT" text = "EXIT"
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="10"]
stream = ExtResource("5_mcwxw")
bus = &"Music"
[connection signal="pressed" from="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer/ContinueGameButton" to="." method="_on_continue_game_button_pressed"] [connection signal="pressed" from="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer/ContinueGameButton" to="." method="_on_continue_game_button_pressed"]