more work on the ui theme and changing the hud

Assets/Textures/place_icon.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://broabvnrwp73t"
-path="res://.godot/imported/button_patch.png-22aba966b297663456907901b6cbce38.ctex"
+uid="uid://deelc254ct7ae"
+path="res://.godot/imported/place_icon.png-ad3a74931c0ccf2fbff4749d1f6da64b.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://button_patch.png"
-dest_files=["res://.godot/imported/button_patch.png-22aba966b297663456907901b6cbce38.ctex"]
+source_file="res://Assets/Textures/place_icon.png"
+dest_files=["res://.godot/imported/place_icon.png-ad3a74931c0ccf2fbff4749d1f6da64b.ctex"]
 
 [params]
 

Classes/Engineer/plan.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="Script" uid="uid://cl2mi4bnpatwk" path="res://Scripts/float_and_spin.gd" id="3_b2a1t"]
 [ext_resource type="Texture2D" uid="uid://dds48gjgiyjp6" path="res://Classes/Engineer/plan_plan_tex.png" id="4_75s6s"]
 [ext_resource type="Material" uid="uid://dq30v3hgyi4da" path="res://Classes/Engineer/mouse_hover_material.tres" id="5_2u312"]
-[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="6_etati"]
+[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://UI/card_hand.tscn" id="6_etati"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_2u312"]
 size = Vector3(0.436279, 1.47153, 1.05554)

Classes/Engineer/podium.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=9 format=3 uid="uid://ciagj1hfn4gou"]
 
