Add different size cells, adjust stats, update art

Author: Overkane

game/projectile/projectile.tscn

@@ -1,10 +1,10 @@
 [gd_scene format=3 uid="uid://cnf8dv1t2lgxb"]
 
 [ext_resource type="PackedScene" uid="uid://c1flcsvrxwav7" path="res://components/hitbox/component_hitbox_2d.tscn" id="1_4f6j3"]
-[ext_resource type="Texture2D" uid="uid://1ml5obg52a88" path="res://icon.svg" id="1_06jd3"]
 [ext_resource type="Script" uid="uid://oghk0ir2n3ci" path="res://game/projectile/projectile.gd" id="1_08h31"]
+[ext_resource type="Texture2D" uid="uid://c75370j5g1r0b" path="res://game/projectile/projectile_data/projectiles/simple_bullet/simple_bullet.svg" id="2_08h31"]
 
-[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_08h31"]
+[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_cpvyg"]
 resource_local_to_scene = true
 radius = 5.0
 height = 10.0
@@ -13,13 +13,12 @@ height = 10.0
 script = ExtResource("1_08h31")
 
 [node name="Sprite2D" type="Sprite2D" parent="." unique_id=698949931]
-scale = Vector2(0.078125, 0.078125)
-texture = ExtResource("1_06jd3")
+texture = ExtResource("2_08h31")
 
 [node name="Hitbox2D" parent="." unique_id=1358559902 instance=ExtResource("1_4f6j3")]
 unique_name_in_owner = true
 
 [node name="CollisionShape2D" parent="Hitbox2D" index="0" unique_id=1055038057]
-shape = SubResource("CapsuleShape2D_08h31")
+shape = SubResource("CapsuleShape2D_cpvyg")
 
 [editable path="Hitbox2D"]

game/projectile/projectile_data/projectiles/simple_bullet/simple_bullet.svg

@@ -2,18 +2,13 @@
 
 [ext_resource type="PackedScene" uid="uid://cnf8dv1t2lgxb" path="res://game/projectile/projectile.tscn" id="1_l3gi0"]
 [ext_resource type="Script" uid="uid://38prbnxyxqsu" path="res://game/projectile/projectile_data/projectiles/simple_bullet/simple_bullet.gd" id="2_17s52"]
-[ext_resource type="Texture2D" uid="uid://c75370j5g1r0b" path="res://game/projectile/projectile_data/projectiles/simple_bullet/simple_bullet.svg" id="3_t0llp"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_t0llp"]
-radius = 6.0
+radius = 8.062258
 
 [node name="SimpleBullet" unique_id=865771493 instance=ExtResource("1_l3gi0")]
 script = ExtResource("2_17s52")
 
-[node name="Sprite2D" parent="." index="0" unique_id=698949931]
-scale = Vector2(0.21874997, 0.21874997)
-texture = ExtResource("3_t0llp")
-
 [node name="CollisionShape2D" parent="Hitbox2D" parent_id_path=PackedInt32Array(1358559902) index="0" unique_id=1055038057]
 shape = SubResource("CircleShape2D_t0llp")
 

game/projectile/projectile_data/projectiles/simple_bullet/simple_bullet.tscn

@@ -4,8 +4,6 @@ extends Node2D
 signal restored
 signal destroyed
 
-# TODO. On core destroyed destroye owner too.
-@export var health: float
 @export var core_parents: Array[Cell]
 @export var core_children: Array[Cell]
 @export var repair_rate: float
@@ -22,8 +20,6 @@ func _ready() -> void:
 	hurtbox_2d.got_hit.connect(_on_hit)
 	health_component.health_depleted.connect(_on_health_depleted)
 
-	health_component.set_health(health)
-
 func _physics_process(delta: float) -> void:
 	if is_destroyed:
 		var can_restore := false
@@ -33,7 +29,7 @@ func _physics_process(delta: float) -> void:
 
 		if can_restore:
 			health_component.current_health += repair_rate * delta
-			if health_component.current_health >= health:
+			if health_component.current_health >= health_component.max_health:
 				restored.emit()
 				_related_movemenet_collision_shape.disabled = false
 				hurtbox_2d.monitorable = true

game/ship_skeleton/cell/cell.gd

@@ -3,17 +3,15 @@
 [ext_resource type="PackedScene" uid="uid://cm6tq3xwihkxl" path="res://game/ship_skeleton/cell/cells/basic_cell/medium_basic_cell.tscn" id="1_654sg"]
 [ext_resource type="Texture2D" uid="uid://dw8eyhjagpbgk" path="res://game/ship_skeleton/cell/cells/basic_cell/big_basic_cell.svg" id="2_2qipr"]
 
-[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_2qipr"]
-resource_local_to_scene = true
-radius = 63.0
-height = 126.0
+[sub_resource type="CircleShape2D" id="CircleShape2D_2qipr"]
+radius = 36.013885
 
 [node name="BigBasicCell" unique_id=1435320636 instance=ExtResource("1_654sg")]
 
 [node name="Sprite2D" parent="." index="0" unique_id=1975990942]
 texture = ExtResource("2_2qipr")
 
 [node name="CollisionShape2D" parent="Hurtbox2D" parent_id_path=PackedInt32Array(146611675) index="0" unique_id=2074960276]
-shape = SubResource("CapsuleShape2D_2qipr")
+shape = SubResource("CircleShape2D_2qipr")
 
 [editable path="Hurtbox2D"]

game/ship_skeleton/cell/cells/basic_cell/big_basic_cell.tscn

@@ -0,0 +1,20 @@
+[gd_scene format=3 uid="uid://c5jb1txbmf3ex"]
+
+[ext_resource type="PackedScene" uid="uid://cm6tq3xwihkxl" path="res://game/ship_skeleton/cell/cells/basic_cell/medium_basic_cell.tscn" id="1_05sdy"]
+[ext_resource type="Texture2D" uid="uid://cqucs53afxryp" path="res://game/ship_skeleton/cell/cells/basic_cell/extra_large_basic_cell.svg" id="2_46aer"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_05sdy"]
+radius = 81.02469
+
+[node name="ExtraLargeBasicCell" unique_id=1435320636 instance=ExtResource("1_05sdy")]
+
+[node name="Sprite2D" parent="." index="0" unique_id=1975990942]
+texture = ExtResource("2_46aer")
+
+[node name="CollisionShape2D" parent="Hurtbox2D" parent_id_path=PackedInt32Array(146611675) index="0" unique_id=2074960276]
+shape = SubResource("CircleShape2D_05sdy")
+
+[node name="Health" parent="." index="2" unique_id=562956058]
+max_health = 25.0
+
+[editable path="Hurtbox2D"]

game/ship_skeleton/cell/cells/basic_cell/extra_large_basic_cell.tscn

@@ -0,0 +1,20 @@
+[gd_scene format=3 uid="uid://g7r6jujgrh5a"]
+
+[ext_resource type="PackedScene" uid="uid://cm6tq3xwihkxl" path="res://game/ship_skeleton/cell/cells/basic_cell/medium_basic_cell.tscn" id="1_sr7xj"]
+[ext_resource type="Texture2D" uid="uid://bbriutj3tbq66" path="res://game/ship_skeleton/cell/cells/basic_cell/large_basic_cell.svg" id="2_iy7jg"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_sr7xj"]
+radius = 53.037724
+
+[node name="LargeBasicCell" unique_id=1435320636 instance=ExtResource("1_sr7xj")]
+
+[node name="Sprite2D" parent="." index="0" unique_id=1975990942]
+texture = ExtResource("2_iy7jg")
+
+[node name="CollisionShape2D" parent="Hurtbox2D" parent_id_path=PackedInt32Array(146611675) index="0" unique_id=2074960276]
+shape = SubResource("CircleShape2D_sr7xj")
+
+[node name="Health" parent="." index="2" unique_id=562956058]
+max_health = 20.0
+
+[editable path="Hurtbox2D"]

game/ship_skeleton/cell/cells/basic_cell/large_basic_cell.tscn

@@ -2,14 +2,15 @@
 
 [ext_resource type="PackedScene" uid="uid://73o17dpehsvx" path="res://game/ship_skeleton/cell/cell.tscn" id="1_pff0w"]
 
-[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_r4tuq"]
-resource_local_to_scene = true
-radius = 31.0
-height = 62.0
+[sub_resource type="CircleShape2D" id="CircleShape2D_r4tuq"]
+radius = 24.0
 
 [node name="MediumBasicCell" unique_id=1435320636 instance=ExtResource("1_pff0w")]
 
 [node name="CollisionShape2D" parent="Hurtbox2D" parent_id_path=PackedInt32Array(146611675) index="0" unique_id=2074960276]
-shape = SubResource("CapsuleShape2D_r4tuq")
+shape = SubResource("CircleShape2D_r4tuq")
+
+[node name="Health" parent="." index="2" unique_id=562956058]
+max_health = 10.0
 
 [editable path="Hurtbox2D"]

game/ship_skeleton/cell/cells/basic_cell/medium_basic_cell.tscn

@@ -3,17 +3,17 @@
 [ext_resource type="PackedScene" uid="uid://cm6tq3xwihkxl" path="res://game/ship_skeleton/cell/cells/basic_cell/medium_basic_cell.tscn" id="1_7kfy5"]
 [ext_resource type="Texture2D" uid="uid://dc6s83443qvfc" path="res://game/ship_skeleton/cell/cells/basic_cell/small_basic_cell.svg" id="2_30epr"]
 
-[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_7kfy5"]
-resource_local_to_scene = true
-radius = 13.0
-height = 26.0
+[sub_resource type="CircleShape2D" id="CircleShape2D_7kfy5"]
 
 [node name="SmallBasicCell" unique_id=1435320636 instance=ExtResource("1_7kfy5")]
 
 [node name="Sprite2D" parent="." index="0" unique_id=1975990942]
 texture = ExtResource("2_30epr")
 
 [node name="CollisionShape2D" parent="Hurtbox2D" parent_id_path=PackedInt32Array(146611675) index="0" unique_id=2074960276]
-shape = SubResource("CapsuleShape2D_7kfy5")
+shape = SubResource("CircleShape2D_7kfy5")
+
+[node name="Health" parent="." index="2" unique_id=562956058]
+max_health = 5.0
 
 [editable path="Hurtbox2D"]

game/ship_skeleton/cell/cells/basic_cell/small_basic_cell.tscn

@@ -1,21 +1,20 @@
 [gd_scene format=3 uid="uid://dbr5ppouefhpn"]
 
 [ext_resource type="Script" uid="uid://b8q0gvn2dj335" path="res://game/ship_skeleton/cell_modifications/base_player_turret.gd" id="1_oml5i"]
-[ext_resource type="Texture2D" uid="uid://1ml5obg52a88" path="res://icon.svg" id="2_jnh57"]
+[ext_resource type="Texture2D" uid="uid://xdbslkxgsr46" path="res://game/ship_skeleton/cell_modifications/turret_base.svg" id="2_oml5i"]
+[ext_resource type="Texture2D" uid="uid://dm3k0inaj22u3" path="res://game/ship_skeleton/cell_modifications/turret_cannon.svg" id="3_jnh57"]
 
 [node name="BasePlayerTurret" type="Node2D" unique_id=192713686]
 script = ExtResource("1_oml5i")
 
-[node name="Sprite2D" type="Sprite2D" parent="." unique_id=849960809]
+[node name="TurretBase" type="Sprite2D" parent="." unique_id=849960809]
 rotation = 1.5707964
-scale = Vector2(0.171875, 0.17187501)
-texture = ExtResource("2_jnh57")
+texture = ExtResource("2_oml5i")
 
-[node name="Sprite2D2" type="Sprite2D" parent="." unique_id=669926242]
-position = Vector2(7, 0)
-scale = Vector2(0.109375, 0.03125)
-texture = ExtResource("2_jnh57")
+[node name="TurretCannon" type="Sprite2D" parent="." unique_id=669926242]
+position = Vector2(23, 0)
+texture = ExtResource("3_jnh57")
 
 [node name="ShootingPos" type="Marker2D" parent="." unique_id=1957190253]
 unique_name_in_owner = true
-position = Vector2(15, 0)
+position = Vector2(35, 0)