From d24a00a0b0e27fa8b616c3537844ead0885d0cf2 Mon Sep 17 00:00:00 2001 From: Sara Date: Mon, 9 Feb 2026 15:39:49 +0100 Subject: [PATCH] chore: added characterphysics --- project/data/spawn_data/default.tres | 4 +++- project/maps/industrial_area_map.scn | Bin 10360 -> 9680 bytes project/objects/enemies/enemy_wretched.tscn | 13 ++++++++----- project/objects/player.tscn | 2 ++ project/project.godot | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) 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 d08ecea0f2aebef968502c60f5ff18642144e6e7..bcf560aeac268645d4ecc457218351a25910ec1b 100644 GIT binary patch delta 8590 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 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]