added enemy inputs as a resource

assets/lift/lift.tscn

@@ -20,6 +20,8 @@ script = ExtResource("2_5i7wx")
 material_override = ExtResource("3_u2uhe")
 
 [node name="StaticBody3D" type="StaticBody3D" parent="Cube_279" index="0"]
+collision_layer = 256
+collision_mask = 65553
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cube_279/StaticBody3D" index="0"]
 shape = SubResource("ConcavePolygonShape3D_5i7wx")
@@ -28,12 +30,15 @@ shape = SubResource("ConcavePolygonShape3D_5i7wx")
 material_override = ExtResource("4_jmnc2")
 
 [node name="StaticBody3D" type="StaticBody3D" parent="Cylinder_001" index="0"]
+collision_layer = 256
+collision_mask = 65553
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder_001/StaticBody3D" index="0"]
 shape = SubResource("ConcavePolygonShape3D_wai75")
 
 [node name="Area3D" type="Area3D" parent="." index="2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -36.343, 0)
+collision_layer = 0
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"]
 shape = SubResource("CylinderShape3D_wai75")

maps/GYMs/enemies.tscn

@@ -0,0 +1,124 @@
+[gd_scene load_steps=11 format=3 uid="uid://q7uc1h2jpbd2"]
+
+[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_62kkh"]
+[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="2_3uydm"]
+[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/first_enemy.tscn" id="3_3uydm"]
+[ext_resource type="Script" uid="uid://b2vdwkiqauhk3" path="res://scenes/enemies/EnemyInitInputs.cs" id="4_nd7vd"]
+
+[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"]
+sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
+ground_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
+
+[sub_resource type="Sky" id="Sky_h2yge"]
+sky_material = SubResource("ProceduralSkyMaterial_0xm2m")
+
+[sub_resource type="Environment" id="Environment_1bvp3"]
+background_mode = 2
+sky = SubResource("Sky_h2yge")
+ambient_light_source = 2
+ambient_light_color = Color(0.576076, 0.459788, 0.652401, 1)
+reflected_light_source = 2
+tonemap_mode = 4
+tonemap_exposure = 1.32
+ssao_enabled = true
+ssao_radius = 3.61
+ssil_enabled = true
+ssil_radius = 8.4
+sdfgi_use_occlusion = true
+glow_enabled = true
+
+[sub_resource type="Resource" id="Resource_8fd2t"]
+script = ExtResource("4_nd7vd")
+Speed = 3.2
+metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
+
+[sub_resource type="Resource" id="Resource_7m3bq"]
+script = ExtResource("4_nd7vd")
+Speed = 2.8
+metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
+
+[sub_resource type="Resource" id="Resource_sysok"]
+script = ExtResource("4_nd7vd")
+Speed = 6.4
+metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
+
+[node name="Main" type="Node3D"]
+
+[node name="Player" parent="." instance=ExtResource("1_62kkh")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 7.5)
+TutorialDone = true
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_1bvp3")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(-0.772218, 0.611111, 0.173844, 0.0446935, -0.220691, 0.974319, 0.633783, 0.760157, 0.143109, 0, 0, 0)
+shadow_enabled = true
+
+[node name="Greybox" type="CSGCombiner3D" parent="."]
+use_collision = true
+collision_layer = 256
+collision_mask = 65553
+
+[node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.096, -0.5, -46.329)
+use_collision = true
+size = Vector3(100, 1, 190.741)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D2" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.346, 4.5, 2.7915)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D6" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(0.70710677, 0, -0.70710677, 0, 1, 0, 0.70710677, 0, 0.70710677, -15.846001, 2.75, 2.0415)
+use_collision = true
+size = Vector3(6.5, 7.5, 11)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D7" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.346001, 1, 1.0415001)
+use_collision = true
+size = Vector3(6.5, 4, 17)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D8" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(0.81915206, 0, 0.57357645, 0, 1, 0, -0.57357645, 0, 0.81915206, -7.3460007, 0, -3.9585)
+use_collision = true
+size = Vector3(6.5, 4, 17)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D3" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.154, 4.5, 2.7915)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D4" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.154, 4.5, -14.2085)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D5" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8460007, 4.5, 17.7915)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="Enemy" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("3_3uydm")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -16.83681)
+Target = NodePath("../Player")
+Inputs = SubResource("Resource_8fd2t")
+
+[node name="Enemy2" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("3_3uydm")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, -16.83681)
+Target = NodePath("../Player")
+Inputs = SubResource("Resource_7m3bq")
+
+[node name="Enemy3" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("3_3uydm")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, -16.83681)
+Target = NodePath("../Player")
+Inputs = SubResource("Resource_sysok")

maps/GYMs/main.tscn

@@ -30,6 +30,7 @@ glow_enabled = true
 
 [node name="Player" parent="." instance=ExtResource("1_ig7tw")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7981, 1.6118, 39.3006)
+TutorialDone = true
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_1bvp3")

maps/GYMs/metrics.tscn

@@ -46,8 +46,8 @@ visible = false
 
 [node name="Greybox" type="CSGCombiner3D" parent="."]
 use_collision = true
-collision_layer = 3
-collision_mask = 5
+collision_layer = 256
+collision_mask = 65553
 
 [node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.096, -0.5, -46.329)

player_controller/PlayerController.tscn

@@ -70,6 +70,7 @@ radius = 0.4
 blend_mode = 1
 
 [node name="Player" type="CharacterBody3D"]
+collision_mask = 272
 script = ExtResource("1_poq2x")
 WalkSpeed = 7.5
 AccelerationFloor = 4.0
@@ -112,7 +113,7 @@ WallHugHorizontalDeceleration = 1.0
 unique_name_in_owner = true
 transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 0, 0, 0)
 target_position = Vector3(0, 0, -5)
-collision_mask = 2
+collision_mask = 256
 
 [node name="InputController" type="Node3D" parent="."]
 script = ExtResource("16_v31n3")
@@ -169,9 +170,11 @@ script = ExtResource("7_bmt5a")
 [node name="StairsAheadRayCast3D" type="RayCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -0.828)
 target_position = Vector3(0, -0.55, 0)
+collision_mask = 256
 
 [node name="StairsBelowRayCast3D" type="RayCast3D" parent="."]
 target_position = Vector3(0, -0.75, 0)
+collision_mask = 256
 
 [node name="Bobbing" type="Node3D" parent="."]
 script = ExtResource("10_7wk1w")
@@ -185,18 +188,22 @@ visible = false
 [node name="HeadCollisionDetector0" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, -0.210707)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="HeadCollisionDetector1" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0.23061)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="HeadCollisionDetector2" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.296, 1.4, 0)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="HeadCollisionDetector3" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.296, 1.4, 0)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")]
 
