ruslan/ScrapFrontier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworked health bar. Added shield regen

Browse Source
This commit is contained in:
Ruslan Ignatov
2025-11-15 18:33:32 +03:00
parent 85a4fc7381
commit c391068961
11 changed files with 168 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/entities/ships/abstract_ship.tscn
+6 -5
View File
@@ -1,7 +1,8 @@
[gd_scene load_steps=4 format=3 uid="uid://jvyagshykmgb"]
[gd_scene load_steps=5 format=3 uid="uid://jvyagshykmgb"]
[ext_resource type="Script" uid="uid://cesibaqtrgotl" path="res://game/entities/ships/abstract_ship.gd" id="1_6isjb"]
[ext_resource type="Script" uid="uid://d3g4xbq45qmpr" path="res://game/health_system/health.gd" id="2_n766o"]
[ext_resource type="PackedScene" uid="uid://clkymhkv3cevm" path="res://game/health_system/health.tscn" id="2_xxtvk"]
[ext_resource type="PackedScene" uid="uid://d2snum2pxc2ui" path="res://game/health_system/health_bar/heath_bar.tscn" id="3_l62e5"]
[sub_resource type="CircleShape2D" id="CircleShape2D_xxtvk"]
@@ -16,7 +17,7 @@ script = ExtResource("1_6isjb")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_xxtvk")
[node name="Health" type="Node" parent="."]
script = ExtResource("2_n766o")
[node name="Health" parent="." instance=ExtResource("2_xxtvk")]
[connection signal="depleted" from="Health" to="." method="_on_health_depleted"]
[node name="HeathBar" parent="." node_paths=PackedStringArray("health") instance=ExtResource("3_l62e5")]
health = NodePath("../Health")
game/entities/ships/enemies/abstract_enemy_ship.tscn
+4 -9
View File
@@ -1,22 +1,17 @@
[gd_scene load_steps=5 format=3 uid="uid://dwsn0lf1e3578"]
[gd_scene load_steps=4 format=3 uid="uid://dwsn0lf1e3578"]
[ext_resource type="PackedScene" uid="uid://jvyagshykmgb" path="res://game/entities/ships/abstract_ship.tscn" id="1_28j6l"]
[ext_resource type="Script" uid="uid://byicf1t0807pq" path="res://game/entities/ships/enemies/abstract_enemy_ship.gd" id="2_fwvrd"]
[ext_resource type="Script" uid="uid://bs8qqj6yepfln" path="res://game/controllers/enemy_controller.gd" id="3_vfnhw"]
[ext_resource type="PackedScene" uid="uid://d2snum2pxc2ui" path="res://game/health_system/health_bar/heath_bar.tscn" id="4_l8c0n"]
[ext_resource type="PackedScene" uid="uid://bsqehbymixust" path="res://game/controllers/enemy_controller.tscn" id="3_l8c0n"]
[node name="AbstractEnemyShip" groups=["enemies"] instance=ExtResource("1_28j6l")]
collision_layer = 4
collision_mask = 0
script = ExtResource("2_fwvrd")
[node name="EnemyController" type="Node" parent="." index="3"]
script = ExtResource("3_vfnhw")
metadata/_custom_type_script = "uid://bs8qqj6yepfln"
[node name="HeathBar" parent="." index="4" node_paths=PackedStringArray("health") instance=ExtResource("4_l8c0n")]
health = NodePath("../Health")
[node name="EnemyController" parent="." index="4" instance=ExtResource("3_l8c0n")]
[connection signal="depleted" from="Health" to="." method="_on_health_depleted"]
[connection signal="accelerate" from="EnemyController" to="." method="accelerate"]
[connection signal="reload" from="EnemyController" to="." method="reload"]
[connection signal="shoot" from="EnemyController" to="." method="shoot"]
game/entities/ships/enemies/medium/medium_enemy_ship.tscn
+4 -1
View File
@@ -27,4 +27,7 @@ shape = SubResource("CapsuleShape2D_4jmkv")
max_hull = 100
[node name="HeathBar" parent="." index="4"]
position = Vector2(0, 30)
offset_top = 30.0
offset_bottom = 30.0
[connection signal="depleted" from="Health" to="." method="_on_health_depleted"]
game/entities/ships/player/player_ship.tscn
+9 -9
View File
@@ -1,9 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://br074cqcnul3d"]
[gd_scene load_steps=6 format=3 uid="uid://br074cqcnul3d"]
[ext_resource type="PackedScene" uid="uid://jvyagshykmgb" path="res://game/entities/ships/abstract_ship.tscn" id="1_6otxb"]
[ext_resource type="Script" uid="uid://ruxw1n03iq4i" path="res://game/entities/ships/player/player_ship.gd" id="2_625ti"]
[ext_resource type="Script" uid="uid://dgevigih7owxd" path="res://game/controllers/player_controller.gd" id="3_dj8f1"]
[ext_resource type="PackedScene" uid="uid://d2snum2pxc2ui" path="res://game/health_system/health_bar/heath_bar.tscn" id="4_4mjo1"]
[ext_resource type="PackedScene" uid="uid://dh1oj1w5wx4je" path="res://game/controllers/player_controller.tscn" id="3_4mjo1"]
[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dj8f1"]
size = Vector2(48, 32)
@@ -28,16 +27,17 @@ rotation = 1.5707964
shape = SubResource("CapsuleShape2D_dj8f1")
[node name="Health" parent="." index="2"]
max_shield = 1000
max_armor = 1000
max_hull = 1000
[node name="PlayerController" type="Node" parent="." index="3"]
script = ExtResource("3_dj8f1")
metadata/_custom_type_script = "uid://dgevigih7owxd"
[node name="HeathBar" parent="." index="3"]
offset_top = 22.0
offset_bottom = 22.0
[node name="HeathBar" parent="." index="4" node_paths=PackedStringArray("health") instance=ExtResource("4_4mjo1")]
position = Vector2(0, 22)
health = NodePath("../Health")
[node name="PlayerController" parent="." index="4" instance=ExtResource("3_4mjo1")]
[connection signal="depleted" from="Health" to="." method="_on_health_depleted"]
[connection signal="accelerate" from="PlayerController" to="." method="accelerate"]
[connection signal="reload" from="PlayerController" to="." method="reload"]
[connection signal="shoot" from="PlayerController" to="." method="shoot"]