Sara/wave-survival
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: upgraded project to godot 4.6

Browse source
This commit is contained in:
Sara Gerretsen 2025-11-08 16:35:20 +01:00
parent c4bd5edb54
commit 504f3dbef0
42 changed files with 700 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/models/weapons/rifle.blend
View file

Binary file not shown.

BIN
assets/models/weapons/rifle.blend1
View file

Binary file not shown.

2
engine

@ -1 +1 @@
Subproject commit 084d5d407e62efcd5be9de44148c5dedce3b9386 Subproject commit 6fd949a6dcbda94140200633394f2b4b99de8f6f

BIN
project/assets/animations/enemies/wretched/RESET.res
View file

Binary file not shown.

BIN
project/assets/animations/enemies/wretched/attack.res
View file

Binary file not shown.

BIN
project/assets/animations/enemies/wretched/ready.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/equip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/fire_double.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/fire_single.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/idle_double.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/idle_single.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/revolver/to_single.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/RESET.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/aim_to_hip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/equip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/fire_aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/fire_hip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/hip.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/hip_to_aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/hip_to_run.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/reload.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/run.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/run_to_aim.res
View file

Binary file not shown.

BIN
project/assets/animations/weapons/rifle/run_to_hip.res
View file

Binary file not shown.

BIN
project/assets/models/base_character.blend
View file

Binary file not shown.

1
project/assets/models/base_character.blend.import
View file

@ -48,6 +48,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true blender/meshes/uvs=true
blender/meshes/normals=true blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true blender/meshes/tangents=true
blender/meshes/skins=2 blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false blender/meshes/export_bones_deforming_mesh_only=false

24
project/assets/models/enemies/model_scenes/wretched.tscn
View file

