From df7cec57acb0c074af2eaa7fa9dbe925ae80ffe4 Mon Sep 17 00:00:00 2001 From: Thomas Lavocat Date: Mon, 29 May 2023 08:22:27 +0200 Subject: [PATCH] =?UTF-8?q?lumi=C3=A8res:=20niveau=201=20et=20deux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amélioration des fenêtres, ajout de lumières dans le niveau 1 (qui est le deux) --- items/fenêtre.tscn | 1 - levels/level_0.tscn | 1 - levels/level_1.tscn | 134 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 131 insertions(+), 5 deletions(-) diff --git a/items/fenêtre.tscn b/items/fenêtre.tscn index b1b0ace..61903ee 100644 --- a/items/fenêtre.tscn +++ b/items/fenêtre.tscn @@ -12,7 +12,6 @@ position = Vector2(-95, -154) position = Vector2(-1, -31) scale = Vector2(0.0587078, 0.0472203) energy = 1.63 -blend_mode = 2 shadow_enabled = true shadow_filter = 1 shadow_filter_smooth = 11.0 diff --git a/levels/level_0.tscn b/levels/level_0.tscn index 36aa599..6bddd86 100644 --- a/levels/level_0.tscn +++ b/levels/level_0.tscn @@ -116,7 +116,6 @@ color = Color(0.239216, 0.239216, 0.239216, 1) position = Vector2(177, -154) [node name="Fenêtre6" parent="lumieres/Fenêtres" instance=ExtResource("9_u1vvx")] -visible = false position = Vector2(241, -154) [node name="Fenêtre4" parent="lumieres/Fenêtres" instance=ExtResource("9_u1vvx")] diff --git a/levels/level_1.tscn b/levels/level_1.tscn index d705d65..b1100ef 100644 --- a/levels/level_1.tscn +++ b/levels/level_1.tscn @@ -1,9 +1,23 @@ -[gd_scene load_steps=5 format=3 uid="uid://u528iojubmyx"] +[gd_scene load_steps=11 format=3 uid="uid://u528iojubmyx"] [ext_resource type="Script" path="res://levels/level.gd" id="1_ree4a"] [ext_resource type="TileSet" uid="uid://cx4160r6lbeb3" path="res://levels/global_tileset.tres" id="1_sdkpd"] [ext_resource type="PackedScene" uid="uid://dv0mokf4eogm7" path="res://princesse.tscn" id="2_p75ky"] [ext_resource type="PackedScene" uid="uid://4pdhps0lgy4o" path="res://items/door.tscn" id="4_mk1ik"] +[ext_resource type="Texture2D" uid="uid://dgsn3ixn46anc" path="res://sprite/light.png" id="5_ycb7o"] +[ext_resource type="PackedScene" uid="uid://dichswip4ynan" path="res://items/torche.tscn" id="6_p6xr7"] + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_blduw"] +polygon = PackedVector2Array(-8, -16, 72, -16, 72, -8, 48, -8, -8, -8) + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_xou1n"] +polygon = PackedVector2Array(7.79114, -27.9365, 7.79114, -27.9365, 7.79114, 20.0635, 7.79114, 20.0635) + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_lk0y7"] +polygon = PackedVector2Array(-8, -8, 0, -8, 8, -8, 8, 8, 8, 8, 0, 0) + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_55tt6"] +polygon = PackedVector2Array(-25.6783, -4.5264, 22.3217, -4.5264, 22.3217, 43.4736, 22.3217, 43.4736, 14.3217, 3.4736) [node name="Node2D" type="Node2D"] script = ExtResource("1_ree4a") @@ -15,7 +29,7 @@ format = 2 layer_0/tile_data = PackedInt32Array(196605, 262145, 2, 196606, 262145, 2, 196607, 196609, 2, 131072, 196609, 2, 131073, 65537, 0, 131074, 65537, 0, 131075, 65537, 0, 131076, 65537, 0, 131077, 196609, 2, 131078, 262145, 2, 131079, 196609, 2, 131080, 262145, 2, 131081, 196609, 2, 131082, 262145, 2, 131083, 196609, 2, 131084, 196609, 2, 196594, 196609, 2, 196595, 262145, 2, 196596, 196609, 2, 196597, 262145, 2, 196598, 196609, 2, 196599, 262145, 2, 196600, 196609, 2, 196601, 262145, 2, 196602, 196609, 2, 196603, 262145, 2, 196604, 196609, 2, 131085, 262145, 2, 131086, 196609, 2, 131087, 262145, 2, 131088, 196609, 2, 131089, 262145, 2, 131090, 196609, 2, 131091, 262145, 2, 131092, 196609, 2, 131093, 262145, 2, 131094, 196609, 2, 131095, 262145, 2, 131096, 196609, 2, 131097, 262145, 2, 196593, 65537, 0, 131098, 65537, 0, -720911, 131073, 1, -786447, 131073, 1, -851983, 131073, 1, -917519, 131073, 1, -983055, 262145, 0, -1310735, 131073, 5, -1310736, 655361, 2, -1245200, 131073, 5, -983056, 65537, 0, -917520, 65537, 1, -851984, 65537, 1, -786448, 65537, 1, -720912, 65537, 1, -655376, 655361, 2, -196624, 262145, 1, 196592, 65537, 0, 131099, 65537, 0, 196635, 65537, 4, 196634, 196609, 3, 196633, 65537, 4, 196632, 65537, 4, 196631, 65537, 1, 196630, 65537, 1, 196629, 65537, 1, 196628, 65537, 1, 196627, 196609, 3, 196626, 196609, 3, 196625, 196609, 3, 196624, 65537, 4, 196623, 196609, 3, 196622, 196609, 3, 196621, 196609, 3, 196620, 65537, 1, 196619, 65537, 1, 196618, 65537, 1, 196617, 196609, 3, 196616, 65537, 1, 196615, 65537, 4, 196614, 65537, 1, 196613, 65537, 1, 196612, 65537, 1, 196611, 196609, 3, 196610, 65537, 4, 196609, 196609, 3, 196608, 65537, 4, 262143, 65537, 1, 262142, 196609, 3, 262141, 196609, 3, 262140, 65537, 4, 262139, 65537, 4, 262138, 196609, 3, 262137, 65537, 4, 262136, 196609, 3, 262135, 65537, 4, 262134, 65537, 1, 262133, 65537, 1, 262132, 65537, 1, 262131, 65537, 1, 262130, 196609, 3, 262129, 65537, 4, 262128, 65537, 4, 262127, 65537, 1, 196591, 655361, 3, 131055, 131073, 1, 65519, 131073, 1, -17, 131073, 1, -65553, 131073, 1, -131089, 131073, 1, -196625, 655361, 2, -524305, 131073, 2, -589841, 655361, 2, -655377, 65537, 4, -720913, 65537, 1, -786449, 196609, 3, -851985, 65537, 1, -917521, 65537, 4, -983057, 65537, 0, -1179665, 131073, 5, -1245201, 655361, 2, -1310737, 65537, 1, 131100, 65537, 0, 196636, 65537, 1, 262172, 65537, 4, 262171, 196609, 3, 262170, 196609, 3, 262169, 65537, 1, 262168, 65537, 1, 262167, 196609, 3, 262166, 196609, 3, 262165, 65537, 4, 262164, 65537, 1, 262163, 65537, 1, 262162, 65537, 4, 262161, 65537, 4, 262160, 65537, 4, 262159, 65537, 1, 262158, 65537, 4, 262157, 65537, 1, 262156, 65537, 4, 262155, 196609, 3, 262154, 65537, 1, 262153, 65537, 1, 262152, 196609, 3, 262151, 65537, 1, 262150, 65537, 1, 262149, 196609, 3, 262148, 196609, 3, 262147, 65537, 4, 262146, 65537, 1, 262145, 65537, 4, 262144, 196609, 3, 327679, 65537, 4, 327678, 196609, 3, 327677, 196609, 3, 327676, 65537, 4, 327675, 65537, 4, 327674, 65537, 4, 327673, 65537, 4, 327672, 65537, 1, 327671, 65537, 4, 327670, 65537, 1, 327669, 65537, 1, 327668, 196609, 3, 327667, 65537, 4, 327666, 196609, 3, 327665, 65537, 1, 327664, 65537, 1, 327663, 196609, 3, -262161, 196609, 3, -262160, 131073, 1, -327697, 65537, 0, -327696, 262145, 0, -655375, 131073, 5, -589840, 131073, 5, -983052, 196609, 0, -983048, 262145, 0, -983051, 65537, 0, -983050, 524289, 4, -983049, 65537, 0, -917516, 196609, 1, -917515, 65537, 2, -917514, 65537, 2, -917513, 65537, 2, -917512, 262145, 1, -720902, 196609, 0, -655366, 196609, 1, -720901, 65537, 0, -655365, 65537, 2, -720900, 524289, 4, -655364, 65537, 2, -720899, 65537, 0, -655363, 65537, 2, -720898, 262145, 0, -655362, 262145, 1, -393228, 196609, 0, -327692, 196609, 1, -393227, 65537, 0, -327691, 65537, 2, -393226, 524289, 4, -327690, 65537, 2, -393225, 65537, 0, -327689, 65537, 2, -393224, 262145, 0, -327688, 262145, 1, -131078, 196609, 0, -65542, 196609, 1, -131077, 65537, 0, -65541, 65537, 2, -131076, 524289, 4, -65540, 65537, 2, -131075, 65537, 0, -65539, 65537, 2, -131074, 262145, 0, -65538, 262145, 1, -1376271, 131073, 1, -1441807, 131073, 1, -1507343, 262145, 0, -1507345, 65537, 0, -1507344, 65537, 0, -1441809, 65537, 1, -1376273, 65537, 1, -1376272, 65537, 1, -1441808, 65537, 1, -1179659, 458755, 1, -1114123, 458755, 2, -1179658, 524291, 1, -1114122, 524291, 2, -1048586, 524291, 3, -1179657, 589827, 1, -1114121, 589827, 2, -917509, 458755, 1, -851973, 458755, 2, -917508, 524291, 1, -851972, 524291, 2, -786436, 524291, 3, -917507, 589827, 1, -851971, 589827, 2, -589835, 458755, 1, -524299, 458755, 2, -589834, 524291, 1, -524298, 524291, 2, -458762, 524291, 3, -589833, 589827, 1, -524297, 589827, 2, -327685, 458755, 1, -262149, 458755, 2, -327684, 524291, 1, -262148, 524291, 2, -196612, 524291, 3, -327683, 589827, 1, -262147, 589827, 2, -12, 983041, 7, -13, 917505, 7) layer_1/name = "background" layer_1/enabled = true -layer_1/modulate = Color(0.647059, 0.509804, 0.615686, 0.807843) +layer_1/modulate = Color(0.380392, 0.27451, 0.356863, 1) layer_1/y_sort_enabled = false layer_1/y_sort_origin = 0 layer_1/z_index = -1 @@ -29,7 +43,7 @@ layer_2/z_index = 1 layer_2/tile_data = PackedInt32Array(-1048592, 983043, 1, -65535, 458755, 1, 1, 458755, 2, -65534, 524291, 1, 2, 524291, 2, 65538, 524291, 3, -65533, 589827, 1, 3, 589827, 2, -65530, 458755, 1, 6, 458755, 2, -65529, 524291, 1, 7, 524291, 2, 65543, 524291, 3, -65528, 589827, 1, 8, 589827, 2, -65521, 458755, 1, 15, 458755, 2, -65520, 524291, 1, 16, 524291, 2, 65552, 524291, 3, -65519, 589827, 1, 17, 589827, 2, -65516, 458755, 1, 20, 458755, 2, -65515, 524291, 1, 21, 524291, 2, 65557, 524291, 3, -65514, 589827, 1, 22, 589827, 2, -65510, 458755, 1, 26, 458755, 2, -65509, 524291, 1, 27, 524291, 2, 65563, 524291, 3, -65508, 589827, 1, 28, 589827, 2) [node name="Princesse" parent="." instance=ExtResource("2_p75ky")] -position = Vector2(128, -192) +position = Vector2(-168, -272) [node name="Doors" type="Node" parent="."] @@ -49,4 +63,118 @@ scale = Vector2(0.48, 11.32) destination = "level_2" other_side_position = Vector2(-248, 16) +[node name="lumieres" type="Node" parent="."] + +[node name="CanvasModulate" type="CanvasModulate" parent="lumieres"] +show_behind_parent = true +z_as_relative = false +y_sort_enabled = true +position = Vector2(152, -201) +color = Color(0.552941, 0.552941, 0.552941, 1) + +[node name="Torches" type="Node" parent="lumieres"] + +[node name="PointLight2D" type="PointLight2D" parent="lumieres"] +position = Vector2(240, -792) +color = Color(0.996078, 0.968627, 0.882353, 1) +shadow_enabled = true +texture = ExtResource("5_ycb7o") +texture_scale = 3.25 + +[node name="Oclusions" type="Node2D" parent="lumieres"] + +[node name="plateformes" type="Node2D" parent="lumieres/Oclusions"] + +[node name="LightOccluder2D2" type="LightOccluder2D" parent="lumieres/Oclusions/plateformes"] +z_index = -1 +position = Vector2(-184, -96) +occluder = SubResource("OccluderPolygon2D_blduw") + +[node name="LightOccluder2D4" type="LightOccluder2D" parent="lumieres/Oclusions/plateformes"] +z_index = -1 +position = Vector2(-88, -176) +occluder = SubResource("OccluderPolygon2D_blduw") + +[node name="LightOccluder2D3" type="LightOccluder2D" parent="lumieres/Oclusions/plateformes"] +z_index = -1 +position = Vector2(-184, -240) +occluder = SubResource("OccluderPolygon2D_blduw") + +[node name="LightOccluder2D" type="LightOccluder2D" parent="lumieres/Oclusions/plateformes"] +z_index = -1 +position = Vector2(-88, -32) +occluder = SubResource("OccluderPolygon2D_blduw") + +[node name="LightOccluder2D5" type="LightOccluder2D" parent="lumieres/Oclusions/plateformes"] +z_index = -1 +position = Vector2(-247.791, -68.0635) +occluder = SubResource("OccluderPolygon2D_xou1n") + +[node name="arbres" type="Node2D" parent="lumieres/Oclusions"] + +[node name="LightOccluder2D4" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +position = Vector2(344, 0) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D3" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +position = Vector2(264, 0) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D2" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +position = Vector2(120, 0) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +position = Vector2(40, 0) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D6" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +z_index = -1 +position = Vector2(-56, -80) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D9" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +z_index = -1 +position = Vector2(-56, -224) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D8" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +z_index = -1 +position = Vector2(-152, -288) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D" type="LightOccluder2D" parent="lumieres/Oclusions/arbres/LightOccluder2D8"] +z_index = -1 +position = Vector2(-94.3217, -91.4736) +occluder = SubResource("OccluderPolygon2D_55tt6") + +[node name="LightOccluder2D7" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +z_index = -1 +position = Vector2(-152, -144) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="LightOccluder2D5" type="LightOccluder2D" parent="lumieres/Oclusions/arbres"] +position = Vector2(440, 0) +occluder = SubResource("OccluderPolygon2D_lk0y7") +sdf_collision = false + +[node name="torches" type="Node2D" parent="lumieres/Oclusions"] + +[node name="Torche2" parent="lumieres/Oclusions/torches" instance=ExtResource("6_p6xr7")] +position = Vector2(-232, -112) + +[node name="Torche" parent="lumieres/Oclusions/torches" instance=ExtResource("6_p6xr7")] +position = Vector2(-104, 0) + +[node name="Torche3" parent="lumieres/Oclusions/torches" instance=ExtResource("6_p6xr7")] +position = Vector2(-240, 0) + [connection signal="princesse_is_dead" from="Princesse" to="." method="_on_princesse_princesse_is_dead"]