3 Commits

Author SHA1 Message Date
8832e8e067 fix: removed the accept buttons from showing early as people would skip important info from the intro
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 10s
Create tag and build when new code gets to main / Export (push) Successful in 2m44s
2025-07-06 17:30:55 +02:00
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
9f176cd1a9 nom bar
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 2m32s
2025-06-29 15:12:39 +02:00
10 changed files with 64 additions and 6 deletions

View File

@ -0,0 +1 @@
uid://d0wu3wxgpt54g

View File

@ -0,0 +1 @@
uid://b2dnvuhxmkjss

View File

@ -0,0 +1 @@
uid://baivsviwtkk6g

View File

@ -0,0 +1 @@
uid://04gv1dhut3pn

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

Binary file not shown.

View File

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

@ -1,4 +1,4 @@
[gd_scene load_steps=117 format=4 uid="uid://b8uo8e7x1frsc"]
[gd_scene load_steps=118 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"]
@ -60,6 +60,7 @@
[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="58_8o1ns"]
[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="59_shjvm"]
[ext_resource type="AudioStream" uid="uid://cb40pasbhcfuq" path="res://assets/Audio/MUS_LVL2_intro.ogg" id="60_shjvm"]
[ext_resource type="Texture2D" uid="uid://c6y6qpondp2v" path="res://assets/garance/EGJ-cyberdrinker.png" id="61_yudpf"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_nyh47"]
texture = ExtResource("3_18rbg")
@ -3271,6 +3272,15 @@ stream = SubResource("AudioStreamInteractive_yudpf")
autoplay = true
bus = &"Music"
[node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2(335, 66)
texture = ExtResource("61_yudpf")
[node name="PointLight2D" type="PointLight2D" parent="Sprite2D"]
color = Color(1, 0.756863, 1, 1)
energy = 2.0
texture = ExtResource("61_yudpf")
[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"]

View File

@ -20,6 +20,7 @@ var is_interjection_next = false
var current_info: int = 0
var is_over = false
var currently_playing: AudioStreamPlayer2D
var lights_off = false
@onready var vo_light_off: AudioStreamPlayer2D = $Hack/VOLightOff
@onready var vo_prise_tiree: AudioStreamPlayer2D = $Hack/VOPriseTiree
@ -73,6 +74,7 @@ func _on_prise_interacted(event_id: String) -> void:
interact.play()
vo_light_off.play()
lights_off = true
currently_playing = vo_light_off
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:
if currently_playing != null and currently_playing.playing:
return
if lights_off:
return
if is_over:
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="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://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://cnxkk1hk4nfwq" path="res://assets/lightcone.jpg" id="68_o58id"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_nyh47"]
texture = ExtResource("3_vefux")
@ -2717,7 +2718,6 @@ region_rect = Rect2(255, 170, 16, 16)
[node name="PointLight2D8" type="PointLight2D" parent="GetOutDoors/RightDoor"]
position = Vector2(3.05176e-05, 0)
scale = Vector2(0.198204, 0.195312)
energy = 0.5
texture = ExtResource("7_7ac63")
[node name="RightPrise" parent="." instance=ExtResource("6_bwlf0")]
@ -2759,7 +2759,6 @@ shape = SubResource("CircleShape2D_m8pkg")
[node name="PointLight2D9" type="PointLight2D" parent="Hack"]
scale = Vector2(0.198204, 0.195312)
energy = 0.3
texture = ExtResource("7_7ac63")
[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")]
position = Vector2(230, -167)
message = "Ces rideaux sont sympas mais ne servent que à vous faire repérer."
interact_text = "vase"
interact_text = "rideau"
event = "wrong"
is_item = true
@ -3038,6 +3037,11 @@ position = Vector2(224, -86)
sprite_frames = SubResource("SpriteFrames_6r2xh")
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="."]
position = Vector2(206, -86)
sprite_frames = SubResource("SpriteFrames_6r2xh")

View File

@ -42,7 +42,6 @@ func _on_further_connexion_timeout() -> void:
func _on_text_start_timeout() -> void:
message.text = ""
time_before_show_buttons.start()
failed_audio.play()
time_between_words.start()