5 Commits

Author SHA1 Message Date
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
5 changed files with 89 additions and 11 deletions

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

@ -11,7 +11,7 @@
[ext_resource type="AudioStream" uid="uid://dwrc0uynvsikh" path="res://assets/Audio/INT_Generic.ogg" id="5_elbga"] [ext_resource type="AudioStream" uid="uid://dwrc0uynvsikh" path="res://assets/Audio/INT_Generic.ogg" id="5_elbga"]
[ext_resource type="Texture2D" uid="uid://dubgoja4vusil" path="res://assets/kenney_rpg-urban-pack/Tilemap/tilemap.png" id="5_v67d5"] [ext_resource type="Texture2D" uid="uid://dubgoja4vusil" path="res://assets/kenney_rpg-urban-pack/Tilemap/tilemap.png" id="5_v67d5"]
[ext_resource type="AudioStream" uid="uid://b1ehpdk1i6gcs" path="res://assets/Audio/VO_LVL2_A_01.ogg" id="5_xpbsm"] [ext_resource type="AudioStream" uid="uid://b1ehpdk1i6gcs" path="res://assets/Audio/VO_LVL2_A_01.ogg" id="5_xpbsm"]
[ext_resource type="Texture2D" uid="uid://ch7k58hcv4d0y" path="res://assets/garance/EGJ-Green-tiles.png" id="6_6qh2u"] [ext_resource type="Texture2D" uid="uid://lqn1agbqybrv" path="res://assets/garance/EGJ-Green-tiles.png" id="6_6qh2u"]
[ext_resource type="AudioStream" uid="uid://c4cfr3vst2tbo" path="res://assets/Audio/VO_LVL2_B_01.ogg" id="6_487yo"] [ext_resource type="AudioStream" uid="uid://c4cfr3vst2tbo" path="res://assets/Audio/VO_LVL2_B_01.ogg" id="6_487yo"]
[ext_resource type="AudioStream" uid="uid://quote3410ki1" path="res://assets/Audio/VO_ALL_Interjection_01.ogg" id="6_jvile"] [ext_resource type="AudioStream" uid="uid://quote3410ki1" path="res://assets/Audio/VO_ALL_Interjection_01.ogg" id="6_jvile"]
[ext_resource type="PackedScene" uid="uid://4ye80a3tugk6" path="res://scenes/player/player.tscn" id="6_rrntp"] [ext_resource type="PackedScene" uid="uid://4ye80a3tugk6" path="res://scenes/player/player.tscn" id="6_rrntp"]
@ -2448,6 +2448,23 @@ scale = Vector2(0.198204, 0.195312)
energy = 0.3 energy = 0.3
texture = ExtResource("9_m8pkg") texture = ExtResource("9_m8pkg")
[node name="WrongTableau" parent="." instance=ExtResource("4_nqcov")]
position = Vector2(250, -166)
message = "Vous regardez derrière le tableau. Rien d'anormal, sauf votre comportement..."
interact_text = "tableau"
event = "wrong"
is_item = true
[node name="Sprite2D" type="Sprite2D" parent="WrongTableau"]
texture = ExtResource("3_18rbg")
region_enabled = true
region_rect = Rect2(130, 362, 28, 13)
[node name="PointLight2D9" type="PointLight2D" parent="WrongTableau"]
scale = Vector2(0.198204, 0.195312)
energy = 0.3
texture = ExtResource("9_m8pkg")
[node name="Furniture" type="TileMapLayer" parent="."] [node name="Furniture" type="TileMapLayer" parent="."]
tile_map_data = PackedByteArray("AAAHAA4AAAAAABAAAAAMAAgAAAALAAYAAAAMAAkAAAALAAcAAAAMAAoAAAALAAgAAAANAAgAAAAMAAYAAAANAAkAAAAMAAcAAAANAAoAAAAMAAgAAAAOAAgAAAANAAYAAAAOAAkAAAANAAcAAAAOAAoAAAANAAgAAAAPAAgAAAAOAAYAAAAPAAkAAAAOAAcAAAAPAAoAAAAOAAgAAAAMAAcAAAALAAYAAAANAAcAAAAMAAYAAAAOAAcAAAANAAYAAAAPAAcAAAAOAAYAAAAMAAYAAAALAAYAAAANAAYAAAAMAAYAAAAOAAYAAAANAAYAAAAPAAYAAAAOAAYAAAAMAAUAAAALAAYAAAANAAUAAAAMAAYAAAAOAAUAAAANAAYAAAAPAAUAAAAOAAYAAAATAAgAAAAHABEAAAAUAAgAAAAIABEAAAAVAAgAAAAJABEAAAAWAAgAAAAKABEAAAATAAYAAAAHAA8AAAATAAcAAAAHABAAAAAUAAYAAAAIAA8AAAAUAAcAAAAIABAAAAAVAAYAAAAJAA8AAAAVAAcAAAAJABAAAAAWAAYAAAAKAA8AAAAWAAcAAAAKABAAAAAaAAUAAAALAAYAAAAaAAYAAAALAAYAAAAaAAcAAAALAAYAAAAaAAgAAAALAAYAAAAaAAkAAAALAAcAAAAbAAUAAAAMAAYAAAAbAAYAAAAMAAYAAAAbAAcAAAAMAAYAAAAbAAgAAAAMAAYAAAAbAAkAAAAMAAcAAAAcAAUAAAANAAYAAAAcAAYAAAANAAYAAAAcAAcAAAANAAYAAAAcAAgAAAANAAYAAAAcAAkAAAANAAcAAAAdAAUAAAAOAAYAAAAdAAYAAAAOAAYAAAAdAAcAAAAOAAYAAAAdAAgAAAAOAAYAAAAdAAkAAAAOAAcAAAASAAkAAAAHAA0AAAASAAoAAAAHAA4AAAATAAkAAAAIAA0AAAATAAoAAAAIAA4AAAAUAAkAAAAIAA0AAAAUAAoAAAAIAA4AAAAVAAkAAAAIAA0AAAAVAAoAAAAIAA4AAAAWAAkAAAAIAA0AAAAWAAoAAAAIAA4AAAAXAAkAAAAJAA0AAAAXAAoAAAAJAA4AAAAQAAYAAAAHAA0AAAAQAAcAAAAHAA4AAAARAAYAAAAJAA0AAAARAAcAAAAJAA4AAAAYAAYAAAAHAA0AAAAYAAcAAAAHAA4AAAAZAAYAAAAJAA0AAAAZAAcAAAAJAA4AAAASAAYAAAAHABUAAAASAAcAAAAHABYAAAAXAAUAAAAGABUAAAAXAAYAAAAGABYAAAAeAA0AAAAFACYAAAAeAA4AAAAFACcAAAAfAA0AAAAGACYAAAAfAA4AAAAGACcAAAAeAA8AAAAFACYAAAAeABAAAAAFACcAAAAfAA8AAAAGACYAAAAfABAAAAAGACcAAAAdAA0AAAAFACgAAAAdAA4AAAAFACkAAAAdAA8AAAAFACgAAAAdABAAAAAFACkAAAAKAAsAAAAJAEwAAAAKAAwAAAAJAE0AAAAKAA0AAAAJAE4AAAALAAsAAAAKAEwAAAALAAwAAAAKAE0AAAALAA0AAAAKAE4AAAAKAA4AAAAJAEwAAAAKAA8AAAAJAE0AAAAKABAAAAAJAE4AAAALAA4AAAAKAEwAAAALAA8AAAAKAE0AAAALABAAAAAKAE4AAAAMAAwAAAANAEsAAAAMAA0AAAANAEwAAAAMAAQAAAALAAYAAAANAAQAAAAMAAYAAAAOAAQAAAANAAYAAAAPAAQAAAAOAAYAAAAMAAMAAAALAAYAAAANAAMAAAAMAAYAAAAOAAMAAAANAAYAAAAPAAMAAAAOAAYAAAAaAAQAAAALAAYAAAAbAAQAAAAMAAYAAAAcAAQAAAANAAYAAAAdAAQAAAAOAAYAAAAaAAMAAAALAAYAAAAbAAMAAAAMAAYAAAAcAAMAAAANAAYAAAAdAAMAAAAOAAYAAAAMAAIAAAAFAAEAAAANAAIAAAAGAAEAAAAOAAIAAAAHAAEAAAAPAAIAAAAIAAEAAAAaAAIAAAAFAAEAAAAbAAIAAAAGAAEAAAAcAAIAAAAHAAEAAAAdAAIAAAAIAAEAAAAeAPz/AgAPAA0AAAAOAPn/AAAMACgAAAAOAPr/AAAMACkAAAANAPn/AAAMACgAAAANAPr/AAAMACkAAAAXAP//AAAHAC0AAAAXAAAAAAAHAC4AAAAXAAEAAAAHAC8AAAAYAP//AAAIAC0AAAAYAAAAAAAIAC4AAAAYAAEAAAAIAC8AAAAZAP//AAAJAC0AAAAZAAAAAAAJAC4AAAAZAAEAAAAJAC8AAAAWAAAAAAAFACwAAAAWAAEAAAAFACwAAAAaAAEAAAAFACwAAAA=") tile_map_data = PackedByteArray("AAAHAA4AAAAAABAAAAAMAAgAAAALAAYAAAAMAAkAAAALAAcAAAAMAAoAAAALAAgAAAANAAgAAAAMAAYAAAANAAkAAAAMAAcAAAANAAoAAAAMAAgAAAAOAAgAAAANAAYAAAAOAAkAAAANAAcAAAAOAAoAAAANAAgAAAAPAAgAAAAOAAYAAAAPAAkAAAAOAAcAAAAPAAoAAAAOAAgAAAAMAAcAAAALAAYAAAANAAcAAAAMAAYAAAAOAAcAAAANAAYAAAAPAAcAAAAOAAYAAAAMAAYAAAALAAYAAAANAAYAAAAMAAYAAAAOAAYAAAANAAYAAAAPAAYAAAAOAAYAAAAMAAUAAAALAAYAAAANAAUAAAAMAAYAAAAOAAUAAAANAAYAAAAPAAUAAAAOAAYAAAATAAgAAAAHABEAAAAUAAgAAAAIABEAAAAVAAgAAAAJABEAAAAWAAgAAAAKABEAAAATAAYAAAAHAA8AAAATAAcAAAAHABAAAAAUAAYAAAAIAA8AAAAUAAcAAAAIABAAAAAVAAYAAAAJAA8AAAAVAAcAAAAJABAAAAAWAAYAAAAKAA8AAAAWAAcAAAAKABAAAAAaAAUAAAALAAYAAAAaAAYAAAALAAYAAAAaAAcAAAALAAYAAAAaAAgAAAALAAYAAAAaAAkAAAALAAcAAAAbAAUAAAAMAAYAAAAbAAYAAAAMAAYAAAAbAAcAAAAMAAYAAAAbAAgAAAAMAAYAAAAbAAkAAAAMAAcAAAAcAAUAAAANAAYAAAAcAAYAAAANAAYAAAAcAAcAAAANAAYAAAAcAAgAAAANAAYAAAAcAAkAAAANAAcAAAAdAAUAAAAOAAYAAAAdAAYAAAAOAAYAAAAdAAcAAAAOAAYAAAAdAAgAAAAOAAYAAAAdAAkAAAAOAAcAAAASAAkAAAAHAA0AAAASAAoAAAAHAA4AAAATAAkAAAAIAA0AAAATAAoAAAAIAA4AAAAUAAkAAAAIAA0AAAAUAAoAAAAIAA4AAAAVAAkAAAAIAA0AAAAVAAoAAAAIAA4AAAAWAAkAAAAIAA0AAAAWAAoAAAAIAA4AAAAXAAkAAAAJAA0AAAAXAAoAAAAJAA4AAAAQAAYAAAAHAA0AAAAQAAcAAAAHAA4AAAARAAYAAAAJAA0AAAARAAcAAAAJAA4AAAAYAAYAAAAHAA0AAAAYAAcAAAAHAA4AAAAZAAYAAAAJAA0AAAAZAAcAAAAJAA4AAAASAAYAAAAHABUAAAASAAcAAAAHABYAAAAXAAUAAAAGABUAAAAXAAYAAAAGABYAAAAeAA0AAAAFACYAAAAeAA4AAAAFACcAAAAfAA0AAAAGACYAAAAfAA4AAAAGACcAAAAeAA8AAAAFACYAAAAeABAAAAAFACcAAAAfAA8AAAAGACYAAAAfABAAAAAGACcAAAAdAA0AAAAFACgAAAAdAA4AAAAFACkAAAAdAA8AAAAFACgAAAAdABAAAAAFACkAAAAKAAsAAAAJAEwAAAAKAAwAAAAJAE0AAAAKAA0AAAAJAE4AAAALAAsAAAAKAEwAAAALAAwAAAAKAE0AAAALAA0AAAAKAE4AAAAKAA4AAAAJAEwAAAAKAA8AAAAJAE0AAAAKABAAAAAJAE4AAAALAA4AAAAKAEwAAAALAA8AAAAKAE0AAAALABAAAAAKAE4AAAAMAAwAAAANAEsAAAAMAA0AAAANAEwAAAAMAAQAAAALAAYAAAANAAQAAAAMAAYAAAAOAAQAAAANAAYAAAAPAAQAAAAOAAYAAAAMAAMAAAALAAYAAAANAAMAAAAMAAYAAAAOAAMAAAANAAYAAAAPAAMAAAAOAAYAAAAaAAQAAAALAAYAAAAbAAQAAAAMAAYAAAAcAAQAAAANAAYAAAAdAAQAAAAOAAYAAAAaAAMAAAALAAYAAAAbAAMAAAAMAAYAAAAcAAMAAAANAAYAAAAdAAMAAAAOAAYAAAAMAAIAAAAFAAEAAAANAAIAAAAGAAEAAAAOAAIAAAAHAAEAAAAPAAIAAAAIAAEAAAAaAAIAAAAFAAEAAAAbAAIAAAAGAAEAAAAcAAIAAAAHAAEAAAAdAAIAAAAIAAEAAAAeAPz/AgAPAA0AAAAOAPn/AAAMACgAAAAOAPr/AAAMACkAAAANAPn/AAAMACgAAAANAPr/AAAMACkAAAAXAP//AAAHAC0AAAAXAAAAAAAHAC4AAAAXAAEAAAAHAC8AAAAYAP//AAAIAC0AAAAYAAAAAAAIAC4AAAAYAAEAAAAIAC8AAAAZAP//AAAJAC0AAAAZAAAAAAAJAC4AAAAZAAEAAAAJAC8AAAAWAAAAAAAFACwAAAAWAAEAAAAFACwAAAAaAAEAAAAFACwAAAA=")
tile_set = SubResource("TileSet_hpoax") tile_set = SubResource("TileSet_hpoax")
@ -2628,6 +2645,7 @@ texture = ExtResource("9_m8pkg")
[connection signal="event_triggered" from="WrongLampe" to="." method="_on_interactible_triggered"] [connection signal="event_triggered" from="WrongLampe" to="." method="_on_interactible_triggered"]
[connection signal="event_triggered" from="WrongPlacard" to="." method="_on_interactible_triggered"] [connection signal="event_triggered" from="WrongPlacard" to="." method="_on_interactible_triggered"]
[connection signal="event_triggered" from="WrongLampe2" to="." method="_on_interactible_triggered"] [connection signal="event_triggered" from="WrongLampe2" to="." method="_on_interactible_triggered"]
[connection signal="event_triggered" from="WrongTableau" to="." method="_on_interactible_triggered"]
[connection signal="event_confirmed" from="WrongDoor" to="." method="_on_wrong_door_event_triggered"] [connection signal="event_confirmed" from="WrongDoor" to="." method="_on_wrong_door_event_triggered"]
[connection signal="event_triggered" from="WrongDoor" to="." method="_on_door_event_triggered"] [connection signal="event_triggered" from="WrongDoor" to="." method="_on_door_event_triggered"]
[connection signal="event_triggered" from="WrongTabouret" to="." method="_on_interactible_triggered"] [connection signal="event_triggered" from="WrongTabouret" to="." method="_on_interactible_triggered"]

