feat: implemented full reload for revolver
This commit is contained in:
parent
f40f01a569
commit
905726c862
18 changed files with 81 additions and 7 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -20604,7 +20604,7 @@ _subresources={
|
|||
"save_to_file/fallback_path": "res://assets/animations/weapons/rifle/run.res",
|
||||
"save_to_file/keep_custom_tracks": "",
|
||||
"save_to_file/path": "uid://cd4fiv3icakog",
|
||||
"settings/loop_mode": 0,
|
||||
"settings/loop_mode": 1,
|
||||
"slice_1/end_frame": 0,
|
||||
"slice_1/loop_mode": 0,
|
||||
"slice_1/name": "",
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -44,7 +44,7 @@ size = Vector2i(1152, 648)
|
|||
render_target_update_mode = 4
|
||||
|
||||
[node name="PlayerBody" parent="SubViewportContainer/SubViewport" instance=ExtResource("1_mhgjp")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.454895, 0.006988764, -8.196066)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20.417719, 1.340589, -8.014704)
|
||||
|
||||
[node name="Map" parent="SubViewportContainer/SubViewport" instance=ExtResource("2_41t38")]
|
||||
|
||||
|
|
|
|||
|
|
@ -739,6 +739,18 @@ size = Vector3(5.7617188, 4.102051, 0.33398438)
|
|||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.6718082, 0.008475304, 14.933871)
|
||||
patrol_path = NodePath("../PatrolPath")
|
||||
|
||||
[node name="NpcUnit2" parent="." node_paths=PackedStringArray("patrol_path") instance=ExtResource("12_plog7")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.331992, 0.008471491, 31.940985)
|
||||
patrol_path = NodePath("../PatrolPath2")
|
||||
|
||||
[node name="NpcUnit3" parent="." node_paths=PackedStringArray("patrol_path") instance=ExtResource("12_plog7")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.503181, 0.008473398, 23.28323)
|
||||
patrol_path = NodePath("../PatrolPath3")
|
||||
|
||||
[node name="NpcUnit4" parent="." node_paths=PackedStringArray("patrol_path") instance=ExtResource("12_plog7")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.339678, 0.008469582, -33.651123)
|
||||
patrol_path = NodePath("../PatrolPath4")
|
||||
|
||||
[node name="PatrolPath" type="PatrolPath" parent="."]
|
||||
|
||||
[node name="Node3D" type="Node3D" parent="PatrolPath"]
|
||||
|
|
@ -746,3 +758,39 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7201138, 0.0069904327, -26
|
|||
|
||||
[node name="Node3D2" type="Node3D" parent="PatrolPath"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.4366512, 0.0069885254, 11.854935)
|
||||
|
||||
[node name="PatrolPath2" type="PatrolPath" parent="."]
|
||||
|
||||
[node name="Node3D" type="Node3D" parent="PatrolPath2"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.294239, 0.00699234, 27.044983)
|
||||
|
||||
[node name="Node3D2" type="Node3D" parent="PatrolPath2"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.3810759, 0.0069847107, 38.745106)
|
||||
|
||||
[node name="Node3D3" type="Node3D" parent="PatrolPath2"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.0630617, 0.0069885254, 29.593536)
|
||||
|
||||
[node name="Node3D4" type="Node3D" parent="PatrolPath2"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.879017, 0.0069847107, 20.841759)
|
||||
|
||||
[node name="PatrolPath3" type="PatrolPath" parent="."]
|
||||
|
||||
[node name="Node3D" type="Node3D" parent="PatrolPath3"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.753383, 0.0069885254, 0.7593994)
|
||||
|
||||
[node name="Node3D2" type="Node3D" parent="PatrolPath3"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.776007, 0.0069885254, 27.428339)
|
||||
|
||||
[node name="Node3D3" type="Node3D" parent="PatrolPath3"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.903455, 0.0069885254, 22.506834)
|
||||
|
||||
[node name="PatrolPath4" type="PatrolPath" parent="."]
|
||||
|
||||
[node name="Node3D" type="Node3D" parent="PatrolPath4"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.0805378, 0.0069885254, -41.387714)
|
||||
|
||||
[node name="Node3D2" type="Node3D" parent="PatrolPath4"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2224083, 0.00699234, -20.997375)
|
||||
|
||||
[node name="Node3D3" type="Node3D" parent="PatrolPath4"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.787289, 0.006986618, -26.568882)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[gd_scene load_steps=6 format=3 uid="uid://snjgu4yp5swd"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://ce40pq785yoyi" path="res://objects/weapons/rifle.tscn" id="1_eqqp1"]
|
||||
[ext_resource type="PackedScene" uid="uid://cfgwif53qypko" path="res://objects/weapons/revolver.tscn" id="1_eqqp1"]
|
||||
|
||||
[sub_resource type="SphereShape3D" id="SphereShape3D_eqqp1"]
|
||||
radius = 0.2
|
||||
|
|
@ -23,7 +23,7 @@ wall_min_slide_angle = 0.0
|
|||
|
||||
[node name="PlayerCamera" type="PlayerCamera" parent="."]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.60811, 0)
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.27450943, 0)
|
||||
fov = 60.0
|
||||
|
||||
[node name="PlayerInteractor" type="PlayerInteractor" parent="PlayerCamera"]
|
||||
|
|
@ -45,10 +45,11 @@ health = 10
|
|||
script = SubResource("GDScript_eqqp1")
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||
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, -0.33360052, 0)
|
||||
shape = SubResource("CapsuleShape3D_bxedw")
|
||||
|
||||
[node name="Hitbox" type="Hitbox" parent="." node_paths=PackedStringArray("health")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.3336005, 0)
|
||||
collision_layer = 8
|
||||
collision_mask = 0
|
||||
monitoring = false
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ anim = NodePath("revolver/AnimationPlayer")
|
|||
max_ammo = 6
|
||||
loaded_ammo = 6
|
||||
single_action_spread = 0.003
|
||||
double_action_spread = 0.02
|
||||
double_action_spread = 0.04
|
||||
|
||||
[node name="revolver" parent="." instance=ExtResource("1_5ynga")]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue