feat: implemented rifle reload with placeholder anim

2025-08-06 18:45:02 +02:00 · 2025-08-06 18:45:02 +02:00 · 68abfdd383
commit 68abfdd383
parent 150231c67c
25 changed files with 26775 additions and 3 deletions
--- a/project/assets/animations/weapons/rifle/RESET.res
+++ b/project/assets/animations/weapons/rifle/RESET.res
--- a/project/assets/animations/weapons/rifle/aim.res
+++ b/project/assets/animations/weapons/rifle/aim.res
--- a/project/assets/animations/weapons/rifle/aim_to_hip.res
+++ b/project/assets/animations/weapons/rifle/aim_to_hip.res
--- a/project/assets/animations/weapons/rifle/equip.res
+++ b/project/assets/animations/weapons/rifle/equip.res
--- a/project/assets/animations/weapons/rifle/fire_aim.res
+++ b/project/assets/animations/weapons/rifle/fire_aim.res
--- a/project/assets/animations/weapons/rifle/fire_hip.res
+++ b/project/assets/animations/weapons/rifle/fire_hip.res
--- a/project/assets/animations/weapons/rifle/hip.res
+++ b/project/assets/animations/weapons/rifle/hip.res
--- a/project/assets/animations/weapons/rifle/hip_to_aim.res
+++ b/project/assets/animations/weapons/rifle/hip_to_aim.res
--- a/project/assets/animations/weapons/rifle/hip_to_run.res
+++ b/project/assets/animations/weapons/rifle/hip_to_run.res
--- a/project/assets/animations/weapons/rifle/reload.res
+++ b/project/assets/animations/weapons/rifle/reload.res
--- a/project/assets/animations/weapons/rifle/run.res
+++ b/project/assets/animations/weapons/rifle/run.res
--- a/project/assets/animations/weapons/rifle/run_to_aim.res
+++ b/project/assets/animations/weapons/rifle/run_to_aim.res
--- a/project/assets/animations/weapons/rifle/run_to_hip.res
+++ b/project/assets/animations/weapons/rifle/run_to_hip.res
--- a/project/assets/models/weapons/revolver.blend
+++ b/project/assets/models/weapons/revolver.blend
--- a/project/assets/models/weapons/revolver.blend1
+++ b/project/assets/models/weapons/revolver.blend1
--- a/project/assets/models/weapons/rifle.blend
+++ b/project/assets/models/weapons/rifle.blend
--- a/project/assets/models/weapons/rifle.blend.import
+++ b/project/assets/models/weapons/rifle.blend.import
--- a/project/assets/models/weapons/rifle.blend1
+++ b/project/assets/models/weapons/rifle.blend1
--- a/project/objects/player.tscn
+++ b/project/objects/player.tscn
@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=3 uid="uid://snjgu4yp5swd"]

-[ext_resource type="PackedScene" uid="uid://cfgwif53qypko" path="res://objects/weapons/revolver.tscn" id="1_eqqp1"]
+[ext_resource type="PackedScene" uid="uid://ce40pq785yoyi" path="res://objects/weapons/rifle.tscn" id="1_eqqp1"]

 [sub_resource type="SphereShape3D" id="SphereShape3D_eqqp1"]
 radius = 0.2
--- a/project/objects/weapons/revolver.tscn
+++ b/project/objects/weapons/revolver.tscn
@ -11,6 +11,8 @@ func trigger() -> void:

 [node name="Revolver" type="Revolver" node_paths=PackedStringArray("anim")]
 anim = NodePath("revolver/AnimationPlayer")
+max_ammo = 6
+loaded_ammo = 6
 single_action_spread = 0.003
 double_action_spread = 0.02

--- a/project/objects/weapons/rifle.tscn
+++ b/project/objects/weapons/rifle.tscn
@ -11,6 +11,8 @@ func trigger() -> void:

 [node name="Rifle" type="Rifle" node_paths=PackedStringArray("anim")]
 anim = NodePath("rifle/AnimationPlayer")
+max_ammo = 10
+loaded_ammo = 10

 [node name="rifle" parent="." instance=ExtResource("1_afgyw")]