@ -15,41 +15,41 @@ size = Vector3(0.24902344, 0.42858887, 0.2619629)
[sub_resource type="BoxShape3D" id="BoxShape3D_yvqru"] [sub_resource type="BoxShape3D" id="BoxShape3D_yvqru"]
size = Vector3(0.35500336, 0.107666016, 0.11816406) size = Vector3(0.35500336, 0.107666016, 0.11816406)
[node name="wretched" instance=ExtResource("1_w0sx6")] [node name="wretched" unique_id=1505510221 instance=ExtResource("1_w0sx6")]
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D" index="2"] [node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D" index="2" unique_id=333008962]
transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, 6.209e-17, 0.097789526, 0.004007945) transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, 6.209e-17, 0.097789526, 0.004007945)
collision_layer = 6 collision_layer = 6
collision_mask = 0 collision_mask = 0
monitoring = false monitoring = false
impact_effect = ExtResource("2_a12c4") impact_effect = ExtResource("2_a12c4")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="Character/Skeleton3D/Hitbox" index="0"] [node name="CollisionShape3D2" type="CollisionShape3D" parent="Character/Skeleton3D/Hitbox" index="0" unique_id=602827216]
transform = Transform3D(1, 6.5504433e-21, 0, 6.2038546e-25, 1.0000037, 0, 0, 0, 1.0000037, -2.2362435e-16, 0.35283393, -0.013339132) transform = Transform3D(1, 6.5504433e-21, 0, 6.2038546e-25, 1.0000037, 0, 0, 0, 1.0000037, -2.2362435e-16, 0.35283393, -0.013339132)
shape = SubResource("BoxShape3D_w0sx6") shape = SubResource("BoxShape3D_w0sx6")
[node name="SpineAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="3"] [node name="SpineAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="3" unique_id=1651916591]
transform = Transform3D(1, -2.2202518e-16, 2.1910394e-16, 2.1910388e-16, 0.9999122, 0.013243958, -2.220252e-16, -0.01324396, 0.99991226, -4.1256417e-17, 1.1546816, -0.0027124756) transform = Transform3D(1, -2.2202518e-16, 2.1910394e-16, 2.1910388e-16, 0.9999122, 0.013243958, -2.220252e-16, -0.01324396, 0.99991226, -4.1256417e-17, 1.1546816, -0.0027124756)
bone_name = "spine.002" bone_name = "spine.002"
bone_idx = 3 bone_idx = 3
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/SpineAttach" index="0"] [node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/SpineAttach" index="0" unique_id=1070250681]
transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, -2.1234107e-16, -1.1546164, -0.012580322) transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, -2.1234107e-16, -1.1546164, -0.012580322)
collision_layer = 4 collision_layer = 4
collision_mask = 0 collision_mask = 0
monitoring = false monitoring = false
impact_effect = ExtResource("2_a12c4") impact_effect = ExtResource("2_a12c4")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/SpineAttach/Hitbox" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/SpineAttach/Hitbox" index="0" unique_id=1643914600]
transform = Transform3D(1, -2.2202515e-16, 2.1910396e-16, 2.1910385e-16, 0.9999122, 0.0132439565, -2.2202522e-16, -0.013243958, 0.99991226, 0.0023498535, 1.1967317, -0.0032694251) transform = Transform3D(1, -2.2202515e-16, 2.1910396e-16, 2.1910385e-16, 0.9999122, 0.0132439565, -2.2202522e-16, -0.013243958, 0.99991226, 0.0023498535, 1.1967317, -0.0032694251)
shape = SubResource("BoxShape3D_a12c4") shape = SubResource("BoxShape3D_a12c4")
[node name="HeadAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="4"] [node name="HeadAttach" type="BoneAttachment3D" parent="Character/Skeleton3D" index="4" unique_id=1057907260]
transform = Transform3D(0.9999988, -0.0007823897, 0.0013344375, 0.0007271601, 0.99916273, 0.04089782, -0.0013653187, -0.040896803, 0.9991622, -1.3069549e-16, 1.5574794, -0.004068734) transform = Transform3D(0.9999988, -0.0007823897, 0.0013344375, 0.0007271601, 0.99916273, 0.04089782, -0.0013653187, -0.040896803, 0.9991622, -1.3069549e-16, 1.5574794, -0.004068734)
bone_name = "Neck" bone_name = "Neck"
bone_idx = 5 bone_idx = 5
[node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/HeadAttach" index="0"] [node name="Hitbox" type="Hitbox" parent="Character/Skeleton3D/HeadAttach" index="0" unique_id=1188667481]
transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, -2.1234107e-16, -1.1546164, -0.012580322) transform = Transform3D(1, 2.1910389e-16, -2.2202524e-16, -2.2202514e-16, 0.9999124, -0.013243958, 2.1910394e-16, 0.01324396, 0.9999123, -2.1234107e-16, -1.1546164, -0.012580322)
collision_layer = 4 collision_layer = 4
collision_mask = 0 collision_mask = 0
@ -57,22 +57,22 @@ monitoring = false
damage_modifier = 2.0 damage_modifier = 2.0
impact_effect = ExtResource("2_a12c4") impact_effect = ExtResource("2_a12c4")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/HeadAttach/Hitbox" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/HeadAttach/Hitbox" index="0" unique_id=1923399941]
transform = Transform3D(1, -2.2202515e-16, 2.1910393e-16, 2.1910723e-16, 0.9999161, 0.013243863, -2.2202641e-16, -0.013243858, 0.9999161, -7.644832e-17, 1.3035276, -0.01432839) transform = Transform3D(1, -2.2202515e-16, 2.1910393e-16, 2.1910723e-16, 0.9999161, 0.013243863, -2.2202641e-16, -0.013243858, 0.9999161, -7.644832e-17, 1.3035276, -0.01432839)
shape = SubResource("BoxShape3D_2le77") shape = SubResource("BoxShape3D_2le77")
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="Character/Skeleton3D" index="5"] [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Character/Skeleton3D" index="5" unique_id=2139322499]
transform = Transform3D(0.10797773, -0.79005337, 0.60345376, 0.4003794, 0.5901581, 0.70100564, -0.9099653, 0.16591746, 0.38004512, 0.28507733, 1.5014915, -0.21731633) transform = Transform3D(0.10797773, -0.79005337, 0.60345376, 0.4003794, 0.5901581, 0.70100564, -0.9099653, 0.16591746, 0.38004512, 0.28507733, 1.5014915, -0.21731633)
bone_name = "hand.R" bone_name = "hand.R"
bone_idx = 9 bone_idx = 9
[node name="DamageBox" type="DamageBox" parent="Character/Skeleton3D/BoneAttachment3D" index="0"] [node name="DamageBox" type="DamageBox" parent="Character/Skeleton3D/BoneAttachment3D" index="0" unique_id=51031781]
transform = Transform3D(0.8168715, 0.42058483, 0.39475223, -0.47940335, 0.87559944, 0.059143633, -0.32076997, -0.2375583, 0.91688204, -0.0065350886, 0.06456717, -0.0151789) transform = Transform3D(0.8168715, 0.42058483, 0.39475223, -0.47940335, 0.87559944, 0.059143633, -0.32076997, -0.2375583, 0.91688204, -0.0065350886, 0.06456717, -0.0151789)
collision_layer = 0 collision_layer = 0
collision_mask = 8 collision_mask = 8
monitoring = false monitoring = false
monitorable = false monitorable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/BoneAttachment3D/DamageBox" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Character/Skeleton3D/BoneAttachment3D/DamageBox" index="0" unique_id=1793068779]
transform = Transform3D(1, -1.1175919e-06, -1.7881156e-06, 1.1175778e-06, 1, -7.912447e-06, 1.7881245e-06, 7.912445e-06, 1, -0.20445287, -3.5762787e-07, -2.682209e-07) transform = Transform3D(1, -1.1175919e-06, -1.7881156e-06, 1.1175778e-06, 1, -7.912447e-06, 1.7881245e-06, 7.912445e-06, 1, -0.20445287, -3.5762787e-07, -2.682209e-07)
shape = SubResource("BoxShape3D_yvqru") shape = SubResource("BoxShape3D_yvqru")

