fix: removed collision between player and weapon which would alter the player's movement
This commit is contained in:
@ -37,6 +37,7 @@ visible = false
|
|||||||
[node name="Greybox" type="CSGCombiner3D" parent="."]
|
[node name="Greybox" type="CSGCombiner3D" parent="."]
|
||||||
use_collision = true
|
use_collision = true
|
||||||
collision_layer = 3
|
collision_layer = 3
|
||||||
|
collision_mask = 5
|
||||||
|
|
||||||
[node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
|
[node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -0.958893)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -0.958893)
|
||||||
|
@ -160,7 +160,6 @@ public partial class PlayerController : CharacterBody3D
|
|||||||
DashSystem.DashResolve = new DashResolveRecord(false, WeaponSystem.PlayerDashLocation, Vector3.Zero);
|
DashSystem.DashResolve = new DashResolveRecord(false, WeaponSystem.PlayerDashLocation, Vector3.Zero);
|
||||||
}
|
}
|
||||||
_dashDirection = (DashSystem.DashResolve.DashLocation - GlobalPosition).Normalized();
|
_dashDirection = (DashSystem.DashResolve.DashLocation - GlobalPosition).Normalized();
|
||||||
GD.Print(_dashDirection);
|
|
||||||
DashSystem.Dash();
|
DashSystem.Dash();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ bottom_radius = 0.05
|
|||||||
height = 1.0
|
height = 1.0
|
||||||
|
|
||||||
[node name="Weapon" type="RigidBody3D"]
|
[node name="Weapon" type="RigidBody3D"]
|
||||||
|
collision_layer = 4
|
||||||
collision_mask = 2
|
collision_mask = 2
|
||||||
continuous_cd = true
|
continuous_cd = true
|
||||||
contact_monitor = true
|
contact_monitor = true
|
||||||
|
Reference in New Issue
Block a user