FINAL JAM COMMIT

Prefabs/Turrets/oni.tscn

@@ -1,11 +1,16 @@
-[gd_scene load_steps=18 format=3 uid="uid://8fsvnmto0ckj"]
+[gd_scene load_steps=26 format=3 uid="uid://8fsvnmto0ckj"]
 
 [ext_resource type="Texture2D" uid="uid://c6dl0tlkdtis1" path="res://Assets/Sprites/Characters/Player/oniSheet.png" id="1_rg6xk"]
 [ext_resource type="Script" uid="uid://cxrhl65cjw4yr" path="res://Scripts/Turrets/Turret.cs" id="2_hi1ge"]
 [ext_resource type="Script" uid="uid://cy00plvsi6vkn" path="res://Scripts/Projectiles/ProjectilePool.cs" id="3_if52b"]
 [ext_resource type="PackedScene" uid="uid://deud430j2w18n" path="res://Prefabs/Projectiles/GreenFist.tscn" id="4_rg6xk"]
 [ext_resource type="Script" uid="uid://bpqof3jshxnug" path="res://Scripts/Turrets/DragMover.cs" id="5_hi1ge"]
+[ext_resource type="Script" uid="uid://qf0qrqg0l7np" path="res://Scripts/Turrets/TurretUpgrader.cs" id="6_6qlhu"]
 [ext_resource type="AudioStream" uid="uid://ce5vqm3tts58o" path="res://Assets/Sounds/Sfx/oni.wav" id="6_if52b"]
+[ext_resource type="Texture2D" uid="uid://b2wa0rqssefiy" path="res://Assets/Sprites/UI/soul.png" id="7_ahiq0"]
+[ext_resource type="FontFile" uid="uid://b8lsp07ucxq6p" path="res://Assets/Fonts/MintsodaLimeGreen13X16Regular-KVvzA.ttf" id="8_6qlhu"]
+[ext_resource type="Texture2D" uid="uid://bfclgdy7dusmg" path="res://Assets/Sprites/Projectiles/projectile_green-Sheet.png" id="9_kidxu"]
+[ext_resource type="Texture2D" uid="uid://m77l7ej5ojn0" path="res://Assets/Sprites/Projectiles/flame_attack.png" id="10_v2c4g"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_hi1ge"]
 atlas = ExtResource("1_rg6xk")
@@ -69,6 +74,20 @@ size = Vector2(100, 100)
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_rg6xk"]
 size = Vector2(32, 16)
 
+[sub_resource type="LabelSettings" id="LabelSettings_nmwuw"]
+font = ExtResource("8_6qlhu")
+font_size = 22
+outline_size = 6
+outline_color = Color(0, 0, 0, 1)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_70y4k"]
+atlas = ExtResource("9_kidxu")
+region = Rect2(0, 0, 16, 32)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_n6aa7"]
+atlas = ExtResource("10_v2c4g")
+region = Rect2(0, 0, 16, 32)
+
 [node name="Turret" type="Node2D"]
 y_sort_enabled = true
 texture_filter = 1
@@ -103,6 +122,15 @@ DragArea = NodePath("../../DragCollider")
 CheckArea = NodePath("../../PlacementCollider")
 ShootArea = NodePath("../../ShootArea")
 
+[node name="TurretUpgrader" type="Node" parent="Scripts" node_paths=PackedStringArray("_turret", "_clickArea", "_ui", "_costLabel", "_damageLabel", "_fireRateLabel")]
+script = ExtResource("6_6qlhu")
+_turret = NodePath("../Turret")
+_clickArea = NodePath("../../DragCollider")
+_ui = NodePath("../../Control")
+_costLabel = NodePath("../../Control/TextureRect/Cost")
+_damageLabel = NodePath("../../Control/TextureRect2/Dmg")
+_fireRateLabel = NodePath("../../Control/TextureRect3/Rps")
+
 [node name="ShootArea" type="Area2D" parent="."]
 collision_layer = 0
 collision_mask = 4
@@ -134,3 +162,92 @@ shape = SubResource("RectangleShape2D_rg6xk")
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("6_if52b")
 volume_db = -20.0
+
+[node name="Control" type="Control" parent="."]
+visible = false
+layout_mode = 3
+anchors_preset = 0
+offset_left = -64.0
+offset_top = -56.0
+offset_right = -24.0
+offset_bottom = -16.0
+scale = Vector2(0.5, 0.5)
+
+[node name="TextureRect" type="TextureRect" parent="Control"]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 40.0
+texture = ExtResource("7_ahiq0")
+
+[node name="Cost" type="Label" parent="Control/TextureRect"]
+layout_mode = 0
+offset_left = 40.0
+offset_top = 12.0
+offset_right = 81.0
+offset_bottom = 38.0
+text = "999"
+label_settings = SubResource("LabelSettings_nmwuw")
+
+[node name="Label2" type="Label" parent="Control/TextureRect"]
+layout_mode = 0
+offset_left = 4.0
+offset_top = 20.0
+offset_right = 58.0
+offset_bottom = 46.0
+scale = Vector2(0.56, 0.56)
+text = "Cost"
+label_settings = SubResource("LabelSettings_nmwuw")
+
+[node name="TextureRect2" type="TextureRect" parent="Control"]
+layout_mode = 0
+offset_left = 80.0
+offset_right = 120.0
+offset_bottom = 40.0
+texture = SubResource("AtlasTexture_70y4k")
+stretch_mode = 5
+
+[node name="Dmg" type="Label" parent="Control/TextureRect2"]
+layout_mode = 0
+offset_left = 40.0
+offset_top = 12.0
+offset_right = 81.0
+offset_bottom = 38.0
+text = "999"
+label_settings = SubResource("LabelSettings_nmwuw")
+
+[node name="Label2" type="Label" parent="Control/TextureRect2"]
+layout_mode = 0
+offset_left = 4.0
+offset_top = 20.0
+offset_right = 58.0
+offset_bottom = 46.0
+scale = Vector2(0.56, 0.56)
+text = "DMG"
+label_settings = SubResource("LabelSettings_nmwuw")
+
+[node name="TextureRect3" type="TextureRect" parent="Control"]
+layout_mode = 0
+offset_left = 160.0
+offset_right = 200.0
+offset_bottom = 40.0
+texture = SubResource("AtlasTexture_n6aa7")
+stretch_mode = 5
+
+[node name="Rps" type="Label" parent="Control/TextureRect3"]
+layout_mode = 0
+offset_left = 40.0
+offset_top = 12.0
+offset_right = 81.0
+offset_bottom = 38.0
+text = "999"
+label_settings = SubResource("LabelSettings_nmwuw")
+
+[node name="Label2" type="Label" parent="Control/TextureRect3"]
+layout_mode = 0
+offset_left = 8.0
+offset_top = 20.0
+offset_right = 62.0
+offset_bottom = 46.0
+scale = Vector2(0.56, 0.56)
+text = "RPS"
+label_settings = SubResource("LabelSettings_nmwuw")