Complete C# rewrite with working game in Editor (#6)

* Refactor collectable components to C# and update resource scripts for consistency * Update resource paths and refactor properties for consistency * Refactor UI components to inherit from Control and update node paths for consistency * Update node paths and group assignments for consistency across scenes * Refactor GameManager and PlayerDeathComponent for improved state management and logging; update scene connections for player death handling * Add PhantomCamera components and UI elements for improved scene management; refactor existing components for better integration * Refactor skill components and update resource paths for consistency; enhance skill management in scenes * Add new UID files and update scene configurations for dialogue components; refactor skill management and input handling * Add next level command and refactor player retrieval in GameManager; update scene files for consistency * Add skill upgrade system and refactor skill components for enhanced functionality; update resource paths and configurations * Enhance ChargeProgressBar and Marketplace functionality; add owner exit handling and update skill button states * Refactor ChargeProgressBar and SkillManager; update skill handling and improve component interactions * Refactor player and level configurations; streamline FlipPlayerComponent and reposition Spaceship Enter
2025-08-27 01:12:26 +02:00
parent d84f7d1740
commit d786ef4c22
532 changed files with 22009 additions and 6630 deletions
--- a/resources/skills/brick_throw.tres
+++ b/resources/skills/brick_throw.tres
@@ -1,24 +1,18 @@
-[gd_resource type="Resource" script_class="SkillData" load_steps=5 format=3 uid="uid://dw5ee2lpeypnb"]
+[gd_resource type="Resource" load_steps=6 format=3 uid="uid://dw5ee2lpeypnb"]

 [ext_resource type="PackedScene" uid="uid://coayig4dxelo2" path="res://objects/player_skills/brick_throw_skill.tscn" id="1_5gnea"]
-[ext_resource type="Script" uid="uid://bya240e627ti6" path="res://scripts/resources/skill_data.gd" id="1_etxe2"]
-[ext_resource type="Resource" uid="uid://br84dsfa3ti04" path="res://resources/throw_behaviors/tap_throw_input.tres" id="1_xwijh"]
 [ext_resource type="Texture2D" uid="uid://dxtdwgg3po0eg" path="res://sprites/brick_power_Skill_icon.png" id="2_yimbq"]
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="3_lt17o"]
+[ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="3_yimbq"]
+[ext_resource type="Resource" uid="uid://d0qk7kh47b4pu" path="res://resources/skills/upgrades/brick_throw/upgrade_1.tres" id="4_nhovl"]

 [resource]
-script = ExtResource("1_etxe2")
-name = "BRICK_POWER"
-description = "BRICK_POWER_DESCRIPTION"
-node = ExtResource("1_5gnea")
-config = {
-"fire_rate": 0.6,
-"player_controller": NodePath("."),
-"throw_input_behavior": ExtResource("1_xwijh"),
-"timer": NodePath("ThrowTimer")
-}
-cost = 50
-icon = ExtResource("2_yimbq")
-type = 1
-is_active = false
-level = 0
-max_level = 3
+script = ExtResource("3_yimbq")
+Name = "BRICK_POWER"
+Description = "BRICK_POWER_DESCRIPTION"
+Icon = ExtResource("2_yimbq")
+IsActive = false
+Level = 1
+Type = 1
+Node = ExtResource("1_5gnea")
+Upgrades = Array[ExtResource("3_lt17o")]([ExtResource("4_nhovl")])
--- a/resources/skills/explosive_brick.tres
+++ b/resources/skills/explosive_brick.tres
@@ -1,25 +1,18 @@
-[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://cdp8sex36vdq2"]
+[gd_resource type="Resource" load_steps=6 format=3 uid="uid://cdp8sex36vdq2"]

-[ext_resource type="PackedScene" uid="uid://5surx230gfw3" path="res://objects/entities/exploding_brick.tscn" id="1_6pfoa"]
-[ext_resource type="Resource" uid="uid://diuv6pr6a0dup" path="res://resources/throw_behaviors/charge_throw_input.tres" id="2_87gkt"]
-[ext_resource type="PackedScene" uid="uid://coayig4dxelo2" path="res://objects/player_skills/brick_throw_skill.tscn" id="2_e0o8w"]
-[ext_resource type="Script" uid="uid://bya240e627ti6" path="res://scripts/resources/skill_data.gd" id="3_cgsq1"]
+[ext_resource type="PackedScene" uid="uid://cfses3kn3y8qw" path="res://objects/player_skills/exploding_brick_throw_skill.tscn" id="2_gt8f6"]
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="3_txev8"]
 [ext_resource type="Texture2D" uid="uid://c0xtjfpmkfolk" path="res://sprites/explosive_brick_skill_icon.png" id="3_wkqmb"]
