derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pickups distributed through level manager. need to fix drop amount

Browse Source
This commit is contained in:
derek
2024-08-05 16:50:09 -05:00
parent 3335ad0804
commit 7c5e850077
27 changed files with 151 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Enemy_casing.tscn
View File

@@ -9,7 +9,7 @@ margin = 0.001
height = 0.248374
radius = 0.062995
[node name="enemycasing" type="RigidBody3D"]
[node name="enemycasing" type="RigidBody3D" groups=["spawned"]]
collision_layer = 2
collision_mask = 7
mass = 0.1

1
assets/ammo_pickup.tscn
View File

@@ -61,7 +61,6 @@ script = ExtResource("1_sni3c")
collision_shape = NodePath("CollisionShape3D2")
despawning = true
despawn_time_s = 20
pickupType = "ammo"
[node name="Area3D" type="Area3D" parent="."]

2
assets/boombox_broken.tscn
View File

@@ -555,7 +555,7 @@ shadow_mesh = SubResource("ArrayMesh_5m3do")
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_hp35l"]
points = PackedVector3Array(0.0232605, 0.0442351, -0.010081, 0.011892, 0.0439651, -0.00243215, 0.0114977, 0.0270315, 0.0347546, 0.24038, -0.00987622, -0.0269458, 0.0505976, 0.0390113, -0.0156751, -0.0846419, 0.0442351, -0.010081, -0.0838205, 0.0439651, -0.00243215, 0.0227348, 0.0214347, 0.0399813, -0.0818819, 0.0270315, 0.0347546, 0.240018, -0.0268257, 0.0102334, -0.0763619, -0.0197363, -0.0314377, 0.230194, -0.00453337, -0.032285, 0.205485, 0.00250841, -0.0322925, 0.0500061, 0.0137895, 0.0397113, 0.20496, -0.0227292, 0.0230864, -0.0763619, -0.00627198, -0.0362969, -0.0859233, 0.0390113, -0.0156751, -0.0941047, -0.00627198, -0.0362969, -0.0951561, -0.0140759, -0.0366268, -0.0820462, 0.0214347, 0.0399813, 0.229701, -0.0273417, 0.0177622, -0.0763619, -0.0368683, 0.0134279, -0.0763619, -0.0366699, 0.00574908, -0.0763619, -0.0140759, -0.0366268, -0.0952876, -0.0197363, -0.0314377, -0.0830647, 0.0137895, 0.0397113, -0.0763619, -0.0314937, 0.019097, -0.0933819, -0.0366699, 0.00574908, -0.0925276, -0.0368683, 0.0134279, -0.0912133, -0.0314937, 0.019097)
[node name="Boombox_broken" type="Node3D" groups=["scene_rigidbody"]]
[node name="Boombox_broken" type="Node3D" groups=["scene_rigidbody", "spawned"]]
[node name="part1" type="RigidBody3D" parent="."]
collision_layer = 2

2
assets/bottle_1_pieces.tscn
View File

