diff --git a/project/models/terrains/level.blend b/project/models/terrains/level.blend index fac2f2de..741a958e 100644 Binary files a/project/models/terrains/level.blend and b/project/models/terrains/level.blend differ diff --git a/project/models/terrains/level.blend1 b/project/models/terrains/level.blend1 index 0381e68f..29f61cd9 100644 Binary files a/project/models/terrains/level.blend1 and b/project/models/terrains/level.blend1 differ diff --git a/project/scenes/valley.tscn b/project/scenes/valley.tscn index db37ee39..bd05d31a 100644 --- a/project/scenes/valley.tscn +++ b/project/scenes/valley.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=3 uid="uid://sofv1apr4467"] +[gd_scene load_steps=22 format=3 uid="uid://sofv1apr4467"] [ext_resource type="PackedScene" uid="uid://dy4yl1paa8whs" path="res://ui/ui.tscn" id="1_a2vvy"] [ext_resource type="PackedScene" uid="uid://dcgsrdacswacl" path="res://objects/player.tscn" id="2_pvuhy"] @@ -47,6 +47,14 @@ size = Vector3(59.896, 12.7068, 60.8476) [sub_resource type="BoxShape3D" id="BoxShape3D_je011"] size = Vector3(1304.71, 20, 1075.7) +[sub_resource type="GDScript" id="GDScript_xecee"] +script/source = "extends ReloadArea + +func _on_body_entered(body: Node3D) -> void: + if body.is_class(\"PlayerBody\") and !(body as PlayerBody).get_can_jump(): + GameUI.get_singleton().display_message(\"I have to find some other way across...\") +" + [sub_resource type="BoxShape3D" id="BoxShape3D_8ppb4"] size = Vector3(120.67, 14.9338, 47.8362) @@ -64,6 +72,12 @@ func _on_body_entered(body: Node3D) -> void: [sub_resource type="BoxShape3D" id="BoxShape3D_l73gk"] size = Vector3(36.8259, 22.1272, 2.65234) +[sub_resource type="BoxShape3D" id="BoxShape3D_4fish"] +size = Vector3(36.8259, 6.47376, 32.3181) + +[sub_resource type="BoxShape3D" id="BoxShape3D_xecee"] +size = Vector3(8.24559, 12.443, 12.8204) + [sub_resource type="BoxShape3D" id="BoxShape3D_2lbax"] size = Vector3(36.8259, 22.1272, 32.501) @@ -140,6 +154,7 @@ debug_color = Color(1, 0.03, 0.0461664, 1) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -163.41, -33.6961, 277.445) collision_layer = 2 collision_mask = 2 +script = SubResource("GDScript_xecee") [node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/ReloadArea2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 13.9835, 0) @@ -167,21 +182,13 @@ shape = SubResource("BoxShape3D_l73gk") debug_color = Color(0.255, 0.9, 0, 1) [node name="CheckpointArea12" type="CheckpointArea" parent="SubViewportContainer/SubViewport"] -transform = Transform3D(0.0484489, 0, -0.998826, 0, 1, 0, 0.998826, 0, 0.0484489, -85.8691, 6.76445, 141.763) +transform = Transform3D(0.853415, 0, 0.521233, 0, 1, 0, -0.521233, 0, 0.853415, -0.618861, 6.76445, 39.5049) collision_layer = 2 collision_mask = 2 [node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/CheckpointArea12"] -shape = SubResource("BoxShape3D_l73gk") -debug_color = Color(0.255, 0.9, 0, 1) - -[node name="CheckpointArea13" type="CheckpointArea" parent="SubViewportContainer/SubViewport"] -transform = Transform3D(0.987488, 0, -0.157693, 0, 1, 0, 0.157693, 0, 0.987488, -153.661, 6.76445, 203.831) -collision_layer = 2 -collision_mask = 2 - -[node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/CheckpointArea13"] -shape = SubResource("BoxShape3D_l73gk") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -7.82672, 0) +shape = SubResource("BoxShape3D_4fish") debug_color = Color(0.255, 0.9, 0, 1) [node name="CheckpointArea14" type="CheckpointArea" parent="SubViewportContainer/SubViewport"] @@ -217,7 +224,8 @@ collision_layer = 2 collision_mask = 2 [node name="CollisionShape3D" type="CollisionShape3D" parent="SubViewportContainer/SubViewport/CheckpointArea5"] -shape = SubResource("BoxShape3D_l73gk") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.08932, -4.8421, 5.08405) +shape = SubResource("BoxShape3D_xecee") debug_color = Color(0.255, 0.9, 0, 1) [node name="CheckpointArea6" type="CheckpointArea" parent="SubViewportContainer/SubViewport"] @@ -293,4 +301,5 @@ shape = SubResource("BoxShape3D_a2vvy") debug_color = Color(0.255, 0.9, 0, 1) [connection signal="body_entered" from="SubViewportContainer/SubViewport/VictoryArea" to="SubViewportContainer/SubViewport/VictoryArea" method="_on_body_entered"] +[connection signal="body_entered" from="SubViewportContainer/SubViewport/ReloadArea2" to="SubViewportContainer/SubViewport/ReloadArea2" method="_on_body_entered"] [connection signal="body_entered" from="SubViewportContainer/SubViewport/CheckpointArea" to="SubViewportContainer/SubViewport/CheckpointArea" method="_on_body_entered"]