Update resource paths and refactor properties for consistency

Mr. Brick Adventures.csproj

@@ -4,140 +4,4 @@
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>Mr.BrickAdventures</RootNamespace>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="README.md" />
-    <Content Include="scripts\components\.idea\.gitignore" />
-    <Content Include="scripts\components\.idea\encodings.xml" />
-    <Content Include="scripts\components\.idea\indexLayout.xml" />
-    <Content Include="scripts\components\.idea\inspectionProfiles\Project_Default.xml" />
-    <Content Include="scripts\components\.idea\projectSettingsUpdater.xml" />
-    <Content Include="scripts\components\.idea\vcs.xml" />
-    <Content Include="scripts\components\.idea\workspace.xml" />
-    <Content Include="scripts\components\BeamComponent.cs.uid" />
-    <Content Include="scripts\components\beam_component.gd" />
-    <Content Include="scripts\components\beam_component.gd.uid" />
-    <Content Include="scripts\components\brick_throw.gd" />
-    <Content Include="scripts\components\brick_throw.gd.uid" />
-    <Content Include="scripts\components\bullet_component.gd" />
-    <Content Include="scripts\components\bullet_component.gd.uid" />
-    <Content Include="scripts\components\cage_component.gd" />
-    <Content Include="scripts\components\cage_component.gd.uid" />
-    <Content Include="scripts\components\cannot_stomp_component.gd" />
-    <Content Include="scripts\components\cannot_stomp_component.gd.uid" />
-    <Content Include="scripts\components\can_be_launched_component.gd" />
-    <Content Include="scripts\components\can_be_launched_component.gd.uid" />
-    <Content Include="scripts\components\can_pickup.gd" />
-    <Content Include="scripts\components\can_pickup.gd.uid" />
-    <Content Include="scripts\components\charge_throw_component.gd" />
-    <Content Include="scripts\components\charge_throw_component.gd.uid" />
-    <Content Include="scripts\components\chase_level_component.gd" />
-    <Content Include="scripts\components\chase_level_component.gd.uid" />
-    <Content Include="scripts\components\cleanup_component.gd" />
-    <Content Include="scripts\components\cleanup_component.gd.uid" />
-    <Content Include="scripts\components\collapsable.gd" />
-    <Content Include="scripts\components\collapsable.gd.uid" />
-    <Content Include="scripts\components\collectable.gd" />
-    <Content Include="scripts\components\collectable.gd.uid" />
-    <Content Include="scripts\components\damage_component.gd" />
-    <Content Include="scripts\components\damage_component.gd.uid" />
-    <Content Include="scripts\components\destroyable_component.gd" />
-    <Content Include="scripts\components\destroyable_component.gd.uid" />
-    <Content Include="scripts\components\effect_inflictor_component.gd" />
-    <Content Include="scripts\components\effect_inflictor_component.gd.uid" />
-    <Content Include="scripts\components\enemy_death.gd" />
-    <Content Include="scripts\components\enemy_death.gd.uid" />
-    <Content Include="scripts\components\enemy_wave_trigger.gd" />
-    <Content Include="scripts\components\enemy_wave_trigger.gd.uid" />
-    <Content Include="scripts\components\exit_door_component.gd" />
-    <Content Include="scripts\components\exit_door_component.gd.uid" />
-    <Content Include="scripts\components\explosive_component.gd" />
-    <Content Include="scripts\components\explosive_component.gd.uid" />
-    <Content Include="scripts\components\fade_away.gd" />
-    <Content Include="scripts\components\fade_away.gd.uid" />
-    <Content Include="scripts\components\fire_effect_component.gd" />
-    <Content Include="scripts\components\fire_effect_component.gd.uid" />
-    <Content Include="scripts\components\flashing_component.gd" />
-    <Content Include="scripts\components\flashing_component.gd.uid" />
-    <Content Include="scripts\components\flip_player.gd" />
-    <Content Include="scripts\components\flip_player.gd.uid" />
-    <Content Include="scripts\components\gravity_motion_component.gd" />
-    <Content Include="scripts\components\gravity_motion_component.gd.uid" />
-    <Content Include="scripts\components\health.gd" />
-    <Content Include="scripts\components\health.gd.uid" />
-    <Content Include="scripts\components\heal_component.gd" />
-    <Content Include="scripts\components\heal_component.gd.uid" />
-    <Content Include="scripts\components\hit_component.gd" />
-    <Content Include="scripts\components\hit_component.gd.uid" />
-    <Content Include="scripts\components\homing_missile_motion.gd" />
-    <Content Include="scripts\components\homing_missile_motion.gd.uid" />
-    <Content Include="scripts\components\ice_effect_component.gd" />
-    <Content Include="scripts\components\ice_effect_component.gd.uid" />
-    <Content Include="scripts\components\invulnerability_component.gd" />
-    <Content Include="scripts\components\invulnerability_component.gd.uid" />
-    <Content Include="scripts\components\jump_pad_component.gd" />
-    <Content Include="scripts\components\jump_pad_component.gd.uid" />
-    <Content Include="scripts\components\kill_player_out_of_screen.gd" />
-    <Content Include="scripts\components\kill_player_out_of_screen.gd.uid" />
-    <Content Include="scripts\components\knockback.gd" />
-    <Content Include="scripts\components\knockback.gd.uid" />
-    <Content Include="scripts\components\launch_component.gd" />
-    <Content Include="scripts\components\launch_component.gd.uid" />
-    <Content Include="scripts\components\lever_component.gd" />
-    <Content Include="scripts\components\lever_component.gd.uid" />
-    <Content Include="scripts\components\lifetime_component.gd" />
-    <Content Include="scripts\components\lifetime_component.gd.uid" />
-    <Content Include="scripts\components\magnetic_skill.gd" />
-    <Content Include="scripts\components\magnetic_skill.gd.uid" />
-    <Content Include="scripts\components\out_of_screen_component.gd" />
-    <Content Include="scripts\components\out_of_screen_component.gd.uid" />
-    <Content Include="scripts\components\periodic_shooting.gd" />
-    <Content Include="scripts\components\periodic_shooting.gd.uid" />
-    <Content Include="scripts\components\PlatformMovementComponent.cs.uid" />
-    <Content Include="scripts\components\platform_movement.gd" />
-    <Content Include="scripts\components\PlayerController.cs.uid" />
-    <Content Include="scripts\components\player_death.gd" />
-    <Content Include="scripts\components\player_death.gd.uid" />
-    <Content Include="scripts\components\player_movement.gd" />
-    <Content Include="scripts\components\player_movement.gd.uid" />
-    <Content Include="scripts\components\progressive_damage_component.gd" />
-    <Content Include="scripts\components\progressive_damage_component.gd.uid" />
-    <Content Include="scripts\components\projectile_component.gd" />
-    <Content Include="scripts\components\projectile_component.gd.uid" />
-    <Content Include="scripts\components\projectile_init_component.gd" />
-    <Content Include="scripts\components\projectile_init_component.gd.uid" />
-    <Content Include="scripts\components\requirement_component.gd" />
-    <Content Include="scripts\components\requirement_component.gd.uid" />
-    <Content Include="scripts\components\score.gd" />
-    <Content Include="scripts\components\score.gd.uid" />
-    <Content Include="scripts\components\ship_movement.gd" />
-    <Content Include="scripts\components\ship_movement.gd.uid" />
-    <Content Include="scripts\components\ship_shooter.gd" />
-    <Content Include="scripts\components\ship_shooter.gd.uid" />
-    <Content Include="scripts\components\side_to_side_movement.gd" />
-    <Content Include="scripts\components\side_to_side_movement.gd.uid" />
-    <Content Include="scripts\components\skill_unlocker_component.gd" />
-    <Content Include="scripts\components\skill_unlocker_component.gd.uid" />
-    <Content Include="scripts\components\spaceship_enter_component.gd" />
-    <Content Include="scripts\components\spaceship_enter_component.gd.uid" />
-    <Content Include="scripts\components\spaceship_exit_component.gd" />
-    <Content Include="scripts\components\spaceship_exit_component.gd.uid" />
-    <Content Include="scripts\components\spin_component.gd" />
-    <Content Include="scripts\components\spin_component.gd.uid" />
-    <Content Include="scripts\components\status_effect_component.gd" />
-    <Content Include="scripts\components\status_effect_component.gd.uid" />
-    <Content Include="scripts\components\stomp_damage_component.gd" />
-    <Content Include="scripts\components\stomp_damage_component.gd.uid" />
-    <Content Include="scripts\components\straight_motion_component.gd" />
-    <Content Include="scripts\components\straight_motion_component.gd.uid" />
-    <Content Include="scripts\components\terrain_hit_fx.gd" />
-    <Content Include="scripts\components\terrain_hit_fx.gd.uid" />
-    <Content Include="scripts\components\tooltip_component.gd" />
-    <Content Include="scripts\components\tooltip_component.gd.uid" />
-    <Content Include="scripts\components\trail_component.gd" />
-    <Content Include="scripts\components\trail_component.gd.uid" />
-    <Content Include="scripts\components\trigger_lever_component.gd" />
-    <Content Include="scripts\components\trigger_lever_component.gd.uid" />
-    <Content Include="scripts\components\unlock_on_requirement_component.gd" />
-    <Content Include="scripts\components\unlock_on_requirement_component.gd.uid" />
-  </ItemGroup>
 </Project>

