From 308cfc8edee26a63794d54dd39e06aebefdf7100 Mon Sep 17 00:00:00 2001 From: Rob Kelly Date: Thu, 10 Jul 2025 18:15:01 -0600 Subject: [PATCH] Tweaks to prop physics layers --- src/props/sofa/phys_sofa.tscn | 12 ++++++------ src/props/trash_can/phys_trash_can.tscn | 2 +- src/ui/hud/player_hud.tscn | 8 ++++---- src/world/world.tscn | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/props/sofa/phys_sofa.tscn b/src/props/sofa/phys_sofa.tscn index 54c6759..c722467 100644 --- a/src/props/sofa/phys_sofa.tscn +++ b/src/props/sofa/phys_sofa.tscn @@ -89,7 +89,7 @@ shape = SubResource("ConvexPolygonShape3D_p1o88") [node name="BottomCushion" type="RigidBody3D" parent="."] transform = Transform3D(0.999999, 0, -0.00153589, 0, 1, 0, 0.00153589, 0, 0.999999, 0, -0.224, 0.153) collision_layer = 70 -collision_mask = 73 +collision_mask = 65 mass = 30.0 sleeping = true @@ -114,7 +114,7 @@ metadata/_custom_type_script = "uid://040xta01xqxd" [node name="BottomCushion3" type="RigidBody3D" parent="."] transform = Transform3D(0.999822, 0.00228604, -0.0187437, -0.00228638, 0.999997, 3.51163e-06, 0.0187437, 3.93442e-05, 0.999824, 0.688976, -0.224, 0.17095) collision_layer = 70 -collision_mask = 73 +collision_mask = 65 mass = 30.0 sleeping = true @@ -139,7 +139,7 @@ metadata/_custom_type_script = "uid://040xta01xqxd" [node name="BottomCushion2" type="RigidBody3D" parent="."] transform = Transform3D(0.999913, 0, 0.0131594, 0, 1, 0, -0.0131594, 0, 0.999913, -0.690142, -0.223657, 0.154269) collision_layer = 70 -collision_mask = 73 +collision_mask = 65 mass = 30.0 sleeping = true @@ -164,7 +164,7 @@ metadata/_custom_type_script = "uid://040xta01xqxd" [node name="TopCushion" type="RigidBody3D" parent="."] transform = Transform3D(0.999895, 0.0133165, 0.00570669, -0.0133163, 0.999911, -7.59997e-05, -0.0057072, -7.27493e-12, 0.999984, -0.689198, 0.077623, -0.380305) collision_layer = 70 -collision_mask = 73 +collision_mask = 65 mass = 30.0 sleeping = true @@ -189,7 +189,7 @@ metadata/_custom_type_script = "uid://040xta01xqxd" [node name="TopCushion2" type="RigidBody3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000443935, 0.0780895, -0.380305) collision_layer = 70 -collision_mask = 73 +collision_mask = 65 mass = 30.0 sleeping = true @@ -214,7 +214,7 @@ metadata/_custom_type_script = "uid://040xta01xqxd" [node name="TopCushion3" type="RigidBody3D" parent="."] transform = Transform3D(0.999759, -0.00898652, -0.0200525, 0.00898832, 0.99996, 0, 0.0200517, -0.000180238, 0.999799, 0.691321, 0.0831664, -0.380305) collision_layer = 70 -collision_mask = 73 +collision_mask = 65 mass = 30.0 sleeping = true diff --git a/src/props/trash_can/phys_trash_can.tscn b/src/props/trash_can/phys_trash_can.tscn index 67ba0e2..2669ea3 100644 --- a/src/props/trash_can/phys_trash_can.tscn +++ b/src/props/trash_can/phys_trash_can.tscn @@ -26,7 +26,7 @@ texture_filter = 2 data = PackedVector3Array(-0.2828, 0.4, -0.2828, -0.2828, 0.3069, -0.2828, 0, 0.4, -0.4, 0, 0.4, -0.4, -0.2828, 0.3069, -0.2828, 0, 0.3069, -0.4, 0.4, 0.4, 0, 0.4, 0.3069, 0, 0.2828, 0.4, 0.2828, 0.2828, 0.4, 0.2828, 0.4, 0.3069, 0, 0.2828, 0.3069, 0.2828, 0.2828, 0.4, 0.2828, 0.2828, 0.3069, 0.2828, 0, 0.4, 0.4, 0, 0.4, 0.4, 0.2828, 0.3069, 0.2828, 0, 0.3069, 0.4, 0, 0.4, 0.4, 0, 0.3069, 0.4, -0.2828, 0.4, 0.2828, -0.2828, 0.4, 0.2828, 0, 0.3069, 0.4, -0.2828, 0.3069, 0.2828, -0.2828, 0.4, 0.2828, -0.2828, 0.3069, 0.2828, -0.4, 0.4, 0, -0.4, 0.4, 0, -0.2828, 0.3069, 0.2828, -0.4, 0.3069, 0, -0.4, 0.4, 0, -0.4, 0.3069, 0, -0.2828, 0.4, -0.2828, -0.2828, 0.4, -0.2828, -0.4, 0.3069, 0, -0.2828, 0.3069, -0.2828, 0, 0.4, -0.4, 0, 0.3069, -0.4, 0.2828, 0.4, -0.2828, 0.2828, 0.4, -0.2828, 0, 0.3069, -0.4, 0.2828, 0.3069, -0.2828, 0.2828, 0.4, -0.2828, 0.2828, 0.3069, -0.2828, 0.4, 0.4, 0, 0.4, 0.4, 0, 0.2828, 0.3069, -0.2828, 0.4, 0.3069, 0, 0.2828, -0.5, -0.2828, 0, -0.5, -0.4, 0.4, -0.5, 0, 0.4, -0.5, 0, 0, -0.5, -0.4, 0.2828, -0.5, 0.2828, 0.2828, -0.5, 0.2828, 0, -0.5, -0.4, 0, -0.5, 0.4, 0, -0.5, 0.4, 0, -0.5, -0.4, -0.2828, -0.5, 0.2828, -0.2828, -0.5, 0.2828, 0, -0.5, -0.4, -0.4, -0.5, 0, -0.4, -0.5, 0, 0, -0.5, -0.4, -0.2828, -0.5, -0.2828, 0, 0.4, -0.4, 0.2828, 0.4, -0.2828, 0, 0.5, -0.3501, 0, 0.5, -0.3501, 0.2828, 0.4, -0.2828, 0.2476, 0.5, -0.2476, 0.2828, 0.4, -0.2828, 0.4, 0.4, 0, 0.2476, 0.5, -0.2476, 0.2476, 0.5, -0.2476, 0.4, 0.4, 0, 0.3501, 0.5, 0, 0.4, 0.4, 0, 0.2828, 0.4, 0.2828, 0.3501, 0.5, 0, 0.3501, 0.5, 0, 0.2828, 0.4, 0.2828, 0.2476, 0.5, 0.2476, 0.2828, 0.4, 0.2828, 0, 0.4, 0.4, 0.2476, 0.5, 0.2476, 0.2476, 0.5, 0.2476, 0, 0.4, 0.4, 0, 0.5, 0.3501, 0, 0.4, 0.4, -0.2828, 0.4, 0.2828, 0, 0.5, 0.3501, 0, 0.5, 0.3501, -0.2828, 0.4, 0.2828, -0.2476, 0.5, 0.2476, -0.2828, 0.4, 0.2828, -0.4, 0.4, 0, -0.2476, 0.5, 0.2476, -0.2476, 0.5, 0.2476, -0.4, 0.4, 0, -0.3501, 0.5, 0, -0.4, 0.4, 0, -0.2828, 0.4, -0.2828, -0.3501, 0.5, 0, -0.3501, 0.5, 0, -0.2828, 0.4, -0.2828, -0.2476, 0.5, -0.2476, -0.2828, 0.4, -0.2828, 0, 0.4, -0.4, -0.2476, 0.5, -0.2476, -0.2476, 0.5, -0.2476, 0, 0.4, -0.4, 0, 0.5, -0.3501, 0, 0.5, -0.3501, 0.2476, 0.5, -0.2476, -0.2476, 0.5, -0.2476, -0.2476, 0.5, -0.2476, 0.2476, 0.5, -0.2476, -0.3501, 0.5, 0, -0.3501, 0.5, 0, 0.2476, 0.5, -0.2476, -0.2476, 0.5, 0.2476, -0.2476, 0.5, 0.2476, 0.2476, 0.5, -0.2476, 0, 0.5, 0.3501, 0, 0.5, 0.3501, 0.2476, 0.5, -0.2476, 0.2476, 0.5, 0.2476, 0.2476, 0.5, 0.2476, 0.2476, 0.5, -0.2476, 0.3501, 0.5, 0, -0.2828, 0.3069, 0.2828, 0, 0.3069, 0.4, -0.2546, 0.3069, 0.2546, -0.2546, 0.3069, 0.2546, 0, 0.3069, 0.4, 0, 0.3069, 0.36, -0.36, 0.3069, 0, -0.2828, 0.3069, 0.2828, -0.2546, 0.3069, 0.2546, 0, 0.3069, 0.4, 0.2828, 0.3069, 0.2828, 0, 0.3069, 0.36, -0.4, 0.3069, 0, -0.2828, 0.3069, 0.2828, -0.36, 0.3069, 0, 0, 0.3069, 0.36, 0.2828, 0.3069, 0.2828, 0.2546, 0.3069, 0.2546, -0.2546, 0.3069, -0.2546, -0.4, 0.3069, 0, -0.36, 0.3069, 0, 0.2828, 0.3069, 0.2828, 0.4, 0.3069, 0, 0.2546, 0.3069, 0.2546, -0.2828, 0.3069, -0.2828, -0.4, 0.3069, 0, -0.2546, 0.3069, -0.2546, 0, 0.3069, -0.36, -0.2828, 0.3069, -0.2828, -0.2546, 0.3069, -0.2546, 0, 0.3069, -0.4, -0.2828, 0.3069, -0.2828, 0, 0.3069, -0.36, 0.2546, 0.3069, 0.2546, 0.4, 0.3069, 0, 0.36, 0.3069, 0, 0.4, 0.3069, 0, 0.2828, 0.3069, -0.2828, 0.36, 0.3069, 0, 0.36, 0.3069, 0, 0.2828, 0.3069, -0.2828, 0.2546, 0.3069, -0.2546, 0.2828, 0.3069, -0.2828, 0, 0.3069, -0.4, 0.2546, 0.3069, -0.2546, 0.2546, 0.3069, -0.2546, 0, 0.3069, -0.4, 0, 0.3069, -0.36, 0.2828, 0.2138, 0.2828, 0, 0.2138, 0.4, 0.2546, 0.2138, 0.2546, 0.2546, 0.2138, 0.2546, 0, 0.2138, 0.4, 0, 0.2138, 0.36, 0.36, 0.2138, 0, 0.2828, 0.2138, 0.2828, 0.2546, 0.2138, 0.2546, 0, 0.2138, 0.4, -0.2828, 0.2138, 0.2828, 0, 0.2138, 0.36, 0.4, 0.2138, 0, 0.2828, 0.2138, 0.2828, 0.36, 0.2138, 0, 0, 0.2138, 0.36, -0.2828, 0.2138, 0.2828, -0.2546, 0.2138, 0.2546, 0.2546, 0.2138, -0.2546, 0.4, 0.2138, 0, 0.36, 0.2138, 0, -0.2828, 0.2138, 0.2828, -0.4, 0.2138, 0, -0.2546, 0.2138, 0.2546, 0.2828, 0.2138, -0.2828, 0.4, 0.2138, 0, 0.2546, 0.2138, -0.2546, 0, 0.2138, -0.36, 0.2828, 0.2138, -0.2828, 0.2546, 0.2138, -0.2546, 0, 0.2138, -0.4, 0.2828, 0.2138, -0.2828, 0, 0.2138, -0.36, -0.2546, 0.2138, 0.2546, -0.4, 0.2138, 0, -0.36, 0.2138, 0, -0.4, 0.2138, 0, -0.2828, 0.2138, -0.2828, -0.36, 0.2138, 0, -0.36, 0.2138, 0, -0.2828, 0.2138, -0.2828, -0.2546, 0.2138, -0.2546, -0.2828, 0.2138, -0.2828, 0, 0.2138, -0.4, -0.2546, 0.2138, -0.2546, -0.2546, 0.2138, -0.2546, 0, 0.2138, -0.4, 0, 0.2138, -0.36, -0.2828, 0.2138, -0.2828, -0.2828, -0.5, -0.2828, 0, 0.2138, -0.4, 0, 0.2138, -0.4, -0.2828, -0.5, -0.2828, 0, -0.5, -0.4, 0.4, 0.2138, 0, 0.4, -0.5, 0, 0.2828, 0.2138, 0.2828, 0.2828, 0.2138, 0.2828, 0.4, -0.5, 0, 0.2828, -0.5, 0.2828, 0.2828, 0.2138, 0.2828, 0.2828, -0.5, 0.2828, 0, 0.2138, 0.4, 0, 0.2138, 0.4, 0.2828, -0.5, 0.2828, 0, -0.5, 0.4, 0, 0.2138, 0.4, 0, -0.5, 0.4, -0.2828, 0.2138, 0.2828, -0.2828, 0.2138, 0.2828, 0, -0.5, 0.4, -0.2828, -0.5, 0.2828, -0.2828, 0.2138, 0.2828, -0.2828, -0.5, 0.2828, -0.4, 0.2138, 0, -0.4, 0.2138, 0, -0.2828, -0.5, 0.2828, -0.4, -0.5, 0, -0.4, 0.2138, 0, -0.4, -0.5, 0, -0.2828, 0.2138, -0.2828, -0.2828, 0.2138, -0.2828, -0.4, -0.5, 0, -0.2828, -0.5, -0.2828, 0, 0.2138, -0.4, 0, -0.5, -0.4, 0.2828, 0.2138, -0.2828, 0.2828, 0.2138, -0.2828, 0, -0.5, -0.4, 0.2828, -0.5, -0.2828, 0.2828, 0.2138, -0.2828, 0.2828, -0.5, -0.2828, 0.4, 0.2138, 0, 0.4, 0.2138, 0, 0.2828, -0.5, -0.2828, 0.4, -0.5, 0, 0.2546, 0.3069, -0.2546, 0.2546, 0.2138, -0.2546, 0.36, 0.3069, 0, 0.36, 0.3069, 0, 0.2546, 0.2138, -0.2546, 0.36, 0.2138, 0, 0, 0.3069, -0.36, 0, 0.2138, -0.36, 0.2546, 0.3069, -0.2546, 0.2546, 0.3069, -0.2546, 0, 0.2138, -0.36, 0.2546, 0.2138, -0.2546, -0.36, 0.3069, 0, -0.36, 0.2138, 0, -0.2546, 0.3069, -0.2546, -0.2546, 0.3069, -0.2546, -0.36, 0.2138, 0, -0.2546, 0.2138, -0.2546, -0.2546, 0.3069, 0.2546, -0.2546, 0.2138, 0.2546, -0.36, 0.3069, 0, -0.36, 0.3069, 0, -0.2546, 0.2138, 0.2546, -0.36, 0.2138, 0, 0, 0.3069, 0.36, 0, 0.2138, 0.36, -0.2546, 0.3069, 0.2546, -0.2546, 0.3069, 0.2546, 0, 0.2138, 0.36, -0.2546, 0.2138, 0.2546, 0.2546, 0.3069, 0.2546, 0.2546, 0.2138, 0.2546, 0, 0.3069, 0.36, 0, 0.3069, 0.36, 0.2546, 0.2138, 0.2546, 0, 0.2138, 0.36, 0.36, 0.3069, 0, 0.36, 0.2138, 0, 0.2546, 0.3069, 0.2546, 0.2546, 0.3069, 0.2546, 0.36, 0.2138, 0, 0.2546, 0.2138, 0.2546, -0.2546, 0.3069, -0.2546, -0.2546, 0.2138, -0.2546, 0, 0.3069, -0.36, 0, 0.3069, -0.36, -0.2546, 0.2138, -0.2546, 0, 0.2138, -0.36) [node name="PhysTrashCan" type="RigidBody3D" groups=["MetalMaterial", "Persistent"]] -collision_layer = 66 +collision_layer = 67 collision_mask = 73 mass = 40.0 script = ExtResource("1_g7pab") diff --git a/src/ui/hud/player_hud.tscn b/src/ui/hud/player_hud.tscn index a95ab31..19c258d 100644 --- a/src/ui/hud/player_hud.tscn +++ b/src/ui/hud/player_hud.tscn @@ -612,7 +612,7 @@ tutorial_key = &"game/tutorial/progress/sneak" [node name="InputPrompt" parent="TutorialContainer/VBoxContainer/SneakTutorial/HBoxContainer/MessageContainer" index="0" instance=ExtResource("4_iwjh7")] layout_mode = 2 size_flags_vertical = 8 -text = "❓ ACTION_HOLD_MODIFIER" +text = "ACTION_HOLD_MODIFIER ❓" action = &"sneak" hold = true show_name = false @@ -627,7 +627,7 @@ tutorial_key = &"game/tutorial/progress/sprint" [node name="InputPrompt" parent="TutorialContainer/VBoxContainer/SprintTutorial/HBoxContainer/MessageContainer" index="0" instance=ExtResource("4_iwjh7")] layout_mode = 2 size_flags_vertical = 8 -text = "❓ ACTION_HOLD_MODIFIER" +text = "ACTION_HOLD_MODIFIER ❓" action = &"sprint" hold = true show_name = false @@ -642,7 +642,7 @@ tutorial_key = &"game/tutorial/progress/fire" [node name="InputPrompt" parent="TutorialContainer/VBoxContainer/FireTutorial/HBoxContainer/MessageContainer" index="0" instance=ExtResource("4_iwjh7")] layout_mode = 2 size_flags_vertical = 8 -text = "❓ ACTION_HOLD_MODIFIER" +text = "ACTION_HOLD_MODIFIER ❓" action = &"fire" hold = true show_name = false @@ -755,7 +755,7 @@ tutorial_key = &"game/tutorial/progress/rotate" [node name="InputPrompt" parent="TutorialContainer/VBoxContainer/RotateTutorial/HBoxContainer/MessageContainer" index="0" instance=ExtResource("4_iwjh7")] layout_mode = 2 size_flags_vertical = 8 -text = "❓ ACTION_HOLD_MODIFIER" +text = "ACTION_HOLD_MODIFIER ❓" action = &"rotate_object" hold = true show_name = false diff --git a/src/world/world.tscn b/src/world/world.tscn index faf7b8c..4d2d566 100644 --- a/src/world/world.tscn +++ b/src/world/world.tscn @@ -4,7 +4,7 @@ [ext_resource type="Resource" uid="uid://tgac5tnfx56r" path="res://src/world/world_manager.tres" id="2_5kmgb"] [ext_resource type="PackedScene" uid="uid://byvjsvavbg5xe" path="res://src/ui/menus/pause_menu/pause_menu.tscn" id="2_6fy3g"] [ext_resource type="Resource" uid="uid://0i72bf8ip1lx" path="res://src/world/spook_manager.tres" id="3_l0av5"] -[ext_resource type="PackedScene" uid="uid://b8rv6dg4tgaeb" path="res://levels/mechanic_test/mechanic_test.tscn" id="4_5kmgb"] +[ext_resource type="PackedScene" uid="uid://dc4tts6342cuj" path="res://levels/prop_test/prop_test.tscn" id="4_5kmgb"] [ext_resource type="PackedScene" uid="uid://c0uitm5cg88h1" path="res://src/ui/menus/kill_screen/kill_screen.tscn" id="6_l0av5"] [ext_resource type="PackedScene" uid="uid://brknr57xc2cp0" path="res://src/ui/elements/save_icon/save_icon.tscn" id="7_5kmgb"]