diff options
| -rw-r--r-- | character/fps_controller/fps_controller.tscn | 2 | ||||
| -rw-r--r-- | ship/ladder/ladder.tscn | 2 | ||||
| -rw-r--r-- | ship/mast/mast.tscn | 10 | ||||
| -rw-r--r-- | ship/ship/ship.tscn | 2 | ||||
| -rw-r--r-- | ship/staircase_1/staircase_1.tscn | 3 | ||||
| -rw-r--r-- | ship/water_pump/water_pump.tscn | 6 |
6 files changed, 22 insertions, 3 deletions
diff --git a/character/fps_controller/fps_controller.tscn b/character/fps_controller/fps_controller.tscn index b1d9cdf..4bea03f 100644 --- a/character/fps_controller/fps_controller.tscn +++ b/character/fps_controller/fps_controller.tscn @@ -28,7 +28,7 @@ collision_mask = 2 [node name="ladder_detector" type="Area" parent="."] collision_layer = 0 -collision_mask = 16 +collision_mask = 4 [node name="CollisionShape" type="CollisionShape" parent="ladder_detector"] transform = Transform( 1, 0, 0, 0, -1, -8.74228e-08, 0, 8.74228e-08, -1, 0, 0.0169024, -0.28562 ) diff --git a/ship/ladder/ladder.tscn b/ship/ladder/ladder.tscn index 0c009c1..7a267f4 100644 --- a/ship/ladder/ladder.tscn +++ b/ship/ladder/ladder.tscn @@ -12,7 +12,7 @@ points = PoolVector3Array( -2.63751e-05, 17, 1.1522, 0.134708, 17, 1.07459, -0.1 material/0 = ExtResource( 2 ) [node name="StaticBody" type="StaticBody" parent="ladder" index="0" groups=["ladder"]] -collision_layer = 16 +collision_layer = 4 collision_mask = 0 [node name="CollisionShape" type="CollisionShape" parent="ladder/StaticBody" index="0"] diff --git a/ship/mast/mast.tscn b/ship/mast/mast.tscn index 0f9e068..8148e31 100644 --- a/ship/mast/mast.tscn +++ b/ship/mast/mast.tscn @@ -7,8 +7,18 @@ extents = Vector3( 0.258624, 13.019, 1.30381 ) [node name="mast" instance=ExtResource( 1 )] +[node name="StaticBody" parent="mast/crows_nest" index="0"] +collision_layer = 4 +collision_mask = 0 + [node name="StaticBody" type="StaticBody" parent="mast/ladder" index="0" groups=["ladder"]] +collision_layer = 4 +collision_mask = 0 [node name="CollisionShape" type="CollisionShape" parent="mast/ladder/StaticBody" index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 12.1324, 0 ) shape = SubResource( 1 ) + +[node name="StaticBody" parent="mast" index="2"] +collision_layer = 4 +collision_mask = 0 diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn index afeb6b7..d4c40e7 100644 --- a/ship/ship/ship.tscn +++ b/ship/ship/ship.tscn @@ -418,6 +418,8 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 16.1735, 33.8931 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0495434, 0.2843, 0.447197 ) [node name="StaticBody" type="StaticBody" parent="control_panel"] +collision_layer = 4 +collision_mask = 0 [node name="main_control_panel" type="MeshInstance" parent="control_panel/StaticBody"] mesh = SubResource( 25 ) diff --git a/ship/staircase_1/staircase_1.tscn b/ship/staircase_1/staircase_1.tscn index 130df2d..adc5a52 100644 --- a/ship/staircase_1/staircase_1.tscn +++ b/ship/staircase_1/staircase_1.tscn @@ -10,9 +10,10 @@ points = PoolVector3Array( -1.80455, -1.87224, -2.97945, -1.80455, -1.33747, -2. [node name="stairs" parent="." index="0"] material/0 = ExtResource( 2 ) -collision_mask = 0 [node name="StaticBody" type="StaticBody" parent="stairs" index="0"] +collision_layer = 4 +collision_mask = 0 [node name="CollisionShape" type="CollisionShape" parent="stairs/StaticBody" index="0"] shape = SubResource( 1 ) diff --git a/ship/water_pump/water_pump.tscn b/ship/water_pump/water_pump.tscn index 28d0e51..277856a 100644 --- a/ship/water_pump/water_pump.tscn +++ b/ship/water_pump/water_pump.tscn @@ -20,6 +20,8 @@ radius = 0.456237 [node name="StaticBody" type="StaticBody" parent="water_pump" index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.106341, 0.0284684, -0.00456106 ) +collision_layer = 4 +collision_mask = 0 [node name="CollisionShape" type="CollisionShape" parent="water_pump/StaticBody" index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.377931, -0.746272, 0 ) @@ -30,11 +32,15 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.26882, -0.0493568, 0 ) shape = SubResource( 2 ) [node name="StaticBody" type="StaticBody" parent="button_1" index="0"] +collision_layer = 4 +collision_mask = 0 [node name="CollisionShape" type="CollisionShape" parent="button_1/StaticBody" index="0"] shape = SubResource( 3 ) [node name="StaticBody" type="StaticBody" parent="button_0" index="0"] +collision_layer = 4 +collision_mask = 0 [node name="CollisionShape" type="CollisionShape" parent="button_0/StaticBody" index="0"] shape = SubResource( 4 ) |