+[ext_resource type="Resource" uid="uid://c50advf65oi8c" path="res://resources/skills/upgrades/explosive_brick/upgrade_1.tres" id="4_1x338"]
+[ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="5_wkqmb"]

 [resource]
-script = ExtResource("3_cgsq1")
-name = "EXPLOSIVE_BRICK"
-description = "EXPLOSIVE_BRICK_DESCRIPTION"
-node = ExtResource("2_e0o8w")
-config = {
-"brick_scene": ExtResource("1_6pfoa"),
-"player_controller": NodePath("."),
-"throw_input_behavior": ExtResource("2_87gkt"),
-"timer": NodePath("ThrowTimer")
-}
-cost = 180
-icon = ExtResource("3_wkqmb")
-type = 1
-is_active = false
-level = 0
-max_level = 1
+script = ExtResource("5_wkqmb")
+Name = "EXPLOSIVE_BRICK"
+Description = "EXPLOSIVE_BRICK_DESCRIPTION"
+Icon = ExtResource("3_wkqmb")
+IsActive = false
+Level = 0
+Type = 1
+Node = ExtResource("2_gt8f6")
+Upgrades = Array[ExtResource("3_txev8")]([ExtResource("4_1x338")])
--- a/resources/skills/fire_brick.tres
+++ b/resources/skills/fire_brick.tres
@@ -1,25 +1,18 @@
-[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://2glvryih82t1"]
+[gd_resource type="Resource" load_steps=6 format=3 uid="uid://cr5lo4h8wm0jc"]

-[ext_resource type="PackedScene" uid="uid://daau4j5hbklk0" path="res://objects/entities/fire_brick.tscn" id="1_2g43l"]
-[ext_resource type="Script" uid="uid://bya240e627ti6" path="res://scripts/resources/skill_data.gd" id="1_2j5ko"]
-[ext_resource type="PackedScene" uid="uid://coayig4dxelo2" path="res://objects/player_skills/brick_throw_skill.tscn" id="1_g53fp"]
-[ext_resource type="Resource" uid="uid://br84dsfa3ti04" path="res://resources/throw_behaviors/tap_throw_input.tres" id="2_dm5pj"]
+[ext_resource type="PackedScene" uid="uid://dfm2you3v5ap4" path="res://objects/player_skills/fire_brick_throw_skill.tscn" id="2_d6y6i"]
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="3_1ooyb"]
 [ext_resource type="Texture2D" uid="uid://cocbnr38qsikt" path="res://sprites/fire_brick_skill_icon.png" id="3_w87qb"]
+[ext_resource type="Resource" uid="uid://dmfiqqjmfa7m3" path="res://resources/skills/upgrades/fire_brick/upgrade_1.tres" id="4_aj7vs"]
+[ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="5_us7vb"]

 [resource]
-script = ExtResource("1_2j5ko")
-name = "FIRE_BRICK"
-description = "FIRE_BIRCK_DESCRIPTION"
-node = ExtResource("1_g53fp")
-config = {
-"brick_scene": ExtResource("1_2g43l"),
-"player_controller": NodePath("."),
-"throw_input_behavior": ExtResource("2_dm5pj"),
-"timer": NodePath("ThrowTimer")
-}
-cost = 150
-icon = ExtResource("3_w87qb")
-type = 1
-is_active = false
-level = 0
-max_level = 3
+script = ExtResource("5_us7vb")
+Name = "FIRE_BRICK"
+Description = "FIRE_BIRCK_DESCRIPTION"
+Icon = ExtResource("3_w87qb")
+IsActive = false
+Level = 0
+Type = 1
+Node = ExtResource("2_d6y6i")
+Upgrades = Array[ExtResource("3_1ooyb")]([ExtResource("4_aj7vs")])
--- a/resources/skills/ice_brick.tres
+++ b/resources/skills/ice_brick.tres
@@ -1,25 +1,18 @@
-[gd_resource type="Resource" script_class="SkillData" load_steps=6 format=3 uid="uid://cx5fsbexblp60"]
+[gd_resource type="Resource" load_steps=6 format=3 uid="uid://ceakv6oqob6m7"]