@@ -205,39 +212,39 @@ script = ExtResource("27_n7qhm")
 
 [node name="back" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(0, 0, 1)
-collision_mask = 2
+collision_mask = 256
 
 [node name="back2" type="RayCast3D" parent="WallHugSystem"]
 transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
 target_position = Vector3(0, 0, 1)
-collision_mask = 2
+collision_mask = 256
 
 [node name="front" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(0, 0, -1)
-collision_mask = 2
+collision_mask = 256
 
 [node name="front2" type="RayCast3D" parent="WallHugSystem"]
 transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
 target_position = Vector3(0, 0, -1)
-collision_mask = 2
+collision_mask = 256
 
 [node name="right" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(1, 0, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="right2" type="RayCast3D" parent="WallHugSystem"]
 transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
 target_position = Vector3(1, 0, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="left" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(-1, 0, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="left2" type="RayCast3D" parent="WallHugSystem"]
 transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
 target_position = Vector3(-1, 0, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="DashSystem" parent="." instance=ExtResource("18_q5h8a")]
 DashSpeed = 0.2
@@ -259,18 +266,18 @@ mesh = SubResource("CylinderMesh_nodcl")
 
 [node name="GroundDetector" type="ShapeCast3D" parent="."]
 shape = SubResource("CapsuleShape3D_6lejt")
-collision_mask = 2
+collision_mask = 256
 
 [node name="CeilingDetector" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
 enabled = false
 shape = SubResource("SphereShape3D_nob5r")
 target_position = Vector3(0, 0.4, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="DirectGroundDetector" type="RayCast3D" parent="."]
 target_position = Vector3(0, -2, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="DashCooldown" type="Timer" parent="."]
 wait_time = 0.8

player_controller/Scripts/PlayerController.cs

@@ -1551,7 +1551,8 @@ public partial class PlayerController : CharacterBody3D
 	}
 	public void HandleAiming(float delta)
 	{
-		RotateWeaponWithPlayer();
+		if (WeaponSystem.InHandState.Active)
+			RotateWeaponWithPlayer();
 		
 		DashIndicatorMeshCylinder.Height = DashSystem.PlannedLocation.DistanceTo(GlobalPosition);
 		DashIndicatorNode.LookAt(DashSystem.PlannedLocation);

project.godot

@@ -146,6 +146,16 @@ aim_dash={
 
 locale/translations=PackedStringArray("res://addons/maaacks_game_template/base/translations/menus_translations.en.translation", "res://addons/maaacks_game_template/base/translations/menus_translations.fr.translation")
 
+[layer_names]
+
+3d_physics/layer_1="Player"
+3d_physics/layer_2="2"
+3d_physics/layer_3="3"
+3d_physics/layer_4="4"
+3d_physics/layer_5="enemies"
+3d_physics/layer_9="terrain"
+3d_physics/layer_17="weapon"
+
 [maaacks_game_template]
 
 disable_update_check=false
@@ -154,6 +164,7 @@ copy_path="res://scenes"
 
 [physics]
 
+3d/run_on_separate_thread=true
 common/physics_jitter_fix=0.0
 3d/physics_engine="Jolt Physics"
 common/physics_interpolation=true

scenes/enemies/EnemyInitInputs.cs

@@ -0,0 +1,18 @@
+using Godot;
+using System;
+
+[GlobalClass]
+public partial class EnemyInitInputs : Resource
+{
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float Speed = 5.0f;
+
+    public EnemyInitInputs()
+    {
+        Speed = 5.0f;
+    }
+    public EnemyInitInputs(float speed)
+    {
+        Speed = speed;
+    }
+}

scenes/enemies/EnemyInitInputs.cs.uid

@@ -0,0 +1 @@
+uid://b2vdwkiqauhk3

scenes/enemies/FirstEnemy.cs

@@ -0,0 +1,40 @@
+using Godot;
+using System;
+using Movementtests.player_controller.Scripts;
+
+public partial class FirstEnemy : CharacterBody3D
+{
+	[Export]
+	public Node3D Target { get; set; }
+	
+	[Export]
+	public EnemyInitInputs Inputs;
+	
+	private RayCast3D _wallInFrontRayCast;
+	
+	public override void _Ready()
+	{
+		_wallInFrontRayCast = GetNode<RayCast3D>("WallInFrontRayCast");
+	}
+
+	public override void _PhysicsProcess(double delta)
+	{
+		var target = Target.GlobalPosition;
+		var direction = (target - GlobalPosition).Normalized();
+
+		var targetPlane = new Vector3(target.X, GlobalPosition.Y, target.Z);
+		LookAt(targetPlane);
+		
+		var velocity = Velocity;
+		velocity.X = direction.X * Inputs.Speed;
+		velocity.Z = direction.Z * Inputs.Speed;
+
+		if (_wallInFrontRayCast.IsColliding())
+			velocity.Y = Inputs.Speed;
+		else if (!IsOnFloor())
+			velocity += GetGravity() * (float)delta;
+		
+		Velocity = velocity;
+		MoveAndSlide();
+	}
+}

scenes/enemies/FirstEnemy.cs.uid

@@ -0,0 +1 @@
+uid://bn7sc6id7n166

scenes/enemies/first_enemy.tscn

@@ -0,0 +1,51 @@
+[gd_scene load_steps=6 format=3 uid="uid://dxt0e2ugmttqq"]
+
+[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/FirstEnemy.cs" id="1_4yfjf"]
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_62kkh"]
+
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_3uydm"]
+
+[sub_resource type="SphereMesh" id="SphereMesh_4yfjf"]
+radius = 0.05
+height = 0.1
+radial_segments = 4
+rings = 4
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4yfjf"]
+albedo_color = Color(0.06469653, 0.06469653, 0.06469653, 1)
+
+[node name="CharacterBody3D" type="CharacterBody3D"]
+collision_layer = 16
+collision_mask = 273
+script = ExtResource("1_4yfjf")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
+shape = SubResource("CapsuleShape3D_62kkh")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
+layers = 33
+mesh = SubResource("CapsuleMesh_3uydm")
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 1.5, -0.5)
+layers = 33
+cast_shadow = 0
+ignore_occlusion_culling = true
+mesh = SubResource("SphereMesh_4yfjf")
+surface_material_override/0 = SubResource("StandardMaterial3D_4yfjf")
+
+[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 1.5, -0.5)
+layers = 33
+cast_shadow = 0
+ignore_occlusion_culling = true
+mesh = SubResource("SphereMesh_4yfjf")
+surface_material_override/0 = SubResource("StandardMaterial3D_4yfjf")
+
+[node name="WallInFrontRayCast" type="RayCast3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0)
+target_position = Vector3(0, 0, -1.5)
+collision_mask = 272

scenes/tuto_trigger/TutoTrigger.tscn

@@ -10,7 +10,6 @@ font_size = 30
 
 [node name="TutoTrigger" type="Area3D"]
 collision_layer = 0
-collision_mask = 16
 script = ExtResource("1_w8mpv")
 
 [node name="Control" type="Control" parent="."]

systems/dash/dash_system.tscn

@@ -28,7 +28,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
 shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -12)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
 
 [node name="DashCastDrop" type="ShapeCast3D" parent="."]
@@ -36,7 +36,7 @@ transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1
 shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -50)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
 
 [node name="DashTarget" type="MeshInstance3D" parent="."]

systems/head/head_system.tscn

@@ -69,10 +69,6 @@ transform = Transform3D(1, 0, 0, 0, 0.99999994, 0, 0, 0, 0.99999994, 0, 0, 0)
 current = true
 fov = 90.0
 
-[node name="RayCast3D" type="RayCast3D" parent="CameraSmooth/Camera3D"]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, -0.64723)
-visible = false
-
 [node name="CameraAnchor" type="Marker3D" parent="."]
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]

systems/mantle/mantle_system.tscn

@@ -28,7 +28,7 @@ visible = false
 shape = SubResource("CapsuleShape3D_4coqe")
 target_position = Vector3(0, 0, 0)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(1, 0, 0, 1)
 
 [node name="WallInFrontCast3D" type="ShapeCast3D" parent="."]
@@ -37,20 +37,20 @@ visible = false
 shape = SubResource("SphereShape3D_2oobp")
 target_position = Vector3(0, 0, -1.5)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
 
 [node name="InAirWallDetect" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.01, 0)
 shape = SubResource("CapsuleShape3D_2oobp")
 target_position = Vector3(0, 0, -2)
-collision_mask = 2
+collision_mask = 256
 
 [node name="GroundedWallDetect" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26, 0)
 shape = SubResource("CapsuleShape3D_i32qj")
 target_position = Vector3(0, 0, -2)
-collision_mask = 2
+collision_mask = 256
 
 [node name="WallProfileShapeCasts" type="Node3D" parent="."]
 
@@ -59,46 +59,46 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.5)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast2" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.75)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast3" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast4" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.25)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast5" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.5)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast6" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.75)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast7" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -2)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256

systems/weapon/weapon.tscn

@@ -37,8 +37,8 @@ stencil_outline_thickness = 0.1
 material = SubResource("StandardMaterial3D_m0v1h")
 
 [node name="Weapon" type="RigidBody3D"]
-collision_layer = 4
-collision_mask = 2
+collision_layer = 65536
+collision_mask = 256
 continuous_cd = true
 contact_monitor = true
 max_contacts_reported = 1