1 Commits

Author SHA1 Message Date
0ebd81c479 fix: rideaux names rideaux et arreter de parler apres lights off
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 2m32s
2025-06-29 16:07:10 +02:00
2 changed files with 12 additions and 4 deletions

View File

@ -20,6 +20,7 @@ var is_interjection_next = false
var current_info: int = 0 var current_info: int = 0
var is_over = false var is_over = false
var currently_playing: AudioStreamPlayer2D var currently_playing: AudioStreamPlayer2D
var lights_off = false
@onready var vo_light_off: AudioStreamPlayer2D = $Hack/VOLightOff @onready var vo_light_off: AudioStreamPlayer2D = $Hack/VOLightOff
@onready var vo_prise_tiree: AudioStreamPlayer2D = $Hack/VOPriseTiree @onready var vo_prise_tiree: AudioStreamPlayer2D = $Hack/VOPriseTiree
@ -73,6 +74,7 @@ func _on_prise_interacted(event_id: String) -> void:
interact.play() interact.play()
vo_light_off.play() vo_light_off.play()
lights_off = true
currently_playing = vo_light_off currently_playing = vo_light_off
func made_mistake() -> void: func made_mistake() -> void:
@ -111,6 +113,8 @@ 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 currently_playing != null and currently_playing.playing: if currently_playing != null and currently_playing.playing:
return return
if lights_off:
return
if is_over: if is_over:
vo_interjection.play() vo_interjection.play()

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=130 format=4 uid="uid://bnba2vd0m0qao"] [gd_scene load_steps=131 format=4 uid="uid://bnba2vd0m0qao"]
[ext_resource type="Script" uid="uid://c232mm5h43ed4" path="res://scenes/indoors/last.gd" id="1_cad5s"] [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"] [ext_resource type="Resource" uid="uid://7bmpcn0dxwr8" path="res://scenes/player/base.tres" id="2_1lxr4"]
@ -68,6 +68,7 @@
[ext_resource type="Texture2D" uid="uid://pc5817wfl1no" path="res://assets/garance/EGJ-TrapDoor.png" id="62_xiu81"] [ext_resource type="Texture2D" uid="uid://pc5817wfl1no" path="res://assets/garance/EGJ-TrapDoor.png" id="62_xiu81"]
[ext_resource type="Texture2D" uid="uid://dhjv5lvcp7so" path="res://assets/Modern_Interiors_Free_v2.2/Modern tiles_Free/Characters_free/Bob_idle_anim_16x16.png" id="64_ixshy"] [ext_resource type="Texture2D" uid="uid://dhjv5lvcp7so" path="res://assets/Modern_Interiors_Free_v2.2/Modern tiles_Free/Characters_free/Bob_idle_anim_16x16.png" id="64_ixshy"]
[ext_resource type="Texture2D" uid="uid://cdkd4frggan56" path="res://assets/Modern_Interiors_Free_v2.2/Modern tiles_Free/Characters_free/Alex_idle_anim_16x16.png" id="65_6r2xh"] [ext_resource type="Texture2D" uid="uid://cdkd4frggan56" path="res://assets/Modern_Interiors_Free_v2.2/Modern tiles_Free/Characters_free/Alex_idle_anim_16x16.png" id="65_6r2xh"]
[ext_resource type="Texture2D" uid="uid://cnxkk1hk4nfwq" path="res://assets/lightcone.jpg" id="68_o58id"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_nyh47"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_nyh47"]
texture = ExtResource("3_vefux") texture = ExtResource("3_vefux")
@ -2717,7 +2718,6 @@ region_rect = Rect2(255, 170, 16, 16)
[node name="PointLight2D8" type="PointLight2D" parent="GetOutDoors/RightDoor"] [node name="PointLight2D8" type="PointLight2D" parent="GetOutDoors/RightDoor"]
position = Vector2(3.05176e-05, 0) position = Vector2(3.05176e-05, 0)
scale = Vector2(0.198204, 0.195312) scale = Vector2(0.198204, 0.195312)
energy = 0.5
texture = ExtResource("7_7ac63") texture = ExtResource("7_7ac63")
[node name="RightPrise" parent="." instance=ExtResource("6_bwlf0")] [node name="RightPrise" parent="." instance=ExtResource("6_bwlf0")]
@ -2759,7 +2759,6 @@ shape = SubResource("CircleShape2D_m8pkg")
[node name="PointLight2D9" type="PointLight2D" parent="Hack"] [node name="PointLight2D9" type="PointLight2D" parent="Hack"]
scale = Vector2(0.198204, 0.195312) scale = Vector2(0.198204, 0.195312)
energy = 0.3
texture = ExtResource("7_7ac63") texture = ExtResource("7_7ac63")
[node name="WrongHack" parent="Hack" instance=ExtResource("6_bwlf0")] [node name="WrongHack" parent="Hack" instance=ExtResource("6_bwlf0")]
@ -2991,7 +2990,7 @@ shape = SubResource("CircleShape2D_o22xi")
[node name="WrongRideaux" parent="." instance=ExtResource("6_bwlf0")] [node name="WrongRideaux" parent="." instance=ExtResource("6_bwlf0")]
position = Vector2(230, -167) position = Vector2(230, -167)
message = "Ces rideaux sont sympas mais ne servent que à vous faire repérer." message = "Ces rideaux sont sympas mais ne servent que à vous faire repérer."
interact_text = "vase" interact_text = "rideau"
event = "wrong" event = "wrong"
is_item = true is_item = true
@ -3038,6 +3037,11 @@ position = Vector2(224, -86)
sprite_frames = SubResource("SpriteFrames_6r2xh") sprite_frames = SubResource("SpriteFrames_6r2xh")
autoplay = "default" autoplay = "default"
[node name="PointLight2D10" type="PointLight2D" parent="."]
position = Vector2(290, 23)
scale = Vector2(0.198204, 0.195312)
texture = ExtResource("68_o58id")
[node name="AnimatedSprite2D24" type="AnimatedSprite2D" parent="."] [node name="AnimatedSprite2D24" type="AnimatedSprite2D" parent="."]
position = Vector2(206, -86) position = Vector2(206, -86)
sprite_frames = SubResource("SpriteFrames_6r2xh") sprite_frames = SubResource("SpriteFrames_6r2xh")