Tweaks to prop physics layers

levels/ghost_ship/level/cargo_bay/cargo_bay.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=3 uid="uid://c2k0x1dp527n1"]
+[gd_scene load_steps=30 format=3 uid="uid://c2k0x1dp527n1"]
 
 [ext_resource type="ArrayMesh" uid="uid://bumwpsm42csme" path="res://assets/level/ceiling/ceiling_9x9.mesh" id="1_20lab"]
 [ext_resource type="PackedScene" uid="uid://cdi5sl60mw1po" path="res://src/world/gunkable/gunkable.tscn" id="2_jd3pc"]
@@ -43,6 +43,9 @@ texture_filter = 2
 material = SubResource("StandardMaterial3D_sqa4l")
 size = Vector3(9, 6, 0.2)
 
+[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_fopii"]
+points = PackedVector3Array(4.5, 3, 0.1, 4.5, 3, -0.1, -4.5, 3, 0.1, 4.5, -3, 0.1, 4.5, -3, -0.1, -4.5, 3, -0.1, -4.5, -3, 0.1, -4.5, -3, -0.1)
+
 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_s2uxq"]
 data = PackedVector3Array(1.5, 0, 1.5, -1.5, 0, 1.5, 1.5, 0, -1.5, 1.5, 0, -1.5, -1.5, 0, 1.5, -1.5, 0, -1.5)
 
@@ -805,6 +808,11 @@ source_gunk_material = ExtResource("6_d0c5k")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 10.5)
 mesh = SubResource("BoxMesh_dly4i")
 
+[node name="StaticBody3D" type="StaticBody3D" parent="LoadingDock/Bounds/BayDoor"]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="LoadingDock/Bounds/BayDoor/StaticBody3D"]
+shape = SubResource("ConvexPolygonShape3D_fopii")
+
 [node name="Elevator" parent="LoadingDock" instance=ExtResource("12_18p4i")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -10.5)
 

src/game/tutorial/tutorial_manager/tutorial_manager_type.gd

@@ -7,8 +7,9 @@ const TUTORIAL_KEY_PREFIX := "game/tutorial/progress/"
 
 
 func activate(key: String) -> void:
-	ProjectSettings.set_setting(key, true)
-	Game.settings.write()
+	if not is_active(key):
+		ProjectSettings.set_setting(key, true)
+		Game.settings.write()
 
 
 func is_active(key: String) -> bool:
@@ -45,6 +46,6 @@ func reset_tutorial() -> void:
 
 
 func disable_tutorial() -> void:
-	disable_all.emit()
-	# XXX does this ensure the call to write will happen after all signals resolve?
-	Game.settings.write.call_deferred()
+	for key: String in get_tutorial_keys():
+		ProjectSettings.set_setting(key, true)
+	Game.settings.write()

src/props/interactive.gd

@@ -21,6 +21,7 @@ func _ready() -> void:
 	controller.connect(SELECT_SIGNAL, select)
 	controller.add_user_signal(DESELECT_SIGNAL)
 	controller.connect(DESELECT_SIGNAL, deselect)
+	controller.tree_exited.connect(deselect)
 	controller.add_user_signal(ACTIVATE_SIGNAL)
 	controller.connect(ACTIVATE_SIGNAL, activate)
 

src/props/retinal_scanner/retinal_scanner.gd

@@ -8,6 +8,7 @@ signal activated
 
 
 func _ready() -> void:
+	interactive.controller.connect(Interactive.SELECT_SIGNAL, _on_interactive_selected)
 	_deferred_init.call_deferred()
 
 
@@ -52,3 +53,8 @@ func serialize() -> Dictionary:
 
 func deserialize(state: Dictionary) -> void:
 	enabled = state["enabled"]
+
+
+func _process(_delta: float) -> void:
+	# TODO donAAaaaa't do this in _process
+	interactive.enabled = enabled and _has_item()

src/props/retinal_scanner/retinal_scanner.tscn

@@ -24,6 +24,7 @@ font_size = 96
 outline_size = 24
 
 [node name="InteractiveBody" type="StaticBody3D" parent="."]
+unique_name_in_owner = true
 collision_layer = 3
 collision_mask = 0
 

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
 

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

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://bov4ok76woyc" path="res://levels/ghost_ship/ghost_ship.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"]
 

vault/level.canvas

@@ -11,7 +11,7 @@
 		{"id":"bbfc75ce368543fc","type":"file","file":"level/player ship.md","x":-957,"y":-320,"width":320,"height":400},
 		{"id":"55780df8c38e6693","type":"file","file":"level/cargo bay.md","x":0,"y":-1402,"width":391,"height":350},
 		{"id":"1800ef4d498a530f","type":"file","file":"level/ops center.md","x":-300,"y":-2160,"width":300,"height":396},
-		{"id":"f92e4ff7439ba3b9","x":-1304,"y":-2080,"width":246,"height":50,"type":"text","text":"# THE GURKN"}
+		{"id":"f92e4ff7439ba3b9","type":"text","text":"# HK-409 DOGTOOTH","x":-1304,"y":-2080,"width":244,"height":80}
 	],
 	"edges":[
 		{"id":"f88a68cbe1935f27","fromNode":"bbfc75ce368543fc","fromSide":"top","toNode":"be3415e76c0603f6","toSide":"bottom","toEnd":"none"},