8 files changed, 35 insertions, 2 deletions
diff --git a/Main.tscn b/Main.tscn
index 6c838ac..a531b2d 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -49,7 +49,6 @@ directional_shadow_blend_splits = true
 
 [node name="fps_controller" parent="." instance=ExtResource( 1 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 17, 44 )
-collision_mask = 4
 
 [node name="Ground" type="StaticBody" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, 0 )
@@ -87,7 +86,7 @@ shape = SubResource( 23 )
 
 [node name="WorldGenCull" type="Area" parent="."]
 collision_layer = 0
-collision_mask = 8
+collision_mask = 40
 
 [node name="CollisionShape" type="CollisionShape" parent="WorldGenCull"]
 shape = SubResource( 24 )
diff --git a/character/fps_controller/fps_controller.tscn b/character/fps_controller/fps_controller.tscn
index d1bf6be..d878068 100644
--- a/character/fps_controller/fps_controller.tscn
+++ b/character/fps_controller/fps_controller.tscn
@@ -10,6 +10,7 @@ height = 2.0
 radius = 0.374691
 
 [node name="fps_controller" type="KinematicBody"]
+collision_mask = 20
 script = ExtResource( 1 )
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
diff --git a/project.godot b/project.godot
index 13b5902..af0d510 100644
--- a/project.godot
+++ b/project.godot
@@ -97,6 +97,15 @@ ship_right={
  ]
 }
 
+[layer_names]
+
+3d_physics/layer_1="Player"
+3d_physics/layer_2="Boat"
+3d_physics/layer_3="Floor"
+3d_physics/layer_4="Obstacles"
+3d_physics/layer_5="Items"
+3d_physics/layer_6="World Gen"
+
 [physics]
 
 common/enable_pause_aware_picking=true
diff --git a/ship/ladder/ladder.tscn b/ship/ladder/ladder.tscn
index 763a233..0c009c1 100644
--- a/ship/ladder/ladder.tscn
+++ b/ship/ladder/ladder.tscn
@@ -12,6 +12,8 @@ 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_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="ladder/StaticBody" index="0"]
 shape = SubResource( 2 )
diff --git a/ship/ship/crate.tscn b/ship/ship/crate.tscn
index a2cd355..e39bb73 100644
--- a/ship/ship/crate.tscn
+++ b/ship/ship/crate.tscn
@@ -20,6 +20,8 @@ surfaces/0 = {
 [sub_resource type="BoxShape" id=2]
 
 [node name="crate" type="RigidBody"]
+collision_layer = 16
+collision_mask = 28
 
 [node name="crate-" type="MeshInstance" parent="."]
 mesh = SubResource( 1 )
diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn
index adb09a3..0412661 100644
--- a/ship/ship/ship.tscn
+++ b/ship/ship/ship.tscn
@@ -223,6 +223,8 @@ mesh = SubResource( 1 )
 material/0 = ExtResource( 11 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/below_deck"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/below_deck/StaticBody"]
 shape = SubResource( 2 )
@@ -231,6 +233,8 @@ shape = SubResource( 2 )
 mesh = SubResource( 3 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/below_deck_wall"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/below_deck_wall/StaticBody"]
 shape = SubResource( 4 )
@@ -239,6 +243,8 @@ shape = SubResource( 4 )
 mesh = SubResource( 5 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/below_deck_wall_1"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/below_deck_wall_1/StaticBody"]
 shape = SubResource( 6 )
@@ -247,6 +253,8 @@ shape = SubResource( 6 )
 mesh = SubResource( 7 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/bow"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/bow/StaticBody"]
 shape = SubResource( 8 )
@@ -257,6 +265,8 @@ material/0 = SubResource( 16 )
 material/1 = SubResource( 19 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/bridge"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/bridge/StaticBody"]
 shape = SubResource( 10 )
@@ -265,6 +275,8 @@ shape = SubResource( 10 )
 mesh = SubResource( 11 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/hull"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/hull/StaticBody"]
 shape = SubResource( 12 )
@@ -273,6 +285,8 @@ shape = SubResource( 12 )
 mesh = SubResource( 13 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/rear-deck"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/rear-deck/StaticBody"]
 shape = SubResource( 14 )
@@ -282,6 +296,8 @@ mesh = SubResource( 15 )
 material/0 = SubResource( 20 )
 
 [node name="StaticBody" type="StaticBody" parent="pivot/top_deck"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="CollisionShape" type="CollisionShape" parent="pivot/top_deck/StaticBody"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -7.72568 )
diff --git a/ship/ship_control_panel/control_panel.tscn b/ship/ship_control_panel/control_panel.tscn
index 973ee45..bc19c2f 100644
--- a/ship/ship_control_panel/control_panel.tscn
+++ b/ship/ship_control_panel/control_panel.tscn
@@ -45,6 +45,8 @@ size = Vector2( 1.087, 0.731 )
 [node name="control_panel" instance=ExtResource( 1 )]
 
 [node name="StaticBody" type="StaticBody" parent="." index="0"]
+collision_layer = 16
+collision_mask = 0
 
 [node name="main_control_panel" type="MeshInstance" parent="StaticBody" index="0"]
 mesh = SubResource( 1 )
diff --git a/ship/staircase_1/staircase_1.tscn b/ship/staircase_1/staircase_1.tscn
index f7e7649..e27f0ff 100644
--- a/ship/staircase_1/staircase_1.tscn
+++ b/ship/staircase_1/staircase_1.tscn
@@ -24,6 +24,8 @@ points = PoolVector3Array( -1.80455, -1.87224, -2.97945, -1.80455, -1.33747, -2.
 [node name="staircase_1" instance=ExtResource( 1 )]
 
 [node name="StaticBody" type="StaticBody" parent="." index="0"]
+collision_layer = 4
+collision_mask = 0
 
 [node name="stairs" type="MeshInstance" parent="StaticBody" index="0"]
 mesh = SubResource( 1 )