1
project/assets/models/enemies/rifleman.blend.import
View file

@ -48,6 +48,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true blender/meshes/uvs=true
blender/meshes/normals=true blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true blender/meshes/tangents=true
blender/meshes/skins=2 blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false blender/meshes/export_bones_deforming_mesh_only=false

1
project/assets/models/enemies/wretched.blend.import
View file

@ -6219,6 +6219,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true blender/meshes/uvs=true
blender/meshes/normals=true blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true blender/meshes/tangents=true
blender/meshes/skins=2 blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false blender/meshes/export_bones_deforming_mesh_only=false

BIN
project/assets/models/weapons/revolver.blend
View file

Binary file not shown.

1
project/assets/models/weapons/revolver.blend.import
View file

@ -12404,6 +12404,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true blender/meshes/uvs=true
blender/meshes/normals=true blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true blender/meshes/tangents=true
blender/meshes/skins=2 blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false blender/meshes/export_bones_deforming_mesh_only=false

BIN
project/assets/models/weapons/revolver.blend1
View file

Binary file not shown.

1
project/assets/models/weapons/rifle.blend.import
View file

@ -26796,6 +26796,7 @@ blender/meshes/colors=false
blender/meshes/uvs=true blender/meshes/uvs=true
blender/meshes/normals=true blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false blender/meshes/export_geometry_nodes_instances=false
blender/meshes/gpu_instances=false
blender/meshes/tangents=true blender/meshes/tangents=true
blender/meshes/skins=2 blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false blender/meshes/export_bones_deforming_mesh_only=false

10
project/guis/heads_up_display.tscn
View file

@ -24,7 +24,7 @@ corner_radius_bottom_right = 6
corner_radius_bottom_left = 6 corner_radius_bottom_left = 6
corner_detail = 6 corner_detail = 6
[node name="HeadsUpDisplay" type="HeadsUpDisplay"] [node name="HeadsUpDisplay" type="HeadsUpDisplay" unique_id=1540510514]
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@ -33,7 +33,7 @@ grow_vertical = 2
mouse_filter = 2 mouse_filter = 2
mouse_behavior_recursive = 1 mouse_behavior_recursive = 1
[node name="CenterContainer" type="CenterContainer" parent="."] [node name="CenterContainer" type="CenterContainer" parent="." unique_id=1440286179]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -41,10 +41,10 @@ anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="Control" type="Control" parent="CenterContainer"] [node name="Control" type="Control" parent="CenterContainer" unique_id=285746191]
layout_mode = 2 layout_mode = 2
[node name="Tooltip" type="Label" parent="CenterContainer/Control"] [node name="Tooltip" type="Label" parent="CenterContainer/Control" unique_id=557672531]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 1 layout_mode = 1
anchors_preset = 5 anchors_preset = 5
@ -57,7 +57,7 @@ grow_horizontal = 2
horizontal_alignment = 1 horizontal_alignment = 1
vertical_alignment = 2 vertical_alignment = 2
[node name="Healthbar" type="ProgressBar" parent="."] [node name="Healthbar" type="ProgressBar" parent="." unique_id=1326599907]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 1 layout_mode = 1
anchors_preset = 2 anchors_preset = 2

603
project/maps/industrial_area_map.tscn
View file

File diff suppressed because one or more lines are too long

34
project/objects/enemies/enemy_wretched.tscn
View file