objects/entities/brick_player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=48 format=3 uid="uid://bqi5s710xb1ju"]
+[gd_scene load_steps=49 format=3 uid="uid://bqi5s710xb1ju"]
 
 [ext_resource type="Script" uid="uid://csel4s0e4g5uf" path="res://scripts/components/PlayerController.cs" id="1_yysbb"]
 [ext_resource type="Shader" uid="uid://bs4xvm4qkurpr" path="res://shaders/hit_flash.tres" id="2_lgb3u"]
@@ -35,6 +35,7 @@
 [ext_resource type="PackedScene" uid="uid://b12tppjkkqpt4" path="res://objects/fxs/hit_particles.tscn" id="28_jh5m0"]
 [ext_resource type="AudioStream" uid="uid://dyev46uqusimi" path="res://sfx/shoot.wav" id="32_x2b7c"]
 [ext_resource type="Script" uid="uid://d1ctdx52gskv1" path="res://scripts/components/ship_shooter.gd" id="34_gwc8i"]
+[ext_resource type="Script" uid="uid://dev2q1228otm2" path="res://scripts/UI/ChargeProgressBar.cs" id="34_o1ihh"]
 [ext_resource type="PackedScene" uid="uid://dtem8jgcyoqar" path="res://objects/entities/green_laser.tscn" id="36_oxudy"]
 [ext_resource type="Script" uid="uid://diw6opv6yutgi" path="res://scripts/components/KillPlayerOutOfScreenComponent.cs" id="37_qec3q"]
 [ext_resource type="Script" uid="uid://3qy7rm28q66a" path="res://scripts/components/ProgressiveDamageComponent.cs" id="38_dhjci"]