View File

@ -2515,14 +2515,14 @@ position = Vector2(292, -17)
sprite_frames = SubResource("SpriteFrames_fcj1w") sprite_frames = SubResource("SpriteFrames_fcj1w")
animation = &"idle" animation = &"idle"
autoplay = "idle" autoplay = "idle"
frame_progress = 0.457516 frame_progress = 0.524898
[node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="Hack"] [node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="Hack"]
position = Vector2(-11, 14) position = Vector2(-11, 14)
sprite_frames = SubResource("SpriteFrames_tnfmx") sprite_frames = SubResource("SpriteFrames_tnfmx")
animation = &"idle" animation = &"idle"
autoplay = "idle" autoplay = "idle"
frame_progress = 0.502363 frame_progress = 0.569746
[node name="StaticBody2D" type="StaticBody2D" parent="Hack"] [node name="StaticBody2D" type="StaticBody2D" parent="Hack"]
@ -2632,7 +2632,7 @@ position = Vector2(468, -6)
texture = ExtResource("7_7ac63") texture = ExtResource("7_7ac63")
[node name="TimerBetweenVO" type="Timer" parent="."] [node name="TimerBetweenVO" type="Timer" parent="."]
wait_time = 0.2 wait_time = 4.0
autostart = true autostart = true
[connection signal="event_confirmed" from="GetOutDoors/WrongDoor" to="." method="_on_wrong_door_event_triggered"] [connection signal="event_confirmed" from="GetOutDoors/WrongDoor" to="." method="_on_wrong_door_event_triggered"]

File diff suppressed because one or more lines are too long