-[ext_resource type="PackedScene" uid="uid://bcmx07k12gcsc" path="res://objects/entities/ice_brick.tscn" id="1_ci3d1"]
-[ext_resource type="PackedScene" uid="uid://coayig4dxelo2" path="res://objects/player_skills/brick_throw_skill.tscn" id="1_rflri"]
-[ext_resource type="Resource" uid="uid://br84dsfa3ti04" path="res://resources/throw_behaviors/tap_throw_input.tres" id="2_hsgyv"]
-[ext_resource type="Script" uid="uid://bya240e627ti6" path="res://scripts/resources/skill_data.gd" id="2_pspkt"]
+[ext_resource type="PackedScene" uid="uid://dpmmacva7qf8j" path="res://objects/player_skills/ice_brick_throw_skill.tscn" id="2_gm1ka"]
 [ext_resource type="Texture2D" uid="uid://c1qaxspv8aemf" path="res://sprites/ice_brick_skill_icon.png" id="3_6btth"]
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="3_e3cb0"]
+[ext_resource type="Resource" uid="uid://myr57ylobqkn" path="res://resources/skills/upgrades/ice_brick/upgrade_1.tres" id="4_3pbub"]
+[ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="5_57pl3"]

 [resource]
-script = ExtResource("2_pspkt")
-name = "ICE_BRICK"
-description = "ICE_BRICK_DESCRIPTION"
-node = ExtResource("1_rflri")
-config = {
-"brick_scene": ExtResource("1_ci3d1"),
-"player_controller": NodePath("."),
-"throw_input_behavior": ExtResource("2_hsgyv"),
-"timer": NodePath("ThrowTimer")
-}
-cost = 150
-icon = ExtResource("3_6btth")
-type = 1
-is_active = false
-level = 0
-max_level = 3
+script = ExtResource("5_57pl3")
+Name = "ICE_BRICK"
+Description = "ICE_BRICK_DESCRIPTION"
+Icon = ExtResource("3_6btth")
+IsActive = false
+Level = 0
+Type = 1
+Node = ExtResource("2_gm1ka")
+Upgrades = Array[ExtResource("3_e3cb0")]([ExtResource("4_3pbub")])
--- a/resources/skills/magnetic.tres
+++ b/resources/skills/magnetic.tres
@@ -1,22 +1,18 @@
-[gd_resource type="Resource" script_class="SkillData" load_steps=4 format=3 uid="uid://d3bjre2etov1n"]
+[gd_resource type="Resource" load_steps=6 format=3 uid="uid://d3bjre2etov1n"]

 [ext_resource type="Texture2D" uid="uid://cvhoq7aubxlmq" path="res://sprites/ui/magnetic_skill_icon.png" id="1_16qcg"]
 [ext_resource type="PackedScene" uid="uid://cunyndudjh2he" path="res://objects/player_skills/magnetic_skill.tscn" id="1_er41s"]