@@ -249,11 +250,13 @@ bus = &"sfx"
 stream = ExtResource("32_x2b7c")
 bus = &"sfx"
 
-[node name="ChargingBarLayer" parent="." instance=ExtResource("28_3f5nm")]
+[node name="ChargingBarLayer" parent="." node_paths=PackedStringArray("ProgressBar") instance=ExtResource("28_3f5nm")]
 offset_left = -17.0
 offset_top = -30.0
 offset_right = 23.0
 offset_bottom = -20.0
+script = ExtResource("34_o1ihh")
+ProgressBar = NodePath(".")
 
 [node name="HitParticles" parent="." instance=ExtResource("28_jh5m0")]
 process_material = SubResource("ParticleProcessMaterial_lgb3u")

resources/collectables/big_coin.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=2 format=3 uid="uid://bsnr5v2b2mfsl"]
 
-[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/resources/CollectableResource.cs" id="1_wfbgp"]
+[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_wfbgp"]
 
 [resource]
 script = ExtResource("1_wfbgp")

resources/collectables/big_treasure.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=2 format=3 uid="uid://b6xqotmke54x"]
 
-[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/resources/CollectableResource.cs" id="1_5mosu"]
+[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_5mosu"]
 
 [resource]
 script = ExtResource("1_5mosu")

resources/collectables/child.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=2 format=3 uid="uid://b6apusc0jmi3x"]
 
-[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/resources/CollectableResource.cs" id="1_d8txc"]
+[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_d8txc"]
 
 [resource]
 script = ExtResource("1_d8txc")

resources/collectables/coin.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=2 format=3 uid="uid://vql535ckoeqm"]
 
-[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/resources/CollectableResource.cs" id="1_7pquc"]
+[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_7pquc"]
 
 [resource]
 script = ExtResource("1_7pquc")

resources/collectables/small_health_potion.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=2 format=3 uid="uid://2tl3yoh202no"]
 
-[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/resources/CollectableResource.cs" id="1_brkhb"]
+[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_brkhb"]
 
 [resource]
 script = ExtResource("1_brkhb")

resources/collectables/treasure.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=2 format=3 uid="uid://bws2xldndlre1"]
 
-[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/resources/CollectableResource.cs" id="1_clntw"]
+[ext_resource type="Script" uid="uid://gptsgaw3agkf" path="res://scripts/Resources/CollectableResource.cs" id="1_clntw"]
 
 [resource]
 script = ExtResource("1_clntw")

resources/skills/brick_throw.tres

@@ -1,24 +1,23 @@
-[gd_resource type="Resource" script_class="SkillData" load_steps=5 format=3 uid="uid://dw5ee2lpeypnb"]
+[gd_resource type="Resource" load_steps=4 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://d4crrfmbgxnqf" path="res://scripts/Resources/SkillData.cs" id="3_yimbq"]
 
 [resource]
-script = ExtResource("1_etxe2")
+script = ExtResource("3_yimbq")
-name = "BRICK_POWER"
+Name = "BRICK_POWER"
-description = "BRICK_POWER_DESCRIPTION"
+Description = "BRICK_POWER_DESCRIPTION"
-node = ExtResource("1_5gnea")
+Config = Dictionary[String, Variant]({
-config = {
 "fire_rate": 0.6,
 "player_controller": NodePath("."),
-"throw_input_behavior": ExtResource("1_xwijh"),
+"throw_input_behavior": null,
 "timer": NodePath("ThrowTimer")
-}
+})
-cost = 50
+Cost = 50
-icon = ExtResource("2_yimbq")
+Icon = ExtResource("2_yimbq")
-type = 1
+IsActive = false
-is_active = false
+Level = 1
-level = 0
+MaxLevel = 3
-max_level = 3
+Type = 0
+Node = ExtResource("1_5gnea")

scenes/main_menu.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=3 uid="uid://cl00e2ocomk3m"]
 
-[ext_resource type="PackedScene" uid="uid://8b6ol5sssbgo" path="res://objects/ui/main_menu.tscn" id="1_ekxnf"]
+[ext_resource type="PackedScene" path="res://objects/ui/main_menu.tscn" id="1_ekxnf"]
 [ext_resource type="PackedScene" uid="uid://y0ae6e7t70fj" path="res://objects/ui/settings_menu.tscn" id="2_bqqt6"]
 [ext_resource type="PackedScene" uid="uid://bwgmrcyj4mvu" path="res://objects/ui/credits.tscn" id="3_bqqt6"]
 [ext_resource type="PackedScene" uid="uid://b5fx1vdfky307" path="res://objects/ui/audio_settings.tscn" id="4_8ln24"]

scripts/Resources/CollectableResource.cs

@@ -4,6 +4,6 @@ namespace Mr.BrickAdventures.scripts.Resources;
 
 public partial class CollectableResource : Resource
 {
-    [Export] public Variant Amount { get; set; } = 0.0;
+    [Export] public float Amount { get; set; } = 0.0f;
     [Export] public CollectableType Type { get; set; }
 }