pretty happy with ladder movement right now

This commit is contained in:
derek
2025-01-17 16:04:03 -06:00
parent 5eb065830a
commit f74d599b64
11 changed files with 111 additions and 80 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=116 format=4 uid="uid://6agmt1hqlhww"]
[gd_scene load_steps=112 format=4 uid="uid://6agmt1hqlhww"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_sbpvn"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_fn4vb"]
@@ -25,7 +25,6 @@
[ext_resource type="Script" path="res://scripts/room_manager.gd" id="13_84vop"]
[ext_resource type="PackedScene" uid="uid://bessq6hl7qsh8" path="res://assets/stats.tscn" id="13_gu6tc"]
[ext_resource type="PackedScene" uid="uid://cgo4qyul7ix5p" path="res://assets/ladder.tscn" id="13_qu8oi"]
[ext_resource type="PackedScene" uid="uid://cdpxctwwi12j" path="res://assets/ladder_collision_check.tscn" id="14_gijx0"]
[ext_resource type="PackedScene" uid="uid://b3t8fra7evqfb" path="res://assets/Models/building_1.tscn" id="15_ds1t8"]
[ext_resource type="PackedScene" uid="uid://cp7tsicuudd6v" path="res://assets/boxcar_1.tscn" id="16_65evy"]
[ext_resource type="Script" path="res://scripts/room_check.gd" id="16_ba8wj"]
@@ -44,7 +43,7 @@
[ext_resource type="PackedScene" uid="uid://bcmd7elfjhppe" path="res://assets/tree_1.tscn" id="43_o23bq"]
[ext_resource type="PackedScene" uid="uid://df34olntmk0wl" path="res://assets/vent_1.tscn" id="44_b0rr7"]
[ext_resource type="PackedScene" uid="uid://dlhjacsike5a4" path="res://assets/oildrum1.tscn" id="45_eatji"]
[ext_resource type="Shader" path="res://assets/Shaders/outline.gdshader" id="46_avsk5"]
[ext_resource type="PackedScene" uid="uid://bj1y0fbjtul4a" path="res://post_processing.tscn" id="45_lveut"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_eiud5"]
sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
@@ -896,29 +895,6 @@ _data = {
"RESET": SubResource("Animation_3oaw1")
}
[sub_resource type="ShaderMaterial" id="ShaderMaterial_axa5q"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_loib4"]
render_priority = 0
next_pass = SubResource("ShaderMaterial_axa5q")
shader = ExtResource("46_avsk5")
shader_parameter/outlineColor = Color(0, 0, 0, 1)
shader_parameter/depth_threshold = 0.025
shader_parameter/normal_threshold = 0.5
shader_parameter/normal_smoothing = 0.25
shader_parameter/max_thickness = 1.3
shader_parameter/min_thickness = 0.5
shader_parameter/max_distance = 75.0
shader_parameter/min_distance = 2.0
shader_parameter/grazing_fresnel_power = 5.0
shader_parameter/grazing_angle_mask_power = 1.0
shader_parameter/grazing_angle_modulation_factor = 50.0
[sub_resource type="QuadMesh" id="QuadMesh_ootk3"]
material = SubResource("ShaderMaterial_loib4")
flip_faces = true
size = Vector2(2, 2)
[node name="BLOCKOUT2Test" type="Node3D" node_paths=PackedStringArray("player")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.016016, 0.0225029, -0.0192337)
script = ExtResource("1_sbpvn")
@@ -1267,9 +1243,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.8461, -7.8707, 15.6061)
[node name="Ladder2" parent="." instance=ExtResource("13_qu8oi")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.8461, -3.91327, 15.6061)
[node name="LadderCollisionCheck" parent="." instance=ExtResource("14_gijx0")]
transform = Transform3D(1, 0, 0, 0, 0.683592, 0, 0, 0, 1, 3.80189, -5.50271, 16.0033)
[node name="Building1" parent="." instance=ExtResource("15_ds1t8")]
transform = Transform3D(-6.11959e-08, 0, 1.4, 0, 1.4, 0, -1.4, 0, -6.11959e-08, 21.5803, -472.358, 97.8783)
@@ -1291,9 +1264,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.100218, 24.4327, 46.4567)
[node name="Ladder6" parent="." instance=ExtResource("13_qu8oi")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.100218, 28.3013, 46.4567)
[node name="LadderCollisionCheck2" parent="." instance=ExtResource("14_gijx0")]
transform = Transform3D(1, 0, 0, 0, 1.88048, 0, 0, 0, 0.180683, -0.0459655, 17.4816, 46.5358)
[node name="pistol1_pickup" parent="." instance=ExtResource("17_buv6l")]
transform = Transform3D(0.558498, -0.829506, 0, 0.829506, 0.558498, 0, 0, 0, 1, 35.2023, 17.3708, 122.41)
@@ -2064,10 +2034,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.46674, 27.457, -7.49986)
[node name="Oildrum2" parent="." instance=ExtResource("45_eatji")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.84071, 27.457, 3.20335)
[node name="PostProcessing" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.271851, 1.43588, -9.80906)
extra_cull_margin = 16384.0
mesh = SubResource("QuadMesh_ootk3")
[node name="PostProcessing" parent="." instance=ExtResource("45_lveut")]
[connection signal="body_entered" from="Room1/RoomCheck" to="Room1/RoomCheck" method="_on_body_entered"]
[connection signal="body_exited" from="Room1/RoomCheck" to="Room1/RoomCheck" method="_on_body_exited"]

View File

@@ -580,6 +580,7 @@ attenuation_model = 1
autoplay = true
[node name="Magnet_Timer" type="Timer" parent="."]
wait_time = 0.5
one_shot = true
autostart = true

View File

@@ -59,3 +59,6 @@ skeleton = NodePath("")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(3.57628e-07, 1, 7.54979e-08, 1, -3.57628e-07, -7.54979e-08, -7.54979e-08, 7.54979e-08, -1, 0, 0, 0)
shape = SubResource("ConvexPolygonShape3D_wmqg7")
[node name="ladder_top" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.677, 0)

View File

@@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://scripts/ladder.gd" id="1_ugi45"]
[sub_resource type="BoxShape3D" id="BoxShape3D_gxu3i"]
size = Vector3(1, 8.23889, 1.6582)
size = Vector3(1, 10, 1)
[node name="LadderCollisionCheck" type="Area3D"]
collision_layer = 2
@@ -11,8 +11,11 @@ collision_mask = 2
script = ExtResource("1_ugi45")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.67353, 0.329102)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0.329)
shape = SubResource("BoxShape3D_gxu3i")
[node name="CollisionMidpoint" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0)
[connection signal="body_entered" from="." to="." method="_on_body_entered"]
[connection signal="body_exited" from="." to="." method="_on_body_exited"]