@ -30,57 +30,59 @@ func _enter_tree() -> void:
" "
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ng1ul"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ng1ul"]
radius = 0.58691406 radius = 0.30615234
[node name="EnemyWretched" type="EnemyWretched"] [node name="EnemyWretched" type="EnemyWretched" unique_id=2042600475]
slide_on_ceiling = false
wall_min_slide_angle = 0.0 wall_min_slide_angle = 0.0
floor_max_angle = 0.9773844
script = SubResource("GDScript_qot2n") script = SubResource("GDScript_qot2n")
[node name="wretched" parent="." instance=ExtResource("1_qot2n")] [node name="wretched" parent="." unique_id=1505510221 instance=ExtResource("1_qot2n")]
[node name="Body" parent="wretched/Character/Skeleton3D" index="0"] [node name="Body" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 355963281) index="0" unique_id=1561023907]
gi_mode = 0 gi_mode = 0
[node name="club" parent="wretched/Character/Skeleton3D" index="1"] [node name="club" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 355963281) index="1" unique_id=637269416]
gi_mode = 0 gi_mode = 0
[node name="Hitbox" parent="wretched/Character/Skeleton3D" index="2" node_paths=PackedStringArray("health")] [node name="Hitbox" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 355963281) index="2" unique_id=333008962 node_paths=PackedStringArray("health")]
health = NodePath("../../../../HealthStatus") health = NodePath("../../../../HealthStatus")
[node name="CollisionShape3D2" parent="wretched/Character/Skeleton3D/Hitbox" index="0"] [node name="CollisionShape3D2" parent="wretched/Character/Skeleton3D/Hitbox" index="0" unique_id=602827216]
transform = Transform3D(1, 6.8945504e-21, 0, 6.2038546e-25, 1.0000037, 0, 0, 0, 1.0000037, -2.2362435e-16, 0.35283393, -0.013339132) transform = Transform3D(1, 6.8945504e-21, 0, 6.2038546e-25, 1.0000037, 0, 0, 0, 1.0000037, -2.2362435e-16, 0.35283393, -0.013339132)
[node name="Hitbox" parent="wretched/Character/Skeleton3D/SpineAttach" index="0" node_paths=PackedStringArray("health")] [node name="Hitbox" parent="wretched/Character/Skeleton3D/SpineAttach" parent_id_path=PackedInt32Array(1505510221, 1651916591) index="0" unique_id=1070250681 node_paths=PackedStringArray("health")]
health = NodePath("../../../../../HealthStatus") health = NodePath("../../../../../HealthStatus")
[node name="Hitbox" parent="wretched/Character/Skeleton3D/HeadAttach" index="0" node_paths=PackedStringArray("health")] [node name="Hitbox" parent="wretched/Character/Skeleton3D/HeadAttach" parent_id_path=PackedInt32Array(1505510221, 1057907260) index="0" unique_id=1188667481 node_paths=PackedStringArray("health")]
health = NodePath("../../../../../HealthStatus") health = NodePath("../../../../../HealthStatus")
damage_modifier = 4.0 damage_modifier = 4.0
[node name="CollisionShape3D" parent="wretched/Character/Skeleton3D/HeadAttach/Hitbox" index="0"] [node name="CollisionShape3D" parent="wretched/Character/Skeleton3D/HeadAttach/Hitbox" index="0" unique_id=1923399941]
transform = Transform3D(1.0000024, -1.4661055e-09, 2.3283064e-09, 6.548362e-11, 0.9999224, 0.013243848, 4.0745363e-09, -0.013244033, 0.9999193, -4.656613e-10, 1.3035285, -0.014328403) transform = Transform3D(1.0000024, -1.4661055e-09, 2.3283064e-09, 6.548362e-11, 0.9999224, 0.013243848, 4.0745363e-09, -0.013244033, 0.9999193, -4.656613e-10, 1.3035285, -0.014328403)
[node name="CollisionShape3D" parent="wretched/Character/Skeleton3D/BoneAttachment3D/DamageBox" index="0"] [node name="CollisionShape3D" parent="wretched/Character/Skeleton3D/BoneAttachment3D/DamageBox" parent_id_path=PackedInt32Array(1505510221, 51031781) index="0" unique_id=1793068779]
transform = Transform3D(1, -9.834766e-07, -2.454035e-06, 1.4305115e-06, 0.9999989, -8.145726e-06, 1.8983264e-06, 7.3344854e-06, 1, -0.20908, -5.9604645e-07, -4.7683716e-07) transform = Transform3D(1, -9.834766e-07, -2.454035e-06, 1.4305115e-06, 0.9999989, -8.145726e-06, 1.8983264e-06, 7.3344854e-06, 1, -0.20908, -5.9604645e-07, -4.7683716e-07)
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=117412966]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("CapsuleShape3D_ng1ul") shape = SubResource("CapsuleShape3D_ng1ul")
[node name="StateMachine" type="StateMachine" parent="."] [node name="StateMachine" type="StateMachine" parent="." unique_id=130345628]
unique_name_in_owner = true unique_name_in_owner = true
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."] [node name="NavigationAgent3D" type="NavigationAgent3D" parent="." unique_id=1751288447]
unique_name_in_owner = true unique_name_in_owner = true
avoidance_enabled = true avoidance_enabled = true
neighbor_distance = 10.0 neighbor_distance = 10.0
time_horizon_agents = 0.7 time_horizon_agents = 0.7
[node name="PlayerDetector" type="PlayerDetector" parent="."] [node name="PlayerDetector" type="PlayerDetector" parent="." unique_id=592530198]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 1.4599279, 0) transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 1.4599279, 0)
[node name="HealthStatus" type="HealthStatus" parent="."] [node name="HealthStatus" type="HealthStatus" parent="." unique_id=625738980]
unique_name_in_owner = true unique_name_in_owner = true
health = 3 health = 3

