diff --git a/assets/ladder_collision_check.tscn b/assets/ladder_collision_check.tscn index 8935bd0..2e2dc78 100644 --- a/assets/ladder_collision_check.tscn +++ b/assets/ladder_collision_check.tscn @@ -7,7 +7,7 @@ size = Vector3(1, 8.23889, 1.6582) [node name="LadderCollisionCheck" type="Area3D"] collision_layer = 2 -collision_mask = 0 +collision_mask = 2 script = ExtResource("1_ugi45") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] diff --git a/assets/player.tscn b/assets/player.tscn index bd7e0d4..e78c87a 100644 --- a/assets/player.tscn +++ b/assets/player.tscn @@ -37,7 +37,7 @@ radius = 8.0 [node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["player"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11359, 0) collision_layer = 126 -collision_mask = 9 +collision_mask = 11 safe_margin = 0.5 script = ExtResource("1_x7wms") dead_player = ExtResource("2_4hoys") diff --git a/assets/spider2.tscn b/assets/spider2.tscn index ab5c3a9..49d6969 100644 --- a/assets/spider2.tscn +++ b/assets/spider2.tscn @@ -732,6 +732,7 @@ size = Vector3(0.816284, 0.725159, 0.75531) [node name="spider" type="CharacterBody3D" groups=["enemy"]] collision_layer = 8 +collision_mask = 9 script = ExtResource("1_7e7fe") bullet = ExtResource("2_aew5r") casing = ExtResource("3_e5ft5") diff --git a/scenes/test_level_2v2.tscn b/scenes/test_level_2v2.tscn index f8c5b5b..7914d7d 100644 --- a/scenes/test_level_2v2.tscn +++ b/scenes/test_level_2v2.tscn @@ -1170,6 +1170,7 @@ health_drop_enabled = false [node name="Player" parent="." instance=ExtResource("2_f87c2")] transform = Transform3D(-0.866025, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866025, -16.0295, 1.4435, 12.1166) +AUDIO = false JUMP_VELOCITY = 6 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]