diff --git a/main.tscn b/main.tscn index 393209d..6c78832 100644 --- a/main.tscn +++ b/main.tscn @@ -29,7 +29,7 @@ glow_enabled = true [node name="Main" type="Node3D"] [node name="Player" parent="." instance=ExtResource("1_ig7tw")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.2019, 12.6118, 13.3006) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7981, 1.6118, 39.3006) [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_1bvp3") @@ -49,9 +49,9 @@ collision_layer = 3 collision_mask = 5 [node name="CSGBox3D" type="CSGBox3D" parent="Greybox"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -0.958893) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -46.3293) use_collision = true -size = Vector3(100, 1, 100) +size = Vector3(100, 1, 190.741) material = ExtResource("3_h2yge") [node name="CSGBox3D2" type="CSGBox3D" parent="Greybox"] @@ -60,6 +60,54 @@ use_collision = true size = Vector3(10, 10, 57.8774) material = ExtResource("3_h2yge") +[node name="CSGBox3D19" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.5, 8.25323, -39.2813) +use_collision = true +size = Vector3(13, 16.5065, 47) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D30" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 34.3, -33.2813) +use_collision = true +size = Vector3(10, 2, 35) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D31" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.5, 26.3, -47.4313) +use_collision = true +size = Vector3(79, 2, 7.3) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.5, 15.3, -47.4313) +use_collision = true +size = Vector3(29, 2, 7.3) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.5, 20.8, -44.2813) +use_collision = true +size = Vector3(19, 13, 1) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.5, 20.8, -51.2813) +use_collision = true +size = Vector3(19, 13, 1) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(0.866025, 0.5, 0, -0.5, 0.866025, 0, 0, 0, 1, 17.0311, 6.45, -47.4313) +use_collision = true +size = Vector3(36, 2, 7.3) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D32" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21, 30.3, -47.4313) +use_collision = true +size = Vector3(12, 10, 7.3) +material = ExtResource("3_h2yge") + [node name="Stairs" type="CSGCombiner3D" parent="Greybox"] use_collision = true @@ -134,6 +182,24 @@ use_collision = true size = Vector3(25.9171, 10, 66.0572) material = ExtResource("3_h2yge") +[node name="CSGBox3D24" type="CSGBox3D" parent="Greybox/CSGBox3D4"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -4.4306, -1.45655, 25.6867) +operation = 2 +size = Vector3(12, 7, 35) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D25" type="CSGBox3D" parent="Greybox/CSGBox3D4"] +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.0694, -1.45655, 7.6867) +operation = 2 +size = Vector3(12, 7, 30) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D26" type="CSGBox3D" parent="Greybox/CSGBox3D4"] +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 9.0694, 1.04345, -3.3133) +operation = 2 +size = Vector3(12, 12, 8) +material = ExtResource("3_h2yge") + [node name="CSGBox3D9" type="CSGBox3D" parent="Greybox"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.5038, 2.5, 7.30957) size = Vector3(3, 5, 25.3809) @@ -145,15 +211,102 @@ size = Vector3(3, 2.5, 22.978) material = ExtResource("3_h2yge") [node name="CSGBox3D5" type="CSGBox3D" parent="Greybox"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.45774, 10.7885, -6.46509) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.45774, 10.7885, -6.32539) use_collision = true -size = Vector3(2.15405, 21.577, 22.8794) +size = Vector3(2.15405, 21.577, 22.6) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D21" type="CSGBox3D" parent="Greybox/CSGBox3D5"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.10074, 8.35729, -0.350719) +operation = 2 +use_collision = true +size = Vector3(9.25954, 5.10669, 7.561) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D20" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.7766, 17.433, -31.0838) +use_collision = true +size = Vector3(2.15405, 35.9, 27) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D37" type="CSGBox3D" parent="Greybox/CSGBox3D20"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.174269, 10.3449, -0.91618) +operation = 2 +use_collision = true +size = Vector3(4, 4, 3) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D25" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -3.02663, 27.983, -16.9838) +use_collision = true +size = Vector3(2.15405, 13, 52.3) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/CSGBox3D25"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.41618, -2.15506, -19.5757) +operation = 2 +use_collision = true +size = Vector3(3, 7, 6) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox/CSGBox3D25"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.41618, -2.15506, -8.57573) +operation = 2 +use_collision = true +size = Vector3(3, 7, 6) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox/CSGBox3D25"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.41618, -2.15506, 4.42427) +operation = 2 +use_collision = true +size = Vector3(3, 7, 6) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D29" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 21.9734, 27.983, -4.93377) +use_collision = true +size = Vector3(2.15405, 13, 25) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D26" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -3.07663, 27.983, 6.51623) +use_collision = true +size = Vector3(2.15405, 13, 52.2) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D30" type="CSGBox3D" parent="Greybox/CSGBox3D26"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.08382, -0.65506, -19.6257) +operation = 2 +use_collision = true +size = Vector3(3, 4, 6) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D31" type="CSGBox3D" parent="Greybox/CSGBox3D26"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.08382, -0.65506, -8.62572) +operation = 2 +use_collision = true +size = Vector3(3, 4, 6) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D32" type="CSGBox3D" parent="Greybox/CSGBox3D26"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.08382, -0.65506, 3.37428) +operation = 2 +use_collision = true +size = Vector3(3, 4, 6) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/CSGBox3D26"] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.08382, -2.15506, 18.8743) +operation = 2 +use_collision = true +size = Vector3(10, 7, 6) material = ExtResource("3_h2yge") [node name="CSGBox3D6" type="CSGBox3D" parent="Greybox"] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -7.80455, 10.8026, -16.8324) +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -7.80455, 10.8026, -16.7054) use_collision = true -size = Vector3(2.15405, 21.6052, 18.459) +size = Vector3(1.9, 21.6052, 18.459) material = ExtResource("3_h2yge") [node name="CSGBox3D7" type="CSGBox3D" parent="Greybox"] @@ -175,7 +328,7 @@ size = Vector3(2.14108, 52.2441, 99.9347) material = ExtResource("3_h2yge") [node name="CSGBox3D12" type="CSGBox3D" parent="Greybox"] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 8.92915, 26.122, -49.9656) +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -93.2643, 26.122, -49.9656) use_collision = true size = Vector3(2.14108, 52.2441, 99.9347) material = ExtResource("3_h2yge") @@ -192,6 +345,42 @@ use_collision = true size = Vector3(1.10791, 1.71436, 25.7228) material = ExtResource("3_h2yge") +[node name="CSGBox3D21" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.4606, 10.8458, -4.97476) +use_collision = true +size = Vector3(1.10791, 1.71436, 25.2857) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D24" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 23.4606, 16.1886, -17.1176) +use_collision = true +size = Vector3(1.10791, 12.4, 1) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D22" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 36.3499, 10.8458, 7.02524) +use_collision = true +size = Vector3(1.10791, 1.71436, 28) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D23" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 36.8499, 10.8458, -17.0748) +use_collision = true +size = Vector3(1.10791, 1.71436, 27) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D27" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 4.19987, 23.1458, -23.0748) +use_collision = true +size = Vector3(1.10791, 1.71436, 37.7) +material = ExtResource("3_h2yge") + +[node name="CSGBox3D28" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 22.5999, 23.1458, -20.2248) +use_collision = true +size = Vector3(1.10791, 1.71436, 6) +material = ExtResource("3_h2yge") + [node name="CSGBox3D15" type="CSGBox3D" parent="Greybox"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.9058, 10.795, 47.0594) use_collision = true @@ -199,19 +388,19 @@ size = Vector3(76.2239, 21.6211, 2.62695) material = ExtResource("3_h2yge") [node name="CSGBox3D16" type="CSGBox3D" parent="Greybox"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.8856, 21.8279, -5.20281) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.02149, 21.8279, -7.89995) use_collision = true -size = Vector3(74.1406, 1, 25.6403) +size = Vector3(52.1412, 1, 31) material = ExtResource("3_h2yge") [node name="CSGBox3D17" type="CSGBox3D" parent="Greybox"] -transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -22.0327, 10.786, -16.8929) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.02149, 34.8279, -5.19995) use_collision = true -size = Vector3(2.03296, 2.20193, 10.1753) +size = Vector3(52.1412, 1, 25.6) material = ExtResource("3_h2yge") [node name="CSGBox3D18" type="CSGBox3D" parent="Greybox"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.534, 10.9583, -4.19618) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.534, 10.7583, -4.19618) use_collision = true size = Vector3(1.10791, 1.71436, 23.4043) material = ExtResource("3_h2yge") diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn index 9f6a977..caf2a09 100644 --- a/player_controller/PlayerController.tscn +++ b/player_controller/PlayerController.tscn @@ -125,13 +125,6 @@ StartVelocity = 4.0 [node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")] -[node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")] -offset_left = 840.0 -offset_top = 1.0 -offset_right = -2.0 -offset_bottom = 1.0 -initial_node_to_watch = NodePath("../StateChart") - [node name="WeaponRoot" type="Node3D" parent="."] [node name="WeaponSystem" parent="WeaponRoot" instance=ExtResource("29_wv70j")] @@ -139,9 +132,6 @@ transform = Transform3D(1, 0, 0, 0, 0.173648, -0.984808, 0, 0.984808, 0.173648, ThrowForce = 25.0 StraightThrowDuration = 0.07 -[node name="CoyoteTime" type="Timer" parent="."] -wait_time = 0.2 - [node name="WallHugSystem" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) script = ExtResource("27_n7qhm") @@ -162,6 +152,16 @@ collision_mask = 2 target_position = Vector3(-1, 0, 0) collision_mask = 2 +[node name="CoyoteTime" type="Timer" parent="."] +wait_time = 0.2 + +[node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")] +offset_left = 840.0 +offset_top = 1.0 +offset_right = -2.0 +offset_bottom = 1.0 +initial_node_to_watch = NodePath("../StateChart") + [node name="StateChart" type="Node" parent="."] script = ExtResource("25_wv70j") metadata/_custom_type_script = "uid://couw105c3bde4"