8
project/objects/pickups/weapon_pickup.tscn
View file

@ -24,16 +24,16 @@ size = Vector3(0.2, 0.1, 0.7)
[sub_resource type="BoxShape3D" id="BoxShape3D_fn0cd"] [sub_resource type="BoxShape3D" id="BoxShape3D_fn0cd"]
size = Vector3(0.20874023, 0.115478516, 0.7109375) size = Vector3(0.20874023, 0.115478516, 0.7109375)
[node name="WeaponPickup" type="StaticBody3D"] [node name="WeaponPickup" type="StaticBody3D" unique_id=1699115370]
collision_layer = 16 collision_layer = 16
collision_mask = 0 collision_mask = 0
[node name="Interactable" type="Interactable" parent="."] [node name="Interactable" type="Interactable" parent="." unique_id=644810202]
script = SubResource("GDScript_fn0cd") script = SubResource("GDScript_fn0cd")
weapon_scene = ExtResource("1_y6dn2") weapon_scene = ExtResource("1_y6dn2")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."] [node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=805704635]
mesh = SubResource("BoxMesh_fn0cd") mesh = SubResource("BoxMesh_fn0cd")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1273242218]
shape = SubResource("BoxShape3D_fn0cd") shape = SubResource("BoxShape3D_fn0cd")

19
project/objects/player.tscn
View file

@ -24,45 +24,46 @@ radius = 0.4350586
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_eqqp1"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_eqqp1"]
radius = 0.43017578 radius = 0.43017578
[node name="PlayerBody" type="PlayerBody"] [node name="PlayerBody" type="PlayerBody" unique_id=685493739]
slide_on_ceiling = false
wall_min_slide_angle = 0.0 wall_min_slide_angle = 0.0
[node name="PlayerCamera" type="PlayerCamera" parent="."] [node name="PlayerCamera" type="PlayerCamera" parent="." unique_id=2125314771]
unique_name_in_owner = true unique_name_in_owner = true
process_priority = -1 process_priority = -1
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.27450943, 0) transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.27450943, 0)
fov = 65.0 fov = 65.0
[node name="PlayerInteractor" type="PlayerInteractor" parent="PlayerCamera"] [node name="PlayerInteractor" type="PlayerInteractor" parent="PlayerCamera" unique_id=1590374872]
shape = SubResource("SphereShape3D_eqqp1") shape = SubResource("SphereShape3D_eqqp1")
target_position = Vector3(0, 0, -2) target_position = Vector3(0, 0, -2)
collision_mask = 22 collision_mask = 22
collide_with_areas = true collide_with_areas = true
[node name="PlayerInput" type="PlayerInput" parent="."] [node name="PlayerInput" type="PlayerInput" parent="." unique_id=2107792432]
unique_name_in_owner = true unique_name_in_owner = true
process_mode = 3 process_mode = 3
[node name="WeaponInventory" type="WeaponInventory" parent="."] [node name="WeaponInventory" type="WeaponInventory" parent="." unique_id=1004789215]
unique_name_in_owner = true unique_name_in_owner = true
starting_weapon = ExtResource("1_eqqp1") starting_weapon = ExtResource("1_eqqp1")
[node name="HealthStatus" type="HealthStatus" parent="."] [node name="HealthStatus" type="HealthStatus" parent="." unique_id=1245161153]
health = 10 health = 10
script = SubResource("GDScript_eqqp1") script = SubResource("GDScript_eqqp1")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=419094207]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.33360052, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.33360052, 0)
shape = SubResource("CapsuleShape3D_bxedw") shape = SubResource("CapsuleShape3D_bxedw")
[node name="Hitbox" type="Hitbox" parent="." node_paths=PackedStringArray("health")] [node name="Hitbox" type="Hitbox" parent="." unique_id=94910331 node_paths=PackedStringArray("health")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.3336005, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.3336005, 0)
collision_layer = 8 collision_layer = 8
collision_mask = 0 collision_mask = 0
monitoring = false monitoring = false
health = NodePath("../HealthStatus") health = NodePath("../HealthStatus")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox" unique_id=1397212893]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("CapsuleShape3D_eqqp1") shape = SubResource("CapsuleShape3D_eqqp1")

