diff --git a/modules/wave_survival/weapons/revolver.h b/modules/wave_survival/weapons/revolver.h index 2933c8da..b3b81ea1 100644 --- a/modules/wave_survival/weapons/revolver.h +++ b/modules/wave_survival/weapons/revolver.h @@ -46,7 +46,7 @@ private: bool alt_active{ false }; HitscanMuzzle *muzzle{ nullptr }; - float recoil_force{ 2.f }; + float recoil_force{ 5.f }; double recoil_time{ 0.1 }; double recoil_timer{ 0.0 }; diff --git a/modules/wave_survival/weapons/rifle.h b/modules/wave_survival/weapons/rifle.h index 1877c5b5..335b86ce 100644 --- a/modules/wave_survival/weapons/rifle.h +++ b/modules/wave_survival/weapons/rifle.h @@ -46,7 +46,7 @@ private: bool in_alt_mode{ false }; bool running{ false }; - float recoil_force{ 3.f }; + float recoil_force{ 5.f }; float recoil_time{ 0.05f }; double fov{ 1.0 }; diff --git a/project/assets/animations/enemies/rifleman/RESET.res b/project/assets/animations/enemies/rifleman/RESET.res index a71360d6..f26514cb 100644 Binary files a/project/assets/animations/enemies/rifleman/RESET.res and b/project/assets/animations/enemies/rifleman/RESET.res differ diff --git a/project/assets/animations/enemies/rifleman/death.res b/project/assets/animations/enemies/rifleman/death.res index e65c2447..eec3dd3a 100644 Binary files a/project/assets/animations/enemies/rifleman/death.res and b/project/assets/animations/enemies/rifleman/death.res differ diff --git a/project/assets/animations/enemies/rifleman/fire.anim b/project/assets/animations/enemies/rifleman/fire.anim index 81f03e21..41c0dd2e 100644 Binary files a/project/assets/animations/enemies/rifleman/fire.anim and b/project/assets/animations/enemies/rifleman/fire.anim differ diff --git a/project/assets/animations/enemies/rifleman/ready.res b/project/assets/animations/enemies/rifleman/ready.res index cdf0978b..cfdd7541 100644 Binary files a/project/assets/animations/enemies/rifleman/ready.res and b/project/assets/animations/enemies/rifleman/ready.res differ diff --git a/project/assets/animations/weapons/revolver/double_to_reload.res b/project/assets/animations/weapons/revolver/double_to_reload.res index fdc5e9eb..4c8c1116 100644 Binary files a/project/assets/animations/weapons/revolver/double_to_reload.res and b/project/assets/animations/weapons/revolver/double_to_reload.res differ diff --git a/project/assets/animations/weapons/revolver/equip.res b/project/assets/animations/weapons/revolver/equip.res index 276229ae..b013449c 100644 Binary files a/project/assets/animations/weapons/revolver/equip.res and b/project/assets/animations/weapons/revolver/equip.res differ diff --git a/project/assets/animations/weapons/revolver/fire_double.res b/project/assets/animations/weapons/revolver/fire_double.res index 5d6ad919..74a4c2eb 100644 Binary files a/project/assets/animations/weapons/revolver/fire_double.res and b/project/assets/animations/weapons/revolver/fire_double.res differ diff --git a/project/assets/animations/weapons/revolver/fire_single.res b/project/assets/animations/weapons/revolver/fire_single.res index a1d12f38..3abc78a8 100644 Binary files a/project/assets/animations/weapons/revolver/fire_single.res and b/project/assets/animations/weapons/revolver/fire_single.res differ diff --git a/project/assets/animations/weapons/revolver/reload_one.res b/project/assets/animations/weapons/revolver/reload_one.res index 0b6a9dbd..27f3e181 100644 Binary files a/project/assets/animations/weapons/revolver/reload_one.res and b/project/assets/animations/weapons/revolver/reload_one.res differ diff --git a/project/assets/animations/weapons/revolver/reload_to_double.res b/project/assets/animations/weapons/revolver/reload_to_double.res index 61ebd56c..e3749b19 100644 Binary files a/project/assets/animations/weapons/revolver/reload_to_double.res and b/project/assets/animations/weapons/revolver/reload_to_double.res differ diff --git a/project/assets/models/enemies/rifleman.blend b/project/assets/models/enemies/rifleman.blend index 9987a011..2b55a180 100644 Binary files a/project/assets/models/enemies/rifleman.blend and b/project/assets/models/enemies/rifleman.blend differ diff --git a/project/assets/models/enemies/rifleman.blend1 b/project/assets/models/enemies/rifleman.blend1 index 53316bde..d4464bde 100644 Binary files a/project/assets/models/enemies/rifleman.blend1 and b/project/assets/models/enemies/rifleman.blend1 differ diff --git a/project/assets/models/weapons/revolver.blend b/project/assets/models/weapons/revolver.blend index eeaf0ec4..f8b95bea 100644 Binary files a/project/assets/models/weapons/revolver.blend and b/project/assets/models/weapons/revolver.blend differ diff --git a/project/assets/models/weapons/revolver.blend1 b/project/assets/models/weapons/revolver.blend1 index 5994cdaf..9734e98f 100644 Binary files a/project/assets/models/weapons/revolver.blend1 and b/project/assets/models/weapons/revolver.blend1 differ diff --git a/project/objects/enemies/enemy_rifleman.tscn b/project/objects/enemies/enemy_rifleman.tscn index 73428323..45d5afcd 100644 --- a/project/objects/enemies/enemy_rifleman.tscn +++ b/project/objects/enemies/enemy_rifleman.tscn @@ -52,9 +52,9 @@ wall_min_slide_angle = 0.0 script = SubResource("GDScript_l222e") difficulty_weight = 0.3 -[node name="rifleman" parent="." unique_id=498635215 instance=ExtResource("1_l222e")] +[node name="rifleman" parent="." unique_id=1974372899 instance=ExtResource("1_l222e")] -[node name="Hitbox" type="Hitbox" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(498635215, 766212660) index="2" unique_id=1055859191 node_paths=PackedStringArray("health")] +[node name="Hitbox" type="Hitbox" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(1974372899, 1661246372) index="2" unique_id=1055859191 node_paths=PackedStringArray("health")] 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_mask = 0 @@ -67,7 +67,7 @@ transform = Transform3D(1.0000024, -1.4661055e-09, 2.3283064e-09, 6.548362e-11, shape = SubResource("BoxShape3D_0dxtm") debug_color = Color(0, 0.64368725, 0.30114147, 0.41960785) -[node name="SpineAttach" type="BoneAttachment3D" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(498635215, 766212660) index="3" unique_id=1906380733] +[node name="SpineAttach" type="BoneAttachment3D" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(1974372899, 1661246372) index="3" unique_id=1906380733] 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_idx = 6 @@ -85,7 +85,7 @@ transform = Transform3D(1.0000024, -1.4661055e-09, 2.3283064e-09, 6.548362e-11, shape = SubResource("BoxShape3D_avqge") debug_color = Color(0, 0.64368725, 0.30114147, 0.41960785) -[node name="HeadAttach" type="BoneAttachment3D" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(498635215, 766212660) index="4" unique_id=174540097] +[node name="HeadAttach" type="BoneAttachment3D" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(1974372899, 1661246372) index="4" unique_id=174540097] transform = Transform3D(1, -2.2186816e-16, 2.1319254e-16, 2.1319254e-16, 0.99920464, 0.039866533, -2.2186818e-16, -0.039866537, 0.99920475, -1.3069549e-16, 1.5574794, -0.004068733) bone_name = "Neck" bone_idx = 8 diff --git a/project/objects/weapons/revolver.tscn b/project/objects/weapons/revolver.tscn index 70b2e96a..843354a8 100644 --- a/project/objects/weapons/revolver.tscn +++ b/project/objects/weapons/revolver.tscn @@ -16,15 +16,15 @@ loaded_ammo = 6 single_action_spread = 0.015 double_action_spread = 0.04 -[node name="revolver" parent="." unique_id=1383801072 instance=ExtResource("1_5ynga")] +[node name="revolver" parent="." unique_id=920739050 instance=ExtResource("1_5ynga")] -[node name="Body" parent="revolver/Character/Skeleton3D" parent_id_path=PackedInt32Array(1383801072, 2101919789) index="0" unique_id=1318550051] +[node name="Body" parent="revolver/Character/Skeleton3D" parent_id_path=PackedInt32Array(920739050, 1237005388) index="0" unique_id=757337077] layers = 2 -[node name="Cube" parent="revolver/Character/Skeleton3D" parent_id_path=PackedInt32Array(1383801072, 2101919789) index="1" unique_id=288875909] +[node name="Cube" parent="revolver/Character/Skeleton3D" parent_id_path=PackedInt32Array(920739050, 1237005388) index="1" unique_id=1465457237] layers = 2 -[node name="BoneAttachment3D" type="BoneAttachment3D" parent="revolver/Character/Skeleton3D" parent_id_path=PackedInt32Array(1383801072, 2101919789) index="2" unique_id=1012267645] +[node name="BoneAttachment3D" type="BoneAttachment3D" parent="revolver/Character/Skeleton3D" parent_id_path=PackedInt32Array(920739050, 1237005388) 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, 0, -0.03667751, 0.009908612) bone_name = "root" bone_idx = 39