tweaks to weapon pickups

This commit is contained in:
Derek
2025-03-11 08:29:13 -05:00
parent a72c62b760
commit 64ec7b12b6
9 changed files with 13 additions and 21 deletions

View File

@@ -235,12 +235,11 @@ points = PackedVector3Array(-0.899645, -0.235985, -0.176739, 0.797351, 0.356305,
[sub_resource type="SphereShape3D" id="SphereShape3D_87tum"]
radius = 1.26183
[node name="mac10_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup", "weapon_pickup"]]
collision_layer = 17
[node name="mac10_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]]
collision_layer = 16
collision_mask = 17
script = ExtResource("1_46utd")
gun_resource = ExtResource("2_kkmr5")
collision_shape = NodePath("CollisionShape3D")
[node name="mac11" type="MeshInstance3D" parent="."]
transform = Transform3D(-1.31134e-08, 0, -0.3, 0, 0.3, 0, 0.3, 0, -1.31134e-08, 0, 0, 0)

View File

@@ -100,7 +100,7 @@ size = Vector3(0.162, 0.05, 1)
radius = 1.26183
[node name="machete_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]]
collision_layer = 17
collision_layer = 16
collision_mask = 17
continuous_cd = true
contact_monitor = true

View File

@@ -153,12 +153,11 @@ points = PackedVector3Array(-0.860472, 0.302737, 0.0809691, -0.860472, 0.302737,
[sub_resource type="SphereShape3D" id="SphereShape3D_87tum"]
radius = 1.26183
[node name="pistol1_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup", "weapon_pickup"]]
collision_layer = 17
[node name="pistol1_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]]
collision_layer = 16
collision_mask = 17
script = ExtResource("1_pw3bx")
gun_resource = ExtResource("2_x7kb7")
collision_shape = NodePath("CollisionShape3D")
[node name="gun" type="MeshInstance3D" parent="."]
transform = Transform3D(-3.23167e-06, 0, -0.892729, 0, 0.892728, 0, 0.892728, 0, -3.23167e-06, 0, -0.000397999, 0)

View File

@@ -741,7 +741,7 @@ points = PackedVector3Array(0.930093, 0.100662, 0.798251, 0.930093, -0.0820646,
radius = 1.26183
[node name="pistol1_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]]
collision_layer = 17
collision_layer = 16
collision_mask = 17
script = ExtResource("1_8fbqg")
gun_resource = ExtResource("2_qbywk")

View File

@@ -221,12 +221,11 @@ points = PackedVector3Array(0.25648, 1.26062, 0.0939077, -0.271823, -1.21875, -0
[sub_resource type="SphereShape3D" id="SphereShape3D_87tum"]
radius = 1.26183
[node name="rocketlauncher1_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["pickup", "weapon_pickup"]]
collision_layer = 17
[node name="rocketlauncher1_pickup" type="RigidBody3D" groups=["pickup", "weapon_pickup"]]
collision_layer = 16
collision_mask = 17
script = ExtResource("1_mytm1")
gun_resource = ExtResource("2_5t04l")
collision_shape = NodePath("CollisionShape3D2")
[node name="rocketlauncher1" type="MeshInstance3D" parent="."]
transform = Transform3D(3.57628e-07, 1, 0, -1, 3.57628e-07, 0, 0, 0, 1, 0, 0, 0)