68
project/objects/weapons/revolver.tscn
View file

@ -9,31 +9,83 @@ func trigger() -> void:
SoundEventPatchboard.trigger_sound(global_position, 100) SoundEventPatchboard.trigger_sound(global_position, 100)
" "
[node name="Revolver" type="Revolver" node_paths=PackedStringArray("anim")] [node name="Revolver" type="Revolver" unique_id=1509965416 node_paths=PackedStringArray("anim")]
anim = NodePath("revolver/AnimationPlayer") anim = NodePath("revolver/AnimationPlayer")
max_ammo = 6 max_ammo = 6
loaded_ammo = 6 loaded_ammo = 6
single_action_spread = 0.015 single_action_spread = 0.015
double_action_spread = 0.04 double_action_spread = 0.04
[node name="revolver" parent="." instance=ExtResource("1_5ynga")] [node name="revolver" parent="." unique_id=749881158 instance=ExtResource("1_5ynga")]
[node name="Body" parent="revolver/Character/Skeleton3D" index="0"] [node name="Skeleton3D" parent="revolver/Character" parent_id_path=PackedInt32Array(749881158, 1494028839) index="0" unique_id=691467434]
bones/1/position = Vector3(0.077683, 0.15356629, 0.22951864)
bones/1/rotation = Quaternion(0.5851843, 0.4764963, 0.47324383, -0.45447868)
bones/2/rotation = Quaternion(-0.13058601, 0.036996044, 0.61635554, 0.7756833)
bones/3/rotation = Quaternion(0.041782245, 0.11465855, 0.27514994, 0.9536247)
bones/4/rotation = Quaternion(0.14384021, 0.35639, -0.26087257, 0.8855743)
bones/5/rotation = Quaternion(-0.22070737, 0.14418079, 0.13519569, 0.95510334)
bones/6/rotation = Quaternion(-0.10018806, 0.0017374308, -0.01725145, 0.99481744)
bones/7/rotation = Quaternion(-0.5670921, 0.0002677271, -0.0003900336, 0.82365435)
bones/8/position = Vector3(-0.00024733064, 0.094130345, 0.0060290145)
bones/8/rotation = Quaternion(-0.679744, 0.1527604, 0.07346371, 0.7135934)
bones/9/rotation = Quaternion(-0.52413255, -0.0052551352, 0.008540803, 0.85157764)
bones/10/rotation = Quaternion(-0.45302963, 0.0016381256, -0.0032266823, 0.89148813)
bones/11/position = Vector3(0.019964736, 0.08920876, -0.0011444099)
bones/11/rotation = Quaternion(-0.6447599, 0.17695157, 0.030249309, 0.74300593)
bones/12/rotation = Quaternion(-0.61815894, -0.0058423677, 0.008146217, 0.78598917)
bones/13/rotation = Quaternion(-0.2895717, 0.0008908666, -0.0035062192, 0.95714957)
bones/14/rotation = Quaternion(-0.41372666, 0.18337816, -0.05571315, 0.88999933)
bones/15/rotation = Quaternion(-0.56248397, 0.0085162, 0.018579094, 0.82655555)
bones/16/rotation = Quaternion(-0.5171131, -0.0032988985, -0.01302587, 0.8558117)
bones/17/position = Vector3(-0.035217408, 0.031610176, 0.010926676)
bones/17/rotation = Quaternion(-0.4766158, 0.022983566, 0.16551939, 0.8630831)
bones/18/rotation = Quaternion(0.30545127, -0.076055326, -0.15467335, 0.9364782)
bones/19/rotation = Quaternion(0.008012294, 0.013962945, -0.36334667, 0.9315149)
bones/20/position = Vector3(-0.077683, 0.12932053, 0.0004705212)
bones/20/rotation = Quaternion(0.5851843, -0.4764963, -0.47324383, -0.45447868)
bones/21/rotation = Quaternion(-0.054112177, 0.041348223, 0.06595896, 0.9954957)
bones/22/rotation = Quaternion(-0.026361316, 0.047682222, -0.08761911, 0.99466294)
bones/23/rotation = Quaternion(0.0087715145, 0.00401132, -0.04126034, 0.9991019)
bones/25/rotation = Quaternion(-0.00016073987, -2.7729832e-06, 0.017338712, 0.9998497)
bones/26/rotation = Quaternion(-5.533049e-06, 8.158349e-07, 0.00047269202, 0.99999994)
bones/27/rotation = Quaternion(-0.09291299, -0.16547912, 0.03673224, 0.9811394)
bones/28/rotation = Quaternion(9.743209e-05, -2.249952e-06, -0.010027913, 0.9999498)
bones/29/rotation = Quaternion(-3.571963e-05, 1.3003668e-06, 0.0036188553, 0.99999344)
bones/30/rotation = Quaternion(-0.09937216, -0.162095, 0.07714952, 0.9787228)
bones/31/rotation = Quaternion(0.0005252566, -0.0004487199, -0.010014582, 0.99994963)
bones/32/rotation = Quaternion(-0.00018943015, 0.00016181999, 0.0036140762, 0.99999344)
bones/33/rotation = Quaternion(-0.10820272, -0.15602519, 0.111299604, 0.9754798)
bones/35/rotation = Quaternion(-0.008701338, 0.009477453, 0.009525659, 0.9998719)
bones/36/rotation = Quaternion(-0.08824564, -0.15454084, -0.14938323, 0.97263277)
bones/38/rotation = Quaternion(0.012276233, -0.010414393, 0.025581092, 0.99954313)
bones/39/position = Vector3(0.075784564, -0.25414097, -0.44517958)
bones/39/rotation = Quaternion(-0.14452313, 2.8000815e-17, 2.8000815e-17, 0.9895014)
bones/40/position = Vector3(0.018712092, 0.02616787, 0.005937299)
bones/41/rotation = Quaternion(0.13431591, 1.18129094e-07, 1.6011704e-08, 0.99093854)
bones/43/rotation = Quaternion(0.0037203024, 1.1920845e-07, 4.4349532e-10, 0.9999931)
bones/44/rotation = Quaternion(0.9970487, -9.152006e-09, 1.1885747e-07, -0.07677229)
bones/45/position = Vector3(0.012085369, 0.16355935, -0.1564293)
bones/45/rotation = Quaternion(0.8511746, -0.50459415, -0.07369914, -0.124319114)
[node name="Body" parent="revolver/Character/Skeleton3D" index="0" unique_id=1452096908]
layers = 2 layers = 2
skeleton = NodePath("..")
[node name="Cube" parent="revolver/Character/Skeleton3D" index="1"] [node name="Cube" parent="revolver/Character/Skeleton3D" index="1" unique_id=1134152416]
layers = 2 layers = 2
skeleton = NodePath("..")
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="revolver/Character/Skeleton3D" index="2"] [node name="BoneAttachment3D" type="BoneAttachment3D" parent="revolver/Character/Skeleton3D" index="2" unique_id=1012267645]
transform = Transform3D(1, -6.350722e-17, 4.732016e-17, 4.732016e-17, 0.95822614, 0.28601173, -6.350722e-17, -0.28601173, 0.95822614, -1.1196792e-16, -0.03667751, 0.009908612) transform = Transform3D(1, -6.350722e-17, 4.7320164e-17, 4.7320164e-17, 0.95822614, 0.2860117, -6.350722e-17, -0.2860117, 0.95822614, 0.075784564, -0.25414097, -0.44517958)
bone_name = "root" bone_name = "root"
bone_idx = 39 bone_idx = 39
[node name="MuzzleEffect" type="MuzzleEffect" parent="revolver/Character/Skeleton3D/BoneAttachment3D"] [node name="MuzzleEffect" type="MuzzleEffect" parent="revolver/Character/Skeleton3D/BoneAttachment3D" unique_id=1214801832]
transform = Transform3D(1, 0, 0, 0, 0.95768696, -0.28781185, 0, 0.28781185, 0.95768696, 2.4018701e-17, 0.19591203, -0.24464998) transform = Transform3D(1, 0, 0, 0, 0.95768696, -0.28781185, 0, 0.28781185, 0.95768696, 2.4018701e-17, 0.19591203, -0.24464998)
script = SubResource("GDScript_5ynga") script = SubResource("GDScript_5ynga")
[node name="HitscanMuzzle" type="HitscanMuzzle" parent="." node_paths=PackedStringArray("muzzle_effect")] [node name="HitscanMuzzle" type="HitscanMuzzle" parent="." unique_id=1015839339 node_paths=PackedStringArray("muzzle_effect")]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, -4.3711385e-08, 0.9999999, 0, -0.9999999, -4.3711385e-08, 0, 0, 0) transform = Transform3D(1, 0, 0, 0, -4.3711385e-08, 0.9999999, 0, -0.9999999, -4.3711385e-08, 0, 0, 0)
target_position = Vector3(0, 200, 0) target_position = Vector3(0, 200, 0)