@@ -194,7 +194,7 @@ shadow_mesh = SubResource("ArrayMesh_i03s3")
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_611bg"]
points = PackedVector3Array(0.0944869, -0.228895, -0.107533, -0.056244, 0.175358, -0.0321848, 0.156169, -0.153471, 0.00204893, -0.0767958, 0.0657196, 0.104823, 0.0259363, 0.175358, -0.018472, 0.0739083, -0.146688, -0.128102, -0.0988416, 0.172671, 0.0541892, -0.0151405, -0.0780892, -0.107533, 0.121907, -0.153471, -0.107533, 0.108197, -0.249458, -0.0801314, -0.0219821, 0.0657196, 0.118535, -0.117926, -0.0507011, 0.00204893, 0.046488, 0.182226, 0.0363068, 0.0259363, 0.175358, 0.0979662, -0.0836643, 0.182226, -0.018472, -0.0467355, 0.173692, 0.107146, 0.128722, -0.0849576, 0.0363068, 0.156169, -0.153471, -0.0253284, -0.0151405, 0.182226, -0.0321848, 0.115012, -0.256326, -0.100676, -0.104216, 0.0109006, 0.056876, 0.142459, -0.153471, 0.00204893, -0.0151405, -0.0986517, -0.100676, -0.0853973, 0.172008, 0.0866411, -0.0915414, -0.0431356, -0.0293689, 0.128722, -0.249458, -0.0801314, 0.00543814, -0.0918261, -0.114389, -0.111058, -0.0507011, 0.00890533, 0.0396464, 0.182226, 0.0157617, -0.0905059, 0.0314631, 0.0774211, 0.115012, -0.235721, -0.0664185, 0.046488, 0.182226, 0.0431632)
[node name="Bottle1Pieces" type="Node3D" node_paths=PackedStringArray("timer", "sound") groups=["scene_rigidbody"]]
[node name="Bottle1Pieces" type="Node3D" node_paths=PackedStringArray("timer", "sound") groups=["scene_rigidbody", "spawned"]]
script = ExtResource("1_3nyc3")
timer = NodePath("Timer")
sound = NodePath("Piece 1/BrokenSound")

2
assets/bullet_hole.tscn
View File

@@ -13,7 +13,7 @@ alpha_antialiasing_mode = 0
blend_mode = 3
albedo_texture = ExtResource("1_a6hxe")
[node name="BulletHole" type="Node3D"]
[node name="BulletHole" type="Node3D" groups=["spawned"]]
script = ExtResource("1_r63bq")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]

2
assets/casing_2.tscn
View File

@@ -9,7 +9,7 @@ margin = 0.001
height = 0.07
radius = 0.025
[node name="casing_2" type="RigidBody3D"]
[node name="casing_2" type="RigidBody3D" groups=["spawned"]]
collision_layer = 2
collision_mask = 7
mass = 0.1

2
assets/die_particles.tscn
View File

@@ -253,7 +253,7 @@ shadow_mesh = SubResource("ArrayMesh_lj803")
[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_6s52t"]
points = PackedVector3Array(0.0373867, 0.506736, 0.264769, -0.356717, -0.359168, -0.355095, -0.0320077, -0.359938, -0.355895, -0.354628, -0.356682, 0.361267, 0.420766, -0.216171, 0.424228, 0.423749, 0.219941, -0.416246, -0.365389, 0.352423, -0.345166, -0.416466, 0.218879, 0.424331, 0.360266, -0.357965, -0.353736, 0.102349, 0.335027, 0.589588, 0.402901, 0.268555, 0.389875, 0.195153, 0.506736, -0.190996, -0.422081, -0.220248, -0.419715, -0.260721, 0.506736, 0.0369412, 0.358523, -0.35589, 0.360761, -0.0313043, 0.303622, 0.62754, -0.421842, 0.220812, -0.419429, 0.424319, -0.218587, -0.41693, -0.417407, -0.21707, 0.425083, -0.0479629, 0.437309, 0.542168, 0.265281, 0.506736, 0.0369412, 0.0869742, 0.203613, -0.452175, -0.0502516, 0.506736, -0.26119, -0.365015, 0.352134, 0.35648, 0.102079, 0.434188, 0.505107, 0.0358136, 0.235707, 0.625416, 0.355023, 0.353852, -0.363978, 0.419586, 0.218443, 0.423284, 0.358118, 0.356357, 0.360453, -0.350469, 0.353856, -0.36409, -0.208103, 0.506736, 0.176999, -0.208103, 0.506736, -0.17353)
[node name="dieParticles" type="Node3D" node_paths=PackedStringArray("audio_explode")]
[node name="dieParticles" type="Node3D" node_paths=PackedStringArray("audio_explode") groups=["spawned"]]
script = ExtResource("1_frf2k")
audio_explode = NodePath("Audio/Die")

2
assets/health_pickup.tscn
View File

@@ -51,7 +51,7 @@ script = ExtResource("1_bncdc")
collision_shape = NodePath("CollisionShape3D2")
despawning = true
despawn_time_s = 20
pickupType = "health"
pickupType = 2
[node name="HealthPickup" type="MeshInstance3D" parent="."]
transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0)

