From 8a93ae4816e5fcdb1d91b57a135440fae5d7b193 Mon Sep 17 00:00:00 2001 From: JonShard Date: Thu, 30 Jul 2026 16:39:56 +0200 Subject: [PATCH] Update hob --- Stations/Hob.tscn | 74 ++++++++++++++++++------------------ Stations/station_movement.gd | 1 + 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Stations/Hob.tscn b/Stations/Hob.tscn index 7e582d0..254acd1 100644 --- a/Stations/Hob.tscn +++ b/Stations/Hob.tscn @@ -64,10 +64,10 @@ properties/1/replication_mode = 1 properties/2/path = NodePath(".:cooking_result") properties/2/spawn = true properties/2/replication_mode = 1 -properties/3/path = NodePath(".:position") +properties/3/path = NodePath("Hob:position") properties/3/spawn = true properties/3/replication_mode = 1 -properties/4/path = NodePath(".:rotation") +properties/4/path = NodePath("Hob:rotation") properties/4/spawn = true properties/4/replication_mode = 1 @@ -76,7 +76,7 @@ length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Station/CSGCombiner3D/CSGTorus3D3:material") +tracks/0/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D3:material") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -88,7 +88,7 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Station/CSGCombiner3D/CSGTorus3D2:material") +tracks/1/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D2:material") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { @@ -100,7 +100,7 @@ tracks/1/keys = { tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Station/CSGCombiner3D/CSGTorus3D:material") +tracks/2/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D:material") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { @@ -112,7 +112,7 @@ tracks/2/keys = { tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("Station/CSGCombiner3D/CSGTorus3D3:material:emission_energy_multiplier") +tracks/3/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D3:material:emission_energy_multiplier") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { @@ -124,7 +124,7 @@ tracks/3/keys = { tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true -tracks/4/path = NodePath("Station/OmniLight3D:light_energy") +tracks/4/path = NodePath("Hob/OmniLight3D:light_energy") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { @@ -140,7 +140,7 @@ loop_mode = 1 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Station/CSGCombiner3D/CSGTorus3D3:material") +tracks/0/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D3:material") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -152,7 +152,7 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("Station/CSGCombiner3D/CSGTorus3D2:material") +tracks/1/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D2:material") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { @@ -164,7 +164,7 @@ tracks/1/keys = { tracks/2/type = "value" tracks/2/imported = false tracks/2/enabled = true -tracks/2/path = NodePath("Station/CSGCombiner3D/CSGTorus3D:material") +tracks/2/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D:material") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { @@ -176,7 +176,7 @@ tracks/2/keys = { tracks/3/type = "value" tracks/3/imported = false tracks/3/enabled = true -tracks/3/path = NodePath("Station/CSGCombiner3D/CSGTorus3D3:material:emission_energy_multiplier") +tracks/3/path = NodePath("Hob/CSGCombiner3D/CSGTorus3D3:material:emission_energy_multiplier") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/keys = { @@ -188,7 +188,7 @@ tracks/3/keys = { tracks/4/type = "value" tracks/4/imported = false tracks/4/enabled = true -tracks/4/path = NodePath("Station/OmniLight3D:light_energy") +tracks/4/path = NodePath("Hob/OmniLight3D:light_energy") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/keys = { @@ -207,10 +207,10 @@ _data = { [node name="Hob" type="Node3D" unique_id=172418174 groups=["station"]] [node name="Movement" type="Node3D" parent="." unique_id=1818087979] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.08, 0) script = ExtResource("7_akjp4") [node name="MoveHandle" type="RigidBody3D" parent="Movement" unique_id=1675596942 groups=["platalbe_item"]] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.92786825, 0) collision_layer = 4 collision_mask = 196615 axis_lock_linear_y = true @@ -239,13 +239,13 @@ hand_pose = SubResource("Resource_qyiot") replication_config = SubResource("SceneReplicationConfig_np_cube") script = ExtResource("15_trny8") -[node name="Station" type="StaticBody3D" parent="." unique_id=1332123047] +[node name="Hob" type="StaticBody3D" parent="." unique_id=1332123047] script = ExtResource("1_7jc4g") -[node name="CollisionShape3D" type="CollisionShape3D" parent="Station" unique_id=1283846023] +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hob" unique_id=1283846023] shape = SubResource("BoxShape3D_kdxnr") -[node name="XRToolsSnapZone" type="Area3D" parent="Station" unique_id=538157739 groups=["station"]] +[node name="XRToolsSnapZone" type="Area3D" parent="Hob" unique_id=538157739 groups=["station"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5270121, 0) collision_layer = 65536 collision_mask = 65540 @@ -254,106 +254,106 @@ stash_sound = ExtResource("3_6oyg1") snap_mode = 1 metadata/_custom_type_script = "uid://cquqe4f1m1sw6" -[node name="CollisionShape3D2" type="CollisionShape3D" parent="Station/XRToolsSnapZone" unique_id=370920392] +[node name="CollisionShape3D2" type="CollisionShape3D" parent="Hob/XRToolsSnapZone" unique_id=370920392] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.000975132, 0) shape = SubResource("BoxShape3D_7uuqv") -[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Station/XRToolsSnapZone" unique_id=1991627595] +[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Hob/XRToolsSnapZone" unique_id=1991627595] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.022546828, -0.5270121, 0.36528283) -[node name="CSGCombiner3D" type="CSGCombiner3D" parent="Station" unique_id=70901698] +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="Hob" unique_id=70901698] -[node name="CSGBox3D" type="CSGBox3D" parent="Station/CSGCombiner3D" unique_id=1111505172] +[node name="CSGBox3D" type="CSGBox3D" parent="Hob/CSGCombiner3D" unique_id=1111505172] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.00894776) size = Vector3(0.6, 1, 0.5821045) -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Station/CSGCombiner3D/CSGBox3D" unique_id=1338463939] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Hob/CSGCombiner3D/CSGBox3D" unique_id=1338463939] transform = Transform3D(0.8943019, 0, 0, 0, 0.8943019, 0, 0, 0, 0.8943019, 0, 0.5103538, -7.827557e-05) operation = 2 radius = 0.25976563 height = 0.08898926 sides = 32 -[node name="CSGTorus3D3" type="CSGTorus3D" parent="Station/CSGCombiner3D" unique_id=666891341] +[node name="CSGTorus3D3" type="CSGTorus3D" parent="Hob/CSGCombiner3D" unique_id=666891341] transform = Transform3D(0.8943019, 0, 0, 0, 0.8943019, 0, 0, 0, 0.8943019, 0, 0.5003869, -7.827557e-05) inner_radius = 0.09153879 outer_radius = 0.120084204 sides = 32 material = ExtResource("4_8qpxk") -[node name="CSGTorus3D2" type="CSGTorus3D" parent="Station/CSGCombiner3D" unique_id=24541894] +[node name="CSGTorus3D2" type="CSGTorus3D" parent="Hob/CSGCombiner3D" unique_id=24541894] transform = Transform3D(0.8943019, 0, 0, 0, 0.8943019, 0, 0, 0, 0.8943019, 0, 0.5003869, -7.827557e-05) inner_radius = 0.15036294 outer_radius = 0.17592031 sides = 32 material = ExtResource("4_8qpxk") -[node name="CSGTorus3D" type="CSGTorus3D" parent="Station/CSGCombiner3D" unique_id=1901978664] +[node name="CSGTorus3D" type="CSGTorus3D" parent="Hob/CSGCombiner3D" unique_id=1901978664] transform = Transform3D(0.8943019, 0, 0, 0, 0.8943019, 0, 0, 0, 0.8943019, 0, 0.5003869, -7.827557e-05) inner_radius = 0.20426142 outer_radius = 0.2321898 sides = 32 material = ExtResource("4_8qpxk") -[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Station/CSGCombiner3D" unique_id=1107239311] +[node name="CSGCylinder3D" type="CSGCylinder3D" parent="Hob/CSGCombiner3D" unique_id=1107239311] transform = Transform3D(0.8943019, 0, 0, 0, 0.8943019, 0, 0, 0, 0.8943019, 0, 0.4498226, -7.827557e-05) radius = 0.071777344 height = 0.09637451 sides = 32 -[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="Station/CSGCombiner3D" unique_id=435540815] +[node name="CSGCylinder3D2" type="CSGCylinder3D" parent="Hob/CSGCombiner3D" unique_id=435540815] transform = Transform3D(0.8943019, 0, 0, 0, -3.9091177e-08, 0.8943019, 0, -0.8943019, -3.9091177e-08, 0, 0.48668858, -0.0020651226) radius = 0.008 height = 0.44487303 -[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="Station/CSGCombiner3D" unique_id=878171801] +[node name="CSGCylinder3D3" type="CSGCylinder3D" parent="Hob/CSGCombiner3D" unique_id=878171801] transform = Transform3D(-3.9091177e-08, -0.8943019, -3.9091177e-08, 0, -3.9091177e-08, 0.8943019, -0.8943019, 3.9091177e-08, 1.7087296e-15, 0, 0.48668858, -0.0020651226) radius = 0.008 height = 0.44487303 -[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="Station/CSGCombiner3D" unique_id=1619646436] +[node name="CSGCylinder3D4" type="CSGCylinder3D" parent="Hob/CSGCombiner3D" unique_id=1619646436] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, -0.20412213, 0.42728558, 0.26171687) radius = 0.044433594 height = 0.10932617 material = SubResource("StandardMaterial3D_gkb3v") -[node name="CSGCylinder3D5" type="CSGCylinder3D" parent="Station/CSGCombiner3D" unique_id=548846612] +[node name="CSGCylinder3D5" type="CSGCylinder3D" parent="Hob/CSGCombiner3D" unique_id=548846612] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0.12531614, 0.42728558, 0.26171687) radius = 0.044433594 height = 0.10932617 material = SubResource("StandardMaterial3D_gkb3v") -[node name="CSGCylinder3D6" type="CSGCylinder3D" parent="Station/CSGCombiner3D" unique_id=1208989647] +[node name="CSGCylinder3D6" type="CSGCylinder3D" parent="Hob/CSGCombiner3D" unique_id=1208989647] transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0.22979808, 0.42728558, 0.26171687) radius = 0.044433594 height = 0.10932617 material = SubResource("StandardMaterial3D_gkb3v") -[node name="CSGBox3D2" type="CSGBox3D" parent="Station/CSGCombiner3D" unique_id=465340362] +[node name="CSGBox3D2" type="CSGBox3D" parent="Hob/CSGCombiner3D" unique_id=465340362] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.039733887, -0.07685089, 0.29250562) operation = 2 size = Vector3(1.0999756, 0.8462982, 0.072387695) -[node name="CSGBox3D3" type="CSGBox3D" parent="Station/CSGCombiner3D" unique_id=1813079759] +[node name="CSGBox3D3" type="CSGBox3D" parent="Hob/CSGCombiner3D" unique_id=1813079759] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.003479004, -0.08253479, 0.2656765) size = Vector3(0.55, 0.835, 0.072) -[node name="CSGBox3D4" type="CSGBox3D" parent="Station/CSGCombiner3D" unique_id=1978186019] +[node name="CSGBox3D4" type="CSGBox3D" parent="Hob/CSGCombiner3D" unique_id=1978186019] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.003479004, -0.45215607, 0.24655426) size = Vector3(0.55, 0.096, 0.14) -[node name="Sync" type="MultiplayerSynchronizer" parent="Station" unique_id=768992259] +[node name="Sync" type="MultiplayerSynchronizer" parent="Hob" unique_id=768992259] root_path = NodePath("../..") replication_config = SubResource("SceneReplicationConfig_np_hob") -[node name="ProgressBar3D" parent="Station" unique_id=654673176 instance=ExtResource("3_7uuqv")] +[node name="ProgressBar3D" parent="Hob" unique_id=654673176 instance=ExtResource("3_7uuqv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.74736404, -0.09216304) -[node name="AnimationPlayer" type="AnimationPlayer" parent="Station" unique_id=1525460719] +[node name="AnimationPlayer" type="AnimationPlayer" parent="Hob" unique_id=1525460719] root_node = NodePath("../..") libraries/ = SubResource("AnimationLibrary_ac5f3") -[node name="OmniLight3D" type="OmniLight3D" parent="Station" unique_id=1618457623] +[node name="OmniLight3D" type="OmniLight3D" parent="Hob" unique_id=1618457623] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5053487, 0) light_color = Color(1, 0.13725491, 0, 1) light_energy = 0.0 diff --git a/Stations/station_movement.gd b/Stations/station_movement.gd index f655b2a..5e2d4ca 100644 --- a/Stations/station_movement.gd +++ b/Stations/station_movement.gd @@ -17,6 +17,7 @@ func _process(_delta: float) -> void: station.collision_layer = 0 else: station.collision_layer = original_collision_layer + # move_handle.transform.origin = Vector3.ZERO move_handle_rigid.linear_velocity = Vector3.ZERO move_handle_rigid.angular_velocity = Vector3.ZERO