diff --git a/project/assets/animations/enemies/rifleman/fire.anim b/project/assets/animations/enemies/rifleman/fire.anim index 38ae9ddd..81f03e21 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/models/enemies/rifleman.blend b/project/assets/models/enemies/rifleman.blend index 53316bde..9987a011 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 a8e82800..53316bde 100644 Binary files a/project/assets/models/enemies/rifleman.blend1 and b/project/assets/models/enemies/rifleman.blend1 differ diff --git a/project/objects/enemies/enemy_rifleman.tscn b/project/objects/enemies/enemy_rifleman.tscn index 34638d41..6ca8b155 100644 --- a/project/objects/enemies/enemy_rifleman.tscn +++ b/project/objects/enemies/enemy_rifleman.tscn @@ -45,10 +45,11 @@ radius = 0.17480469 [node name="EnemyRifleman" type="EnemyRifleman" unique_id=1089821759] script = SubResource("GDScript_l222e") +difficulty_weight = 0.4 -[node name="rifleman" parent="." unique_id=1463524398 instance=ExtResource("1_l222e")] +[node name="rifleman" parent="." unique_id=498635215 instance=ExtResource("1_l222e")] -[node name="Hitbox" type="Hitbox" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(1463524398, 1950882827) index="2" unique_id=1055859191 node_paths=PackedStringArray("health")] +[node name="Hitbox" type="Hitbox" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(498635215, 766212660) 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 @@ -61,7 +62,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(1463524398, 1950882827) index="3" unique_id=1906380733] +[node name="SpineAttach" type="BoneAttachment3D" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(498635215, 766212660) 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 @@ -79,7 +80,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(1463524398, 1950882827) index="4" unique_id=174540097] +[node name="HeadAttach" type="BoneAttachment3D" parent="rifleman/Character/Skeleton3D" parent_id_path=PackedInt32Array(498635215, 766212660) 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/enemies/enemy_wretched.tscn b/project/objects/enemies/enemy_wretched.tscn index 05b31b64..4497ff9a 100644 --- a/project/objects/enemies/enemy_wretched.tscn +++ b/project/objects/enemies/enemy_wretched.tscn @@ -36,8 +36,9 @@ radius = 0.17480469 slide_on_ceiling = false wall_min_slide_angle = 0.0 floor_max_angle = 0.9773844 +max_speed = 3.0 script = SubResource("GDScript_qot2n") -difficulty_weight = 0.333 +difficulty_weight = 0.1 [node name="wretched" parent="." unique_id=1505510221 instance=ExtResource("1_qot2n")] diff --git a/project/objects/units/hunt_a.tscn b/project/objects/units/hunt_a.tscn index 418cdcd7..aaa1f82a 100644 --- a/project/objects/units/hunt_a.tscn +++ b/project/objects/units/hunt_a.tscn @@ -2,13 +2,14 @@ [ext_resource type="PackedScene" uid="uid://cclghy01gblif" path="res://objects/pickups/demo_pack_pickup.tscn" id="1_h11v4"] [ext_resource type="PackedScene" uid="uid://dqlqgk1veyos8" path="res://objects/enemies/enemy_wretched.tscn" id="2_l3d4y"] +[ext_resource type="PackedScene" uid="uid://qx1ywrcl3gf6" path="res://objects/enemies/enemy_rifleman.tscn" id="3_l3d4y"] [node name="PatrolA" type="NpcUnit" unique_id=209119201] patrol_speed = 3.0 drop_on_clear = ExtResource("1_h11v4") -[node name="EnemyWretched" parent="." unique_id=589775425 instance=ExtResource("2_l3d4y")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.4453423, 0.023195954, -0.37280393) - [node name="EnemyWretched5" parent="." unique_id=833864271 instance=ExtResource("2_l3d4y")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.30714047, 0.023195954, 0.58812845) + +[node name="EnemyRifleman" parent="." unique_id=1089821759 instance=ExtResource("3_l3d4y")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -0.24979722, 0, -0.4631126)