diff --git a/project/data/spawn_data/default.tres b/project/data/spawn_data/default.tres index 3a377ca6..894772b7 100644 --- a/project/data/spawn_data/default.tres +++ b/project/data/spawn_data/default.tres @@ -7,5 +7,7 @@ difficulty_spawns = { 0: ExtResource("1_xecfb"), 1: ExtResource("2_rayfl"), -2: ExtResource("1_xecfb") +2: ExtResource("1_xecfb"), +3: ExtResource("2_rayfl"), +4: ExtResource("1_xecfb") } diff --git a/project/maps/industrial_area_map.scn b/project/maps/industrial_area_map.scn index d08ecea0..bcf560ae 100644 Binary files a/project/maps/industrial_area_map.scn and b/project/maps/industrial_area_map.scn differ diff --git a/project/objects/enemies/enemy_wretched.tscn b/project/objects/enemies/enemy_wretched.tscn index 7b595e9a..0a58560d 100644 --- a/project/objects/enemies/enemy_wretched.tscn +++ b/project/objects/enemies/enemy_wretched.tscn @@ -30,9 +30,12 @@ func _enter_tree() -> void: " [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ng1ul"] -radius = 0.17480469 +radius = 0.087402344 +height = 1.918457 [node name="EnemyWretched" type="EnemyWretched" unique_id=2042600475] +collision_layer = 33 +collision_mask = 33 slide_on_ceiling = false wall_min_slide_angle = 0.0 floor_max_angle = 0.9773844 @@ -42,13 +45,13 @@ difficulty_weight = 0.1 [node name="wretched" parent="." unique_id=1505510221 instance=ExtResource("1_qot2n")] -[node name="Body" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 1609453018) index="0" unique_id=1713926168] +[node name="Body" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 962057238) index="0" unique_id=1457137505] gi_mode = 0 -[node name="club" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 1609453018) index="1" unique_id=1668686594] +[node name="club" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 962057238) index="1" unique_id=924159644] gi_mode = 0 -[node name="Hitbox" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 1609453018) index="2" unique_id=333008962 node_paths=PackedStringArray("health")] +[node name="Hitbox" parent="wretched/Character/Skeleton3D" parent_id_path=PackedInt32Array(1505510221, 962057238) index="2" unique_id=333008962 node_paths=PackedStringArray("health")] health = NodePath("../../../../HealthStatus") [node name="CollisionShape3D2" parent="wretched/Character/Skeleton3D/Hitbox" index="0" unique_id=602827216] @@ -74,7 +77,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2553203, 0.010501024, -0.0 debug_color = Color(0.98584324, 0, 0.3343837, 0.41960785) [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=117412966] -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.9592285, 0) shape = SubResource("CapsuleShape3D_ng1ul") [node name="StateMachine" type="StateMachine" parent="." unique_id=130345628] diff --git a/project/objects/player.tscn b/project/objects/player.tscn index 483271b8..4ae05c1c 100644 --- a/project/objects/player.tscn +++ b/project/objects/player.tscn @@ -25,6 +25,8 @@ func _on_health_changed(remaining: int, _delta: int) -> void: " [node name="PlayerBody" type="PlayerBody" unique_id=685493739] +collision_layer = 33 +collision_mask = 33 slide_on_ceiling = false wall_min_slide_angle = 0.0 diff --git a/project/project.godot b/project/project.godot index e7a0a2ba..9404c2d8 100644 --- a/project/project.godot +++ b/project/project.godot @@ -104,6 +104,7 @@ reload={ 3d_physics/layer_3="Hitbox(Enemy)" 3d_physics/layer_4="Hitbox(Player)" 3d_physics/layer_5="Interactables" +3d_physics/layer_6="CharacterPhysics" [rendering]