5 Commits

Author SHA1 Message Date
d1996d44ed fix: wrong building and project name
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 2m31s
2025-06-29 14:43:22 +02:00
9c2bbd631f feat: lvl 3
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 15s
Create tag and build when new code gets to main / Export (push) Successful in 2m33s
2025-06-29 14:33:23 +02:00
bd72931024 Lumières fenêtres scène 1
Some checks failed
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) Has been cancelled
2025-06-29 14:32:19 +02:00
a853a5b11b Lumières billboard et un asset blanc
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 2m33s
2025-06-29 14:17:24 +02:00
0e4fe61d03 Billboard added to main
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 2m31s
2025-06-29 14:04:47 +02:00
12 changed files with 1107 additions and 36 deletions

BIN
assets/garance/RectangleBlanc.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b7056kyfrlwyo"
path="res://.godot/imported/RectangleBlanc.png-49aad6f81ba6468615261702b42fd584.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/garance/RectangleBlanc.png"
dest_files=["res://.godot/imported/RectangleBlanc.png-49aad6f81ba6468615261702b42fd584.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,25 +5,25 @@ bus/1/name = &"Cinematique"
bus/1/solo = false
bus/1/mute = false
bus/1/bypass_fx = false
bus/1/volume_db = -10.5185
bus/1/volume_db = -3.43255
bus/1/send = &"Master"
bus/2/name = &"VoiceOver"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
bus/2/volume_db = -0.030508
bus/2/volume_db = 2.1515
bus/2/send = &"Master"
bus/3/name = &"UI"
bus/3/solo = false
bus/3/mute = false
bus/3/bypass_fx = false
bus/3/volume_db = -2.91905
bus/3/volume_db = -2.51026
bus/3/send = &"Master"
bus/4/name = &"Music"
bus/4/solo = false
bus/4/mute = false
bus/4/bypass_fx = false
bus/4/volume_db = -10.0741
bus/4/volume_db = -3.11736
bus/4/send = &"Master"
bus/5/name = &"Ambiance"
bus/5/solo = false

View File

@ -10,7 +10,7 @@ config_version=5
[application]
config/name="Between the lines"
config/name="ENTRE LES LIGNES"
run/main_scene="res://template/scenes/opening/opening_with_logo.tscn"
config/features=PackedStringArray("4.4", "Forward Plus")
config/icon="res://icon.svg"

View File

@ -18,6 +18,8 @@ extends Node2D
@onready var timer_between_vo: Timer = $TimerBetweenVO
var is_interjection_next = false
var current_info: int = 0
var is_over = false
var currently_playing: AudioStreamPlayer2D
@onready var vo_prise_tiree: AudioStreamPlayer2D = $Hack/VOPriseTiree
@onready var vo_interjection: AudioStreamPlayer2D = $Hack/VOInterjection
@ -54,6 +56,10 @@ func _ready() -> void:
vo_players.append(vo_player_9)
vo_players.append(vo_player_10)
currently_playing = vo_players[current_info]
vo_players[current_info].play()
current_info += 1
func _on_prise_interacted(event_id: String) -> void:
wrong_hack.deactivate()
@ -67,15 +73,21 @@ func made_mistake() -> void:
SceneLoader.load_scene(golé)
func _on_failed_hack(event_id: String) -> void:
if currently_playing != null and currently_playing.playing:
currently_playing.stop()
made_mistake()
interact.play()
vo_trop_proche.play()
currently_playing = vo_trop_proche
func _on_successful_hack(event_id: String) -> void:
if currently_playing != null and currently_playing.playing:
currently_playing.stop()
right_door.activate()
wrong_door.deactivate()
interact.play()
vo_prise_tiree.play()
currently_playing = vo_prise_tiree
right_door.visible = true
func _on_interactible_triggered(event_id: String) -> void:
@ -89,14 +101,19 @@ func _on_right_door_event_triggered(event_id: String) -> void:
SceneLoader.load_scene(next_level) # Replace with function body.
func _on_timer_between_vo_timeout() -> void:
if is_interjection_next:
vo_interjection.play()
is_interjection_next = not is_interjection_next
if currently_playing != null and currently_playing.playing:
return
if is_over:
vo_interjection.play()
if current_info >= len(vo_players):
is_over = true
return
currently_playing = vo_players[current_info]
vo_players[current_info].play()
current_info += 1
is_interjection_next = not is_interjection_next
func _on_vo_trop_proche_finished() -> void:
pass

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -166,8 +166,6 @@ script = ExtResource("1_dovo2")
move = ExtResource("2_gmlin")
interact = ExtResource("3_lvxji")
[node name="AudioListener2D" type="AudioListener2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 2)
shape = SubResource("CapsuleShape2D_dovo2")

View File

@ -1,22 +1,13 @@
[gd_scene load_steps=13 format=3 uid="uid://cgql2prrr5cj7"]
[gd_scene load_steps=9 format=3 uid="uid://cgql2prrr5cj7"]
[ext_resource type="PackedScene" uid="uid://bhhphcagggc1" path="res://template/scenes/credits/scrolling_credits.tscn" id="1_a1vv7"]
[ext_resource type="Script" uid="uid://bwr3tliac4mo2" path="res://scenes/text_wrappers/text_wrapper.gd" id="2_at5ku"]
[ext_resource type="PackedScene" uid="uid://bkcsjsk2ciff" path="res://addons/maaacks_menus_template/base/scenes/music_players/background_music_player.tscn" id="3_gqt46"]
[ext_resource type="AudioStream" uid="uid://cf4nuujvtsup8" path="res://assets/Audio/VO_ALL_EVENT_Temps ecoule_01.ogg" id="3_uu3cc"]
[ext_resource type="AudioStream" uid="uid://dbjabxovmko46" path="res://assets/Audio/VO_ALL_EVENT_Temps ecoule_02.ogg" id="4_2sqmg"]
[ext_resource type="Script" uid="uid://1nf36h0gms3q" path="res://addons/maaacks_menus_template/base/scripts/capture_focus.gd" id="4_uu3cc"]
[ext_resource type="AudioStream" uid="uid://dj0xq3jf0hx5i" path="res://assets/Audio/VO_ALL_EVENT_Temps ecoule_03.ogg" id="5_6gsxv"]
[ext_resource type="AudioStream" uid="uid://bt50x0ixm8ffo" path="res://assets/Audio/VO_LVL3_EVENT_Aha echec_01.ogg" id="6_ir5jc"]
[ext_resource type="AudioStream" uid="uid://766x5e1nsjng" path="res://assets/Audio/VO_LVL3_EVENT_Aha echec_02.ogg" id="7_iynht"]
[ext_resource type="AudioStream" uid="uid://3y3cljtkhb2x" path="res://assets/Audio/VO_LVL3_EVENT_Aha echec_03.ogg" id="8_o1fwe"]
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_uu3cc"]
streams_count = 3
stream_0/stream = ExtResource("3_uu3cc")
stream_1/stream = ExtResource("4_2sqmg")
stream_2/stream = ExtResource("5_6gsxv")
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ir5jc"]
streams_count = 3
stream_0/stream = ExtResource("6_ir5jc")
@ -28,7 +19,6 @@ script = ExtResource("2_at5ku")
scene_to_trigger = "uid://s1cx1gvt4bed"
[node name="FailedAudio" type="AudioStreamPlayer2D" parent="." index="0"]
stream = SubResource("AudioStreamRandomizer_uu3cc")
bus = &"VoiceOver"
[node name="AHAAudio" type="AudioStreamPlayer2D" parent="." index="1"]

View File

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

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://eh3y4s4qad8m"]
[gd_scene load_steps=10 format=3 uid="uid://eh3y4s4qad8m"]
[ext_resource type="PackedScene" uid="uid://bhhphcagggc1" path="res://template/scenes/credits/scrolling_credits.tscn" id="1_o8vp5"]
[ext_resource type="Script" uid="uid://bwr3tliac4mo2" path="res://scenes/text_wrappers/text_wrapper.gd" id="2_fg6t0"]
@ -16,8 +16,6 @@ stream_1/stream = ExtResource("6_0ltfy")
stream_2/stream = ExtResource("7_8gnxm")
stream_3/stream = ExtResource("8_m6anb")
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_0ltfy"]
[node name="WrongBuilding" instance=ExtResource("1_o8vp5")]
script = ExtResource("2_fg6t0")
scene_to_trigger = "uid://s1cx1gvt4bed"
@ -133,7 +131,6 @@ wait_time = 2.0
one_shot = true
[node name="AHAAudio" type="AudioStreamPlayer2D" parent="." index="11"]
stream = SubResource("AudioStreamRandomizer_0ltfy")
autoplay = true
bus = &"VoiceOver"

View File

@ -373,7 +373,7 @@ modulate = Color(1, 1, 1, 0)
modulate = Color(1, 1, 1, 0)
[node name="TitleLabel" parent="MenuContainer/TitleMargin/TitleContainer" index="0"]
text = "BETWEEN THE LINES"
text = "ENTRE LES LIGNES"
[node name="SubTitleContainer" parent="MenuContainer/SubTitleMargin" index="0"]
modulate = Color(1, 1, 1, 0)