5 Commits

Author SHA1 Message Date
1057d2d81b et l'import
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:44:17 +02:00
3f5156a48b Asset billboard Onid 2025-06-29 12:44:03 +02:00
5b37da17e0 fix: some lights on lvl 1
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 2m33s
2025-06-29 12:11:11 +02:00
9b781ac431 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 13s
Create tag and build when new code gets to main / Export (push) Successful in 2m33s
2025-06-29 12:02:41 +02:00
42fa5edecf feat: lvl2 decor 2025-06-29 12:02:37 +02:00
5 changed files with 258 additions and 33 deletions

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

Binary file not shown.

View File

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

File diff suppressed because one or more lines are too long

View File

@ -2515,14 +2515,14 @@ position = Vector2(292, -17)
sprite_frames = SubResource("SpriteFrames_fcj1w")
animation = &"idle"
autoplay = "idle"
frame_progress = 0.524898
frame_progress = 0.987176
[node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="Hack"]
position = Vector2(-11, 14)
sprite_frames = SubResource("SpriteFrames_tnfmx")
animation = &"idle"
autoplay = "idle"
frame_progress = 0.569746
frame_progress = 0.0320194
[node name="StaticBody2D" type="StaticBody2D" parent="Hack"]

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=80 format=4 uid="uid://s1cx1gvt4bed"]
[gd_scene load_steps=81 format=4 uid="uid://s1cx1gvt4bed"]
[ext_resource type="Script" uid="uid://csujcot8xk1om" path="res://scenes/main.gd" id="1_0wfyh"]
[ext_resource type="PackedScene" uid="uid://4ye80a3tugk6" path="res://scenes/player/player.tscn" id="1_o5qli"]
@ -21,6 +21,7 @@
[ext_resource type="Texture2D" uid="uid://4gt5bxd762jf" path="res://assets/garance/EGJ-POSTE-neon.png" id="8_tipki"]
[ext_resource type="AudioStream" uid="uid://mbumd1hnp7yd" path="res://assets/Audio/VO_ALL_Interjection_12.ogg" id="9_fuf3a"]
[ext_resource type="AudioStream" uid="uid://bvk71nu7epwy" path="res://assets/Audio/VO_LVL1_B_02.ogg" id="9_ro3en"]
[ext_resource type="Texture2D" uid="uid://dna7ld7qgab32" path="res://assets/light.webp" id="10_choun"]
[ext_resource type="AudioStream" uid="uid://ba1x4vgi5k3ls" path="res://assets/Audio/VO_LVL1_A_11.ogg" id="10_od4ux"]
[ext_resource type="AudioStream" uid="uid://ddgkyj2ild8k0" path="res://assets/Audio/VO_ALL_Interjection_13.ogg" id="10_pibwh"]
[ext_resource type="AudioStream" uid="uid://bdaercty8ftg8" path="res://assets/Audio/VO_ALL_Interjection_14.ogg" id="11_c6pm6"]
@ -2008,7 +2009,7 @@ stream_16/stream = ExtResource("14_2cjbq")
stream_17/stream = ExtResource("15_chjal")
stream_18/stream = ExtResource("16_cjqg0")
[node name="Main" type="Node2D"]
[node name="Main2" type="Node2D"]
script = ExtResource("1_0wfyh")
wrong_building = "uid://eh3y4s4qad8m"
next_level = "uid://b8uo8e7x1frsc"
@ -2167,20 +2168,17 @@ tile_map_data = PackedByteArray("AAATAAYAAAAQAAgAAAATAAcAAAAQAAkAAAAhAAYAAAAQAAg
tile_set = SubResource("TileSet_tefeu")
[node name="Sprite2D2" type="Sprite2D" parent="."]
position = Vector2(382, -23)
rotation = -0.474524
position = Vector2(382, -33)
scale = Vector2(1.5, 1.5)
texture = ExtResource("8_eb6dy")
[node name="PointLight2D4" type="PointLight2D" parent="Sprite2D2"]
rotation = -0.00143352
energy = 0.8
energy = 0.5
blend_mode = 1
texture = ExtResource("8_eb6dy")
[node name="PointLight2D10" type="PointLight2D" parent="Sprite2D2"]
position = Vector2(-66.405, 129.276)
rotation = 0.474524
position = Vector2(-2.66667, 152)
scale = Vector2(1.5, 2)
color = Color(0.829476, 0.26404, 0.844939, 1)
texture = ExtResource("12_eb6dy")
@ -2199,7 +2197,6 @@ texture = ExtResource("8_tipki")
position = Vector2(0, 152)
scale = Vector2(2, 2)
color = Color(3.36915e-06, 0.61579, 0.742444, 1)
energy = 0.5
texture = ExtResource("12_eb6dy")
[node name="Sprite2D5" type="Sprite2D" parent="."]
@ -2216,7 +2213,6 @@ texture = ExtResource("11_ya4ey")
position = Vector2(0, 113)
scale = Vector2(1.5, 1.5)
color = Color(0.131565, 0.6402, 0.540846, 1)
energy = 0.5
texture = ExtResource("12_eb6dy")
[node name="Sprite2D6" type="Sprite2D" parent="."]
@ -2236,6 +2232,39 @@ color = Color(0.90509, 0.345261, 0.761844, 1)
energy = 0.8
texture = ExtResource("12_eb6dy")
[node name="Streetlight" type="Node2D" parent="."]
[node name="PointLight2D10" type="PointLight2D" parent="Streetlight"]
position = Vector2(40, 223)
scale = Vector2(0.5, 0.5)
color = Color(0.748052, 0.938853, 1, 1)
texture = ExtResource("12_eb6dy")
[node name="PointLight2D11" type="PointLight2D" parent="Streetlight"]
position = Vector2(104, 221)
scale = Vector2(0.5, 0.5)
color = Color(0.748052, 0.938853, 1, 1)
texture = ExtResource("12_eb6dy")
[node name="PointLight2D12" type="PointLight2D" parent="Streetlight"]
position = Vector2(393, 286)
scale = Vector2(0.5, 0.5)
color = Color(0.748052, 0.938853, 1, 1)
texture = ExtResource("12_eb6dy")
[node name="PointLight2D13" type="PointLight2D" parent="Streetlight"]
position = Vector2(455, 286)
scale = Vector2(0.5, 0.5)
color = Color(0.748052, 0.938853, 1, 1)
texture = ExtResource("12_eb6dy")
[node name="PointLight2D14" type="PointLight2D" parent="Streetlight"]
position = Vector2(99, 23)
scale = Vector2(0.0324346, 0.036338)
color = Color(0.841686, 0.0733665, 0.224079, 1)
energy = 4.16
texture = ExtResource("10_choun")
[connection signal="timeout" from="TimerBetweenVO" to="." method="_on_timer_between_vo_timeout"]
[connection signal="event_confirmed" from="WrongDoor" to="." method="_on_door_event_confirmed"]
[connection signal="event_triggered" from="WrongDoor" to="." method="_on_door_event_triggered"]