From 88a02fce4e997fe353e72df6599ffb86e491c150 Mon Sep 17 00:00:00 2001 From: Dmitry Degtyarev Date: Wed, 20 Nov 2024 20:12:08 +0100 Subject: [PATCH] Organize ui files/folders --- src/singletons/preloads.gd | 16 ++++++------- src/ui/{hud => }/buttons/ability_button.gd | 0 src/ui/{hud => }/buttons/ability_button.tscn | 2 +- .../{hud => }/buttons/auto_mode_indicator.gd | 0 .../buttons/auto_mode_indicator.tscn | 2 +- src/ui/{hud => }/buttons/autocast_button.gd | 2 +- src/ui/{hud => }/buttons/autocast_button.tscn | 6 ++--- src/ui/{hud => }/buttons/buff_group_button.gd | 0 .../{hud => }/buttons/buff_group_button.tscn | 2 +- src/ui/{hud => }/buttons/builder_button.tscn | 2 +- src/ui/{hud => buttons}/button_tooltip.gd | 0 src/ui/{hud => buttons}/button_tooltip.tscn | 2 +- .../button_with_rich_tooltip.gd | 0 src/ui/{hud => }/buttons/element_button.gd | 0 src/ui/{hud => }/buttons/element_button.tscn | 2 +- src/ui/{hud => }/buttons/empty_unit_button.gd | 0 .../{hud => }/buttons/empty_unit_button.tscn | 2 +- .../{hud => }/buttons/freshness_indicator.gd | 0 .../buttons/freshness_indicator.tscn | 2 +- .../buttons/inventory_slot_button.tscn | 0 src/ui/{hud => }/buttons/item_button.gd | 0 src/ui/{hud => }/buttons/item_button.tscn | 10 ++++---- src/ui/{hud => }/buttons/item_button_inner.gd | 0 .../buttons/menu_expanding_button.gd | 0 .../buttons/menu_expanding_button.tscn | 2 +- src/ui/{hud => }/buttons/rarity_background.gd | 0 .../{hud => }/buttons/rarity_background.tscn | 2 +- src/ui/{hud => }/buttons/recipe_button.gd | 0 src/ui/{hud => }/buttons/recipe_button.tscn | 2 +- src/ui/{hud => }/buttons/speed_button.tscn | 0 src/ui/{hud => }/buttons/time_indicator.gd | 0 src/ui/{hud => }/buttons/time_indicator.tscn | 2 +- src/ui/{hud => }/buttons/tower_button.gd | 0 src/ui/{hud => }/buttons/tower_button.tscn | 6 ++--- .../buttons/wisdom_upgrade_button.gd | 2 +- .../buttons/wisdom_upgrade_button.tscn | 2 +- src/ui/{hud => dev_controls}/dev_controls.gd | 0 .../{hud => dev_controls}/dev_controls.tscn | 6 ++--- .../{hud => }/dev_controls/signals_control.gd | 0 .../dev_controls/signals_control.tscn | 2 +- src/ui/{hud => }/dev_controls/wave_control.gd | 0 .../{hud => }/dev_controls/wave_control.tscn | 2 +- .../element_filter.gd | 0 .../element_filter.tscn | 4 ++-- .../filter_button.tscn | 0 .../filter_button_element.gd | 0 .../filter_button_element.tscn | 4 ++-- .../filter_button_item_type.gd | 0 .../filter_button_item_type.tscn | 4 ++-- .../filter_button_rarity.gd | 0 .../filter_button_rarity.tscn | 4 ++-- .../item_type_filter.gd | 0 .../item_type_filter.tscn | 4 ++-- .../rarity_filter.gd | 0 .../rarity_filter.tscn | 4 ++-- .../{dev_controls => }/build_version_label.gd | 0 ..._version.tscn => build_version_label.tscn} | 2 +- src/ui/hud/elements_menu.tscn | 2 +- src/ui/hud/flying_item.tscn | 3 +-- src/ui/hud/game_speed_controller.tscn | 2 +- src/ui/hud/general_control/close_button.tscn | 17 -------------- src/ui/hud/hud.tscn | 23 +++++++++---------- .../item_stash_menu/item_stash_menu.gd | 0 .../item_stash_menu/item_stash_menu.tscn | 10 ++++---- .../player_resource_display.gd | 0 .../player_resource_display.tscn | 4 ++-- .../resource_status_panel.gd | 0 .../resource_status_panel.tscn | 2 +- src/ui/title_screen/title_screen.tscn | 2 +- src/ui/{hud => top_left_menu}/game_stats.gd | 0 src/ui/{hud => top_left_menu}/game_stats.tscn | 2 +- .../{hud => top_left_menu}/top_left_menu.gd | 0 .../{hud => top_left_menu}/top_left_menu.tscn | 17 +++++++------- src/ui/{hud => top_left_menu}/wave_status.gd | 0 .../{hud => top_left_menu}/wave_status.tscn | 2 +- .../tower_stash_menu/tower_stash_menu.gd | 0 .../tower_stash_menu/tower_stash_menu.tscn | 8 +++---- src/ui/{hud => }/unit_menu/buff_container.gd | 0 .../{hud => }/unit_menu/buff_container.tscn | 4 ++-- src/ui/{hud => }/unit_menu/buff_display.gd | 0 src/ui/{hud => }/unit_menu/buff_display.tscn | 4 ++-- .../{hud => }/unit_menu/buff_group_editor.gd | 0 .../unit_menu/buff_group_editor.tscn | 4 ++-- src/ui/{hud => }/unit_menu/creep_details.gd | 0 src/ui/{hud => }/unit_menu/creep_details.tscn | 2 +- .../{hud => }/unit_menu/creep_mini_details.gd | 0 .../unit_menu/creep_mini_details.tscn | 4 ++-- .../unit_menu/item_container_panel.gd | 0 .../unit_menu/item_container_panel.tscn | 8 +++---- .../unit_menu/mini_details_label.tscn | 0 .../unit_menu/progress_bar_with_label.gd | 0 .../unit_menu/progress_bar_with_label.tscn | 2 +- src/ui/{hud => }/unit_menu/tower_details.gd | 0 src/ui/{hud => }/unit_menu/tower_details.tscn | 2 +- .../{hud => }/unit_menu/tower_mini_details.gd | 0 .../unit_menu/tower_mini_details.tscn | 4 ++-- src/ui/{hud => }/unit_menu/unit_menu.gd | 0 src/ui/{hud => }/unit_menu/unit_menu.tscn | 20 ++++++++-------- 98 files changed, 116 insertions(+), 136 deletions(-) rename src/ui/{hud => }/buttons/ability_button.gd (100%) rename src/ui/{hud => }/buttons/ability_button.tscn (86%) rename src/ui/{hud => }/buttons/auto_mode_indicator.gd (100%) rename src/ui/{hud => }/buttons/auto_mode_indicator.tscn (96%) rename src/ui/{hud => }/buttons/autocast_button.gd (98%) rename src/ui/{hud => }/buttons/autocast_button.tscn (88%) rename src/ui/{hud => }/buttons/buff_group_button.gd (100%) rename src/ui/{hud => }/buttons/buff_group_button.tscn (93%) rename src/ui/{hud => }/buttons/builder_button.tscn (84%) rename src/ui/{hud => buttons}/button_tooltip.gd (100%) rename src/ui/{hud => buttons}/button_tooltip.tscn (94%) rename src/ui/{hud => buttons}/button_with_rich_tooltip.gd (100%) rename src/ui/{hud => }/buttons/element_button.gd (100%) rename src/ui/{hud => }/buttons/element_button.tscn (93%) rename src/ui/{hud => }/buttons/empty_unit_button.gd (100%) rename src/ui/{hud => }/buttons/empty_unit_button.tscn (80%) rename src/ui/{hud => }/buttons/freshness_indicator.gd (100%) rename src/ui/{hud => }/buttons/freshness_indicator.tscn (94%) rename src/ui/{hud => }/buttons/inventory_slot_button.tscn (100%) rename src/ui/{hud => }/buttons/item_button.gd (100%) rename src/ui/{hud => }/buttons/item_button.tscn (90%) rename src/ui/{hud => }/buttons/item_button_inner.gd (100%) rename src/ui/{hud => }/buttons/menu_expanding_button.gd (100%) rename src/ui/{hud => }/buttons/menu_expanding_button.tscn (94%) rename src/ui/{hud => }/buttons/rarity_background.gd (100%) rename src/ui/{hud => }/buttons/rarity_background.tscn (81%) rename src/ui/{hud => }/buttons/recipe_button.gd (100%) rename src/ui/{hud => }/buttons/recipe_button.tscn (72%) rename src/ui/{hud => }/buttons/speed_button.tscn (100%) rename src/ui/{hud => }/buttons/time_indicator.gd (100%) rename src/ui/{hud => }/buttons/time_indicator.tscn (71%) rename src/ui/{hud => }/buttons/tower_button.gd (100%) rename src/ui/{hud => }/buttons/tower_button.tscn (94%) rename src/ui/{hud => }/buttons/wisdom_upgrade_button.gd (91%) rename src/ui/{hud => }/buttons/wisdom_upgrade_button.tscn (84%) rename src/ui/{hud => dev_controls}/dev_controls.gd (100%) rename src/ui/{hud => dev_controls}/dev_controls.tscn (93%) rename src/ui/{hud => }/dev_controls/signals_control.gd (100%) rename src/ui/{hud => }/dev_controls/signals_control.tscn (91%) rename src/ui/{hud => }/dev_controls/wave_control.gd (100%) rename src/ui/{hud => }/dev_controls/wave_control.tscn (96%) rename src/ui/{hud/filters => filter_buttons}/element_filter.gd (100%) rename src/ui/{hud/filters => filter_buttons}/element_filter.tscn (95%) rename src/ui/{hud/filters => filter_buttons}/filter_button.tscn (100%) rename src/ui/{hud/filters => filter_buttons}/filter_button_element.gd (100%) rename src/ui/{hud/filters => filter_buttons}/filter_button_element.tscn (57%) rename src/ui/{hud/filters => filter_buttons}/filter_button_item_type.gd (100%) rename src/ui/{hud/filters => filter_buttons}/filter_button_item_type.tscn (57%) rename src/ui/{hud/filters => filter_buttons}/filter_button_rarity.gd (100%) rename src/ui/{hud/filters => filter_buttons}/filter_button_rarity.tscn (57%) rename src/ui/{hud/filters => filter_buttons}/item_type_filter.gd (100%) rename src/ui/{hud/filters => filter_buttons}/item_type_filter.tscn (91%) rename src/ui/{hud/filters => filter_buttons}/rarity_filter.gd (100%) rename src/ui/{hud/filters => filter_buttons}/rarity_filter.tscn (92%) rename src/ui/hud/{dev_controls => }/build_version_label.gd (100%) rename src/ui/hud/{build_version.tscn => build_version_label.tscn} (76%) delete mode 100644 src/ui/hud/general_control/close_button.tscn rename src/ui/{hud => }/item_stash_menu/item_stash_menu.gd (100%) rename src/ui/{hud => }/item_stash_menu/item_stash_menu.tscn (98%) rename src/ui/{hud => player_resource_display}/player_resource_display.gd (100%) rename src/ui/{hud => player_resource_display}/player_resource_display.tscn (95%) rename src/ui/{hud/status_panel => player_resource_display}/resource_status_panel.gd (100%) rename src/ui/{hud/status_panel => player_resource_display}/resource_status_panel.tscn (92%) rename src/ui/{hud => top_left_menu}/game_stats.gd (100%) rename src/ui/{hud => top_left_menu}/game_stats.tscn (95%) rename src/ui/{hud => top_left_menu}/top_left_menu.gd (100%) rename src/ui/{hud => top_left_menu}/top_left_menu.tscn (74%) rename src/ui/{hud => top_left_menu}/wave_status.gd (100%) rename src/ui/{hud => top_left_menu}/wave_status.tscn (98%) rename src/ui/{hud => }/tower_stash_menu/tower_stash_menu.gd (100%) rename src/ui/{hud => }/tower_stash_menu/tower_stash_menu.tscn (96%) rename src/ui/{hud => }/unit_menu/buff_container.gd (100%) rename src/ui/{hud => }/unit_menu/buff_container.tscn (93%) rename src/ui/{hud => }/unit_menu/buff_display.gd (100%) rename src/ui/{hud => }/unit_menu/buff_display.tscn (92%) rename src/ui/{hud => }/unit_menu/buff_group_editor.gd (100%) rename src/ui/{hud => }/unit_menu/buff_group_editor.tscn (84%) rename src/ui/{hud => }/unit_menu/creep_details.gd (100%) rename src/ui/{hud => }/unit_menu/creep_details.tscn (99%) rename src/ui/{hud => }/unit_menu/creep_mini_details.gd (100%) rename src/ui/{hud => }/unit_menu/creep_mini_details.tscn (89%) rename src/ui/{hud => }/unit_menu/item_container_panel.gd (100%) rename src/ui/{hud => }/unit_menu/item_container_panel.tscn (92%) rename src/ui/{hud => }/unit_menu/mini_details_label.tscn (100%) rename src/ui/{hud => }/unit_menu/progress_bar_with_label.gd (100%) rename src/ui/{hud => }/unit_menu/progress_bar_with_label.tscn (92%) rename src/ui/{hud => }/unit_menu/tower_details.gd (100%) rename src/ui/{hud => }/unit_menu/tower_details.tscn (99%) rename src/ui/{hud => }/unit_menu/tower_mini_details.gd (100%) rename src/ui/{hud => }/unit_menu/tower_mini_details.tscn (93%) rename src/ui/{hud => }/unit_menu/unit_menu.gd (100%) rename src/ui/{hud => }/unit_menu/unit_menu.tscn (96%) diff --git a/src/singletons/preloads.gd b/src/singletons/preloads.gd index c69152b60..8b9a83f91 100644 --- a/src/singletons/preloads.gd +++ b/src/singletons/preloads.gd @@ -9,8 +9,8 @@ extends Node const title_screen_scene: PackedScene = preload("res://src/ui/title_screen/title_screen.tscn") const game_scene_scene: PackedScene = preload("res://src/game_scene/game_scene.tscn") -const item_button_scene: PackedScene = preload("res://src/ui/hud/buttons/item_button.tscn") -const tower_button_scene: PackedScene = preload("res://src/ui/hud/buttons/tower_button.tscn") +const item_button_scene: PackedScene = preload("res://src/ui/buttons/item_button.tscn") +const tower_button_scene: PackedScene = preload("res://src/ui/buttons/tower_button.tscn") const floating_text_scene: PackedScene = preload("res://src/ui/hud/floating_text.tscn") const projectile_scene: PackedScene = preload("res://src/projectiles/projectile.tscn") const aura_scene: PackedScene = preload("res://src/buffs/aura.tscn") @@ -18,21 +18,21 @@ const buff_range_area_scene: PackedScene = preload("res://src/buffs/buff_range_a const corpse_scene: PackedScene = preload("res://src/creeps/creep_corpse.tscn") const blood_pool_scene: PackedScene = preload("res://src/creeps/creep_blood_pool.tscn") const flying_item_scene: PackedScene = preload("res://src/ui/hud/flying_item.tscn") -const autocast_button_scene: PackedScene = preload("res://src/ui/hud/buttons/autocast_button.tscn") +const autocast_button_scene: PackedScene = preload("res://src/ui/buttons/autocast_button.tscn") const autocast_scene: PackedScene = preload("res://src/towers/autocast.tscn") const placeholder_effect_scene: PackedScene = preload("res://src/effects/placeholder.tscn") -const empty_slot_button_scene: PackedScene = preload("res://src/ui/hud/buttons/empty_unit_button.tscn") +const empty_slot_button_scene: PackedScene = preload("res://src/ui/buttons/empty_unit_button.tscn") const range_indicator_scene: PackedScene = preload("res://src/towers/range_indicator.tscn") const outline_shader: Material = preload("res://resources/shaders/glowing_outline.material") const player_scene: PackedScene = preload("res://src/player/player.tscn") const team_scene: PackedScene = preload("res://src/player/team.tscn") const tower_preview_scene: PackedScene = preload("res://src/towers/tower_preview.tscn") const tower_scene: PackedScene = preload("res://src/towers/tower.tscn") -const buff_display_scene: PackedScene = preload("res://src/ui/hud/unit_menu/buff_display.tscn") +const buff_display_scene: PackedScene = preload("res://src/ui/unit_menu/buff_display.tscn") const fallback_buff_icon: Texture = preload("res://resources/icons/generic_icons/egg.tres") -const builder_button_scene: PackedScene = preload("res://src/ui/hud/buttons/builder_button.tscn") -const ability_button_scene: PackedScene = preload("res://src/ui/hud/buttons/ability_button.tscn") -const inventory_slot_button_scene: PackedScene = preload("res://src/ui/hud/buttons/inventory_slot_button.tscn") +const builder_button_scene: PackedScene = preload("res://src/ui/buttons/builder_button.tscn") +const ability_button_scene: PackedScene = preload("res://src/ui/buttons/ability_button.tscn") +const inventory_slot_button_scene: PackedScene = preload("res://src/ui/buttons/inventory_slot_button.tscn") const mission_card: PackedScene = preload("res://src/ui/title_screen/missions_menu/mission_card.tscn") const mission_track_indicator_scene: PackedScene = preload("res://src/ui/hud/mission_track_indicator.tscn") const element_icons: Dictionary = { diff --git a/src/ui/hud/buttons/ability_button.gd b/src/ui/buttons/ability_button.gd similarity index 100% rename from src/ui/hud/buttons/ability_button.gd rename to src/ui/buttons/ability_button.gd diff --git a/src/ui/hud/buttons/ability_button.tscn b/src/ui/buttons/ability_button.tscn similarity index 86% rename from src/ui/hud/buttons/ability_button.tscn rename to src/ui/buttons/ability_button.tscn index ef254b0c3..690c58450 100644 --- a/src/ui/hud/buttons/ability_button.tscn +++ b/src/ui/buttons/ability_button.tscn @@ -2,7 +2,7 @@ [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_vdlb1"] [ext_resource type="Texture2D" uid="uid://ckb2soah83qpl" path="res://resources/icons/rockets/rocket_05.tres" id="2_b5mkd"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/ability_button.gd" id="3_cgguu"] +[ext_resource type="Script" path="res://src/ui/buttons/ability_button.gd" id="3_cgguu"] [node name="AbilityButton" type="Button"] custom_minimum_size = Vector2(85, 85) diff --git a/src/ui/hud/buttons/auto_mode_indicator.gd b/src/ui/buttons/auto_mode_indicator.gd similarity index 100% rename from src/ui/hud/buttons/auto_mode_indicator.gd rename to src/ui/buttons/auto_mode_indicator.gd diff --git a/src/ui/hud/buttons/auto_mode_indicator.tscn b/src/ui/buttons/auto_mode_indicator.tscn similarity index 96% rename from src/ui/hud/buttons/auto_mode_indicator.tscn rename to src/ui/buttons/auto_mode_indicator.tscn index 07b748285..b586fb398 100644 --- a/src/ui/hud/buttons/auto_mode_indicator.tscn +++ b/src/ui/buttons/auto_mode_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://bovo5mbv22jly"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/auto_mode_indicator.gd" id="1_r4cmb"] +[ext_resource type="Script" path="res://src/ui/buttons/auto_mode_indicator.gd" id="1_r4cmb"] [ext_resource type="Texture2D" uid="uid://ce6k2v2g5l88d" path="res://assets/misc/autocast_automode_particle.png" id="2_jh2gc"] diff --git a/src/ui/hud/buttons/autocast_button.gd b/src/ui/buttons/autocast_button.gd similarity index 98% rename from src/ui/hud/buttons/autocast_button.gd rename to src/ui/buttons/autocast_button.gd index 447f601e2..3eaba0804 100644 --- a/src/ui/hud/buttons/autocast_button.gd +++ b/src/ui/buttons/autocast_button.gd @@ -80,7 +80,7 @@ func _on_mouse_entered(): static func make(autocast: Autocast) -> AutocastButton: - var autocast_button_scene: PackedScene = preload("res://src/ui/hud/buttons/autocast_button.tscn") + var autocast_button_scene: PackedScene = preload("res://src/ui/buttons/autocast_button.tscn") var button: AutocastButton = autocast_button_scene.instantiate() button._autocast = autocast diff --git a/src/ui/hud/buttons/autocast_button.tscn b/src/ui/buttons/autocast_button.tscn similarity index 88% rename from src/ui/hud/buttons/autocast_button.tscn rename to src/ui/buttons/autocast_button.tscn index 9039587f7..50af22b4a 100644 --- a/src/ui/hud/buttons/autocast_button.tscn +++ b/src/ui/buttons/autocast_button.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://cf3dgj0hegtqq"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/autocast_button.gd" id="1_eojut"] +[ext_resource type="Script" path="res://src/ui/buttons/autocast_button.gd" id="1_eojut"] [ext_resource type="Texture2D" uid="uid://0npkf7jas08m" path="res://resources/icons/gloves/heal.tres" id="2_o57jp"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/time_indicator.gd" id="3_d6wsi"] +[ext_resource type="Script" path="res://src/ui/buttons/time_indicator.gd" id="3_d6wsi"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="3_rtugu"] -[ext_resource type="PackedScene" uid="uid://bovo5mbv22jly" path="res://src/ui/hud/buttons/auto_mode_indicator.tscn" id="5_xah78"] +[ext_resource type="PackedScene" uid="uid://bovo5mbv22jly" path="res://src/ui/buttons/auto_mode_indicator.tscn" id="5_xah78"] [node name="AutocastButton" type="Button" node_paths=PackedStringArray("_time_indicator", "_auto_mode_indicator", "_indicator_container")] custom_minimum_size = Vector2(85, 85) diff --git a/src/ui/hud/buttons/buff_group_button.gd b/src/ui/buttons/buff_group_button.gd similarity index 100% rename from src/ui/hud/buttons/buff_group_button.gd rename to src/ui/buttons/buff_group_button.gd diff --git a/src/ui/hud/buttons/buff_group_button.tscn b/src/ui/buttons/buff_group_button.tscn similarity index 93% rename from src/ui/hud/buttons/buff_group_button.tscn rename to src/ui/buttons/buff_group_button.tscn index 3e8ad9f87..e21af1dd7 100644 --- a/src/ui/hud/buttons/buff_group_button.tscn +++ b/src/ui/buttons/buff_group_button.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://dfid7khpwu0i8"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_2mwqg"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/buff_group_button.gd" id="1_ddno2"] +[ext_resource type="Script" path="res://src/ui/buttons/buff_group_button.gd" id="1_ddno2"] [ext_resource type="Texture2D" uid="uid://dho1jq3a82j7u" path="res://resources/ui_textures/buff_group_none.tres" id="3_d7v21"] [node name="BuffGroupButton" type="Button" node_paths=PackedStringArray("_number_label", "_texture_rect")] diff --git a/src/ui/hud/buttons/builder_button.tscn b/src/ui/buttons/builder_button.tscn similarity index 84% rename from src/ui/hud/buttons/builder_button.tscn rename to src/ui/buttons/builder_button.tscn index d2775b22f..45284350b 100644 --- a/src/ui/hud/buttons/builder_button.tscn +++ b/src/ui/buttons/builder_button.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://wqb5cj4ppde8"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_btx8k"] -[ext_resource type="Script" path="res://src/ui/hud/button_with_rich_tooltip.gd" id="1_il3lu"] +[ext_resource type="Script" path="res://src/ui/buttons/button_with_rich_tooltip.gd" id="1_il3lu"] [ext_resource type="Texture2D" uid="uid://cirq2nbm85h2e" path="res://resources/icons/faces/orc_02.tres" id="2_28q2n"] diff --git a/src/ui/hud/button_tooltip.gd b/src/ui/buttons/button_tooltip.gd similarity index 100% rename from src/ui/hud/button_tooltip.gd rename to src/ui/buttons/button_tooltip.gd diff --git a/src/ui/hud/button_tooltip.tscn b/src/ui/buttons/button_tooltip.tscn similarity index 94% rename from src/ui/hud/button_tooltip.tscn rename to src/ui/buttons/button_tooltip.tscn index e18b1ad4e..425c8f1ef 100644 --- a/src/ui/hud/button_tooltip.tscn +++ b/src/ui/buttons/button_tooltip.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://nl0pvhb4rasi"] [ext_resource type="Texture2D" uid="uid://dex1xjcdq1fv7" path="res://resources/ui_textures/rect_container_m.tres" id="1_4g5vq"] -[ext_resource type="Script" path="res://src/ui/hud/button_tooltip.gd" id="1_xd471"] +[ext_resource type="Script" path="res://src/ui/buttons/button_tooltip.gd" id="1_xd471"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="3_jper7"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_47fwl"] diff --git a/src/ui/hud/button_with_rich_tooltip.gd b/src/ui/buttons/button_with_rich_tooltip.gd similarity index 100% rename from src/ui/hud/button_with_rich_tooltip.gd rename to src/ui/buttons/button_with_rich_tooltip.gd diff --git a/src/ui/hud/buttons/element_button.gd b/src/ui/buttons/element_button.gd similarity index 100% rename from src/ui/hud/buttons/element_button.gd rename to src/ui/buttons/element_button.gd diff --git a/src/ui/hud/buttons/element_button.tscn b/src/ui/buttons/element_button.tscn similarity index 93% rename from src/ui/hud/buttons/element_button.tscn rename to src/ui/buttons/element_button.tscn index d282c9947..a72f2cab5 100644 --- a/src/ui/hud/buttons/element_button.tscn +++ b/src/ui/buttons/element_button.tscn @@ -2,7 +2,7 @@ [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_qxufv"] [ext_resource type="Texture2D" uid="uid://63uq7vjycais" path="res://resources/icons/elements/ice.tres" id="2_y31aw"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/element_button.gd" id="3_eftv1"] +[ext_resource type="Script" path="res://src/ui/buttons/element_button.gd" id="3_eftv1"] [node name="ElementButton" type="Button" node_paths=PackedStringArray("_level_label")] custom_minimum_size = Vector2(120, 120) diff --git a/src/ui/hud/buttons/empty_unit_button.gd b/src/ui/buttons/empty_unit_button.gd similarity index 100% rename from src/ui/hud/buttons/empty_unit_button.gd rename to src/ui/buttons/empty_unit_button.gd diff --git a/src/ui/hud/buttons/empty_unit_button.tscn b/src/ui/buttons/empty_unit_button.tscn similarity index 80% rename from src/ui/hud/buttons/empty_unit_button.tscn rename to src/ui/buttons/empty_unit_button.tscn index 29cac3603..5ee31dd2d 100644 --- a/src/ui/hud/buttons/empty_unit_button.tscn +++ b/src/ui/buttons/empty_unit_button.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://8xsklkw4jhlw"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_lv050"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/empty_unit_button.gd" id="2_0vien"] +[ext_resource type="Script" path="res://src/ui/buttons/empty_unit_button.gd" id="2_0vien"] [node name="EmptyUnitButton" type="Button"] diff --git a/src/ui/hud/buttons/freshness_indicator.gd b/src/ui/buttons/freshness_indicator.gd similarity index 100% rename from src/ui/hud/buttons/freshness_indicator.gd rename to src/ui/buttons/freshness_indicator.gd diff --git a/src/ui/hud/buttons/freshness_indicator.tscn b/src/ui/buttons/freshness_indicator.tscn similarity index 94% rename from src/ui/hud/buttons/freshness_indicator.tscn rename to src/ui/buttons/freshness_indicator.tscn index 522beb2d7..1c0ebd06a 100644 --- a/src/ui/hud/buttons/freshness_indicator.tscn +++ b/src/ui/buttons/freshness_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://dpsfkaoappjpe"] [ext_resource type="Texture2D" uid="uid://ce6k2v2g5l88d" path="res://assets/misc/autocast_automode_particle.png" id="1_ke6i2"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/freshness_indicator.gd" id="1_t5wvv"] +[ext_resource type="Script" path="res://src/ui/buttons/freshness_indicator.gd" id="1_t5wvv"] [sub_resource type="Curve" id="Curve_fdccb"] _data = [Vector2(0, 0.663158), 0.0, 0.0, 0, 0, Vector2(0.911227, 0.294737), 0.0, 0.0, 0, 0] diff --git a/src/ui/hud/buttons/inventory_slot_button.tscn b/src/ui/buttons/inventory_slot_button.tscn similarity index 100% rename from src/ui/hud/buttons/inventory_slot_button.tscn rename to src/ui/buttons/inventory_slot_button.tscn diff --git a/src/ui/hud/buttons/item_button.gd b/src/ui/buttons/item_button.gd similarity index 100% rename from src/ui/hud/buttons/item_button.gd rename to src/ui/buttons/item_button.gd diff --git a/src/ui/hud/buttons/item_button.tscn b/src/ui/buttons/item_button.tscn similarity index 90% rename from src/ui/hud/buttons/item_button.tscn rename to src/ui/buttons/item_button.tscn index ed9f1cfab..5f35d38d8 100644 --- a/src/ui/hud/buttons/item_button.tscn +++ b/src/ui/buttons/item_button.tscn @@ -2,11 +2,11 @@ [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_hwmts"] [ext_resource type="Texture2D" uid="uid://bbax2xlr25ajb" path="res://resources/icons/mechanical/compass.tres" id="2_4ao5v"] -[ext_resource type="PackedScene" uid="uid://8mjwtvwfpjf5" path="res://src/ui/hud/buttons/rarity_background.tscn" id="2_byhor"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/item_button.gd" id="3_if4ie"] -[ext_resource type="PackedScene" uid="uid://d1i5vdh8yrhbx" path="res://src/ui/hud/buttons/time_indicator.tscn" id="4_xna04"] -[ext_resource type="PackedScene" uid="uid://dpsfkaoappjpe" path="res://src/ui/hud/buttons/freshness_indicator.tscn" id="5_mfbh4"] -[ext_resource type="PackedScene" uid="uid://bovo5mbv22jly" path="res://src/ui/hud/buttons/auto_mode_indicator.tscn" id="6_8tjm3"] +[ext_resource type="PackedScene" uid="uid://8mjwtvwfpjf5" path="res://src/ui/buttons/rarity_background.tscn" id="2_byhor"] +[ext_resource type="Script" path="res://src/ui/buttons/item_button.gd" id="3_if4ie"] +[ext_resource type="PackedScene" uid="uid://d1i5vdh8yrhbx" path="res://src/ui/buttons/time_indicator.tscn" id="4_xna04"] +[ext_resource type="PackedScene" uid="uid://dpsfkaoappjpe" path="res://src/ui/buttons/freshness_indicator.tscn" id="5_mfbh4"] +[ext_resource type="PackedScene" uid="uid://bovo5mbv22jly" path="res://src/ui/buttons/auto_mode_indicator.tscn" id="6_8tjm3"] [ext_resource type="Texture2D" uid="uid://bya4q121hruh1" path="res://resources/ui_textures/unit_button_disabled.tres" id="7_1ary0"] diff --git a/src/ui/hud/buttons/item_button_inner.gd b/src/ui/buttons/item_button_inner.gd similarity index 100% rename from src/ui/hud/buttons/item_button_inner.gd rename to src/ui/buttons/item_button_inner.gd diff --git a/src/ui/hud/buttons/menu_expanding_button.gd b/src/ui/buttons/menu_expanding_button.gd similarity index 100% rename from src/ui/hud/buttons/menu_expanding_button.gd rename to src/ui/buttons/menu_expanding_button.gd diff --git a/src/ui/hud/buttons/menu_expanding_button.tscn b/src/ui/buttons/menu_expanding_button.tscn similarity index 94% rename from src/ui/hud/buttons/menu_expanding_button.tscn rename to src/ui/buttons/menu_expanding_button.tscn index d002fed13..5907cea73 100644 --- a/src/ui/hud/buttons/menu_expanding_button.tscn +++ b/src/ui/buttons/menu_expanding_button.tscn @@ -2,7 +2,7 @@ [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_r701g"] [ext_resource type="Texture2D" uid="uid://r7qkt7vep0ar" path="res://resources/icons/hud/tower_stash.tres" id="2_7h80o"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/menu_expanding_button.gd" id="3_cmnlx"] +[ext_resource type="Script" path="res://src/ui/buttons/menu_expanding_button.gd" id="3_cmnlx"] [ext_resource type="Texture2D" uid="uid://dex1xjcdq1fv7" path="res://resources/ui_textures/rect_container_m.tres" id="4_3y845"] diff --git a/src/ui/hud/buttons/rarity_background.gd b/src/ui/buttons/rarity_background.gd similarity index 100% rename from src/ui/hud/buttons/rarity_background.gd rename to src/ui/buttons/rarity_background.gd diff --git a/src/ui/hud/buttons/rarity_background.tscn b/src/ui/buttons/rarity_background.tscn similarity index 81% rename from src/ui/hud/buttons/rarity_background.tscn rename to src/ui/buttons/rarity_background.tscn index 339181763..348097fa9 100644 --- a/src/ui/hud/buttons/rarity_background.tscn +++ b/src/ui/buttons/rarity_background.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://8mjwtvwfpjf5"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_h8l7j"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/rarity_background.gd" id="2_6a5cr"] +[ext_resource type="Script" path="res://src/ui/buttons/rarity_background.gd" id="2_6a5cr"] [node name="RarityBackground" type="PanelContainer"] diff --git a/src/ui/hud/buttons/recipe_button.gd b/src/ui/buttons/recipe_button.gd similarity index 100% rename from src/ui/hud/buttons/recipe_button.gd rename to src/ui/buttons/recipe_button.gd diff --git a/src/ui/hud/buttons/recipe_button.tscn b/src/ui/buttons/recipe_button.tscn similarity index 72% rename from src/ui/hud/buttons/recipe_button.tscn rename to src/ui/buttons/recipe_button.tscn index ab9631915..ddcceed46 100644 --- a/src/ui/hud/buttons/recipe_button.tscn +++ b/src/ui/buttons/recipe_button.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://c1ccsqvpyqd4i"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/recipe_button.gd" id="1_3j7jj"] +[ext_resource type="Script" path="res://src/ui/buttons/recipe_button.gd" id="1_3j7jj"] [node name="RecipeButton" type="Button" groups=["recipe_buttons"]] focus_mode = 0 diff --git a/src/ui/hud/buttons/speed_button.tscn b/src/ui/buttons/speed_button.tscn similarity index 100% rename from src/ui/hud/buttons/speed_button.tscn rename to src/ui/buttons/speed_button.tscn diff --git a/src/ui/hud/buttons/time_indicator.gd b/src/ui/buttons/time_indicator.gd similarity index 100% rename from src/ui/hud/buttons/time_indicator.gd rename to src/ui/buttons/time_indicator.gd diff --git a/src/ui/hud/buttons/time_indicator.tscn b/src/ui/buttons/time_indicator.tscn similarity index 71% rename from src/ui/hud/buttons/time_indicator.tscn rename to src/ui/buttons/time_indicator.tscn index c5e57cd65..2205bdf17 100644 --- a/src/ui/hud/buttons/time_indicator.tscn +++ b/src/ui/buttons/time_indicator.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://d1i5vdh8yrhbx"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/time_indicator.gd" id="1_wuiti"] +[ext_resource type="Script" path="res://src/ui/buttons/time_indicator.gd" id="1_wuiti"] [node name="TimeIndicator" type="Control"] layout_mode = 3 diff --git a/src/ui/hud/buttons/tower_button.gd b/src/ui/buttons/tower_button.gd similarity index 100% rename from src/ui/hud/buttons/tower_button.gd rename to src/ui/buttons/tower_button.gd diff --git a/src/ui/hud/buttons/tower_button.tscn b/src/ui/buttons/tower_button.tscn similarity index 94% rename from src/ui/hud/buttons/tower_button.tscn rename to src/ui/buttons/tower_button.tscn index 52bf26f3b..f2cc6f9a6 100644 --- a/src/ui/hud/buttons/tower_button.tscn +++ b/src/ui/buttons/tower_button.tscn @@ -2,11 +2,11 @@ [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_gjufa"] [ext_resource type="Texture2D" uid="uid://b0cvl7ota8rxq" path="res://resources/icons/tower_icons/lesser_iron_defender.tres" id="2_5y7kf"] -[ext_resource type="PackedScene" uid="uid://8mjwtvwfpjf5" path="res://src/ui/hud/buttons/rarity_background.tscn" id="2_sd6cs"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/tower_button.gd" id="3_ht2cb"] +[ext_resource type="PackedScene" uid="uid://8mjwtvwfpjf5" path="res://src/ui/buttons/rarity_background.tscn" id="2_sd6cs"] +[ext_resource type="Script" path="res://src/ui/buttons/tower_button.gd" id="3_ht2cb"] [ext_resource type="Texture2D" uid="uid://bxlxlgnldo7ci" path="res://assets/icons/tier_icons_m.png" id="3_n04co"] [ext_resource type="Texture2D" uid="uid://bya4q121hruh1" path="res://resources/ui_textures/unit_button_disabled.tres" id="4_kwp58"] -[ext_resource type="PackedScene" uid="uid://dpsfkaoappjpe" path="res://src/ui/hud/buttons/freshness_indicator.tscn" id="5_tame2"] +[ext_resource type="PackedScene" uid="uid://dpsfkaoappjpe" path="res://src/ui/buttons/freshness_indicator.tscn" id="5_tame2"] [sub_resource type="AtlasTexture" id="AtlasTexture_80ypy"] atlas = ExtResource("3_n04co") diff --git a/src/ui/hud/buttons/wisdom_upgrade_button.gd b/src/ui/buttons/wisdom_upgrade_button.gd similarity index 91% rename from src/ui/hud/buttons/wisdom_upgrade_button.gd rename to src/ui/buttons/wisdom_upgrade_button.gd index 2434fddd7..c1d85661b 100644 --- a/src/ui/hud/buttons/wisdom_upgrade_button.gd +++ b/src/ui/buttons/wisdom_upgrade_button.gd @@ -27,7 +27,7 @@ func _make_custom_tooltip(for_text: String) -> Object: ######################### static func make(upgrade_id: int ) -> WisdomUpgradeButton: - var scene: PackedScene = load("res://src/ui/hud/buttons/wisdom_upgrade_button.tscn") + var scene: PackedScene = load("res://src/ui/buttons/wisdom_upgrade_button.tscn") var button: WisdomUpgradeButton = scene.instantiate() var tooltip: String = WisdomUpgradeProperties.get_tooltip(upgrade_id) diff --git a/src/ui/hud/buttons/wisdom_upgrade_button.tscn b/src/ui/buttons/wisdom_upgrade_button.tscn similarity index 84% rename from src/ui/hud/buttons/wisdom_upgrade_button.tscn rename to src/ui/buttons/wisdom_upgrade_button.tscn index 9d4b1d168..7d7ed01b0 100644 --- a/src/ui/hud/buttons/wisdom_upgrade_button.tscn +++ b/src/ui/buttons/wisdom_upgrade_button.tscn @@ -2,7 +2,7 @@ [ext_resource type="Texture2D" uid="uid://cdqtd51r814ka" path="res://resources/icons/generic_icons/egg.tres" id="1_kndti"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_vwwoe"] -[ext_resource type="Script" path="res://src/ui/hud/buttons/wisdom_upgrade_button.gd" id="2_ra3be"] +[ext_resource type="Script" path="res://src/ui/buttons/wisdom_upgrade_button.gd" id="2_ra3be"] [node name="WisdomUpgradeButton" type="Button"] diff --git a/src/ui/hud/dev_controls.gd b/src/ui/dev_controls/dev_controls.gd similarity index 100% rename from src/ui/hud/dev_controls.gd rename to src/ui/dev_controls/dev_controls.gd diff --git a/src/ui/hud/dev_controls.tscn b/src/ui/dev_controls/dev_controls.tscn similarity index 93% rename from src/ui/hud/dev_controls.tscn rename to src/ui/dev_controls/dev_controls.tscn index 116c4c6bd..6a3244ca8 100644 --- a/src/ui/hud/dev_controls.tscn +++ b/src/ui/dev_controls/dev_controls.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://cro8ec573upqo"] -[ext_resource type="Script" path="res://src/ui/hud/dev_controls.gd" id="1_0jdrl"] -[ext_resource type="PackedScene" uid="uid://bsu2i4smjlpui" path="res://src/ui/hud/dev_controls/wave_control.tscn" id="2_455wo"] -[ext_resource type="PackedScene" uid="uid://cojr80363rwx2" path="res://src/ui/hud/dev_controls/signals_control.tscn" id="3_esahe"] +[ext_resource type="Script" path="res://src/ui/dev_controls/dev_controls.gd" id="1_0jdrl"] +[ext_resource type="PackedScene" uid="uid://bsu2i4smjlpui" path="res://src/ui/dev_controls/wave_control.tscn" id="2_455wo"] +[ext_resource type="PackedScene" uid="uid://cojr80363rwx2" path="res://src/ui/dev_controls/signals_control.tscn" id="3_esahe"] [node name="DevControls" type="Control" node_paths=PackedStringArray("positional_control", "position_info_label")] diff --git a/src/ui/hud/dev_controls/signals_control.gd b/src/ui/dev_controls/signals_control.gd similarity index 100% rename from src/ui/hud/dev_controls/signals_control.gd rename to src/ui/dev_controls/signals_control.gd diff --git a/src/ui/hud/dev_controls/signals_control.tscn b/src/ui/dev_controls/signals_control.tscn similarity index 91% rename from src/ui/hud/dev_controls/signals_control.tscn rename to src/ui/dev_controls/signals_control.tscn index 55949ea4d..96dae8b89 100644 --- a/src/ui/hud/dev_controls/signals_control.tscn +++ b/src/ui/dev_controls/signals_control.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://cojr80363rwx2"] -[ext_resource type="Script" path="res://src/ui/hud/dev_controls/signals_control.gd" id="1_3sjri"] +[ext_resource type="Script" path="res://src/ui/dev_controls/signals_control.gd" id="1_3sjri"] [node name="SignalsControl" type="Control" node_paths=PackedStringArray("debug_container")] diff --git a/src/ui/hud/dev_controls/wave_control.gd b/src/ui/dev_controls/wave_control.gd similarity index 100% rename from src/ui/hud/dev_controls/wave_control.gd rename to src/ui/dev_controls/wave_control.gd diff --git a/src/ui/hud/dev_controls/wave_control.tscn b/src/ui/dev_controls/wave_control.tscn similarity index 96% rename from src/ui/hud/dev_controls/wave_control.tscn rename to src/ui/dev_controls/wave_control.tscn index 8d6fdd0d1..def95cc07 100644 --- a/src/ui/hud/dev_controls/wave_control.tscn +++ b/src/ui/dev_controls/wave_control.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://bsu2i4smjlpui"] -[ext_resource type="Script" path="res://src/ui/hud/dev_controls/wave_control.gd" id="1_4w1t3"] +[ext_resource type="Script" path="res://src/ui/dev_controls/wave_control.gd" id="1_4w1t3"] [node name="WaveControl" type="Control"] diff --git a/src/ui/hud/filters/element_filter.gd b/src/ui/filter_buttons/element_filter.gd similarity index 100% rename from src/ui/hud/filters/element_filter.gd rename to src/ui/filter_buttons/element_filter.gd diff --git a/src/ui/hud/filters/element_filter.tscn b/src/ui/filter_buttons/element_filter.tscn similarity index 95% rename from src/ui/hud/filters/element_filter.tscn rename to src/ui/filter_buttons/element_filter.tscn index 9e8348af4..4b21844cb 100644 --- a/src/ui/hud/filters/element_filter.tscn +++ b/src/ui/filter_buttons/element_filter.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=11 format=3 uid="uid://l8hrrql7ne16"] -[ext_resource type="Script" path="res://src/ui/hud/filters/element_filter.gd" id="1_6o50p"] -[ext_resource type="PackedScene" uid="uid://cgdwym7h2i5ot" path="res://src/ui/hud/filters/filter_button_element.tscn" id="2_ds1w8"] +[ext_resource type="Script" path="res://src/ui/filter_buttons/element_filter.gd" id="1_6o50p"] +[ext_resource type="PackedScene" uid="uid://cgdwym7h2i5ot" path="res://src/ui/filter_buttons/filter_button_element.tscn" id="2_ds1w8"] [ext_resource type="ButtonGroup" uid="uid://btb8xdpulas1s" path="res://resources/button_groups/element_filter_button_group.tres" id="3_g3ljb"] [ext_resource type="Texture2D" uid="uid://63uq7vjycais" path="res://resources/icons/elements/ice.tres" id="4_p60bo"] [ext_resource type="Texture2D" uid="uid://c14cl1op1y5wk" path="res://resources/icons/elements/nature.tres" id="5_s2nhr"] diff --git a/src/ui/hud/filters/filter_button.tscn b/src/ui/filter_buttons/filter_button.tscn similarity index 100% rename from src/ui/hud/filters/filter_button.tscn rename to src/ui/filter_buttons/filter_button.tscn diff --git a/src/ui/hud/filters/filter_button_element.gd b/src/ui/filter_buttons/filter_button_element.gd similarity index 100% rename from src/ui/hud/filters/filter_button_element.gd rename to src/ui/filter_buttons/filter_button_element.gd diff --git a/src/ui/hud/filters/filter_button_element.tscn b/src/ui/filter_buttons/filter_button_element.tscn similarity index 57% rename from src/ui/hud/filters/filter_button_element.tscn rename to src/ui/filter_buttons/filter_button_element.tscn index 7b84cd8a5..8e9e32631 100644 --- a/src/ui/hud/filters/filter_button_element.tscn +++ b/src/ui/filter_buttons/filter_button_element.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cgdwym7h2i5ot"] -[ext_resource type="PackedScene" uid="uid://bpewn2rh5b1kf" path="res://src/ui/hud/filters/filter_button.tscn" id="1_daova"] -[ext_resource type="Script" path="res://src/ui/hud/filters/filter_button_element.gd" id="2_crwt1"] +[ext_resource type="PackedScene" uid="uid://bpewn2rh5b1kf" path="res://src/ui/filter_buttons/filter_button.tscn" id="1_daova"] +[ext_resource type="Script" path="res://src/ui/filter_buttons/filter_button_element.gd" id="2_crwt1"] [node name="FilterButtonElement" instance=ExtResource("1_daova")] script = ExtResource("2_crwt1") diff --git a/src/ui/hud/filters/filter_button_item_type.gd b/src/ui/filter_buttons/filter_button_item_type.gd similarity index 100% rename from src/ui/hud/filters/filter_button_item_type.gd rename to src/ui/filter_buttons/filter_button_item_type.gd diff --git a/src/ui/hud/filters/filter_button_item_type.tscn b/src/ui/filter_buttons/filter_button_item_type.tscn similarity index 57% rename from src/ui/hud/filters/filter_button_item_type.tscn rename to src/ui/filter_buttons/filter_button_item_type.tscn index 73c8dddd9..0bfa368e2 100644 --- a/src/ui/hud/filters/filter_button_item_type.tscn +++ b/src/ui/filter_buttons/filter_button_item_type.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://8rqr6mlftwrx"] -[ext_resource type="PackedScene" uid="uid://bpewn2rh5b1kf" path="res://src/ui/hud/filters/filter_button.tscn" id="1_l27c0"] -[ext_resource type="Script" path="res://src/ui/hud/filters/filter_button_item_type.gd" id="2_wk4uf"] +[ext_resource type="PackedScene" uid="uid://bpewn2rh5b1kf" path="res://src/ui/filter_buttons/filter_button.tscn" id="1_l27c0"] +[ext_resource type="Script" path="res://src/ui/filter_buttons/filter_button_item_type.gd" id="2_wk4uf"] [node name="FilterButtonItemType" instance=ExtResource("1_l27c0")] script = ExtResource("2_wk4uf") diff --git a/src/ui/hud/filters/filter_button_rarity.gd b/src/ui/filter_buttons/filter_button_rarity.gd similarity index 100% rename from src/ui/hud/filters/filter_button_rarity.gd rename to src/ui/filter_buttons/filter_button_rarity.gd diff --git a/src/ui/hud/filters/filter_button_rarity.tscn b/src/ui/filter_buttons/filter_button_rarity.tscn similarity index 57% rename from src/ui/hud/filters/filter_button_rarity.tscn rename to src/ui/filter_buttons/filter_button_rarity.tscn index 4ba9e4479..1e17368d0 100644 --- a/src/ui/hud/filters/filter_button_rarity.tscn +++ b/src/ui/filter_buttons/filter_button_rarity.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bg7nrj1oufmwa"] -[ext_resource type="PackedScene" uid="uid://bpewn2rh5b1kf" path="res://src/ui/hud/filters/filter_button.tscn" id="1_c5lm0"] -[ext_resource type="Script" path="res://src/ui/hud/filters/filter_button_rarity.gd" id="2_45pqm"] +[ext_resource type="PackedScene" uid="uid://bpewn2rh5b1kf" path="res://src/ui/filter_buttons/filter_button.tscn" id="1_c5lm0"] +[ext_resource type="Script" path="res://src/ui/filter_buttons/filter_button_rarity.gd" id="2_45pqm"] [node name="FilterButtonRarity" instance=ExtResource("1_c5lm0")] script = ExtResource("2_45pqm") diff --git a/src/ui/hud/filters/item_type_filter.gd b/src/ui/filter_buttons/item_type_filter.gd similarity index 100% rename from src/ui/hud/filters/item_type_filter.gd rename to src/ui/filter_buttons/item_type_filter.gd diff --git a/src/ui/hud/filters/item_type_filter.tscn b/src/ui/filter_buttons/item_type_filter.tscn similarity index 91% rename from src/ui/hud/filters/item_type_filter.tscn rename to src/ui/filter_buttons/item_type_filter.tscn index 5af17b683..abfa849da 100644 --- a/src/ui/hud/filters/item_type_filter.tscn +++ b/src/ui/filter_buttons/item_type_filter.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://ib3y0a6h0v46"] -[ext_resource type="Script" path="res://src/ui/hud/filters/item_type_filter.gd" id="1_jj4ac"] -[ext_resource type="PackedScene" uid="uid://8rqr6mlftwrx" path="res://src/ui/hud/filters/filter_button_item_type.tscn" id="2_dcwgy"] +[ext_resource type="Script" path="res://src/ui/filter_buttons/item_type_filter.gd" id="1_jj4ac"] +[ext_resource type="PackedScene" uid="uid://8rqr6mlftwrx" path="res://src/ui/filter_buttons/filter_button_item_type.tscn" id="2_dcwgy"] [ext_resource type="Texture2D" uid="uid://boxxhen27xatf" path="res://resources/icons/hud/item_stash.tres" id="2_ftq7a"] [ext_resource type="ButtonGroup" uid="uid://cycas5vk7h2lw" path="res://resources/button_groups/item_type_filter_button_group.tres" id="3_254a3"] [ext_resource type="Texture2D" uid="uid://bk4dvb16ukwx8" path="res://resources/icons/hud/recipe_reassemble.tres" id="4_0ptir"] diff --git a/src/ui/hud/filters/rarity_filter.gd b/src/ui/filter_buttons/rarity_filter.gd similarity index 100% rename from src/ui/hud/filters/rarity_filter.gd rename to src/ui/filter_buttons/rarity_filter.gd diff --git a/src/ui/hud/filters/rarity_filter.tscn b/src/ui/filter_buttons/rarity_filter.tscn similarity index 92% rename from src/ui/hud/filters/rarity_filter.tscn rename to src/ui/filter_buttons/rarity_filter.tscn index 527d70daa..5e309a0b5 100644 --- a/src/ui/hud/filters/rarity_filter.tscn +++ b/src/ui/filter_buttons/rarity_filter.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://qcct52drete4"] -[ext_resource type="Script" path="res://src/ui/hud/filters/rarity_filter.gd" id="1_b88ja"] -[ext_resource type="PackedScene" uid="uid://bg7nrj1oufmwa" path="res://src/ui/hud/filters/filter_button_rarity.tscn" id="2_j5bkp"] +[ext_resource type="Script" path="res://src/ui/filter_buttons/rarity_filter.gd" id="1_b88ja"] +[ext_resource type="PackedScene" uid="uid://bg7nrj1oufmwa" path="res://src/ui/filter_buttons/filter_button_rarity.tscn" id="2_j5bkp"] [ext_resource type="Texture2D" uid="uid://dnfyls46vqccy" path="res://resources/icons/hud/gem_common.tres" id="3_nd2bw"] [ext_resource type="Texture2D" uid="uid://bbgnvq4hx2ady" path="res://resources/icons/hud/gem_uncommon.tres" id="4_6gbsy"] [ext_resource type="Texture2D" uid="uid://do0ipsu6xkehe" path="res://resources/icons/hud/gem_rare.tres" id="5_wbg08"] diff --git a/src/ui/hud/dev_controls/build_version_label.gd b/src/ui/hud/build_version_label.gd similarity index 100% rename from src/ui/hud/dev_controls/build_version_label.gd rename to src/ui/hud/build_version_label.gd diff --git a/src/ui/hud/build_version.tscn b/src/ui/hud/build_version_label.tscn similarity index 76% rename from src/ui/hud/build_version.tscn rename to src/ui/hud/build_version_label.tscn index 9460f8bea..658491099 100644 --- a/src/ui/hud/build_version.tscn +++ b/src/ui/hud/build_version_label.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://i0b3uilwt2as"] -[ext_resource type="Script" path="res://src/ui/hud/dev_controls/build_version_label.gd" id="1_cj454"] +[ext_resource type="Script" path="res://src/ui/hud/build_version_label.gd" id="1_cj454"] [node name="BuildVersionLabel" type="Label"] modulate = Color(1, 1, 1, 0.537255) diff --git a/src/ui/hud/elements_menu.tscn b/src/ui/hud/elements_menu.tscn index 9edb000aa..629570cf5 100644 --- a/src/ui/hud/elements_menu.tscn +++ b/src/ui/hud/elements_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=16 format=3 uid="uid://bg77tobjy7jgy"] [ext_resource type="Script" path="res://src/ui/hud/elements_menu.gd" id="2_ge6sb"] -[ext_resource type="PackedScene" uid="uid://bpdanpr2im0gg" path="res://src/ui/hud/buttons/element_button.tscn" id="2_w3jvl"] +[ext_resource type="PackedScene" uid="uid://bpdanpr2im0gg" path="res://src/ui/buttons/element_button.tscn" id="2_w3jvl"] [ext_resource type="Texture2D" uid="uid://b7c8ugpn34iib" path="res://resources/icons/elements/darkness.tres" id="4_6xdvu"] [ext_resource type="Texture2D" uid="uid://bvhrjk28kmjxg" path="res://resources/icons/elements/fire.tres" id="5_7kvqd"] [ext_resource type="Texture2D" uid="uid://c14cl1op1y5wk" path="res://resources/icons/elements/nature.tres" id="7_ogjdt"] diff --git a/src/ui/hud/flying_item.tscn b/src/ui/hud/flying_item.tscn index 861ce04cd..ceeb11e8e 100644 --- a/src/ui/hud/flying_item.tscn +++ b/src/ui/hud/flying_item.tscn @@ -3,8 +3,7 @@ [ext_resource type="Script" path="res://src/ui/hud/flying_item.gd" id="1_5ump5"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="3_vx2oo"] [ext_resource type="Texture2D" uid="uid://bbax2xlr25ajb" path="res://resources/icons/mechanical/compass.tres" id="4_42i2u"] -[ext_resource type="PackedScene" uid="uid://8mjwtvwfpjf5" path="res://src/ui/hud/buttons/rarity_background.tscn" id="4_jqp1b"] - +[ext_resource type="PackedScene" uid="uid://8mjwtvwfpjf5" path="res://src/ui/buttons/rarity_background.tscn" id="4_jqp1b"] [node name="FlyingItem" type="Control" node_paths=PackedStringArray("_button", "_rarity_background")] layout_mode = 3 diff --git a/src/ui/hud/game_speed_controller.tscn b/src/ui/hud/game_speed_controller.tscn index 27453060e..e6fea51a7 100644 --- a/src/ui/hud/game_speed_controller.tscn +++ b/src/ui/hud/game_speed_controller.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=12 format=3 uid="uid://n8326r4m33s3"] [ext_resource type="Script" path="res://src/ui/hud/game_speed_controller.gd" id="1_ak56x"] -[ext_resource type="PackedScene" uid="uid://dq1y6eowvvl45" path="res://src/ui/hud/buttons/speed_button.tscn" id="1_vx7on"] +[ext_resource type="PackedScene" uid="uid://dq1y6eowvvl45" path="res://src/ui/buttons/speed_button.tscn" id="1_vx7on"] [ext_resource type="ButtonGroup" uid="uid://5mj7ntug0txa" path="res://resources/button_groups/speed_button_group.tres" id="2_3te4o"] [ext_resource type="Texture2D" uid="uid://cny5e3y68r18y" path="res://resources/ui_textures/speed_fast.tres" id="3_co8ko"] [ext_resource type="Texture2D" uid="uid://c1cbjc01sbgsu" path="res://resources/ui_textures/speed_fastest.tres" id="4_5fx06"] diff --git a/src/ui/hud/general_control/close_button.tscn b/src/ui/hud/general_control/close_button.tscn deleted file mode 100644 index d0e526a47..000000000 --- a/src/ui/hud/general_control/close_button.tscn +++ /dev/null @@ -1,17 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://dft0yk15qxg0d"] - -[ext_resource type="Texture2D" uid="uid://dyixmgwifdsin" path="res://assets/hud/misc3_s.png" id="1_kea2d"] - - -[sub_resource type="AtlasTexture" id="AtlasTexture_45jpf"] -atlas = ExtResource("1_kea2d") -region = Rect2(224, 2.08165e-12, 32, 32) - -[sub_resource type="CanvasTexture" id="CanvasTexture_dhfos"] - -[node name="TextureButton" type="TextureButton"] -modulate = Color(0.988235, 0.254902, 0.215686, 1) -size_flags_horizontal = 8 -focus_mode = 0 -texture_normal = SubResource("AtlasTexture_45jpf") -texture_pressed = SubResource("CanvasTexture_dhfos") diff --git a/src/ui/hud/hud.tscn b/src/ui/hud/hud.tscn index 64797756e..2022a8ace 100644 --- a/src/ui/hud/hud.tscn +++ b/src/ui/hud/hud.tscn @@ -2,26 +2,25 @@ [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_xs0tv"] [ext_resource type="PackedScene" uid="uid://bakuxdbe6a7f0" path="res://src/ui/hud/mission_tracker_container.tscn" id="5_n7x4d"] -[ext_resource type="PackedScene" uid="uid://dwexxkjguqohm" path="res://src/ui/hud/buttons/menu_expanding_button.tscn" id="7_2qbjb"] +[ext_resource type="PackedScene" uid="uid://dwexxkjguqohm" path="res://src/ui/buttons/menu_expanding_button.tscn" id="7_2qbjb"] [ext_resource type="ButtonGroup" uid="uid://deklccjgbh0k0" path="res://resources/button_groups/menu_cards_button_group.tres" id="7_8m5sl"] [ext_resource type="PackedScene" uid="uid://n8326r4m33s3" path="res://src/ui/hud/game_speed_controller.tscn" id="9_ilyra"] -[ext_resource type="PackedScene" uid="uid://b3grhp7bp5t54" path="res://src/ui/hud/top_left_menu.tscn" id="10_agdn3"] +[ext_resource type="PackedScene" uid="uid://b3grhp7bp5t54" path="res://src/ui/top_left_menu/top_left_menu.tscn" id="10_agdn3"] [ext_resource type="Texture2D" uid="uid://1sklksk2awnr" path="res://resources/icons/hud/research_elements.tres" id="10_ylm6g"] [ext_resource type="Script" path="res://src/ui/hud/hud.gd" id="11"] -[ext_resource type="PackedScene" uid="uid://ino0lr2m12uh" path="res://src/ui/hud/item_stash_menu/item_stash_menu.tscn" id="11_5i6a2"] -[ext_resource type="PackedScene" uid="uid://nl0pvhb4rasi" path="res://src/ui/hud/button_tooltip.tscn" id="11_ka7k1"] +[ext_resource type="PackedScene" uid="uid://ino0lr2m12uh" path="res://src/ui/item_stash_menu/item_stash_menu.tscn" id="11_5i6a2"] +[ext_resource type="PackedScene" uid="uid://nl0pvhb4rasi" path="res://src/ui/buttons/button_tooltip.tscn" id="11_ka7k1"] [ext_resource type="Texture2D" uid="uid://boxxhen27xatf" path="res://resources/icons/hud/item_stash.tres" id="12_vixmf"] [ext_resource type="PackedScene" uid="uid://bx5csta8pr8j0" path="res://src/ui/hud/combat_log_window.tscn" id="14_g64vx"] -[ext_resource type="PackedScene" uid="uid://donslrrviy807" path="res://src/ui/hud/tower_stash_menu/tower_stash_menu.tscn" id="15_eivr8"] -[ext_resource type="PackedScene" uid="uid://cc70ktmpmbjts" path="res://src/ui/hud/player_resource_display.tscn" id="15_ir4hq"] -[ext_resource type="PackedScene" uid="uid://b6l4hi00yx7js" path="res://src/ui/hud/unit_menu/tower_details.tscn" id="17_12w0v"] +[ext_resource type="PackedScene" uid="uid://donslrrviy807" path="res://src/ui/tower_stash_menu/tower_stash_menu.tscn" id="15_eivr8"] +[ext_resource type="PackedScene" uid="uid://cc70ktmpmbjts" path="res://src/ui/player_resource_display/player_resource_display.tscn" id="15_ir4hq"] +[ext_resource type="PackedScene" uid="uid://b6l4hi00yx7js" path="res://src/ui/unit_menu/tower_details.tscn" id="17_12w0v"] [ext_resource type="PackedScene" uid="uid://bg77tobjy7jgy" path="res://src/ui/hud/elements_menu.tscn" id="17_bxii1"] -[ext_resource type="PackedScene" uid="uid://b1l5uiun5nhhx" path="res://src/ui/hud/unit_menu/creep_details.tscn" id="18_acgvt"] -[ext_resource type="PackedScene" uid="uid://dcqjart40vpjy" path="res://src/ui/hud/unit_menu/unit_menu.tscn" id="19_bqmfs"] +[ext_resource type="PackedScene" uid="uid://b1l5uiun5nhhx" path="res://src/ui/unit_menu/creep_details.tscn" id="18_acgvt"] +[ext_resource type="PackedScene" uid="uid://dcqjart40vpjy" path="res://src/ui/unit_menu/unit_menu.tscn" id="19_bqmfs"] [ext_resource type="PackedScene" uid="uid://wqmh2igy5bn4" path="res://src/ui/hud/desync_indicator.tscn" id="19_mcs2s"] [ext_resource type="PackedScene" uid="uid://c4jswu0s2yq2o" path="res://src/ui/hud/multiplayer_pause_indicator.tscn" id="20_cbamn"] -[ext_resource type="PackedScene" uid="uid://i0b3uilwt2as" path="res://src/ui/hud/build_version.tscn" id="21_ko2ou"] - +[ext_resource type="PackedScene" uid="uid://i0b3uilwt2as" path="res://src/ui/hud/build_version_label.tscn" id="21_ko2ou"] [sub_resource type="InputEventKey" id="InputEventKey_hfkwl"] physical_keycode = 84 @@ -320,7 +319,7 @@ layout_mode = 2 mouse_filter = 2 alignment = 2 -[node name="DevControls" parent="." instance_placeholder="res://src/ui/hud/dev_controls.tscn"] +[node name="DevControls" parent="." instance_placeholder="res://src/ui/dev_controls/dev_controls.tscn"] visible = false layout_mode = 1 mouse_filter = 2 diff --git a/src/ui/hud/item_stash_menu/item_stash_menu.gd b/src/ui/item_stash_menu/item_stash_menu.gd similarity index 100% rename from src/ui/hud/item_stash_menu/item_stash_menu.gd rename to src/ui/item_stash_menu/item_stash_menu.gd diff --git a/src/ui/hud/item_stash_menu/item_stash_menu.tscn b/src/ui/item_stash_menu/item_stash_menu.tscn similarity index 98% rename from src/ui/hud/item_stash_menu/item_stash_menu.tscn rename to src/ui/item_stash_menu/item_stash_menu.tscn index e6b3bc1c7..6c6cb262a 100644 --- a/src/ui/hud/item_stash_menu/item_stash_menu.tscn +++ b/src/ui/item_stash_menu/item_stash_menu.tscn @@ -1,19 +1,19 @@ [gd_scene load_steps=19 format=3 uid="uid://ino0lr2m12uh"] -[ext_resource type="Script" path="res://src/ui/hud/item_stash_menu/item_stash_menu.gd" id="2_7jmcp"] +[ext_resource type="Script" path="res://src/ui/item_stash_menu/item_stash_menu.gd" id="2_7jmcp"] [ext_resource type="Texture2D" uid="uid://dl22jvey8l5fo" path="res://assets/hud/hud_atlas.png" id="3_8ah5h"] [ext_resource type="StyleBox" uid="uid://cwmhuo2ppjfx2" path="res://resources/theme/common/rect_container_m.tres" id="3_tvpws"] -[ext_resource type="PackedScene" uid="uid://c1ccsqvpyqd4i" path="res://src/ui/hud/buttons/recipe_button.tscn" id="7_4dttm"] +[ext_resource type="PackedScene" uid="uid://c1ccsqvpyqd4i" path="res://src/ui/buttons/recipe_button.tscn" id="7_4dttm"] [ext_resource type="Texture2D" uid="uid://b1oind72lxrm4" path="res://resources/icons/hud/recipe_rebrew.tres" id="8_aeibv"] [ext_resource type="Texture2D" uid="uid://dfqns87v0xu7x" path="res://resources/icons/hud/recipe_distill.tres" id="9_nqpec"] [ext_resource type="Texture2D" uid="uid://bk4dvb16ukwx8" path="res://resources/icons/hud/recipe_reassemble.tres" id="10_yki42"] [ext_resource type="Texture2D" uid="uid://bqsnuywmbb5c1" path="res://resources/icons/mechanical/alchemy_kit_03.tres" id="11_vmis2"] [ext_resource type="Texture2D" uid="uid://bvclahxp4mvge" path="res://resources/icons/hud/recipe_perfect.tres" id="11_vtu31"] [ext_resource type="Texture2D" uid="uid://b30yt0bkbmhsj" path="res://resources/icons/mechanical/alchemy_kit_01.tres" id="12_b1vp8"] -[ext_resource type="PackedScene" uid="uid://beu73m131qhyk" path="res://src/ui/hud/unit_menu/item_container_panel.tscn" id="12_f1ua4"] -[ext_resource type="PackedScene" uid="uid://ib3y0a6h0v46" path="res://src/ui/hud/filters/item_type_filter.tscn" id="13_1dykx"] +[ext_resource type="PackedScene" uid="uid://beu73m131qhyk" path="res://src/ui/unit_menu/item_container_panel.tscn" id="12_f1ua4"] +[ext_resource type="PackedScene" uid="uid://ib3y0a6h0v46" path="res://src/ui/filter_buttons/item_type_filter.tscn" id="13_1dykx"] [ext_resource type="Texture2D" uid="uid://bkmyw11w5jqjw" path="res://resources/icons/magic/magic_stone.tres" id="13_hyx2e"] -[ext_resource type="PackedScene" uid="uid://qcct52drete4" path="res://src/ui/hud/filters/rarity_filter.tscn" id="14_bh43e"] +[ext_resource type="PackedScene" uid="uid://qcct52drete4" path="res://src/ui/filter_buttons/rarity_filter.tscn" id="14_bh43e"] [ext_resource type="Texture2D" uid="uid://60qc7jcvckhh" path="res://assets/hud/misc3.png" id="17_ba6s8"] diff --git a/src/ui/hud/player_resource_display.gd b/src/ui/player_resource_display/player_resource_display.gd similarity index 100% rename from src/ui/hud/player_resource_display.gd rename to src/ui/player_resource_display/player_resource_display.gd diff --git a/src/ui/hud/player_resource_display.tscn b/src/ui/player_resource_display/player_resource_display.tscn similarity index 95% rename from src/ui/hud/player_resource_display.tscn rename to src/ui/player_resource_display/player_resource_display.tscn index dff773256..dbe4f504b 100644 --- a/src/ui/hud/player_resource_display.tscn +++ b/src/ui/player_resource_display/player_resource_display.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=10 format=3 uid="uid://cc70ktmpmbjts"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_mggw6"] -[ext_resource type="Script" path="res://src/ui/hud/player_resource_display.gd" id="2_m57on"] +[ext_resource type="Script" path="res://src/ui/player_resource_display/player_resource_display.gd" id="2_m57on"] [ext_resource type="StyleBox" uid="uid://dt873umx4sexx" path="res://resources/theme/player_resource_display/rect_container_top_menu.tres" id="3_i5jws"] -[ext_resource type="PackedScene" uid="uid://1a6qmxkrspc8" path="res://src/ui/hud/status_panel/resource_status_panel.tscn" id="4_ajusi"] +[ext_resource type="PackedScene" uid="uid://1a6qmxkrspc8" path="res://src/ui/player_resource_display/resource_status_panel.tscn" id="4_ajusi"] [ext_resource type="Texture2D" uid="uid://bxqh2nddd7eni" path="res://resources/icons/hud/gold.tres" id="5_uvsoy"] [ext_resource type="Texture2D" uid="uid://d1d4h6m0klgw1" path="res://resources/icons/hud/knowledge_tome.tres" id="6_6qkfi"] [ext_resource type="Texture2D" uid="uid://baig85lpi88u" path="res://resources/icons/hud/tower_food.tres" id="7_rye6p"] diff --git a/src/ui/hud/status_panel/resource_status_panel.gd b/src/ui/player_resource_display/resource_status_panel.gd similarity index 100% rename from src/ui/hud/status_panel/resource_status_panel.gd rename to src/ui/player_resource_display/resource_status_panel.gd diff --git a/src/ui/hud/status_panel/resource_status_panel.tscn b/src/ui/player_resource_display/resource_status_panel.tscn similarity index 92% rename from src/ui/hud/status_panel/resource_status_panel.tscn rename to src/ui/player_resource_display/resource_status_panel.tscn index 95623ef84..84dc19334 100644 --- a/src/ui/hud/status_panel/resource_status_panel.tscn +++ b/src/ui/player_resource_display/resource_status_panel.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://1a6qmxkrspc8"] [ext_resource type="StyleBox" uid="uid://8o35dfhhk4km" path="res://resources/theme/player_resource_display/resource_status_panel.tres" id="1_ri1eg"] -[ext_resource type="Script" path="res://src/ui/hud/status_panel/resource_status_panel.gd" id="2_y71mw"] +[ext_resource type="Script" path="res://src/ui/player_resource_display/resource_status_panel.gd" id="2_y71mw"] [node name="ResourceStatusPanel" type="Panel" node_paths=PackedStringArray("_label", "_icon")] custom_minimum_size = Vector2(130, 38) diff --git a/src/ui/title_screen/title_screen.tscn b/src/ui/title_screen/title_screen.tscn index 6464bc383..2e964615a 100644 --- a/src/ui/title_screen/title_screen.tscn +++ b/src/ui/title_screen/title_screen.tscn @@ -16,7 +16,7 @@ [ext_resource type="PackedScene" uid="uid://dkxudlev66vnr" path="res://src/ui/title_screen/online/online_lobby_menu.tscn" id="11_b1t0j"] [ext_resource type="PackedScene" uid="uid://cecaq4wvkvxv3" path="res://src/ui/title_screen/lan_match/lan_lobby_menu.tscn" id="12_3m802"] [ext_resource type="PackedScene" uid="uid://dhvrqpk4snrok" path="res://src/ui/title_screen/missions_menu/missions_menu.tscn" id="14_5jj2m"] -[ext_resource type="PackedScene" uid="uid://i0b3uilwt2as" path="res://src/ui/hud/build_version.tscn" id="16_xve8p"] +[ext_resource type="PackedScene" uid="uid://i0b3uilwt2as" path="res://src/ui/hud/build_version_label.tscn" id="16_xve8p"] [ext_resource type="PackedScene" uid="uid://bvc2yim85t7vs" path="res://src/ui/title_screen/notification_panel.tscn" id="17_whg35"] [ext_resource type="PackedScene" uid="uid://chegdechhho3d" path="res://src/ui/title_screen/connecting_to_server_indicator.tscn" id="18_5n8qn"] diff --git a/src/ui/hud/game_stats.gd b/src/ui/top_left_menu/game_stats.gd similarity index 100% rename from src/ui/hud/game_stats.gd rename to src/ui/top_left_menu/game_stats.gd diff --git a/src/ui/hud/game_stats.tscn b/src/ui/top_left_menu/game_stats.tscn similarity index 95% rename from src/ui/hud/game_stats.tscn rename to src/ui/top_left_menu/game_stats.tscn index 83da6210d..4e11fc168 100644 --- a/src/ui/hud/game_stats.tscn +++ b/src/ui/top_left_menu/game_stats.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://jm3vhrboca8b"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_fcvcc"] -[ext_resource type="Script" path="res://src/ui/hud/game_stats.gd" id="2_yyjiq"] +[ext_resource type="Script" path="res://src/ui/top_left_menu/game_stats.gd" id="2_yyjiq"] [ext_resource type="Script" path="res://src/ui/hud/label_with_rich_tooltip.gd" id="3_r8spy"] [node name="GameStats" type="VBoxContainer" node_paths=PackedStringArray("_settings_label", "_builder_label", "_stats_label")] diff --git a/src/ui/hud/top_left_menu.gd b/src/ui/top_left_menu/top_left_menu.gd similarity index 100% rename from src/ui/hud/top_left_menu.gd rename to src/ui/top_left_menu/top_left_menu.gd diff --git a/src/ui/hud/top_left_menu.tscn b/src/ui/top_left_menu/top_left_menu.tscn similarity index 74% rename from src/ui/hud/top_left_menu.tscn rename to src/ui/top_left_menu/top_left_menu.tscn index 73e1c1f31..3375a1575 100644 --- a/src/ui/hud/top_left_menu.tscn +++ b/src/ui/top_left_menu/top_left_menu.tscn @@ -1,17 +1,16 @@ [gd_scene load_steps=6 format=3 uid="uid://b3grhp7bp5t54"] -[ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_lhpbt"] -[ext_resource type="Script" path="res://src/ui/hud/top_left_menu.gd" id="2_ijvc2"] -[ext_resource type="PackedScene" uid="uid://4tcjyre0hoji" path="res://src/ui/hud/wave_status.tscn" id="2_l18jy"] -[ext_resource type="PackedScene" uid="uid://jm3vhrboca8b" path="res://src/ui/hud/game_stats.tscn" id="3_k62ty"] - +[ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_fewds"] +[ext_resource type="Script" path="res://src/ui/top_left_menu/top_left_menu.gd" id="2_j6xl1"] +[ext_resource type="PackedScene" uid="uid://4tcjyre0hoji" path="res://src/ui/top_left_menu/wave_status.tscn" id="3_8qtkf"] +[ext_resource type="PackedScene" uid="uid://jm3vhrboca8b" path="res://src/ui/top_left_menu/game_stats.tscn" id="4_8lyyh"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_hwtay"] [node name="TopLeftMenu" type="PanelContainer" node_paths=PackedStringArray("_wave_status", "_game_stats")] -theme = ExtResource("1_lhpbt") +theme = ExtResource("1_fewds") theme_override_styles/panel = SubResource("StyleBoxEmpty_hwtay") -script = ExtResource("2_ijvc2") +script = ExtResource("2_j6xl1") _wave_status = NodePath("TabContainer/Wave Status") _game_stats = NodePath("TabContainer/Game Stats") @@ -22,11 +21,11 @@ layout_mode = 2 current_tab = 0 tab_focus_mode = 0 -[node name="Wave Status" parent="TabContainer" instance=ExtResource("2_l18jy")] +[node name="Wave Status" parent="TabContainer" instance=ExtResource("3_8qtkf")] layout_mode = 2 metadata/_tab_index = 0 -[node name="Game Stats" parent="TabContainer" instance=ExtResource("3_k62ty")] +[node name="Game Stats" parent="TabContainer" instance=ExtResource("4_8lyyh")] visible = false layout_mode = 2 metadata/_tab_index = 1 diff --git a/src/ui/hud/wave_status.gd b/src/ui/top_left_menu/wave_status.gd similarity index 100% rename from src/ui/hud/wave_status.gd rename to src/ui/top_left_menu/wave_status.gd diff --git a/src/ui/hud/wave_status.tscn b/src/ui/top_left_menu/wave_status.tscn similarity index 98% rename from src/ui/hud/wave_status.tscn rename to src/ui/top_left_menu/wave_status.tscn index 190732ed8..1fc1c6923 100644 --- a/src/ui/hud/wave_status.tscn +++ b/src/ui/top_left_menu/wave_status.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://4tcjyre0hoji"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_3h6gw"] -[ext_resource type="Script" path="res://src/ui/hud/wave_status.gd" id="2_fsc15"] +[ext_resource type="Script" path="res://src/ui/top_left_menu/wave_status.gd" id="2_fsc15"] [ext_resource type="Script" path="res://src/ui/hud/rich_text_label_with_rich_tooltip.gd" id="3_crgv5"] [sub_resource type="InputEventKey" id="InputEventKey_srlh2"] diff --git a/src/ui/hud/tower_stash_menu/tower_stash_menu.gd b/src/ui/tower_stash_menu/tower_stash_menu.gd similarity index 100% rename from src/ui/hud/tower_stash_menu/tower_stash_menu.gd rename to src/ui/tower_stash_menu/tower_stash_menu.gd diff --git a/src/ui/hud/tower_stash_menu/tower_stash_menu.tscn b/src/ui/tower_stash_menu/tower_stash_menu.tscn similarity index 96% rename from src/ui/hud/tower_stash_menu/tower_stash_menu.tscn rename to src/ui/tower_stash_menu/tower_stash_menu.tscn index 403452253..6b400605d 100644 --- a/src/ui/hud/tower_stash_menu/tower_stash_menu.tscn +++ b/src/ui/tower_stash_menu/tower_stash_menu.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=9 format=3 uid="uid://donslrrviy807"] -[ext_resource type="Script" path="res://src/ui/hud/tower_stash_menu/tower_stash_menu.gd" id="1_3360v"] -[ext_resource type="PackedScene" uid="uid://8xsklkw4jhlw" path="res://src/ui/hud/buttons/empty_unit_button.tscn" id="3_egows"] +[ext_resource type="Script" path="res://src/ui/tower_stash_menu/tower_stash_menu.gd" id="1_3360v"] +[ext_resource type="PackedScene" uid="uid://8xsklkw4jhlw" path="res://src/ui/buttons/empty_unit_button.tscn" id="3_egows"] [ext_resource type="Texture2D" uid="uid://60qc7jcvckhh" path="res://assets/hud/misc3.png" id="3_o2dlo"] [ext_resource type="StyleBox" uid="uid://cwmhuo2ppjfx2" path="res://resources/theme/common/rect_container_m.tres" id="4_jlt7a"] -[ext_resource type="PackedScene" uid="uid://qcct52drete4" path="res://src/ui/hud/filters/rarity_filter.tscn" id="6_x6hx1"] -[ext_resource type="PackedScene" uid="uid://l8hrrql7ne16" path="res://src/ui/hud/filters/element_filter.tscn" id="7_s88kh"] +[ext_resource type="PackedScene" uid="uid://qcct52drete4" path="res://src/ui/filter_buttons/rarity_filter.tscn" id="6_x6hx1"] +[ext_resource type="PackedScene" uid="uid://l8hrrql7ne16" path="res://src/ui/filter_buttons/element_filter.tscn" id="7_s88kh"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_h654a"] diff --git a/src/ui/hud/unit_menu/buff_container.gd b/src/ui/unit_menu/buff_container.gd similarity index 100% rename from src/ui/hud/unit_menu/buff_container.gd rename to src/ui/unit_menu/buff_container.gd diff --git a/src/ui/hud/unit_menu/buff_container.tscn b/src/ui/unit_menu/buff_container.tscn similarity index 93% rename from src/ui/hud/unit_menu/buff_container.tscn rename to src/ui/unit_menu/buff_container.tscn index 0362c5499..342e699da 100644 --- a/src/ui/hud/unit_menu/buff_container.tscn +++ b/src/ui/unit_menu/buff_container.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://7hnklay7gedu"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/buff_container.gd" id="1_5eut6"] -[ext_resource type="PackedScene" uid="uid://d4mgo5v7j01kj" path="res://src/ui/hud/unit_menu/buff_display.tscn" id="2_nldtx"] +[ext_resource type="Script" path="res://src/ui/unit_menu/buff_container.gd" id="1_5eut6"] +[ext_resource type="PackedScene" uid="uid://d4mgo5v7j01kj" path="res://src/ui/unit_menu/buff_display.tscn" id="2_nldtx"] [node name="BuffContainer" type="VBoxContainer" node_paths=PackedStringArray("_row_top", "_row_bottom")] offset_right = 412.0 diff --git a/src/ui/hud/unit_menu/buff_display.gd b/src/ui/unit_menu/buff_display.gd similarity index 100% rename from src/ui/hud/unit_menu/buff_display.gd rename to src/ui/unit_menu/buff_display.gd diff --git a/src/ui/hud/unit_menu/buff_display.tscn b/src/ui/unit_menu/buff_display.tscn similarity index 92% rename from src/ui/hud/unit_menu/buff_display.tscn rename to src/ui/unit_menu/buff_display.tscn index f50eefed6..857f89f8d 100644 --- a/src/ui/hud/unit_menu/buff_display.tscn +++ b/src/ui/unit_menu/buff_display.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=6 format=3 uid="uid://d4mgo5v7j01kj"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/buff_display.gd" id="1_k2kus"] +[ext_resource type="Script" path="res://src/ui/unit_menu/buff_display.gd" id="1_k2kus"] [ext_resource type="Texture2D" uid="uid://bv7gu3v3jconv" path="res://resources/icons/generic_icons/alligator_clip.tres" id="2_ofmfc"] -[ext_resource type="PackedScene" uid="uid://d1i5vdh8yrhbx" path="res://src/ui/hud/buttons/time_indicator.tscn" id="3_3v1eu"] +[ext_resource type="PackedScene" uid="uid://d1i5vdh8yrhbx" path="res://src/ui/buttons/time_indicator.tscn" id="3_3v1eu"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_si6yn"] bg_color = Color(0.0509804, 0.0509804, 0.0509804, 1) diff --git a/src/ui/hud/unit_menu/buff_group_editor.gd b/src/ui/unit_menu/buff_group_editor.gd similarity index 100% rename from src/ui/hud/unit_menu/buff_group_editor.gd rename to src/ui/unit_menu/buff_group_editor.gd diff --git a/src/ui/hud/unit_menu/buff_group_editor.tscn b/src/ui/unit_menu/buff_group_editor.tscn similarity index 84% rename from src/ui/hud/unit_menu/buff_group_editor.tscn rename to src/ui/unit_menu/buff_group_editor.tscn index d61ef92c4..adace891d 100644 --- a/src/ui/hud/unit_menu/buff_group_editor.tscn +++ b/src/ui/unit_menu/buff_group_editor.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://ccys3jpdwu3ft"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/buff_group_editor.gd" id="1_8s3be"] -[ext_resource type="PackedScene" uid="uid://dfid7khpwu0i8" path="res://src/ui/hud/buttons/buff_group_button.tscn" id="1_c3k71"] +[ext_resource type="Script" path="res://src/ui/unit_menu/buff_group_editor.gd" id="1_8s3be"] +[ext_resource type="PackedScene" uid="uid://dfid7khpwu0i8" path="res://src/ui/buttons/buff_group_button.tscn" id="1_c3k71"] [node name="BuffGroupEditor" type="HBoxContainer"] script = ExtResource("1_8s3be") diff --git a/src/ui/hud/unit_menu/creep_details.gd b/src/ui/unit_menu/creep_details.gd similarity index 100% rename from src/ui/hud/unit_menu/creep_details.gd rename to src/ui/unit_menu/creep_details.gd diff --git a/src/ui/hud/unit_menu/creep_details.tscn b/src/ui/unit_menu/creep_details.tscn similarity index 99% rename from src/ui/hud/unit_menu/creep_details.tscn rename to src/ui/unit_menu/creep_details.tscn index 3ec121ae2..afa943ca9 100644 --- a/src/ui/hud/unit_menu/creep_details.tscn +++ b/src/ui/unit_menu/creep_details.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://b1l5uiun5nhhx"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_m73wp"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/creep_details.gd" id="2_a46i7"] +[ext_resource type="Script" path="res://src/ui/unit_menu/creep_details.gd" id="2_a46i7"] [ext_resource type="Texture2D" uid="uid://60qc7jcvckhh" path="res://assets/hud/misc3.png" id="3_6vdvx"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_gcimn"] diff --git a/src/ui/hud/unit_menu/creep_mini_details.gd b/src/ui/unit_menu/creep_mini_details.gd similarity index 100% rename from src/ui/hud/unit_menu/creep_mini_details.gd rename to src/ui/unit_menu/creep_mini_details.gd diff --git a/src/ui/hud/unit_menu/creep_mini_details.tscn b/src/ui/unit_menu/creep_mini_details.tscn similarity index 89% rename from src/ui/hud/unit_menu/creep_mini_details.tscn rename to src/ui/unit_menu/creep_mini_details.tscn index e7dfe848a..92700c466 100644 --- a/src/ui/hud/unit_menu/creep_mini_details.tscn +++ b/src/ui/unit_menu/creep_mini_details.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bkknomxku1jcv"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/creep_mini_details.gd" id="1_0rr73"] -[ext_resource type="PackedScene" uid="uid://b5kapr6gujqbt" path="res://src/ui/hud/unit_menu/mini_details_label.tscn" id="2_swo34"] +[ext_resource type="Script" path="res://src/ui/unit_menu/creep_mini_details.gd" id="1_0rr73"] +[ext_resource type="PackedScene" uid="uid://b5kapr6gujqbt" path="res://src/ui/unit_menu/mini_details_label.tscn" id="2_swo34"] [node name="CreepMiniDetails" type="TabContainer" node_paths=PackedStringArray("_stats_left_label", "_stats_right_label", "_dmg_left_label", "_dmg_right_label")] diff --git a/src/ui/hud/unit_menu/item_container_panel.gd b/src/ui/unit_menu/item_container_panel.gd similarity index 100% rename from src/ui/hud/unit_menu/item_container_panel.gd rename to src/ui/unit_menu/item_container_panel.gd diff --git a/src/ui/hud/unit_menu/item_container_panel.tscn b/src/ui/unit_menu/item_container_panel.tscn similarity index 92% rename from src/ui/hud/unit_menu/item_container_panel.tscn rename to src/ui/unit_menu/item_container_panel.tscn index f9f61c4b7..4e0518eb2 100644 --- a/src/ui/hud/unit_menu/item_container_panel.tscn +++ b/src/ui/unit_menu/item_container_panel.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=6 format=3 uid="uid://beu73m131qhyk"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_663hy"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/item_container_panel.gd" id="2_uxpon"] -[ext_resource type="PackedScene" uid="uid://8xsklkw4jhlw" path="res://src/ui/hud/buttons/empty_unit_button.tscn" id="3_6p1q1"] -[ext_resource type="PackedScene" uid="uid://fwj77pscccxg" path="res://src/ui/hud/buttons/inventory_slot_button.tscn" id="4_mvykn"] -[ext_resource type="PackedScene" uid="uid://cj8l153f630bb" path="res://src/ui/hud/buttons/item_button.tscn" id="5_22vk1"] +[ext_resource type="Script" path="res://src/ui/unit_menu/item_container_panel.gd" id="2_uxpon"] +[ext_resource type="PackedScene" uid="uid://8xsklkw4jhlw" path="res://src/ui/buttons/empty_unit_button.tscn" id="3_6p1q1"] +[ext_resource type="PackedScene" uid="uid://fwj77pscccxg" path="res://src/ui/buttons/inventory_slot_button.tscn" id="4_mvykn"] +[ext_resource type="PackedScene" uid="uid://cj8l153f630bb" path="res://src/ui/buttons/item_button.tscn" id="5_22vk1"] [node name="ItemContainerPanel" type="MarginContainer" node_paths=PackedStringArray("_background_grid", "_slot_grid", "_item_grid")] diff --git a/src/ui/hud/unit_menu/mini_details_label.tscn b/src/ui/unit_menu/mini_details_label.tscn similarity index 100% rename from src/ui/hud/unit_menu/mini_details_label.tscn rename to src/ui/unit_menu/mini_details_label.tscn diff --git a/src/ui/hud/unit_menu/progress_bar_with_label.gd b/src/ui/unit_menu/progress_bar_with_label.gd similarity index 100% rename from src/ui/hud/unit_menu/progress_bar_with_label.gd rename to src/ui/unit_menu/progress_bar_with_label.gd diff --git a/src/ui/hud/unit_menu/progress_bar_with_label.tscn b/src/ui/unit_menu/progress_bar_with_label.tscn similarity index 92% rename from src/ui/hud/unit_menu/progress_bar_with_label.tscn rename to src/ui/unit_menu/progress_bar_with_label.tscn index 120d0869e..d956a2720 100644 --- a/src/ui/hud/unit_menu/progress_bar_with_label.tscn +++ b/src/ui/unit_menu/progress_bar_with_label.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://bscc3lifv4bx4"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/progress_bar_with_label.gd" id="1_cdogi"] +[ext_resource type="Script" path="res://src/ui/unit_menu/progress_bar_with_label.gd" id="1_cdogi"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="2_78qlh"] [ext_resource type="StyleBox" uid="uid://cefr72vfj04ja" path="res://resources/theme/unit_menu/mana_bar_background.tres" id="2_dcp3a"] [ext_resource type="StyleBox" uid="uid://rku7yxxl0iit" path="res://resources/theme/unit_menu/mana_bar_fill.tres" id="3_dyv6x"] diff --git a/src/ui/hud/unit_menu/tower_details.gd b/src/ui/unit_menu/tower_details.gd similarity index 100% rename from src/ui/hud/unit_menu/tower_details.gd rename to src/ui/unit_menu/tower_details.gd diff --git a/src/ui/hud/unit_menu/tower_details.tscn b/src/ui/unit_menu/tower_details.tscn similarity index 99% rename from src/ui/hud/unit_menu/tower_details.tscn rename to src/ui/unit_menu/tower_details.tscn index 79dbf0add..e6a2c45ed 100644 --- a/src/ui/hud/unit_menu/tower_details.tscn +++ b/src/ui/unit_menu/tower_details.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://b6l4hi00yx7js"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_p3jli"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/tower_details.gd" id="2_arilw"] +[ext_resource type="Script" path="res://src/ui/unit_menu/tower_details.gd" id="2_arilw"] [ext_resource type="Texture2D" uid="uid://60qc7jcvckhh" path="res://assets/hud/misc3.png" id="3_3n5aj"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_w837r"] diff --git a/src/ui/hud/unit_menu/tower_mini_details.gd b/src/ui/unit_menu/tower_mini_details.gd similarity index 100% rename from src/ui/hud/unit_menu/tower_mini_details.gd rename to src/ui/unit_menu/tower_mini_details.gd diff --git a/src/ui/hud/unit_menu/tower_mini_details.tscn b/src/ui/unit_menu/tower_mini_details.tscn similarity index 93% rename from src/ui/hud/unit_menu/tower_mini_details.tscn rename to src/ui/unit_menu/tower_mini_details.tscn index c2b45b7fa..ba459abd0 100644 --- a/src/ui/hud/unit_menu/tower_mini_details.tscn +++ b/src/ui/unit_menu/tower_mini_details.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://dy7728ew6n4n"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/tower_mini_details.gd" id="1_nxq0b"] -[ext_resource type="PackedScene" uid="uid://b5kapr6gujqbt" path="res://src/ui/hud/unit_menu/mini_details_label.tscn" id="2_tifx3"] +[ext_resource type="Script" path="res://src/ui/unit_menu/tower_mini_details.gd" id="1_nxq0b"] +[ext_resource type="PackedScene" uid="uid://b5kapr6gujqbt" path="res://src/ui/unit_menu/mini_details_label.tscn" id="2_tifx3"] [node name="TowerMiniDetails" type="TabContainer" node_paths=PackedStringArray("_dmg_left_label", "_dmg_right_label", "_misc_left_label", "_misc_right_label", "_types_left_label", "_types_right_label", "_oils_label")] diff --git a/src/ui/hud/unit_menu/unit_menu.gd b/src/ui/unit_menu/unit_menu.gd similarity index 100% rename from src/ui/hud/unit_menu/unit_menu.gd rename to src/ui/unit_menu/unit_menu.gd diff --git a/src/ui/hud/unit_menu/unit_menu.tscn b/src/ui/unit_menu/unit_menu.tscn similarity index 96% rename from src/ui/hud/unit_menu/unit_menu.tscn rename to src/ui/unit_menu/unit_menu.tscn index f81912806..af26e35cd 100644 --- a/src/ui/hud/unit_menu/unit_menu.tscn +++ b/src/ui/unit_menu/unit_menu.tscn @@ -1,23 +1,23 @@ [gd_scene load_steps=27 format=3 uid="uid://dcqjart40vpjy"] [ext_resource type="Theme" uid="uid://bql5sxaowafw3" path="res://resources/theme/wc3_theme.tres" id="1_trhe5"] -[ext_resource type="Script" path="res://src/ui/hud/unit_menu/unit_menu.gd" id="2_maep6"] -[ext_resource type="PackedScene" uid="uid://ni34yd5liwbj" path="res://src/ui/hud/buttons/tower_button.tscn" id="3_muugt"] -[ext_resource type="PackedScene" uid="uid://8xsklkw4jhlw" path="res://src/ui/hud/buttons/empty_unit_button.tscn" id="4_bl3rp"] +[ext_resource type="Script" path="res://src/ui/unit_menu/unit_menu.gd" id="2_maep6"] +[ext_resource type="PackedScene" uid="uid://ni34yd5liwbj" path="res://src/ui/buttons/tower_button.tscn" id="3_muugt"] +[ext_resource type="PackedScene" uid="uid://8xsklkw4jhlw" path="res://src/ui/buttons/empty_unit_button.tscn" id="4_bl3rp"] [ext_resource type="StyleBox" uid="uid://c2wcu6a3ywhdl" path="res://resources/theme/unit_menu/unit_level_label_normal.tres" id="4_mpyt6"] -[ext_resource type="PackedScene" uid="uid://d0aesr1u8n1xt" path="res://src/ui/hud/buttons/ability_button.tscn" id="5_iq4vd"] -[ext_resource type="PackedScene" uid="uid://ccys3jpdwu3ft" path="res://src/ui/hud/unit_menu/buff_group_editor.tscn" id="5_v3s2e"] +[ext_resource type="PackedScene" uid="uid://d0aesr1u8n1xt" path="res://src/ui/buttons/ability_button.tscn" id="5_iq4vd"] +[ext_resource type="PackedScene" uid="uid://ccys3jpdwu3ft" path="res://src/ui/unit_menu/buff_group_editor.tscn" id="5_v3s2e"] [ext_resource type="Texture2D" uid="uid://60qc7jcvckhh" path="res://assets/hud/misc3.png" id="5_xoeuc"] -[ext_resource type="PackedScene" uid="uid://7hnklay7gedu" path="res://src/ui/hud/unit_menu/buff_container.tscn" id="8_1niac"] -[ext_resource type="PackedScene" uid="uid://bscc3lifv4bx4" path="res://src/ui/hud/unit_menu/progress_bar_with_label.tscn" id="8_7iile"] +[ext_resource type="PackedScene" uid="uid://7hnklay7gedu" path="res://src/ui/unit_menu/buff_container.tscn" id="8_1niac"] +[ext_resource type="PackedScene" uid="uid://bscc3lifv4bx4" path="res://src/ui/unit_menu/progress_bar_with_label.tscn" id="8_7iile"] [ext_resource type="Texture2D" uid="uid://gjoldkg0ife" path="res://resources/icons/creep_icons/orc_normal.tres" id="9_7dqoj"] [ext_resource type="StyleBox" uid="uid://bxmrnso7h7np1" path="res://resources/theme/unit_menu/exp_bar_background.tres" id="9_lvj74"] [ext_resource type="StyleBox" uid="uid://dab1qvryjypqs" path="res://resources/theme/unit_menu/exp_bar_fill.tres" id="10_6udoc"] [ext_resource type="StyleBox" uid="uid://bg0camfo41dqc" path="res://resources/theme/unit_menu/health_bar_background.tres" id="13_10x1w"] [ext_resource type="StyleBox" uid="uid://1g0617tasr0m" path="res://resources/theme/unit_menu/health_bar_fill.tres" id="14_sjp88"] -[ext_resource type="PackedScene" uid="uid://beu73m131qhyk" path="res://src/ui/hud/unit_menu/item_container_panel.tscn" id="15_c66ma"] -[ext_resource type="PackedScene" uid="uid://dy7728ew6n4n" path="res://src/ui/hud/unit_menu/tower_mini_details.tscn" id="18_q420s"] -[ext_resource type="PackedScene" uid="uid://bkknomxku1jcv" path="res://src/ui/hud/unit_menu/creep_mini_details.tscn" id="19_fhhud"] +[ext_resource type="PackedScene" uid="uid://beu73m131qhyk" path="res://src/ui/unit_menu/item_container_panel.tscn" id="15_c66ma"] +[ext_resource type="PackedScene" uid="uid://dy7728ew6n4n" path="res://src/ui/unit_menu/tower_mini_details.tscn" id="18_q420s"] +[ext_resource type="PackedScene" uid="uid://bkknomxku1jcv" path="res://src/ui/unit_menu/creep_mini_details.tscn" id="19_fhhud"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0es22"]