added punch animation and can now melee enemies
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=35 format=3 uid="uid://drwae3loscbw7"]
|
||||
[gd_scene load_steps=38 format=3 uid="uid://drwae3loscbw7"]
|
||||
|
||||
[ext_resource type="Script" path="res://scripts/player.gd" id="1_x7wms"]
|
||||
[ext_resource type="Script" path="res://scripts/recoil.gd" id="3_405jc"]
|
||||
@@ -36,8 +36,6 @@ radius = 0.509802
|
||||
height = 1.19106
|
||||
|
||||
[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_vhypf"]
|
||||
dof_blur_far_enabled = true
|
||||
dof_blur_near_enabled = true
|
||||
dof_blur_amount = 0.3
|
||||
|
||||
[sub_resource type="FastNoiseLite" id="FastNoiseLite_vupcx"]
|
||||
@@ -80,6 +78,55 @@ random_pitch = 2.0
|
||||
streams_count = 1
|
||||
stream_0/stream = ExtResource("19_pi7h7")
|
||||
|
||||
[sub_resource type="Animation" id="Animation_llq31"]
|
||||
resource_name = "punch"
|
||||
length = 0.75
|
||||
step = 0.01
|
||||
tracks/0/type = "method"
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/path = NodePath(".")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/keys = {
|
||||
"times": PackedFloat32Array(0.3),
|
||||
"transitions": PackedFloat32Array(1),
|
||||
"values": [{
|
||||
"args": [],
|
||||
"method": &"punch"
|
||||
}]
|
||||
}
|
||||
tracks/1/type = "position_3d"
|
||||
tracks/1/imported = false
|
||||
tracks/1/enabled = true
|
||||
tracks/1/path = NodePath("Head/Recoil/Camera3D/WeaponHolder")
|
||||
tracks/1/interp = 2
|
||||
tracks/1/loop_wrap = true
|
||||
tracks/1/keys = PackedFloat32Array(0, 1, 0, -0.0341401, -0.111267, 0.19, 1, 0.0274239, -0.455616, 0.416463, 0.23, 1, 0.0346386, -0.441928, 0.312534, 0.3, 1, 0.129892, -0.454487, -0.652062, 0.37, 1, 0.091674, -0.439886, -0.496679, 0.75, 1, 0, -0.0341401, -0.111267)
|
||||
tracks/2/type = "rotation_3d"
|
||||
tracks/2/imported = false
|
||||
tracks/2/enabled = true
|
||||
tracks/2/path = NodePath("Head/Recoil/Camera3D/WeaponHolder")
|
||||
tracks/2/interp = 2
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1, 0.19, 1, 0.429604, -0.0899337, -0.184524, 0.879377, 0.23, 1, 0.404158, -0.0814679, -0.189232, 0.891186, 0.3, 1, 0.0843464, 0.014675, -0.188657, 0.978305, 0.37, 1, 0.124325, 0.0221516, -0.181308, 0.975285, 0.75, 1, 0, 0, 0, 1)
|
||||
|
||||
[sub_resource type="Animation" id="Animation_q5egb"]
|
||||
length = 0.001
|
||||
tracks/0/type = "position_3d"
|
||||
tracks/0/imported = false
|
||||
tracks/0/enabled = true
|
||||
tracks/0/path = NodePath("Head/Recoil/Camera3D/WeaponHolder")
|
||||
tracks/0/interp = 1
|
||||
tracks/0/loop_wrap = true
|
||||
tracks/0/keys = PackedFloat32Array(0, 1, 0, -0.0341401, -0.111267)
|
||||
|
||||
[sub_resource type="AnimationLibrary" id="AnimationLibrary_d0x8a"]
|
||||
_data = {
|
||||
"RESET": SubResource("Animation_q5egb"),
|
||||
"punch": SubResource("Animation_llq31")
|
||||
}
|
||||
|
||||
[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("weapon_holder") groups=["persist", "player"]]
|
||||
transform = Transform3D(1, 0.000164476, 0.000583754, -0.000165075, 0.999999, 0.00104027, -0.000583585, -0.00104036, 0.999999, 0, 1.11359, 0)
|
||||
collision_layer = 6
|
||||
@@ -180,7 +227,7 @@ script = ExtResource("10_ektr6")
|
||||
[node name="InteractRay" type="RayCast3D" parent="Head/Recoil/Camera3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00322104, -0.0232438)
|
||||
target_position = Vector3(0, 0, -2.5)
|
||||
collision_mask = 34
|
||||
collision_mask = 162
|
||||
hit_back_faces = false
|
||||
collide_with_areas = true
|
||||
|
||||
@@ -261,6 +308,11 @@ stream = SubResource("AudioStreamRandomizer_u5cxn")
|
||||
[node name="Crouch" type="AudioStreamPlayer3D" parent="Audio"]
|
||||
stream = SubResource("AudioStreamRandomizer_xswn0")
|
||||
|
||||
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
|
||||
libraries = {
|
||||
"": SubResource("AnimationLibrary_d0x8a")
|
||||
}
|
||||
|
||||
[connection signal="tree_entered" from="." to="." method="_on_tree_entered"]
|
||||
[connection signal="body_entered" from="pick_up_detection" to="." method="_on_pick_up_detection_body_entered"]
|
||||
[connection signal="body_entered" from="pick_up_magnet" to="." method="_on_pick_up_magnet_body_entered"]
|
||||
|
||||
Reference in New Issue
Block a user