started work on moving collision layers and added jump and land sounds

This commit is contained in:
derek
2024-09-25 16:16:20 -05:00
parent 8c2cd81b5c
commit 7c45e53502
20 changed files with 415 additions and 368 deletions

View File

@@ -55,8 +55,8 @@ blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_46pc3")
[node name="ammo_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["magnet", "pickup", "scene_rigidbody"]]
collision_layer = 4
collision_mask = 6
collision_layer = 16
collision_mask = 17
script = ExtResource("1_sni3c")
collision_shape = NodePath("CollisionShape3D2")
despawning = true

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -11,7 +11,6 @@ height = 1.02109
collision_layer = 4
collision_mask = 6
script = ExtResource("1_gmdl1")
pickupType = "jump"
[node name="Area3D" type="Area3D" parent="."]

View File

@@ -26,6 +26,8 @@ surface_material_override/0 = SubResource("StandardMaterial3D_ur8dk")
shape = SubResource("ConcavePolygonShape3D_g882c")
[node name="Area3D" type="Area3D" parent="."]
collision_layer = 0
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)

View File

@@ -6,6 +6,8 @@
size = Vector3(1, 8.23889, 1.6582)
[node name="LadderCollisionCheck" type="Area3D"]
collision_layer = 2
collision_mask = 0
script = ExtResource("1_ugi45")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]

View File

@@ -96,8 +96,8 @@ height = 0.712
[node name="money1" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["magnet", "pickup", "scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0355983, 4.76837e-07, -0.0110531)
collision_layer = 4
collision_mask = 6
collision_layer = 16
collision_mask = 17
script = ExtResource("2_itgxg")
collision_shape = NodePath("CollisionShape3D")
despawning = true

View File

@@ -36,7 +36,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 = 3
collision_layer = 11
safe_margin = 0.5
script = ExtResource("1_x7wms")
dead_player = ExtResource("2_4hoys")
@@ -116,19 +116,19 @@ script = ExtResource("7_pnp4a")
[node name="BulletRay" type="RayCast3D" parent="Head/Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.89879)
target_position = Vector3(0, 0, -200)
collision_mask = 7
collision_mask = 5
collide_with_areas = true
[node name="InteractRay" type="RayCast3D" parent="Head/Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0521634, -0.764677)
target_position = Vector3(0, 0, -3)
collision_mask = 8
collision_mask = 2
hit_from_inside = true
collide_with_areas = true
[node name="pick_up_detection" type="Area3D" parent="."]
collision_layer = 0
collision_mask = 4
collision_mask = 16
[node name="CollisionShape3D2" type="CollisionShape3D" parent="pick_up_detection"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0810862, 0.330574, -0.138576)
@@ -136,7 +136,7 @@ shape = SubResource("BoxShape3D_nfpjw")
[node name="pick_up_magnet" type="Area3D" parent="."]
collision_layer = 0
collision_mask = 4
collision_mask = 16
[node name="CollisionShape3D" type="CollisionShape3D" parent="pick_up_magnet"]
shape = SubResource("SphereShape3D_xfie3")
@@ -146,8 +146,9 @@ shape = SubResource("SphereShape3D_xfie3")
[node name="PickupSound" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("8_dwqsx")
[node name="LandSound" type="AudioStreamPlayer3D" parent="Audio"]
[node name="LandSound" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("10_tn0pn")
volume_db = -5.0
[node name="EarWind" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("11_he7p5")

View File

@@ -339,8 +339,8 @@ _data = {
[node name="rat" type="CharacterBody3D" groups=["breakable", "npc", "rat", "spawned"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.117073, 0)
collision_layer = 2
collision_mask = 7
collision_layer = 64
collision_mask = 45
script = ExtResource("1_m8jnv")
dead_rat = ExtResource("2_it4rd")

View File

@@ -25,8 +25,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.356676)
target_position = Vector3(0, 0, -1)
[node name="Area3D" type="Area3D" parent="."]
collision_layer = 7
collision_mask = 7
collision_layer = 2
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0113525, -0.302734)

View File

@@ -731,6 +731,7 @@ _surfaces = [{
size = Vector3(0.816284, 0.725159, 0.75531)
[node name="spider" type="CharacterBody3D" groups=["enemy"]]
collision_layer = 8
script = ExtResource("1_7e7fe")
bullet = ExtResource("2_aew5r")
casing = ExtResource("3_e5ft5")
@@ -873,8 +874,8 @@ mesh = SubResource("ArrayMesh_d210d")
[node name="Area3D" type="Area3D" parent="body" groups=["enemy_target"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.03709, 0)
collision_layer = 15
collision_mask = 15
collision_layer = 8
collision_mask = 13
script = ExtResource("7_8vkma")
[node name="TargetShape" type="CollisionShape3D" parent="body/Area3D" groups=["enemy"]]

View File

@@ -51,8 +51,8 @@ blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_dsuo5")
[node name="stamina_pickup" type="RigidBody3D" node_paths=PackedStringArray("collision_shape") groups=["magnet", "pickup", "scene_rigidbody"]]
collision_layer = 4
collision_mask = 6
collision_layer = 16
collision_mask = 17
script = ExtResource("1_1udac")
collision_shape = NodePath("CollisionShape3D2")
despawning = true