16
project/objects/weapons/rifle.tscn
View file

@ -9,32 +9,32 @@ func trigger() -> void:
SoundEventPatchboard.trigger_sound(global_position, 100) SoundEventPatchboard.trigger_sound(global_position, 100)
" "
[node name="Rifle" type="Rifle" node_paths=PackedStringArray("anim")] [node name="Rifle" type="Rifle" unique_id=1273685612 node_paths=PackedStringArray("anim")]
anim = NodePath("rifle/AnimationPlayer") anim = NodePath("rifle/AnimationPlayer")
max_ammo = 10 max_ammo = 10
loaded_ammo = 10 loaded_ammo = 10
[node name="rifle" parent="." instance=ExtResource("1_afgyw")] [node name="rifle" parent="." unique_id=1135358702 instance=ExtResource("1_afgyw")]
[node name="Body" parent="rifle/Character/Skeleton3D" index="0"] [node name="Body" parent="rifle/Character/Skeleton3D" parent_id_path=PackedInt32Array(1135358702, 975994391) index="0" unique_id=1806569646]
layers = 2 layers = 2
[node name="mesh" parent="rifle/Character/Skeleton3D" index="1"] [node name="mesh" parent="rifle/Character/Skeleton3D" parent_id_path=PackedInt32Array(1135358702, 975994391) index="1" unique_id=669938357]
layers = 2 layers = 2
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="rifle/Character/Skeleton3D" index="2"] [node name="BoneAttachment3D" type="BoneAttachment3D" parent="rifle/Character/Skeleton3D" parent_id_path=PackedInt32Array(1135358702, 975994391) index="2" unique_id=972750814]
transform = Transform3D(1, -2.0932122e-15, 2.3524223e-18, 2.3525281e-18, 0.0022477505, 0.99999744, -2.0932126e-15, -0.9999974, 0.0022477508, 0.07988295, -0.13953947, -0.33976445) transform = Transform3D(1, -2.0932122e-15, 2.3524223e-18, 2.3525281e-18, 0.0022477505, 0.99999744, -2.0932126e-15, -0.9999974, 0.0022477508, 0.07988295, -0.13953947, -0.33976445)
bone_name = "root" bone_name = "root"
bone_idx = 39 bone_idx = 39
[node name="MuzzleEffect" type="MuzzleEffect" parent="rifle/Character/Skeleton3D/BoneAttachment3D"] [node name="MuzzleEffect" type="MuzzleEffect" parent="rifle/Character/Skeleton3D/BoneAttachment3D" unique_id=513449924]
transform = Transform3D(1, 0, 0, 0, 0.95768696, -0.28781185, 0, 0.28781185, 0.95768696, 2.4018701e-17, 0.19591203, -0.24464998) transform = Transform3D(1, 0, 0, 0, 0.95768696, -0.28781185, 0, 0.28781185, 0.95768696, 2.4018701e-17, 0.19591203, -0.24464998)
script = SubResource("GDScript_afgyw") script = SubResource("GDScript_afgyw")
[node name="AnimationPlayer" parent="rifle" index="2"] [node name="AnimationPlayer" parent="rifle" index="2" unique_id=350270435]
playback_default_blend_time = 0.1 playback_default_blend_time = 0.1
[node name="HitscanMuzzle" type="HitscanMuzzle" parent="." node_paths=PackedStringArray("muzzle_effect")] [node name="HitscanMuzzle" type="HitscanMuzzle" parent="." unique_id=1928749265 node_paths=PackedStringArray("muzzle_effect")]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, -2.0932111e-15, -2.7987948e-18, 2.3525281e-18, -0.00021316158, 0.99999976, -2.0932126e-15, -0.9999997, -0.00021316111, 0, 0, 0) transform = Transform3D(1, -2.0932111e-15, -2.7987948e-18, 2.3525281e-18, -0.00021316158, 0.99999976, -2.0932126e-15, -0.9999997, -0.00021316111, 0, 0, 0)
target_position = Vector3(0, 200, 0) target_position = Vector3(0, 200, 0)

4
project/project.godot
View file

@ -103,6 +103,10 @@ reload={
3d_physics/layer_4="Hitbox(Player)" 3d_physics/layer_4="Hitbox(Player)"
3d_physics/layer_5="Interactables" 3d_physics/layer_5="Interactables"
[physics]
3d/physics_engine="Jolt Physics"
[rendering] [rendering]
lights_and_shadows/directional_shadow/size=8192 lights_and_shadows/directional_shadow/size=8192