5 Commits

Author SHA1 Message Date
08bd2ca3b4 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 2m40s
2025-06-29 13:43:17 +02:00
16c7adfceb feat: straightforward lvl 1 2025-06-29 13:43:11 +02:00
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
8 changed files with 241 additions and 42 deletions

View File

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

View File

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

View File

@ -23,7 +23,7 @@ bus/4/name = &"Music"
bus/4/solo = false
bus/4/mute = false
bus/4/bypass_fx = false
bus/4/volume_db = -0.030508
bus/4/volume_db = -10.0741
bus/4/send = &"Master"
bus/5/name = &"Ambiance"
bus/5/solo = false

View File

@ -26,6 +26,11 @@ var current_info = 0
@onready var vo_player_12: AudioStreamPlayer2D = $RightDoor/VOPlayer12
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.
func _ready() -> void:
GUIDE.enable_mapping_context(base_mode)
@ -34,10 +39,12 @@ func _ready() -> void:
vo_players.append(vo_player_2)
vo_players.append(vo_player_3)
vo_players.append(vo_player_4)
vo_players.append(vo_player_5)
vo_players.append(vo_player_6)
vo_players.append(vo_player_7)
vo_players.append(vo_player_8)
vo_players.append(vo_player_9)
vo_players.append(vo_player_10)
vo_players.append(vo_player_11)
@ -49,7 +56,6 @@ func _on_interactible_triggered(event_id: String) -> void:
if vies == 0:
SceneLoader.load_scene(golé)
func _on_wrong_door_event_triggered(event_id: String) -> void:
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:
if is_interjection_next:
if currently_playing == null or not currently_playing.playing:
currently_playing = vo_interjection
vo_interjection.play()
is_interjection_next = not is_interjection_next
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:
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()

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=116 format=4 uid="uid://b8uo8e7x1frsc"]
[gd_scene load_steps=117 format=4 uid="uid://b8uo8e7x1frsc"]
[ext_resource type="Script" uid="uid://cjo7sxy5vy7bc" path="res://scenes/indoors/bar.gd" id="1_x0onc"]
[ext_resource type="Resource" uid="uid://7bmpcn0dxwr8" path="res://scenes/player/base.tres" id="2_7r073"]
@ -2279,6 +2279,9 @@ sources/1 = SubResource("TileSetAtlasSource_aepdt")
sources/2 = SubResource("TileSetAtlasSource_m8pkg")
sources/3 = SubResource("TileSetAtlasSource_mgt2x")
[sub_resource type="RectangleShape2D" id="RectangleShape2D_shjvm"]
size = Vector2(100, 100)
[sub_resource type="CircleShape2D" id="CircleShape2D_m8pkg"]
radius = 8.0
@ -2631,11 +2634,10 @@ next_level = "uid://bnba2vd0m0qao"
base_mode = ExtResource("2_7r073")
[node name="TimerBetweenVO" type="Timer" parent="."]
wait_time = 4.0
wait_time = 5.0
autostart = true
[node name="CanvasModulate" type="CanvasModulate" parent="."]
visible = false
color = Color(0.402604, 0.402604, 0.402604, 1)
[node name="Background" type="TileMapLayer" parent="."]
@ -2646,6 +2648,30 @@ tile_set = SubResource("TileSet_hpoax")
tile_map_data = PackedByteArray("AAAHAA4AAAAAABAAAAAJABIAAQAGAAEAAAAJABEAAQAGAAAAAAAJABAAAQAGAAAAAAAJAA8AAQAGAAAAAAAJAA4AAQAGAAAAAAAJAA0AAQAGAAAAAAAJAAwAAQAGAAAAAAAJAAsAAQAGAAAAAAAJAAoAAQAGAAAAAAAJAAkAAQAGAAAAAAAJAAgAAQAGAAAAAAAJAAcAAQAGAAAAAAAJAAYAAQAGAAAAAAAJAAUAAQAGAAAAAAAgAAYAAQAFAAAAAAAgAAcAAQAFAAAAAAAgAAgAAQAFAAAAAAAgAAkAAQAFAAAAAAAgAAoAAQAFAAAAAAAgAAsAAQAFAAAAAAAgAAwAAQAFAAAAAAAgAA0AAQAFAAAAAAAgAA4AAQAFAAAAAAAgAA8AAQAFAAAAAAAgABAAAQAFAAAAAAAgABEAAQAFAAAAAAAgABIAAQAFAAEAAAAKABIAAQAMAAMAAAALABIAAQAMAAMAAAAMABIAAQAMAAMAAAANABIAAQAMAAMAAAAOABIAAQAMAAMAAAAPABIAAQAMAAMAAAAQABIAAQAMAAMAAAARABIAAQAMAAMAAAASABIAAQAMAAMAAAATABIAAQAMAAMAAAAUABIAAQAMAAMAAAAVABIAAQAMAAMAAAAWABIAAQAMAAMAAAAXABIAAQAMAAMAAAAYABIAAQAMAAMAAAAZABIAAQAMAAMAAAAaABIAAQAMAAMAAAAbABIAAQAMAAMAAAAcABIAAQAMAAMAAAAdABIAAQAMAAMAAAAeABIAAQAMAAMAAAAfABIAAQAMAAMAAAAJAAQAAQAGAAAAAAAJAAMAAQAGAAAAAAAJAAIAAQAGAAIAAAAKAAIAAQAMAAMAAAALAAIAAQAMAAMAAAAMAAIAAQAMAAMAAAAPAAIAAQAMAAMAAAAQAAIAAQAMAAMAAAARAAIAAQAMAAMAAAASAAIAAQAMAAMAAAATAAIAAQAMAAMAAAAUAAIAAQAMAAMAAAAVAAIAAQAMAAMAAAAWAAIAAQAMAAMAAAAXAAIAAQAMAAMAAAAYAAIAAQAMAAMAAAAZAAIAAQAMAAMAAAAaAAIAAQAMAAMAAAAdAAIAAQAMAAMAAAAeAAIAAQAMAAMAAAAfAAIAAQAMAAMAAAAgAAIAAQAFAAIAAAAgAAMAAQAFAAAAAAAgAAQAAQAFAAAAAAAgAAUAAQAFAAAA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")
tile_set = SubResource("TileSet_hpoax")
[node name="FirstBatchTrigger" type="Area2D" parent="."]
position = Vector2(239, -18)
[node name="CollisionShape2D" type="CollisionShape2D" parent="FirstBatchTrigger"]
position = Vector2(65, 0)
scale = Vector2(4.24, 1)
shape = SubResource("RectangleShape2D_shjvm")
[node name="FirstBatchTrigger2" type="Area2D" parent="."]
position = Vector2(615, -164)
[node name="CollisionShape2D" type="CollisionShape2D" parent="FirstBatchTrigger2"]
position = Vector2(51, 8)
scale = Vector2(1.72, 2.72)
shape = SubResource("RectangleShape2D_shjvm")
[node name="FirstBatchTrigger3" type="Area2D" parent="."]
position = Vector2(236, -209)
[node name="CollisionShape2D" type="CollisionShape2D" parent="FirstBatchTrigger3"]
position = Vector2(-116, -1)
scale = Vector2(3.88, 1.36)
shape = SubResource("RectangleShape2D_shjvm")
[node name="WrongTapis" parent="." instance=ExtResource("4_nqcov")]
position = Vector2(0, -14)
message = "Vous soulevez le tapis, mais rien de spécial en dessous. "
@ -3004,7 +3030,6 @@ stream = ExtResource("5_elbga")
bus = &"UI"
[node name="lights" type="Node2D" parent="."]
visible = false
[node name="PointLight2D" type="PointLight2D" parent="lights"]
position = Vector2(218, 200)
@ -3023,25 +3048,67 @@ position = Vector2(445, 200)
energy = 0.5
texture = ExtResource("9_m8pkg")
[node name="PointLight2D4" type="PointLight2D" parent="lights"]
position = Vector2(218, 200)
scale = Vector2(0.921875, 1)
energy = 0.5
texture = ExtResource("9_m8pkg")
[node name="PointLight2D3" type="PointLight2D" parent="lights"]
position = Vector2(222, -93)
position = Vector2(-24, -143)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D4" type="PointLight2D" parent="lights"]
position = Vector2(56, -252)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D16" type="PointLight2D" parent="lights"]
position = Vector2(300, -208)
scale = Vector2(1.73249, 0.399399)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D10" type="PointLight2D" parent="lights"]
position = Vector2(144, -139)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D17" type="PointLight2D" parent="lights"]
position = Vector2(-74, -266)
color = Color(0.885596, 0.569729, 0.10497, 1)
energy = 2.0
texture = ExtResource("9_m8pkg")
[node name="PointLight2D8" type="PointLight2D" parent="lights"]
position = Vector2(327, -112)
scale = Vector2(0.24, 0.520002)
position = Vector2(383, -118)
scale = Vector2(0.960005, 0.4)
color = Color(0.987414, 0.839812, 0.925624, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D15" type="PointLight2D" parent="lights"]
position = Vector2(416, -276)
scale = Vector2(1.96, 0.4)
color = Color(0.987414, 0.839812, 0.925624, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D5" type="PointLight2D" parent="lights"]
position = Vector2(260, -7)
position = Vector2(65, 5)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D11" type="PointLight2D" parent="lights"]
position = Vector2(334, -5)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D12" type="PointLight2D" parent="lights"]
position = Vector2(611, -45)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D13" type="PointLight2D" parent="lights"]
position = Vector2(720, -129)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
[node name="PointLight2D14" type="PointLight2D" parent="lights"]
position = Vector2(717, -251)
color = Color(1, 0.247059, 1, 1)
texture = ExtResource("9_m8pkg")
@ -3116,6 +3183,16 @@ position = Vector2(224, -305)
sprite_frames = SubResource("SpriteFrames_xu8iw")
autoplay = "default"
[node name="AnimatedSprite2D26" type="AnimatedSprite2D" parent="personel"]
position = Vector2(134, -243)
sprite_frames = SubResource("SpriteFrames_xu8iw")
autoplay = "default"
[node name="AnimatedSprite2D27" type="AnimatedSprite2D" parent="personel"]
position = Vector2(109, -243)
sprite_frames = SubResource("SpriteFrames_xu8iw")
autoplay = "default"
[node name="AnimatedSprite2D21" type="AnimatedSprite2D" parent="personel"]
position = Vector2(448, -152)
sprite_frames = SubResource("SpriteFrames_xu8iw")
@ -3161,6 +3238,11 @@ position = Vector2(203, -156)
sprite_frames = SubResource("SpriteFrames_dsjtd")
autoplay = "default"
[node name="AnimatedSprite2D24" type="AnimatedSprite2D" parent="personel"]
position = Vector2(-15, -195)
sprite_frames = SubResource("SpriteFrames_dsjtd")
autoplay = "default"
[node name="AnimatedSprite2D14" type="AnimatedSprite2D" parent="personel"]
position = Vector2(338, -130)
sprite_frames = SubResource("SpriteFrames_dsjtd")
@ -3172,6 +3254,12 @@ scale = Vector2(-1, 1)
sprite_frames = SubResource("SpriteFrames_dsjtd")
autoplay = "default"
[node name="AnimatedSprite2D25" type="AnimatedSprite2D" parent="personel"]
position = Vector2(7, -195)
scale = Vector2(-1, 1)
sprite_frames = SubResource("SpriteFrames_dsjtd")
autoplay = "default"
[node name="AnimatedSprite2D16" type="AnimatedSprite2D" parent="personel"]
position = Vector2(751, -18)
scale = Vector2(-1, 1)
@ -3184,6 +3272,9 @@ autoplay = true
bus = &"Music"
[connection signal="timeout" from="TimerBetweenVO" to="." method="_on_timer_between_vo_timeout"]
[connection signal="body_entered" from="FirstBatchTrigger" to="." method="_on_first_batch_trigger_body_entered"]
[connection signal="body_entered" from="FirstBatchTrigger2" to="." method="_on_first_batch_trigger_2_body_entered"]
[connection signal="body_entered" from="FirstBatchTrigger3" to="." method="_on_first_batch_trigger_3_body_entered"]
[connection signal="event_triggered" from="WrongTapis" to="." method="_on_interactible_triggered"]
[connection signal="event_triggered" from="WrongTapis3" to="." method="_on_interactible_triggered"]
[connection signal="event_triggered" from="WrongTapis2" to="." method="_on_interactible_triggered"]
@ -3202,3 +3293,16 @@ bus = &"Music"
[connection signal="event_triggered" from="WrongTabouret" to="." method="_on_interactible_triggered"]
[connection signal="event_confirmed" from="RightDoor" to="." method="_on_right_door_event_triggered"]
[connection signal="event_triggered" from="RightDoor" to="." method="_on_door_event_triggered"]
[connection signal="finished" from="RightDoor/VOInterjection" to="." method="_on_vo_interjection_finished"]
[connection signal="finished" from="RightDoor/VOPlayer1" to="." method="_on_vo_player_1_finished"]
[connection signal="finished" from="RightDoor/VOPlayer2" to="." method="_on_vo_player_2_finished"]
[connection signal="finished" from="RightDoor/VOPlayer3" to="." method="_on_vo_player_3_finished"]
[connection signal="finished" from="RightDoor/VOPlayer4" to="." method="_on_vo_player_4_finished"]
[connection signal="finished" from="RightDoor/VOPlayer5" to="." method="_on_vo_player_5_finished"]
[connection signal="finished" from="RightDoor/VOPlayer6" to="." method="_on_vo_player_6_finished"]
[connection signal="finished" from="RightDoor/VOPlayer7" to="." method="_on_vo_player_7_finished"]
[connection signal="finished" from="RightDoor/VOPlayer8" to="." method="_on_vo_player_8_finished"]
[connection signal="finished" from="RightDoor/VOPlayer9" to="." method="_on_vo_player_9_finished"]
[connection signal="finished" from="RightDoor/VOPlayer10" to="." method="_on_vo_player_10_finished"]
[connection signal="finished" from="RightDoor/VOPlayer11" to="." method="_on_vo_player_11_finished"]
[connection signal="finished" from="RightDoor/VOPlayer12" to="." method="_on_vo_player_12_finished"]

File diff suppressed because one or more lines are too long

View File

@ -9,6 +9,7 @@ extends Node2D
var is_interjection_next = false
var current_info = 0
var is_over = false
@onready var vo_interjection: AudioStreamPlayer2D = $RightDoor/VOInterjection
@onready var vo_player_1: AudioStreamPlayer2D = $RightDoor/VOPlayer1
@ -63,16 +64,12 @@ func _on_door_event_confirmed(event_id: String) -> void:
func _on_timer_between_vo_timeout() -> void:
if is_interjection_next:
print("interjection")
if is_over:
vo_interjection.play()
is_interjection_next = not is_interjection_next
return
if current_info >= len(vo_players):
is_over = true
return
vo_players[current_info].play()
current_info += 1
is_interjection_next = not is_interjection_next

View File

@ -366,9 +366,6 @@ tree_root = SubResource("AnimationNodeStateMachine_vikuh")
anim_player = NodePath("../MenuAnimationPlayer")
parameters/conditions/intro_done = false
[node name="BackgroundMusicPlayer" parent="." index="3"]
stream = ExtResource("5_mcwxw")
[node name="VersionContainer" parent="VersionMargin" index="0"]
modulate = Color(1, 1, 1, 0)
@ -408,4 +405,8 @@ text = "CREDITS"
[node name="ExitButton" parent="MenuContainer/MenuButtonsMargin/MenuButtonsContainer/MenuButtonsBoxContainer" index="4"]
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"]