-[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_fo804"]
+[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_fo804"]
 [ext_resource type="Texture2D" uid="uid://d4jd718brpsed" path="res://Classes/Engineer/doe.png" id="2_4b5pd"]
 [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_pmyku"]
 [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_1jafm"]

Classes/Mage/podium.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=9 format=3 uid="uid://bd4k48bdgiddy"]
 
-[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_0wn84"]
+[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_0wn84"]
 [ext_resource type="Texture2D" uid="uid://bvybr3fwnw46p" path="res://Classes/Mage/yeen.png" id="2_skplt"]
 [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_m1210"]
 [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_5wuy8"]

Classes/Mage/scroll.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=12 format=4 uid="uid://bfxgtf1v1okat"]
 
 [ext_resource type="Script" uid="uid://bj7oafusrrsk" path="res://Scripts/card_item.gd" id="1_rlle2"]
-[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="2_aiko0"]
+[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://UI/card_hand.tscn" id="2_aiko0"]
 [ext_resource type="Script" uid="uid://cl2mi4bnpatwk" path="res://Scripts/float_and_spin.gd" id="3_jjaja"]
 [ext_resource type="Texture2D" uid="uid://b0sl2tvwle1m7" path="res://Classes/Mage/scroll2_paper.png" id="4_aiko0"]
 [ext_resource type="Material" uid="uid://0273wjmwcpa5" path="res://Classes/Mage/mouse_hover_material2.tres" id="5_jjaja"]

Classes/NewHero3/podium.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=7 format=3 uid="uid://busdu5na4rf4e"]
 
-[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_nxj67"]
+[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_nxj67"]
 [ext_resource type="Texture2D" uid="uid://d4jd718brpsed" path="res://Classes/Engineer/doe.png" id="2_05uii"]
 [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_il1ej"]
 [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_mrig3"]

Classes/NewHero4/podium.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=7 format=3 uid="uid://6givglesbjef"]
 
-[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://Scenes/Menus/CharacterSelect/character_podium.gd" id="1_h2nqs"]
+[ext_resource type="Script" uid="uid://bc0xyfr5nj1ul" path="res://UI/Menus/CharacterSelect/character_podium.gd" id="1_h2nqs"]
 [ext_resource type="Texture2D" uid="uid://bvybr3fwnw46p" path="res://Classes/Mage/yeen.png" id="2_e7ajb"]
 [ext_resource type="PackedScene" uid="uid://ddbbwx0yy16lh" path="res://Scenes/TowerBase/tower_base.tscn" id="3_brui3"]
 [ext_resource type="ArrayMesh" uid="uid://oxjhqfwlcx5l" path="res://Towers/Assault/assaultmod.res" id="4_6igfd"]

Enemies/BabyEyeDog/baby_eye_dog.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_vl30x"]
 [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="5_f7xim"]
 [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="6_lbm5h"]
-[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="7_o1784"]
+[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="7_o1784"]
 [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="8_1fak8"]
 [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="9_yrbee"]
 [ext_resource type="PackedScene" uid="uid://bgxr27by7jruo" path="res://Enemies/BabyEyeDog/baby_eyedog.glb" id="10_8k5ts"]

Enemies/ElderEyeDog/elder_eye_dog.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_lirjc"]
 [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="5_bi7k0"]
 [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="6_k6khd"]
-[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="7_wko6w"]
+[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="7_wko6w"]
 [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="8_2jssq"]
 [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="9_2x8lp"]
 [ext_resource type="PackedScene" uid="uid://r2s4pd42y0ma" path="res://Enemies/ElderEyeDog/elder_eyedog.glb" id="10_17xxt"]

Enemies/EyeDog/eye_dog.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_1dh2f"]
 [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="6_3v8fr"]
 [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="7_bkkhh"]
-[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://Scenes/health_bar.tscn" id="8_k2835"]
+[ext_resource type="PackedScene" uid="uid://hjq3nrnumklp" path="res://UI/EnemyHealthBar/health_bar.tscn" id="8_k2835"]
 [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="9_t4oco"]
 [ext_resource type="PackedScene" uid="uid://dlhx6r23m5ceg" path="res://Enemies/EyeDog/eyedog.glb" id="10_h25mw"]
 [ext_resource type="Script" uid="uid://cojjgevmbhwal" path="res://Scripts/status_effector.gd" id="11_kpdsm"]

Locales/en.po

@@ -624,6 +624,9 @@ msgstr "Cost: $"
 msgid "LABEL_REMIX_CURRENCY"
 msgstr "Coins: $"
 
+msgid "PROMPT_QUIT"
+msgstr "Are you sure you want to quit?"
+
 #, fuzzy
 #~| msgid "LABEL_DISPLAY_NAME"
 #~ msgid "LABEL_CARD_NAME"

Locales/translation_template.pot

@@ -587,3 +587,6 @@ msgstr ""
 
 msgid "LABEL_REMIX_CURRENCY"
 msgstr ""
+
+msgid "PROMPT_QUIT"
+msgstr ""

PCs/FSM/carding_state.gd

@@ -63,3 +63,4 @@ func swap_to_slot(num: int) -> void:
 	if hero.hand.size >= num:
 		hero.hand_selected_index = num - 1
 		hero.swap_card_audio.play()
+		hero.hud.hot_wheel.update_cassettes(hero.get_wheel_cards())

PCs/FSM/fighting_state.gd

@@ -15,6 +15,7 @@ func enter_state() -> void:
 		hero.weapons[hero.equipped_weapon].current_energy = hero.weapons[hero.equipped_weapon].max_energy
 		#this had to be commented out coz the new energy bar thinks "energy changed" is "energy used"
 		#weapons[equipped_weapon].energy_changed.emit(weapons[equipped_weapon].current_energy)
+	if hero.game_manager.card_gameplay:
 		for x: int in hero.hand.contents.size():
 			hero.discard_pile.add(hero.hand.remove_at(hero.hand.contents.size() - 1))
 	hero.weapon_swap_timer.start()

PCs/hero.gd

@@ -15,7 +15,6 @@ signal ready_state_changed(state: bool)
 @export var draw_pile: Inventory
 @export var hand: Inventory
 @export var discard_pile: Inventory
-@export var gauntlet_cards: Array[CardInHand]
 @export var pause_menu_scene: PackedScene
 @export var hud: HUD
 @export var movement: PlayerMovement
@@ -41,7 +40,7 @@ signal ready_state_changed(state: bool)
 
 var current_state: HeroState
 var pre_fighting_state: HeroState
-var hand_card_scene: PackedScene = preload("res://Scenes/UI/card_hand.tscn")
+var hand_card_scene: PackedScene = preload("res://UI/card_hand.tscn")
 var card_sprites: Array[CardInHand]
 var game_manager: GameManager
 var hovering_item: InteractButton = null
@@ -184,6 +183,7 @@ func increment_selected() -> void:
 	hand_selected_index += 1
 	if hand_selected_index >= hand.size:
 		hand_selected_index = 0
+	hud.hot_wheel.update_cassettes(get_wheel_cards())
 
 
 func decrement_selected() -> void:
@@ -193,20 +193,43 @@ func decrement_selected() -> void:
 	hand_selected_index -= 1
 	if hand_selected_index < 0:
 		hand_selected_index = hand.size - 1
+	hud.hot_wheel.update_cassettes(get_wheel_cards())
+
+
+func get_wheel_cards() -> Array[Card]:
+	var wheel_cards: Array[Card] = []
+	if hand.size > 0:
+		wheel_cards.append(hand.contents[hand_selected_index])
+		var left_searches: int = floori((min(5, hand.size) - 1) / 2.0)
+		var right_searches: int = ceili((min(5, hand.size) - 1) / 2.0)
+		while left_searches > 0 or right_searches > 0:
+			for x: int in left_searches:
+				if hand_selected_index - (x + 1) >= 0:
+					wheel_cards.append(hand.contents[hand_selected_index - (x + 1)])
+					left_searches -= 1
+				else:
+					right_searches += left_searches
+					left_searches = 0
+			for x: int in right_searches:
+				if hand_selected_index + (x + 1) < hand.size:
+					wheel_cards.append(hand.contents[hand_selected_index + (x + 1)])
+					right_searches -= 1
+				else:
+					left_searches += right_searches
+					right_searches = 0
+	return wheel_cards
+
 
 
 func set_card_elements_visibility(value: bool) -> void:
 	if value:
 		hud.show_hot_wheel()
+		hud.hot_wheel.update_cassettes(get_wheel_cards())
+		hud.show_slots()
 	else:
 		hud.hide_hot_wheel()
+		hud.hide_slots()
 	$FirstPersonViewport/Head2/LeftHand.visible = value
-	$HUD/PlaceIcon.visible = value
-	$HUD/SwapIcon.visible = value
-	if cards[0]:
-		$HUD/PlaceIcon.visible = false
-	if cards[1]:
-		$HUD/SwapIcon.visible = false
 
 
 func _unhandled_input(event: InputEvent) -> void:
@@ -226,8 +249,6 @@ func ready_self() -> void:
 	edit_tool.interact_key_held = false
 	if !ready_state:
 		ready_state = true
-		hud.place_icon.set_visible(false)
-		hud.swap_icon.set_visible(false)
 		hud.shrink_wave_start_label()
 		ready_audio.play()
 
@@ -243,6 +264,7 @@ func add_card(new_card: Card) -> void:
 	hand.add(new_card)
 	hud.pickup(new_card)
 	place_card_audio.play()
+	hud.hot_wheel.update_cassettes(get_wheel_cards())
 
 
 func unpause() -> void:
@@ -301,6 +323,8 @@ func equip_weapon(slot: int = 0) -> void:
 			energy -= energy_cost
 		place_card_audio.play()
 		cards[slot] = hand.remove_at(hand.contents.find(selected_card))
+		decrement_selected()
+		hud.hot_wheel.update_cassettes(get_wheel_cards())
 		#card_sprites[hand_selected_index].queue_free()
 		#card_sprites.remove_at(hand_selected_index)
 		if game_manager.card_gameplay:
@@ -314,13 +338,10 @@ func equip_weapon(slot: int = 0) -> void:
 		weapons[slot].duration = 1
 		weapons_spawn_count += 1
 		weapons[slot].set_multiplayer_authority(multiplayer.get_unique_id())
-		gauntlet_cards[slot].set_card(cards[slot])
 		if slot == 0:
-			hud.place_icon.visible = false
+			hud.set_primary_button(cards[slot])
 		else:
-			hud.swap_icon.visible = false
-		gauntlet_cards[slot].view_weapon()
-		gauntlet_cards[slot].visible = true
+			hud.set_secondary_button(cards[slot])
 		weapons[slot].set_hero(self)
 		weapons[slot].visible = false
 		right_hand.add_child(weapons[slot])
@@ -364,14 +385,14 @@ func _on_timer_timeout() -> void:
 
 
 func unequip_weapon(slot: int = 0) -> void:
-	gauntlet_cards[slot].visible = false
 	if slot == 0:
-		hud.place_icon.visible = true
+		hud.set_primary_button(null)
 	else:
-		hud.swap_icon.visible = true
+		hud.set_secondary_button(null)
 	weapons[slot].queue_free()
 	weapons[slot] = null
 	if !game_manager.card_gameplay:
 		add_card(cards[slot])
 	cards[slot] = null
 	place_card_audio.play()
+	hud.hot_wheel.update_cassettes(get_wheel_cards())

PCs/hero.tscn

@@ -1,12 +1,11 @@
-[gd_scene load_steps=69 format=3 uid="uid://dxgxbtf68lcv5"]
+[gd_scene load_steps=67 format=3 uid="uid://dxgxbtf68lcv5"]
 
 [ext_resource type="Script" uid="uid://1fqpoegbdm6n" path="res://PCs/hero.gd" id="1_pihpe"]
 [ext_resource type="Resource" uid="uid://b5pc3frhx467q" path="res://Classes/Engineer/class.tres" id="2_dbyo0"]
 [ext_resource type="PackedScene" uid="uid://ri8r03wqy80t" path="res://Scenes/8_direction_sprite.tscn" id="2_ib0t5"]
-[ext_resource type="PackedScene" uid="uid://buvgdem68wtev" path="res://Scenes/Menus/PauseMenu/pause_menu.tscn" id="3_avnsx"]
+[ext_resource type="PackedScene" uid="uid://buvgdem68wtev" path="res://UI/Menus/PauseMenu/pause_menu.tscn" id="3_avnsx"]
 [ext_resource type="PackedScene" uid="uid://n8ab1cy7ordc" path="res://card_model/3d_card.tscn" id="4_2mqvj"]
 [ext_resource type="Script" uid="uid://cij76at0nbs1v" path="res://PCs/view_movement.gd" id="4_mhexa"]
-[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="4_mwtvp"]
 [ext_resource type="PackedScene" uid="uid://gdd1xupf4oxx" path="res://UI/CardSelectionBox/card_selection_box.tscn" id="5_h82f6"]
 [ext_resource type="PackedScene" uid="uid://dqt1ggtkpkuhs" path="res://PCs/PathEditTool/path_edit_tool.tscn" id="5_jlxb3"]
 [ext_resource type="Script" uid="uid://do24iuot0j7d7" path="res://Scripts/inventory.gd" id="6_cf5ap"]
@@ -20,10 +19,10 @@
 [ext_resource type="Texture2D" uid="uid://c60fh34ttgcvh" path="res://Assets/Textures/minimap_player.png" id="15_nhlam"]
 [ext_resource type="Texture2D" uid="uid://chhmkmlfrobhu" path="res://Assets/Textures/bubble.png" id="15_q3yot"]
 [ext_resource type="Texture2D" uid="uid://cqnapc8cscl7i" path="res://Assets/Textures/border.png" id="16_x1xjr"]
-[ext_resource type="PackedScene" uid="uid://chnj376d3lcjd" path="res://Scenes/UI/pickup_notification.tscn" id="17_oyeww"]
+[ext_resource type="PackedScene" uid="uid://chnj376d3lcjd" path="res://UI/pickup_notification.tscn" id="17_oyeww"]
 [ext_resource type="PackedScene" uid="uid://d17c77pqsi8oy" path="res://UI/EnemyCard/enemy_card_ui.tscn" id="18_dfkac"]
-[ext_resource type="Texture2D" uid="uid://cvjcu3hofahr6" path="res://Assets/Textures/place_slot.png" id="18_okmpi"]
 [ext_resource type="Script" uid="uid://b5wle8f6rv3e7" path="res://PCs/player_movement.gd" id="20_cfhw8"]
+[ext_resource type="Texture2D" uid="uid://deelc254ct7ae" path="res://Assets/Textures/place_icon.png" id="22_o55s8"]
 [ext_resource type="AudioStream" uid="uid://csu2hce4bfoki" path="res://Audio/cardPlace1.ogg" id="24_8ch4w"]
 [ext_resource type="AudioStream" uid="uid://dxq8b77wa41os" path="res://Audio/cardPlace2.ogg" id="25_awl6m"]
 [ext_resource type="Texture2D" uid="uid://bs2mskoyvyehv" path="res://Assets/Textures/crosshair159.png" id="25_l7gpx"]
@@ -36,9 +35,10 @@
 [ext_resource type="AudioStream" uid="uid://val5n418yebw" path="res://Audio/cardSlide3.ogg" id="30_djhlg"]
 [ext_resource type="Texture2D" uid="uid://up7omskwg0yx" path="res://Assets/Textures/battery.png" id="30_rim6q"]
 [ext_resource type="AudioStream" uid="uid://ck6g061w7i6ro" path="res://Audio/cardSlide4.ogg" id="31_546e6"]
-[ext_resource type="PackedScene" uid="uid://ga21hoa8fxmm" path="res://hot_wheel.tscn" id="31_h1yfy"]
-[ext_resource type="PackedScene" uid="uid://cqslp83lf0ku0" path="res://shield_ui.tscn" id="31_o55s8"]
-[ext_resource type="PackedScene" uid="uid://q73cllewm7pj" path="res://energy_pips.tscn" id="32_o55s8"]
+[ext_resource type="PackedScene" uid="uid://ga21hoa8fxmm" path="res://UI/HotWheelUI/hot_wheel.tscn" id="31_h1yfy"]
+[ext_resource type="PackedScene" uid="uid://cqslp83lf0ku0" path="res://UI/ShieldUI/shield_ui.tscn" id="31_o55s8"]
+[ext_resource type="PackedScene" uid="uid://q73cllewm7pj" path="res://UI/EnergyPipUI/energy_pips.tscn" id="32_o55s8"]
+[ext_resource type="Texture2D" uid="uid://doqfkinrjw4mt" path="res://UI/Enemy_icon.png" id="32_r2yb6"]
 [ext_resource type="AudioStream" uid="uid://bj8eitlsjdotb" path="res://Audio/cardSlide5.ogg" id="32_tg7y0"]
 [ext_resource type="AudioStream" uid="uid://d0620p56ad34a" path="res://Audio/cardSlide6.ogg" id="33_2v5co"]
 [ext_resource type="AudioStream" uid="uid://uvoxbl1fbtu0" path="res://Audio/cardSlide7.ogg" id="34_6acmc"]
@@ -59,12 +59,6 @@
 radius = 0.3
 height = 1.8
 
-[sub_resource type="ViewportTexture" id="ViewportTexture_v8f6r"]
-viewport_path = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport2")
-
-[sub_resource type="ViewportTexture" id="ViewportTexture_xme80"]
-viewport_path = NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport3")
-
 [sub_resource type="Environment" id="Environment_cilxe"]
 background_mode = 1
 background_color = Color(0.282353, 0.615686, 0.278431, 1)
@@ -120,7 +114,7 @@ stream_0/stream = ExtResource("36_lsvj8")
 streams_count = 1
 stream_0/stream = ExtResource("37_kv1mg")
 
-[node name="Hero" type="CharacterBody3D" node_paths=PackedStringArray("camera", "gun_camera", "left_hand", "right_hand", "edit_tool", "carding_tool", "sprite", "interaction_raycast", "draw_pile", "hand", "discard_pile", "gauntlet_cards", "hud", "movement", "player_name_tag", "weapon_swap_timer", "editing_states", "fighting_state", "default_state", "ears", "place_card_audio", "swap_card_audio", "ready_audio", "unready_audio", "fullpower_audio", "zeropower_audio", "swap_off_audio", "swap_on_audio")]
+[node name="Hero" type="CharacterBody3D" node_paths=PackedStringArray("camera", "gun_camera", "left_hand", "right_hand", "edit_tool", "carding_tool", "sprite", "interaction_raycast", "draw_pile", "hand", "discard_pile", "hud", "movement", "player_name_tag", "weapon_swap_timer", "editing_states", "fighting_state", "default_state", "ears", "place_card_audio", "swap_card_audio", "ready_audio", "unready_audio", "fullpower_audio", "zeropower_audio", "swap_off_audio", "swap_on_audio")]
 collision_layer = 2
 collision_mask = 37
 script = ExtResource("1_pihpe")
@@ -136,7 +130,6 @@ interaction_raycast = NodePath("ViewMovement/Head/RayCast3D")
 draw_pile = NodePath("DrawPile")
 hand = NodePath("Hand")
 discard_pile = NodePath("DiscardPile")
-gauntlet_cards = [NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport2/Node2D"), NodePath("FirstPersonViewport/Head2/LeftHand/SubViewport3/Node2D")]
 pause_menu_scene = ExtResource("3_avnsx")
 hud = NodePath("HUD")
 movement = NodePath("PlayerMovement")
@@ -214,35 +207,6 @@ weapon_rotation_amount = 0.001
 
 [node name="LeftHand" type="Node3D" parent="FirstPersonViewport/Head2"]
 transform = Transform3D(0.235, 0, 0, 0, 0.235, 0, 0, 0, 0.235, -0.645, -0.26, -1.04)
-visible = false
-
-[node name="SubViewport2" type="SubViewport" parent="FirstPersonViewport/Head2/LeftHand"]
-transparent_bg = true
-render_target_update_mode = 4
-
-[node name="Node2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport2" instance=ExtResource("4_mwtvp")]
-visible = false
-
-[node name="SubViewport3" type="SubViewport" parent="FirstPersonViewport/Head2/LeftHand"]
-transparent_bg = true
-render_target_update_mode = 4
-
-[node name="Node2D" parent="FirstPersonViewport/Head2/LeftHand/SubViewport3" instance=ExtResource("4_mwtvp")]
-visible = false
-
-[node name="Sprite3D2" type="Sprite3D" parent="FirstPersonViewport/Head2/LeftHand"]
-transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 4.72, -0.145, 1.581)
-layers = 2
-sorting_offset = 1.0
-texture_filter = 0
-texture = SubResource("ViewportTexture_v8f6r")
-
-[node name="Sprite3D3" type="Sprite3D" parent="FirstPersonViewport/Head2/LeftHand"]
-transform = Transform3D(0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 6.01, -0.145, 1.581)
-layers = 2
-sorting_offset = 1.0
-texture_filter = 0
-texture = SubResource("ViewportTexture_xme80")
 
 [node name="card_hand_model" parent="FirstPersonViewport/Head2/LeftHand" instance=ExtResource("11_h82f6")]
 transform = Transform3D(-4.16989, -0.848374, -3.61733e-07, -0.824933, 4.05468, -0.993384, 0.198049, -0.973442, -4.13774, 1.56596, 0.519149, 3.37051)
@@ -321,7 +285,7 @@ max_look_up_angle = 80.0
 enable_jumping = true
 weapon_holder = NodePath("../FirstPersonViewport/Head2/RightHand")
 
-[node name="HUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("player", "wave_count", "currency_count", "minimap_outline", "minimap", "minimap_cam", "minimap_viewport", "fps_label", "hover_text", "enemy_sprites", "enemy_counts", "wave_start_label", "place_icon", "swap_icon", "place_text", "swap_text", "energy_label", "blank_cassette_label", "feature_preview", "hot_wheel", "shield_ui", "currencies", "energy_pips")]
+[node name="HUD" type="CanvasLayer" parent="." node_paths=PackedStringArray("player", "wave_count", "currency_count", "minimap_outline", "minimap", "minimap_cam", "minimap_viewport", "fps_label", "hover_text", "enemy_sprites", "enemy_counts", "wave_start_label", "place_text", "swap_text", "energy_label", "blank_cassette_label", "feature_preview", "hot_wheel", "shield_ui", "currencies", "energy_pips", "enemy_count_label", "primary_button", "secondary_button", "slots")]
 script = ExtResource("8_yl6ka")
 player = NodePath("..")
 wave_count = NodePath("EnemyTracker/WaveCount")
@@ -336,10 +300,8 @@ enemy_sprites = [NodePath("EnemyTracker/TextureRect"), NodePath("EnemyTracker/Te
 enemy_counts = [NodePath("EnemyTracker/TextureRect/Label"), NodePath("EnemyTracker/TextureRect2/Label2"), NodePath("EnemyTracker/TextureRect3/Label3"), NodePath("EnemyTracker/TextureRect4/Label4"), NodePath("EnemyTracker/TextureRect5/Label5")]
 pickup_notif_scene = ExtResource("17_oyeww")
 wave_start_label = NodePath("StartWaveLabel")
-place_icon = NodePath("PlaceIcon")
-swap_icon = NodePath("SwapIcon")
-place_text = NodePath("PlaceIcon/RichTextLabel")
-swap_text = NodePath("SwapIcon/RichTextLabel")
+place_text = NodePath("VBoxContainer2/HBoxContainer/RichTextLabel")
+swap_text = NodePath("VBoxContainer2/HBoxContainer2/RichTextLabel")
 enemy_card_scene = ExtResource("18_dfkac")
 energy_label = NodePath("Currencies/HBoxContainer/EnergyLabel")
 blank_cassette_label = NodePath("Currencies/BlankCassetteLabel")
@@ -348,6 +310,11 @@ hot_wheel = NodePath("HotWheel")
 shield_ui = NodePath("ShieldUI")
 currencies = NodePath("Currencies")
 energy_pips = NodePath("EnergyPips")
+enemy_count_label = NodePath("HBoxContainer/Label")
+primary_button = NodePath("VBoxContainer2/HBoxContainer/Button")
+secondary_button = NodePath("VBoxContainer2/HBoxContainer2/Button2")
+null_icon = ExtResource("22_o55s8")
+slots = NodePath("VBoxContainer2")
 
 [node name="FirstPersonCam" type="TextureRect" parent="HUD"]
 anchors_preset = 15
@@ -358,60 +325,6 @@ grow_vertical = 2
 mouse_filter = 2
 texture = SubResource("ViewportTexture_mk87g")
 
-[node name="PlaceIcon" type="TextureRect" parent="HUD"]
-visible = false
-anchors_preset = -1
-anchor_left = 0.75
-anchor_top = 0.95
-anchor_right = 0.8
-anchor_bottom = 0.95
-grow_horizontal = 0
-grow_vertical = 0
-mouse_filter = 2
-texture = ExtResource("18_okmpi")
-stretch_mode = 5
-
-[node name="RichTextLabel" type="RichTextLabel" parent="HUD/PlaceIcon"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-bbcode_enabled = true
-text = "%Primary Fire%"
-scroll_active = false
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="SwapIcon" type="TextureRect" parent="HUD"]
-visible = false
-anchors_preset = -1
-anchor_left = 0.95
-anchor_top = 0.95
-anchor_right = 0.95
-anchor_bottom = 0.95
-grow_horizontal = 0
-grow_vertical = 0
-mouse_filter = 2
-texture = ExtResource("18_okmpi")
-stretch_mode = 5
-
-[node name="RichTextLabel" type="RichTextLabel" parent="HUD/SwapIcon"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-bbcode_enabled = true
-text = "%Secondary Fire%"
-scroll_active = false
-horizontal_alignment = 1
-vertical_alignment = 1
-
 [node name="Minimap" type="TextureRect" parent="HUD"]
 visible = false
 anchors_preset = 1
@@ -452,6 +365,7 @@ horizontal_alignment = 2
 vertical_alignment = 1
 
 [node name="EnemyTracker" type="TextureRect" parent="HUD"]
+visible = false
 texture_filter = 1
 anchors_preset = -1
 anchor_left = 0.5
@@ -601,19 +515,18 @@ vertical_alignment = 1
 anchors_preset = 4
 anchor_top = 0.5
 anchor_bottom = 0.5
-offset_left = 15.0
-offset_top = -295.0
-offset_right = 445.0
-offset_bottom = -40.0
-grow_vertical = 0
+offset_top = -10.0
+offset_right = 104.0
+offset_bottom = 10.0
+grow_vertical = 2
 mouse_filter = 2
 alignment = 2
 
 [node name="StartWaveLabel" type="RichTextLabel" parent="HUD"]
 anchors_preset = -1
-anchor_top = 0.261
+anchor_top = 0.136
 anchor_right = 1.0
-anchor_bottom = 0.395
+anchor_bottom = 0.252
 grow_horizontal = 2
 mouse_filter = 2
 bbcode_enabled = true
@@ -729,9 +642,9 @@ vertical_alignment = 1
 visible = false
 anchors_preset = -1
 anchor_left = 0.5
-anchor_top = 0.893
+anchor_top = 0.973
 anchor_right = 0.5
-anchor_bottom = 0.893
+anchor_bottom = 0.973
 grow_horizontal = 2
 grow_vertical = 0
 
@@ -762,6 +675,77 @@ anchor_bottom = 0.97
 grow_horizontal = 0
 grow_vertical = 0
 
+[node name="HBoxContainer" type="HBoxContainer" parent="HUD"]
+anchors_preset = 5
+anchor_left = 0.5
+anchor_right = 0.5
+offset_left = -20.0
+offset_right = 20.0
+offset_bottom = 40.0
+grow_horizontal = 2
+rotation = 0.008726646
+
+[node name="TextureRect" type="TextureRect" parent="HUD/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("32_r2yb6")
+stretch_mode = 3
+
+[node name="Label" type="Label" parent="HUD/HBoxContainer"]
+layout_mode = 2
+text = "15"
+vertical_alignment = 1
+
+[node name="VBoxContainer2" type="VBoxContainer" parent="HUD"]
+visible = false
+anchors_preset = -1
+anchor_left = 0.98
+anchor_top = 0.768
+anchor_right = 0.98
+anchor_bottom = 0.768
+grow_horizontal = 0
+grow_vertical = 0
+alignment = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="HUD/VBoxContainer2"]
+layout_mode = 2
+
+[node name="RichTextLabel" type="RichTextLabel" parent="HUD/VBoxContainer2/HBoxContainer"]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+mouse_filter = 2
+bbcode_enabled = true
+text = "%Primary Fire%"
+scroll_active = false
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="Button" type="Button" parent="HUD/VBoxContainer2/HBoxContainer"]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+icon = ExtResource("22_o55s8")
+icon_alignment = 1
+expand_icon = true
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="HUD/VBoxContainer2"]
+layout_mode = 2
+
+[node name="RichTextLabel" type="RichTextLabel" parent="HUD/VBoxContainer2/HBoxContainer2"]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+mouse_filter = 2
+bbcode_enabled = true
+text = "%Secondary Fire%"
+scroll_active = false
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="Button2" type="Button" parent="HUD/VBoxContainer2/HBoxContainer2"]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+icon = ExtResource("22_o55s8")
+icon_alignment = 1
+expand_icon = true
+
 [node name="WeaponSwapTimer" type="Timer" parent="."]
 wait_time = 0.4
 one_shot = true

PCs/hud.gd

@@ -15,8 +15,6 @@ extends CanvasLayer
 @export var enemy_counts: Array[Label]
 @export var pickup_notif_scene: PackedScene
 @export var wave_start_label: RichTextLabel
-@export var place_icon: TextureRect
-@export var swap_icon: TextureRect
 @export var place_text: RichTextLabel
 @export var swap_text: RichTextLabel
 @export var enemy_card_scene: PackedScene
@@ -29,12 +27,18 @@ extends CanvasLayer
 @export var shield_ui: ShieldUI
 @export var currencies: VBoxContainer
 @export var energy_pips: EnergyPips
+@export var enemy_count_label: Label
+@export var primary_button: Button
+@export var secondary_button: Button
+@export var null_icon: Texture
+@export var slots: VBoxContainer
 
 var last_lives_count: int = Data.starting_lives
 var enemy_names: Array[String]
 var map_anchor: Node3D
 var cards: Array[EnemyCardUI] = []
 var feature_preview_tween: Tween
+var enemy_count: int = 0
 
 
 func _ready() -> void:
@@ -52,6 +56,28 @@ func hide_hot_wheel() -> void:
 	hot_wheel.visible = false
 
 
+func show_slots() -> void:
+	slots.visible = true
+
+
+func hide_slots() -> void:
+	slots.visible = false
+
+
+func set_primary_button(card: Card) -> void:
+	if card:
+		primary_button.icon = card.icon
+	else:
+		primary_button.icon = null_icon
+
+
+func set_secondary_button(card: Card) -> void:
+	if card:
+		secondary_button.icon = card.icon
+	else:
+		secondary_button.icon = null_icon
+
+
 func set_blank_cassette_count(value: int) -> void:
 	blank_cassette_label.text = str(value)
 
@@ -100,6 +126,7 @@ func _process(_delta: float) -> void:
 
 
 func show_features(cassette: Card) -> void:
+	print("shown features")
 	for child: Node in feature_preview.get_children():
 		child.queue_free()
 	var cols: int = max(cassette.tower_stats.features.size(), cassette.weapon_stats.features.size())
@@ -184,9 +211,12 @@ func enemy_count_down(enemy: Enemy) -> void:
 	if num == 0:
 		enemy_counts[index].set_visible(false)
 		enemy_sprites[index].set_visible(false)
+	enemy_count -= 1
+	enemy_count_label.text = str(enemy_count)
 
 
 func set_upcoming_wave(value: Dictionary) -> void:
+	enemy_count = 0
 	var frame_count: int = 0
 	enemy_names = []
 	var wave: Dictionary = {}
@@ -196,6 +226,7 @@ func set_upcoming_wave(value: Dictionary) -> void:
 			if enemy.title == key:
 				new_enemy = enemy
 		wave[new_enemy] = value[key]
+		enemy_count += value[key]
 	for x: int in enemy_sprites.size():
 		enemy_sprites[x].set_visible(false)
 		enemy_counts[x].set_visible(false)
@@ -206,6 +237,7 @@ func set_upcoming_wave(value: Dictionary) -> void:
 		enemy_sprites[frame_count].set_visible(true)
 		enemy_counts[frame_count].set_visible(true)
 		frame_count += 1
+	enemy_count_label.text = str(enemy_count)
 
 
 func set_currency_count(value: int) -> void:
@@ -255,7 +287,6 @@ func minimize_minimap() -> void:
 
 
 func pickup(card: Card) -> void:
-	hot_wheel.add_cassette(card)
 	var notif: PickupNotification = pickup_notif_scene.instantiate()
 	notif.set_card(card)
 	$VBoxContainer.add_child(notif)

Scenes/CardPrinter/card_printer.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=9 format=3 uid="uid://1b2ikdanl66b"]
 
 [ext_resource type="Script" uid="uid://bivtfdl3p1brv" path="res://Scenes/CardPrinter/card_printer.gd" id="1_qft15"]
-[ext_resource type="PackedScene" uid="uid://bcvjgl0s1wp8y" path="res://choose_card_screen.tscn" id="2_kpujb"]
+[ext_resource type="PackedScene" uid="uid://bcvjgl0s1wp8y" path="res://UI/Menus/RadioMenu/choose_card_screen.tscn" id="2_kpujb"]
 [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://Scripts/interact_button.gd" id="4_eavi1"]
 [ext_resource type="AudioStream" uid="uid://dknygn5eyuhxt" path="res://Audio/shot1.wav" id="5_m033a"]
 

Scenes/Menus/alert_popup.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://6a277g802os0"]
 
 [ext_resource type="Script" uid="uid://4uwd40mavufi" path="res://Scripts/alert_popup.gd" id="1_cac03"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_2mbtt"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_2mbtt"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_veol0"]
 random_pitch = 1.1

Scenes/Menus/confirmation_popup.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://f46qh73hrk4y"]
 
 [ext_resource type="Script" uid="uid://bjt72v1wym5ie" path="res://Scripts/confirmation_popup.gd" id="1_x7akt"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_3w36n"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_3w36n"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_22wuj"]
 random_pitch = 1.1
@@ -27,24 +27,28 @@ layout_mode = 2
 
 [node name="Label" type="Label" parent="VBoxContainer"]
 layout_mode = 2
+size_flags_vertical = 3
 text = "Some Text?"
+horizontal_alignment = 1
+vertical_alignment = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
 layout_mode = 2
-
-[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer"]
-layout_mode = 2
-text = "Confirm"
+alignment = 2
 
 [node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer"]
 layout_mode = 2
 text = "Cancel"
 
+[node name="Confirm" type="Button" parent="VBoxContainer/HBoxContainer"]
+layout_mode = 2
+text = "Confirm"
+
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = SubResource("AudioStreamRandomizer_22wuj")
 bus = &"SFX"
 
-[connection signal="mouse_entered" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_button_mouse_entered"]
-[connection signal="pressed" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"]
 [connection signal="mouse_entered" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_button_mouse_entered"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="_on_cancel_pressed"]
+[connection signal="mouse_entered" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_button_mouse_entered"]
+[connection signal="pressed" from="VBoxContainer/HBoxContainer/Confirm" to="." method="_on_confirm_pressed"]

Scenes/Menus/multiplayer_lobby.tscn

@@ -1,19 +1,18 @@
-[gd_scene load_steps=9 format=3 uid="uid://cwvprrvk4l2k0"]
+[gd_scene load_steps=8 format=3 uid="uid://cwvprrvk4l2k0"]
 
-[ext_resource type="Theme" uid="uid://b6a0ip4p72tgx" path="res://UI/new_theme.tres" id="1_l1spu"]
 [ext_resource type="Script" uid="uid://cvm4lyhx1uh0w" path="res://Scripts/multiplayer_lobby.gd" id="2_nb860"]
-[ext_resource type="PackedScene" uid="uid://dpt3kpixawyby" path="res://Scenes/UI/scoreboard.tscn" id="3_f6bia"]
+[ext_resource type="PackedScene" uid="uid://dpt3kpixawyby" path="res://UI/scoreboard.tscn" id="3_f6bia"]
 [ext_resource type="PackedScene" uid="uid://bvfit0sy2tnw4" path="res://Scenes/Menus/server_form.tscn" id="5_bqbwv"]
-[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://Scenes/UI/chatbox.tscn" id="6_wtqwd"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="7_6mhre"]
-[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://Scenes/Menus/CharacterSelect/character_select.tscn" id="7_kawp7"]
+[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://UI/chatbox.tscn" id="6_wtqwd"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="7_6mhre"]
+[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://UI/Menus/CharacterSelect/character_select.tscn" id="7_kawp7"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_cwnde"]
 random_pitch = 1.1
 streams_count = 1
 stream_0/stream = ExtResource("7_6mhre")
 
-[node name="multiplayer_lobby" type="Control" node_paths=PackedStringArray("server_form", "scoreboard", "chatbox", "ready_button", "audio_player")]
+[node name="multiplayer_lobby" type="Control" node_paths=PackedStringArray("server_form", "chatbox", "audio_player")]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -21,13 +20,10 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
-theme = ExtResource("1_l1spu")
 script = ExtResource("2_nb860")
 server_form = NodePath("ServerForm")
 character_select_screen = ExtResource("7_kawp7")
-scoreboard = NodePath("Scoreboard")
 chatbox = NodePath("Chatbox")
-ready_button = NodePath("ReadyButton")
 audio_player = NodePath("AudioStreamPlayer")
 
 [node name="ServerForm" parent="." instance=ExtResource("5_bqbwv")]

Scenes/Menus/server_form.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://bvfit0sy2tnw4"]
 
 [ext_resource type="Script" uid="uid://dyyhbd2pbfygi" path="res://Scripts/server_form.gd" id="1_43oaq"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_hirre"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_hirre"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_3o7ni"]
 random_pitch = 1.1

Scenes/Menus/singleplayer_lobby.tscn

@@ -1,10 +1,9 @@
-[gd_scene load_steps=7 format=3 uid="uid://176c6fuhg5ic"]
+[gd_scene load_steps=6 format=3 uid="uid://176c6fuhg5ic"]
 
-[ext_resource type="Theme" uid="uid://b6a0ip4p72tgx" path="res://UI/new_theme.tres" id="1_2aur6"]
 [ext_resource type="Script" uid="uid://e5gf7hd5jsw3" path="res://Scripts/singleplayer_lobby.gd" id="1_nd17k"]
-[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://Scenes/UI/chatbox.tscn" id="3_l8xy3"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="6_6nu57"]
-[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://Scenes/Menus/CharacterSelect/character_select.tscn" id="6_ltm04"]
+[ext_resource type="PackedScene" uid="uid://ddmg342ff2qaq" path="res://UI/chatbox.tscn" id="3_l8xy3"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="6_6nu57"]
+[ext_resource type="PackedScene" uid="uid://bc6m3cluulpis" path="res://UI/Menus/CharacterSelect/character_select.tscn" id="6_ltm04"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_g5har"]
 random_pitch = 1.1
@@ -19,7 +18,6 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
-theme = ExtResource("1_2aur6")
 script = ExtResource("1_nd17k")
 character_select_screen = ExtResource("6_ltm04")
 chatbox = NodePath("Chatbox")
@@ -27,6 +25,13 @@ audio_player = NodePath("AudioStreamPlayer")
 
 [node name="Chatbox" parent="." instance=ExtResource("3_l8xy3")]
 layout_mode = 1
+anchors_preset = -1
+anchor_left = 0.02
+anchor_top = 0.65
+anchor_right = 0.4
+anchor_bottom = 0.98
+grow_horizontal = 1
+grow_vertical = 1
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = SubResource("AudioStreamRandomizer_g5har")

Scenes/Menus/text_input_popup.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://dccsyymk4uko6"]
 
 [ext_resource type="Script" uid="uid://b0asb3pmu8pqb" path="res://Scripts/text_input_popup.gd" id="1_ve6eb"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="2_mec4u"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="2_mec4u"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_w0x7l"]
 random_pitch = 1.1

Scenes/MixingTable/remix_table.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=3 uid="uid://c6isprnkaliqr"]
 
-[ext_resource type="Script" uid="uid://bpvmvx10q4ayd" path="res://remix_table.gd" id="1_q8doq"]
-[ext_resource type="PackedScene" uid="uid://bajli4d3nqwll" path="res://track_editor.tscn" id="2_ibyhf"]
+[ext_resource type="Script" uid="uid://bpvmvx10q4ayd" path="res://Scenes/MixingTable/remix_table.gd" id="1_q8doq"]
+[ext_resource type="PackedScene" uid="uid://bajli4d3nqwll" path="res://UI/Menus/MixingMenu/track_editor.tscn" id="2_ibyhf"]
 [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://Scripts/interact_button.gd" id="2_mjah6"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_ibyhf"]

Scenes/ShopStand/shop_stand.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" uid="uid://colk6js4wet11" path="res://Scenes/ShopStand/shop_stand.gd" id="1_4in53"]
 [ext_resource type="Script" uid="uid://dkfswql8ui0bt" path="res://Scripts/interact_button.gd" id="1_x8sts"]
 [ext_resource type="PackedScene" uid="uid://dsasunnk47n8o" path="res://Scenes/item_card.tscn" id="2_qh00w"]
-[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://Scenes/UI/card_hand.tscn" id="3_u7x2f"]
+[ext_resource type="PackedScene" uid="uid://dixtx38u4jhd7" path="res://UI/card_hand.tscn" id="3_u7x2f"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lhc2g"]
 albedo_color = Color(0.313726, 0.180392, 0.00392157, 1)

Scenes/UI/drop_003.ogg.import

@@ -1,19 +0,0 @@
-[remap]
-
-importer="oggvorbisstr"
-type="AudioStreamOggVorbis"
-uid="uid://cp6ph4ra7u5rk"
-path="res://.godot/imported/drop_003.ogg-b1448cf24bb17e683ffb9af8ac49fa5f.oggvorbisstr"
-
-[deps]
-
-source_file="res://Scenes/UI/drop_003.ogg"
-dest_files=["res://.godot/imported/drop_003.ogg-b1448cf24bb17e683ffb9af8ac49fa5f.oggvorbisstr"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4

Scripts/confirmation_popup.gd

@@ -4,9 +4,9 @@ extends PanelContainer
 signal completed(outcome: bool)
 
 func set_popup(prompt_text: String, confirm_text: String, cancel_text: String) -> void:
-	$VBoxContainer/Label.text = prompt_text
-	$VBoxContainer/HBoxContainer/Confirm.text = confirm_text
-	$VBoxContainer/HBoxContainer/Cancel.text = cancel_text
+	$VBoxContainer/Label.text = tr(prompt_text)
+	$VBoxContainer/HBoxContainer/Confirm.text = tr(confirm_text)
+	$VBoxContainer/HBoxContainer/Cancel.text = tr(cancel_text)
 
 
 func _on_confirm_pressed() -> void:

Scripts/game.gd

@@ -168,7 +168,7 @@ func set_upcoming_wave() -> void:
 
 func temp_set_upcoming_wave(new_wave: Wave, coins: int) -> void:
 	pot = coins
-	connected_players_nodes[multiplayer.get_unique_id()].hud.show_wave_generation_anim(new_wave)
+	#connected_players_nodes[multiplayer.get_unique_id()].hud.show_wave_generation_anim(new_wave)
 	connected_players_nodes[multiplayer.get_unique_id()].hud.set_upcoming_wave(new_wave.to_dict())
 
 #TODO: You'll probably have to write a to_dict function for the new wave system 

Scripts/pickup_notification.gd

@@ -2,7 +2,6 @@ class_name PickupNotification
 extends PanelContainer
 
 @export var fade_out_time: float
-@export var style: StyleBoxFlat
 @export var text_style: Color
 @export var common_background: Color
 @export var uncommon_background: Color
@@ -15,19 +14,17 @@ var fading: bool = false
 
 
 func _ready() -> void:
-	add_theme_stylebox_override("panel", style)
-	$HBoxContainer/Label.add_theme_color_override("font_color", text_style)
-	$HBoxContainer/Label2.add_theme_color_override("font_color", text_style)
 	$Timer.start()
 
 
 func _process(delta: float) -> void:
 	if fading:
 		fade_time += delta
-		style.bg_color.a = lerp(200.0 / 255.0, 0.0, fade_time / fade_out_time)
-		text_style.a = lerp(220.0 / 255.0, 0.0, fade_time / fade_out_time)
-		$HBoxContainer/Label.add_theme_color_override("font_color", text_style)
-		$HBoxContainer/Label2.add_theme_color_override("font_color", text_style)
+		var mod_color: Color = Color.WHITE
+		mod_color.a = 1.0 - (fade_time / fade_out_time)
+		modulate = mod_color
+		#$HBoxContainer/Label.add_theme_color_override("font_color", text_style)
+		#$HBoxContainer/Label2.add_theme_color_override("font_color", text_style)
 		if fade_time >= fade_out_time:
 			queue_free()
 
@@ -36,15 +33,15 @@ func set_card(card: Card) -> void:
 	$HBoxContainer/Label.text = tr(card.display_name)
 	match(card.rarity):
 		Data.Rarity.COMMON:
-			style.bg_color = common_background
+			$HBoxContainer/Label.add_theme_color_override("font_color", common_background)
 		Data.Rarity.UNCOMMON:
-			style.bg_color = uncommon_background
+			$HBoxContainer/Label.add_theme_color_override("font_color", uncommon_background)
 		Data.Rarity.RARE:
-			style.bg_color = rare_background
+			$HBoxContainer/Label.add_theme_color_override("font_color", rare_background)
 		Data.Rarity.EPIC:
-			style.bg_color = epic_background
+			$HBoxContainer/Label.add_theme_color_override("font_color", epic_background)
 		Data.Rarity.LEGENDARY:
-			style.bg_color = legendary_background
+			$HBoxContainer/Label.add_theme_color_override("font_color", legendary_background)
 
 
 func _on_timer_timeout() -> void:

Scripts/status_effector.gd

@@ -4,7 +4,7 @@ extends Node
 @export var sprite_container: Container ## Container that effect icons should be instantiated under
 
 var enemy: EnemyController ## Enemy Controller that this node should affect
-var icon_scene: PackedScene = preload("res://Scenes/status_icon.tscn")
+var icon_scene: PackedScene = preload("res://UI/status_icon.tscn")
 var immunities: Array[StatusEffect] = [] ## The set of status effects that this effector shouldn't apply
 var effects: Dictionary[StatusEffect, int] = {}
 var icons: Dictionary[StatusEffect, TextureRect] = {}

UI/DamageParticle/damage_particle.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://cqtew0t8sttpm"]
 
-[ext_resource type="Script" uid="uid://blt7umrgo3tfh" path="res://Scripts/damage_particle.gd" id="1_lgvaq"]
+[ext_resource type="Script" uid="uid://blt7umrgo3tfh" path="res://UI/DamageParticle/damage_particle.gd" id="1_lgvaq"]
 
 [sub_resource type="ViewportTexture" id="ViewportTexture_ppqlh"]
 viewport_path = NodePath("SubViewport")

UI/EnemyHealthBar/health_bar.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://hjq3nrnumklp"]
 
 [ext_resource type="Texture2D" uid="uid://r202vo47jw1q" path="res://Assets/Textures/enemyhealth.png" id="1_x8m88"]
-[ext_resource type="Script" uid="uid://bf06es50d0flv" path="res://Scripts/health_bar.gd" id="2_m8c1f"]
-[ext_resource type="Gradient" uid="uid://dx7auy3oqw82t" path="res://UI/health_bar_gradient.tres" id="3_dpmma"]
+[ext_resource type="Script" uid="uid://bf06es50d0flv" path="res://UI/EnemyHealthBar/health_bar.gd" id="2_m8c1f"]
+[ext_resource type="Gradient" uid="uid://dx7auy3oqw82t" path="res://UI/EnemyHealthBar/health_bar_gradient.tres" id="3_dpmma"]
 
 [node name="HealthBar" type="TextureProgressBar"]
 offset_right = 200.0

UI/Enemy_icon.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://d1v5d8goaf7mu"
-path="res://.godot/imported/screencap.png-3297cf7556450392792667332cdef39f.ctex"
+uid="uid://doqfkinrjw4mt"
+path="res://.godot/imported/Enemy_icon.png-e3ec1e1b7e954feb5c5ab49627db4832.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://screencap.png"
-dest_files=["res://.godot/imported/screencap.png-3297cf7556450392792667332cdef39f.ctex"]
+source_file="res://UI/Enemy_icon.png"
+dest_files=["res://.godot/imported/Enemy_icon.png-e3ec1e1b7e954feb5c5ab49627db4832.ctex"]
 
 [params]
 

UI/EnergyPipUI/energy_pips.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=3 uid="uid://q73cllewm7pj"]
 
-[ext_resource type="Script" uid="uid://cvdb5y5wmkvmm" path="res://energy_pips.gd" id="1_6l017"]
-[ext_resource type="Texture2D" uid="uid://h1m3ss2ln5hq" path="res://energy_sheet.png" id="2_q2m70"]
+[ext_resource type="Script" uid="uid://cvdb5y5wmkvmm" path="res://UI/EnergyPipUI/energy_pips.gd" id="1_6l017"]
+[ext_resource type="Texture2D" uid="uid://h1m3ss2ln5hq" path="res://UI/EnergyPipUI/energy_sheet.png" id="2_q2m70"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_46jyx"]
 atlas = ExtResource("2_q2m70")

UI/EnergyPipUI/energy_sheet.png.import

@@ -3,15 +3,15 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://h1m3ss2ln5hq"
-path="res://.godot/imported/energy_sheet.png-cce4e01dae5f3c3cc83f0e4b096ce208.ctex"
+path="res://.godot/imported/energy_sheet.png-3d8e008c2b32340e3af87512f5cd5773.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://energy_sheet.png"
-dest_files=["res://.godot/imported/energy_sheet.png-cce4e01dae5f3c3cc83f0e4b096ce208.ctex"]
+source_file="res://UI/EnergyPipUI/energy_sheet.png"
+dest_files=["res://.godot/imported/energy_sheet.png-3d8e008c2b32340e3af87512f5cd5773.ctex"]
 
 [params]
 

UI/FeatureUI/feature_ui.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://c8xdsg6gtwvh3"]
 
-[ext_resource type="Script" uid="uid://o668c5lfhgm5" path="res://feature_ui.gd" id="1_tms0v"]
+[ext_resource type="Script" uid="uid://o668c5lfhgm5" path="res://UI/FeatureUI/feature_ui.gd" id="1_tms0v"]
 [ext_resource type="Texture2D" uid="uid://cps7onfe2s1gi" path="res://Scripts/Features/Radar/radar_icon.png" id="2_w6jf0"]
 
 [node name="FeatureUI" type="VBoxContainer" node_paths=PackedStringArray("icon", "name_label")]

UI/HotWheelUI/hot_wheel.gd

@@ -0,0 +1,39 @@
+class_name HotWheel
+extends HBoxContainer
+
+@export var buttons: Array[Button]
+
+
+func update_cassettes(cassettes: Array[Card]) -> void:
+	var entry_count: int = cassettes.size()
+	buttons[0].visible = true
+	buttons[1].visible = true
+	buttons[2].visible = true
+	buttons[3].visible = true
+	buttons[4].visible = true
+	if entry_count < 1:
+		buttons[0].visible = false
+		buttons[1].visible = false
+		buttons[2].visible = false
+		buttons[3].visible = false
+		buttons[4].visible = false
+	elif entry_count < 2:
+		buttons[0].visible = false
+		buttons[1].visible = false
+		buttons[3].visible = false
+		buttons[4].visible = false
+	elif entry_count < 4:
+		buttons[0].visible = false
+		buttons[4].visible = false
+	if entry_count >= 1:
+		buttons[2].icon = cassettes[0].icon
+	if entry_count >= 2:
+		buttons[1].icon = cassettes[1].icon
+		buttons[3].icon = cassettes[1].icon
+	if entry_count >= 3:
+		buttons[3].icon = cassettes[2].icon
+	if entry_count >= 4:
+		buttons[0].icon = cassettes[3].icon
+		buttons[4].icon = cassettes[3].icon
+	if entry_count >= 5:
+		buttons[4].icon = cassettes[4].icon

UI/HotWheelUI/hot_wheel.tscn

@@ -0,0 +1,54 @@
+[gd_scene load_steps=3 format=3 uid="uid://ga21hoa8fxmm"]
+
+[ext_resource type="Script" uid="uid://laoxiep4e5x0" path="res://UI/HotWheelUI/hot_wheel.gd" id="1_2sjpl"]
+[ext_resource type="Texture2D" uid="uid://bpcyxdpog3w85" path="res://Assets/Textures/assault_icon.png" id="2_7sdlw"]
+
+[node name="HotWheel" type="HBoxContainer" node_paths=PackedStringArray("buttons")]
+alignment = 1
+script = ExtResource("1_2sjpl")
+buttons = [NodePath("Button4"), NodePath("Button5"), NodePath("Button"), NodePath("Button2"), NodePath("Button3")]
+
+[node name="Button4" type="Button" parent="."]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+size_flags_vertical = 8
+toggle_mode = true
+icon = ExtResource("2_7sdlw")
+icon_alignment = 1
+expand_icon = true
+
+[node name="Button5" type="Button" parent="."]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+size_flags_vertical = 8
+toggle_mode = true
+icon = ExtResource("2_7sdlw")
+icon_alignment = 1
+expand_icon = true
+
+[node name="Button" type="Button" parent="."]
+custom_minimum_size = Vector2(48, 48)
+layout_mode = 2
+toggle_mode = true
+button_pressed = true
+icon = ExtResource("2_7sdlw")
+icon_alignment = 1
+expand_icon = true
+
+[node name="Button2" type="Button" parent="."]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+size_flags_vertical = 8
+toggle_mode = true
+icon = ExtResource("2_7sdlw")
+icon_alignment = 1
+expand_icon = true
+
+[node name="Button3" type="Button" parent="."]
+custom_minimum_size = Vector2(32, 32)
+layout_mode = 2
+size_flags_vertical = 8
+toggle_mode = true
+icon = ExtResource("2_7sdlw")
+icon_alignment = 1
+expand_icon = true

UI/Menus/CharacterSelect/character_select.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=3 uid="uid://bc6m3cluulpis"]
 
-[ext_resource type="Script" uid="uid://plrd0ckxrabh" path="res://Scenes/Menus/CharacterSelect/character_select.gd" id="1_lqqhx"]
-[ext_resource type="Script" uid="uid://b1ucgfqilvr67" path="res://Scenes/Menus/CharacterSelect/character_preview.gd" id="9_8d0rx"]
+[ext_resource type="Script" uid="uid://plrd0ckxrabh" path="res://UI/Menus/CharacterSelect/character_select.gd" id="1_lqqhx"]
+[ext_resource type="Script" uid="uid://b1ucgfqilvr67" path="res://UI/Menus/CharacterSelect/character_preview.gd" id="9_8d0rx"]
 [ext_resource type="PackedScene" uid="uid://clabkhnbn75rf" path="res://UI/tower_label.tscn" id="10_jdigy"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_tlgw2"]

UI/Menus/GameEndScreen/enemy_row.tscn

@@ -1,9 +1,9 @@
 [gd_scene load_steps=2 format=3 uid="uid://b5hp43bm07b8a"]
 
-[ext_resource type="Script" uid="uid://b0h5oewxd48lv" path="res://UI/enemybox.gd" id="1_lcu0c"]
+[ext_resource type="Script" uid="uid://b0h5oewxd48lv" path="res://UI/Menus/GameEndScreen/enemy_row.gd" id="1_th4b3"]
 
-[node name="HBoxContainer" type="HBoxContainer"]
-script = ExtResource("1_lcu0c")
+[node name="EnemyRow" type="HBoxContainer"]
+script = ExtResource("1_th4b3")
 
 [node name="WaveLabel" type="Label" parent="."]
 layout_mode = 2

UI/Menus/GameEndScreen/game_end_screen.gd

@@ -17,6 +17,11 @@ func _ready() -> void:
 	total_games_label.text = str(Data.save_data.wins + Data.save_data.losses)
 	total_wins_label.text = str(Data.save_data.wins)
 	total_losses_label.text = str(Data.save_data.losses)
+	if game_manager:
+		set_wave()
+
+
+func set_wave() -> void:
 	for wave_key: int in game_manager.stats.enemies_undefeated:
 		var spawned_box: EnemyBox = box.instantiate() as EnemyBox
 		undefeated_enemies.add_child(spawned_box)

UI/Menus/GameEndScreen/game_end_screen.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=5 format=3 uid="uid://ce0m8vbjbng6o"]
 
-[ext_resource type="Script" uid="uid://bdknvktw033g3" path="res://Scenes/Menus/GameEndScreen/game_end_screen.gd" id="1_oa7nq"]
-[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://UI/h_box_container.tscn" id="2_xm8em"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="3_ro1yg"]
+[ext_resource type="Script" uid="uid://bdknvktw033g3" path="res://UI/Menus/GameEndScreen/game_end_screen.gd" id="1_oa7nq"]
+[ext_resource type="PackedScene" uid="uid://b5hp43bm07b8a" path="res://UI/Menus/GameEndScreen/enemy_row.tscn" id="2_xm8em"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="3_ro1yg"]
 
 [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_dram5"]
 random_pitch = 1.1

UI/Menus/MainMenu/main_menu.gd

@@ -16,7 +16,7 @@ var gamemode: GameMode = GameMode.new()
 var confirmation_popup_scene: PackedScene = preload("res://Scenes/Menus/confirmation_popup.tscn")
 var text_input_popup_scene: PackedScene = preload("res://Scenes/Menus/text_input_popup.tscn")
 var multiplayer_lobby_scene_path: String = "res://Scenes/multiplayer_lobby.tscn"
-var options_menu_scene: PackedScene = preload("res://Scenes/Menus/options_menu.tscn")
+var options_menu_scene: PackedScene = preload("res://UI/Menus/OptionsMenu/options_menu.tscn")
 var temp_data: SaveData
 
 
@@ -58,7 +58,7 @@ func change_profile_display_name(display_name: String) -> void:
 
 func _on_quit_button_pressed() -> void:
 	var popup: ConfirmationPopup = confirmation_popup_scene.instantiate() as ConfirmationPopup
-	popup.set_popup("Are you sure you want to quit?", "Yes", "No")
+	popup.set_popup("PROMPT_QUIT", "BUTTON_CONFIRM", "BUTTON_CANCEL")
 	popup.completed.connect(quit_game)
 	add_child(popup)
 

UI/Menus/MainMenu/main_menu.tscn

@@ -1,9 +1,9 @@
 [gd_scene load_steps=12 format=3 uid="uid://8yv7excojcg0"]
 
-[ext_resource type="Script" uid="uid://ci8vq73u23viy" path="res://Scenes/Menus/MainMenu/main_menu.gd" id="2_ivytu"]
-[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://Scenes/UI/drop_003.ogg" id="5_cwn2i"]
+[ext_resource type="Script" uid="uid://ci8vq73u23viy" path="res://UI/Menus/MainMenu/main_menu.gd" id="2_ivytu"]
+[ext_resource type="AudioStream" uid="uid://cp6ph4ra7u5rk" path="res://UI/drop_003.ogg" id="5_cwn2i"]
 [ext_resource type="Texture2D" uid="uid://cr1ucbuw3iotp" path="res://Assets/Textures/first_win_achievements.png" id="15_74epv"]
-[ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://Scenes/Menus/MainMenu/achievements_menu.gd" id="15_sv1gy"]
+[ext_resource type="Script" uid="uid://cjr0pbqisd51v" path="res://UI/Menus/MainMenu/achievements_menu.gd" id="15_sv1gy"]
 [ext_resource type="Texture2D" uid="uid://cpa1hl36xfplg" path="res://Assets/Textures/first_scroll_seen.png" id="16_sv1gy"]
 [ext_resource type="Texture2D" uid="uid://ctbi3gm1me1t5" path="res://Assets/Textures/unlock_mage_achievement.png" id="17_6t4jd"]
 [ext_resource type="Script" uid="uid://cxrm2naq75jo1" path="res://Scripts/mod_menu.gd" id="19_6t4jd"]
@@ -25,7 +25,7 @@ region = Rect2(0, 0, 36, 36)
 atlas = ExtResource("17_6t4jd")
 region = Rect2(0, 0, 36, 36)
 
-[node name="MainMenu" type="Control" node_paths=PackedStringArray("bg_level", "game_select_menu", "main_controls", "seed_entry", "profile_controls", "mods_controls")]
+[node name="MainMenu" type="Control" node_paths=PackedStringArray("game_select_menu", "main_controls", "seed_entry", "profile_controls", "mods_controls")]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -33,7 +33,6 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("2_ivytu")
-bg_level = NodePath("")
 game_select_menu = NodePath("GameSelectMenu")
 main_controls = NodePath("MainControls")
 seed_entry = NodePath("GameSelectMenu/VBoxContainer/HBoxContainer2/LineEdit")

UI/Menus/MixingMenu/price_panel.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://dekexkjl37dvh"]
 
-[ext_resource type="Script" uid="uid://bs73eocafngiu" path="res://price_panel.gd" id="1_sn84y"]
+[ext_resource type="Script" uid="uid://bs73eocafngiu" path="res://UI/Menus/MixingMenu/price_panel.gd" id="1_sn84y"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_517dt"]
 bg_color = Color(0.2702219, 0.27022195, 0.27022177, 0.09019608)

UI/Menus/MixingMenu/track_editor.tscn

@@ -1,11 +1,11 @@
 [gd_scene load_steps=7 format=3 uid="uid://bajli4d3nqwll"]
 
-[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://feature_ui.tscn" id="1_y6tpq"]
-[ext_resource type="Script" uid="uid://mrv5vrlxfc13" path="res://track_editor.gd" id="1_yrnbk"]
-[ext_resource type="PackedScene" uid="uid://dekexkjl37dvh" path="res://price_panel.tscn" id="3_48m6c"]
-[ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://card_description_ui.tscn" id="3_q6wwl"]
-[ext_resource type="Texture2D" uid="uid://cll2vlvf1h454" path="res://track_one_patch.png" id="4_dya4i"]
-[ext_resource type="Texture2D" uid="uid://cvhkk22pxxuqj" path="res://track_two_patch.png" id="5_4gmyw"]
+[ext_resource type="PackedScene" uid="uid://c8xdsg6gtwvh3" path="res://UI/FeatureUI/feature_ui.tscn" id="1_y6tpq"]
+[ext_resource type="Script" uid="uid://mrv5vrlxfc13" path="res://UI/Menus/MixingMenu/track_editor.gd" id="1_yrnbk"]
+[ext_resource type="PackedScene" uid="uid://dekexkjl37dvh" path="res://UI/Menus/MixingMenu/price_panel.tscn" id="3_48m6c"]
+[ext_resource type="PackedScene" uid="uid://cmlpmr78tmo6p" path="res://UI/card_description_ui.tscn" id="3_q6wwl"]
+[ext_resource type="Texture2D" uid="uid://cll2vlvf1h454" path="res://UI/Themes/Scale1/track_one_patch.png" id="4_dya4i"]
+[ext_resource type="Texture2D" uid="uid://cvhkk22pxxuqj" path="res://UI/Themes/Scale1/track_two_patch.png" id="5_4gmyw"]
 
 [node name="TrackEditor" type="Control" node_paths=PackedStringArray("drag_feature", "sample_library", "tower_parts", "weapon_parts", "drop_down", "card_desc", "price_label", "money_label", "confirm_button", "switch_button")]
 layout_mode = 3
@@ -18,8 +18,8 @@ script = ExtResource("1_yrnbk")
 drag_feature = NodePath("FeatureUI")
 sample_library = NodePath("PanelContainer/VBoxContainer/InfoPanel/VBoxContainer2/SamplePanel/ScrollContainer/SampleLibrary")
 feature_scene = ExtResource("1_y6tpq")
-tower_parts = NodePath("PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer/MarginContainer/TowerParts")
-weapon_parts = NodePath("PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer/MarginContainer/WeaponParts")
+tower_parts = NodePath("PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower/MarginContainer/TowerParts")
+weapon_parts = NodePath("PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon/MarginContainer/WeaponParts")
 drop_down = NodePath("PanelContainer/VBoxContainer/Tracks/SourceCartridge/CassetteSelector/OptionButton")
 card_desc = NodePath("PanelContainer/VBoxContainer/InfoPanel/VBoxContainer/DescriptionVBox")
 price_panel_scene = ExtResource("3_48m6c")
@@ -53,7 +53,6 @@ size_flags_vertical = 3
 
 [node name="SourceCartridge" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"]
 layout_mode = 2
-size_flags_vertical = 3
 
 [node name="MarginContainer2" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/SourceCartridge"]
 layout_mode = 2
@@ -90,23 +89,38 @@ text = "Price: $0"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="TowerTrack" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"]
+[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"]
 layout_mode = 2
-size_flags_vertical = 3
 
-[node name="Label" type="Label" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack"]
+[node name="Labels" type="VBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer"]
+layout_mode = 2
+
+[node name="Tower" type="Label" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/Labels"]
 layout_mode = 2
 size_flags_horizontal = 3
+size_flags_vertical = 7
 text = "LABEL_TOWER_TRACK"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack"]
+[node name="Weapon" type="Label" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/Labels"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 7
+text = "LABEL_WEAPON_TRACK"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="TrackUIs" type="VBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Tower" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs"]
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_stretch_ratio = 4.0
 
-[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer"]
+[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower"]
 layout_mode = 2
 texture = ExtResource("5_4gmyw")
 patch_margin_left = 1
@@ -114,39 +128,24 @@ patch_margin_top = 1
 patch_margin_right = 1
 patch_margin_bottom = 1
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower"]
 layout_mode = 2
 theme_override_constants/margin_left = 4
 theme_override_constants/margin_top = 4
 theme_override_constants/margin_right = 4
 theme_override_constants/margin_bottom = 4
 
-[node name="TowerParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/TowerTrack/MarginContainer/MarginContainer"]
+[node name="TowerParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Tower/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks"]
-layout_mode = 2
-theme_override_constants/margin_top = 10
-
-[node name="WeaponTrack" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks"]
-layout_mode = 2
-size_flags_vertical = 3
-
-[node name="Label2" type="Label" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack"]
-layout_mode = 2
-size_flags_horizontal = 3
-text = "LABEL_WEAPON_TRACK"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack"]
+[node name="Weapon" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs"]
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_stretch_ratio = 4.0
 
-[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer"]
+[node name="NinePatchRect" type="NinePatchRect" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon"]
 layout_mode = 2
 texture = ExtResource("4_dya4i")
 patch_margin_left = 1
@@ -154,23 +153,18 @@ patch_margin_top = 1
 patch_margin_right = 1
 patch_margin_bottom = 1
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon"]
 layout_mode = 2
 theme_override_constants/margin_left = 4
 theme_override_constants/margin_top = 4
 theme_override_constants/margin_right = 4
 theme_override_constants/margin_bottom = 4
 
-[node name="WeaponParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/WeaponTrack/MarginContainer/MarginContainer"]
+[node name="WeaponParts" type="HBoxContainer" parent="PanelContainer/VBoxContainer/Tracks/HBoxContainer/TrackUIs/Weapon/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
-[node name="MarginContainer" type="MarginContainer" parent="PanelContainer/VBoxContainer"]
-layout_mode = 2
-size_flags_vertical = 3
-size_flags_stretch_ratio = 0.1
-
 [node name="InfoPanel" type="HBoxContainer" parent="PanelContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 3

UI/Menus/OptionsMenu/audio_options.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://bwc45ogto8thn"]
 
-[ext_resource type="Script" uid="uid://c4ljvgrb81du6" path="res://Scripts/audio_options.gd" id="1_avc0j"]
+[ext_resource type="Script" uid="uid://c4ljvgrb81du6" path="res://UI/Menus/OptionsMenu/audio_options.gd" id="1_avc0j"]
 
 [sub_resource type="ImageTexture" id="ImageTexture_hvvdd"]
 

UI/Menus/OptionsMenu/gameplay_options.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://bjk7jf0bau5lv"]
 
-[ext_resource type="Script" uid="uid://dtrjph756oq1f" path="res://Scripts/gameplay_options.gd" id="1_sy26f"]
+[ext_resource type="Script" uid="uid://dtrjph756oq1f" path="res://UI/Menus/OptionsMenu/gameplay_options.gd" id="1_sy26f"]
 
 [sub_resource type="ImageTexture" id="ImageTexture_03x6q"]
 
@@ -68,6 +68,7 @@ size_flags_horizontal = 3
 [node name="CheckButton" type="CheckButton" parent="ToggleSprint/CenterContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
+flat = true
 
 [node name="InvertMouseY" type="HBoxContainer" parent="."]
 layout_mode = 2
@@ -86,6 +87,7 @@ size_flags_horizontal = 3
 [node name="CheckButton" type="CheckButton" parent="InvertMouseY/CenterContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
+flat = true
 
 [node name="InvertMouseX" type="HBoxContainer" parent="."]
 layout_mode = 2
@@ -104,6 +106,7 @@ size_flags_horizontal = 3
 [node name="CheckButton" type="CheckButton" parent="InvertMouseX/CenterContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
+flat = true
 
 [node name="FixedMinimap" type="HBoxContainer" parent="."]
 layout_mode = 2
@@ -121,6 +124,7 @@ size_flags_horizontal = 3
 
 [node name="CheckButton" type="CheckButton" parent="FixedMinimap/CenterContainer"]
 layout_mode = 2
+flat = true
 
 [node name="FloatingDamageIndicators" type="HBoxContainer" parent="."]
 layout_mode = 2

UI/Menus/OptionsMenu/graphics_options.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://bmd4mawasoc11"]
 
-[ext_resource type="Script" uid="uid://bpb5c5r1yi8um" path="res://Scripts/graphics_options.gd" id="1_85rh6"]
+[ext_resource type="Script" uid="uid://bpb5c5r1yi8um" path="res://UI/Menus/OptionsMenu/graphics_options.gd" id="1_85rh6"]
 
 [sub_resource type="ImageTexture" id="ImageTexture_03x6q"]
 

UI/Menus/OptionsMenu/keybind_entry.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cb8irvp2y2p6g"]
 
-[ext_resource type="Script" uid="uid://y2pxkfjn0wa2" path="res://UI/KeybindEntry.gd" id="1_it8q2"]
+[ext_resource type="Script" uid="uid://y2pxkfjn0wa2" path="res://UI/Menus/OptionsMenu/keybind_entry.gd" id="1_it8q2"]
 
 [node name="KeybindEntry" type="HBoxContainer"]
 anchors_preset = 15

UI/Menus/OptionsMenu/keybind_options.gd

@@ -1,8 +1,8 @@
 extends VBoxContainer
 class_name KeybindsOptionsMenu
 
-var keybind_entry_scene: PackedScene = load("res://Scenes/UI/keybind_entry.tscn")
-var keybind_popup: PackedScene = load("res://Scenes/UI/keybind_popup.tscn")
+@export var keybind_entry_scene: PackedScene
+@export var keybind_popup: PackedScene
 var keybind_boxes: Array[KeybindEntry] = []
 var key_event: InputEvent
 var selected_entry: KeybindEntry

UI/Menus/OptionsMenu/keybind_options.tscn

@@ -1,6 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://bf2nosqt5f82e"]
+[gd_scene load_steps=4 format=3 uid="uid://bf2nosqt5f82e"]
 
-[ext_resource type="Script" uid="uid://cxm67e833baex" path="res://Scripts/keybind_options.gd" id="1_oxg0p"]
+[ext_resource type="Script" uid="uid://cxm67e833baex" path="res://UI/Menus/OptionsMenu/keybind_options.gd" id="1_oxg0p"]
+[ext_resource type="PackedScene" uid="uid://cb8irvp2y2p6g" path="res://UI/Menus/OptionsMenu/keybind_entry.tscn" id="2_ayiik"]
+[ext_resource type="PackedScene" uid="uid://clsdko6ttudu8" path="res://UI/Menus/OptionsMenu/keybind_popup.tscn" id="3_h1scm"]
 
 [node name="Keybinds" type="VBoxContainer"]
 anchors_preset = 15
@@ -9,6 +11,8 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_oxg0p")
+keybind_entry_scene = ExtResource("2_ayiik")
+keybind_popup = ExtResource("3_h1scm")
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 layout_mode = 2

UI/Menus/OptionsMenu/keybind_popup.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=2 format=3 uid="uid://clsdko6ttudu8"]
 
-[ext_resource type="Script" uid="uid://d25hjwjdwv35i" path="res://UI/keybind_screen.gd" id="1_m5i0b"]
+[ext_resource type="Script" uid="uid://d25hjwjdwv35i" path="res://UI/Menus/OptionsMenu/keybind_popup.gd" id="1_m5i0b"]
 
-[node name="Control" type="Control"]
+[node name="KeybindPopup" type="Control"]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0