diff --git a/project/objects/player.tscn b/project/objects/player.tscn index 200f9ffc..351c04bc 100644 --- a/project/objects/player.tscn +++ b/project/objects/player.tscn @@ -5,6 +5,12 @@ [sub_resource type="SphereShape3D" id="SphereShape3D_eqqp1"] radius = 0.2 +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_bxedw"] +radius = 0.4350586 + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_eqqp1"] +radius = 0.43017578 + [sub_resource type="GDScript" id="GDScript_eqqp1"] script/source = "extends HealthStatus @@ -18,12 +24,6 @@ func _on_health_changed(remaining: int, _delta: int) -> void: hud.set_health_percentage(float(remaining) / float(self.get_max_health())) " -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_bxedw"] -radius = 0.4350586 - -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_eqqp1"] -radius = 0.43017578 - [node name="PlayerBody" type="PlayerBody" unique_id=685493739] slide_on_ceiling = false wall_min_slide_angle = 0.0 @@ -40,18 +40,6 @@ target_position = Vector3(0, 0, -2) collision_mask = 22 collide_with_areas = true -[node name="PlayerInput" type="PlayerInput" parent="." unique_id=2107792432] -unique_name_in_owner = true -process_mode = 3 - -[node name="WeaponInventory" type="WeaponInventory" parent="." unique_id=1004789215] -unique_name_in_owner = true -starting_weapon = ExtResource("1_eqqp1") - -[node name="HealthStatus" type="HealthStatus" parent="." unique_id=1245161153] -health = 10 -script = SubResource("GDScript_eqqp1") - [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=419094207] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.33360052, 0) shape = SubResource("CapsuleShape3D_bxedw") @@ -67,5 +55,17 @@ health = NodePath("../HealthStatus") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) shape = SubResource("CapsuleShape3D_eqqp1") +[node name="PlayerInput" type="PlayerInput" parent="." unique_id=2107792432] +unique_name_in_owner = true +process_mode = 3 + +[node name="WeaponInventory" type="WeaponInventory" parent="." unique_id=1004789215] +unique_name_in_owner = true +starting_weapon = ExtResource("1_eqqp1") + +[node name="HealthStatus" type="HealthStatus" parent="." unique_id=1245161153] +health = 10 +script = SubResource("GDScript_eqqp1") + [connection signal="death" from="HealthStatus" to="HealthStatus" method="_on_death"] [connection signal="health_changed" from="HealthStatus" to="HealthStatus" method="_on_health_changed"]