1
assets/mac10_pickup.tscn
View File

@@ -217,7 +217,6 @@ collision_layer = 4
collision_mask = 6
script = ExtResource("1_46utd")
gun_resource = ExtResource("2_kkmr5")
pickupType = "weapon"
collision_shape = NodePath("CollisionShape3D")
[node name="mac10" type="MeshInstance3D" parent="."]

64
assets/mag1.tscn
View File

File diff suppressed because one or more lines are too long

2
assets/money_pickup.tscn
View File

@@ -101,7 +101,7 @@ collision_mask = 6
script = ExtResource("2_itgxg")
collision_shape = NodePath("CollisionShape3D")
despawning = true
pickupType = "money"
pickupType = 3
[node name="Plane" type="MeshInstance3D" parent="."]
transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, -0.000681758, -0.0236325, -0.000314474)

2
assets/rat.tscn
View File

@@ -337,7 +337,7 @@ _data = {
"run": SubResource("Animation_rf35q")
}
[node name="rat" type="CharacterBody3D" groups=["breakable", "npc", "rat"]]
[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

4
assets/rocket_launcher.tscn
View File

@@ -352,7 +352,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0, 0.01, 0.1),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Vector3(0, 0.242, 0.5), Vector3(0, 0.242, 0.6), Vector3(0, 0.242, 0.5)]
"values": [Vector3(0, 0.242, 0.5), Vector3(0, 0.242, 1), Vector3(0, 0.242, 0.5)]
}
tracks/1/type = "value"
tracks/1/imported = false
@@ -462,7 +462,7 @@ audio_empty = NodePath("Audio/Empty")
audio_reload = NodePath("Audio/Reload")
[node name="rocketlauncher1" type="MeshInstance3D" parent="."]
transform = Transform3D(-2.87865e-09, 0.0658559, -0.997829, -1, -4.37114e-08, -3.10862e-15, -4.36165e-08, 0.997829, 0.0658559, 0, 0.242, 0.5)
transform = Transform3D(1.41767e-10, -3.62203e-06, -1, -0.999434, -0.0336273, 1.21657e-07, -0.0336273, 0.999434, -3.61999e-06, 0, 0.242, 0.703125)
mesh = SubResource("ArrayMesh_qiiww")
skeleton = NodePath("")

1
assets/rocketlauncher_pickup.tscn
View File

@@ -226,7 +226,6 @@ collision_layer = 4
collision_mask = 6
script = ExtResource("1_mytm1")
gun_resource = ExtResource("2_5t04l")
pickupType = "weapon"
collision_shape = NodePath("CollisionShape3D2")
[node name="rocketlauncher1" type="MeshInstance3D" parent="."]

5
assets/spider2.tscn
View File

@@ -718,6 +718,10 @@ autostart = true
wait_time = 0.5
one_shot = true
[node name="stunned_timer" type="Timer" parent="Timers"]
wait_time = 8.0
one_shot = true
[node name="AUIDO" type="Node" parent="."]
[node name="Fire" type="AudioStreamPlayer3D" parent="AUIDO"]
@@ -728,3 +732,4 @@ volume_db = 10.0
[connection signal="timeout" from="Timers/prefire_timer" to="." method="_on_prefire_timer_timeout"]
[connection signal="timeout" from="Timers/postfire_timer" to="." method="_on_postfire_timer_timeout"]
[connection signal="timeout" from="Timers/knocked_timer" to="." method="_on_knocked_timer_timeout"]
[connection signal="timeout" from="Timers/stunned_timer" to="." method="_on_stunned_timer_timeout"]

2
assets/stamina_pickup.tscn
View File

@@ -57,7 +57,7 @@ script = ExtResource("1_1udac")
collision_shape = NodePath("CollisionShape3D2")
despawning = true
despawn_time_s = 20
pickupType = "stamina"
pickupType = 1
[node name="Area3D" type="Area3D" parent="."]