-[ext_resource type="Script" uid="uid://bya240e627ti6" path="res://scripts/resources/skill_data.gd" id="1_r01oq"]
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="3_0j4wg"]
+[ext_resource type="Script" uid="uid://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="3_htb6q"]
+[ext_resource type="Resource" uid="uid://dte14sxesjm3y" path="res://resources/skills/upgrades/magnetic/upgrade_1.tres" id="4_0hjrs"]

 [resource]
-script = ExtResource("1_r01oq")
-name = "MAGNETIC"
-description = "MAGNETIC_DESCRIPTION"
-node = ExtResource("1_er41s")
-config = {
-"magnetic_area": NodePath("MagneticArea"),
-"magnetic_move_duration": 1.25,
-"root": NodePath(".")
-}
-cost = 70
-icon = ExtResource("1_16qcg")
-type = 2
-is_active = false
-level = 1
-max_level = 1
+script = ExtResource("3_htb6q")
+Name = "MAGNETIC"
+Description = "MAGNETIC_DESCRIPTION"
+Icon = ExtResource("1_16qcg")
+IsActive = false
+Level = 1
+Type = 2
+Node = ExtResource("1_er41s")
+Upgrades = Array[ExtResource("3_0j4wg")]([ExtResource("4_0hjrs")])
--- a/resources/skills/upgrades/brick_throw/upgrade_1.tres
+++ b/resources/skills/upgrades/brick_throw/upgrade_1.tres
@@ -0,0 +1,12 @@
+[gd_resource type="Resource" script_class="SkillUpgrade" load_steps=2 format=3 uid="uid://d0qk7kh47b4pu"]
+
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="1_1l84l"]
+
+[resource]
+script = ExtResource("1_1l84l")
+Cost = 50
+Description = "Upgrade Description"
+Properties = Dictionary[String, Variant]({
+"FireRate": 0.6
+})
+metadata/_custom_type_script = "uid://dwb0e05pewcsn"
--- a/resources/skills/upgrades/explosive_brick/upgrade_1.tres
+++ b/resources/skills/upgrades/explosive_brick/upgrade_1.tres
@@ -0,0 +1,12 @@
+[gd_resource type="Resource" script_class="SkillUpgrade" load_steps=2 format=3 uid="uid://c50advf65oi8c"]
+
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="1_0hsac"]
+
+[resource]
+script = ExtResource("1_0hsac")
+Cost = 240
+Description = "Upgrade Description"
+Properties = Dictionary[String, Variant]({
+"FireRate": 0.6
+})
+metadata/_custom_type_script = "uid://dwb0e05pewcsn"
--- a/resources/skills/upgrades/fire_brick/upgrade_1.tres
+++ b/resources/skills/upgrades/fire_brick/upgrade_1.tres
@@ -0,0 +1,12 @@
+[gd_resource type="Resource" script_class="SkillUpgrade" load_steps=2 format=3 uid="uid://dmfiqqjmfa7m3"]
+
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="1_fyb20"]
+
+[resource]
+script = ExtResource("1_fyb20")
+Cost = 150
+Description = "Upgrade Description"
+Properties = Dictionary[String, Variant]({
+"FireRate": 0.6
+})
+metadata/_custom_type_script = "uid://dwb0e05pewcsn"
--- a/resources/skills/upgrades/ice_brick/upgrade_1.tres
+++ b/resources/skills/upgrades/ice_brick/upgrade_1.tres
@@ -0,0 +1,12 @@
+[gd_resource type="Resource" script_class="SkillUpgrade" load_steps=2 format=3 uid="uid://myr57ylobqkn"]
+
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="1_bfa1e"]
+
+[resource]
+script = ExtResource("1_bfa1e")
+Cost = 140
+Description = "Upgrade Description"
+Properties = Dictionary[String, Variant]({
+"FireRate": 0.6
+})
+metadata/_custom_type_script = "uid://dwb0e05pewcsn"
--- a/resources/skills/upgrades/magnetic/upgrade_1.tres
+++ b/resources/skills/upgrades/magnetic/upgrade_1.tres
@@ -0,0 +1,12 @@
+[gd_resource type="Resource" script_class="SkillUpgrade" load_steps=2 format=3 uid="uid://dte14sxesjm3y"]
+
+[ext_resource type="Script" uid="uid://dwb0e05pewcsn" path="res://scripts/Resources/SkillUpgrade.cs" id="1_dkk4n"]
+
+[resource]
+script = ExtResource("1_dkk4n")
+Cost = 70
+Description = "Upgrade Description"
+Properties = Dictionary[String, Variant]({
+"FireRate": 0.6
+})
+metadata/_custom_type_script = "uid://dwb0e05pewcsn"