diff --git a/save_load/assets/folder-open-hover.png b/assets/ui/folder-open-hover.png similarity index 100% rename from save_load/assets/folder-open-hover.png rename to assets/ui/folder-open-hover.png diff --git a/save_load/assets/folder-open-hover.png.import b/assets/ui/folder-open-hover.png.import similarity index 69% rename from save_load/assets/folder-open-hover.png.import rename to assets/ui/folder-open-hover.png.import index f68715f..c044877 100644 --- a/save_load/assets/folder-open-hover.png.import +++ b/assets/ui/folder-open-hover.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://by4w5ll3le7g6" -path="res://.godot/imported/folder-open-hover.png-a1ef3a807e674ab8f8806dada553ab61.ctex" +path="res://.godot/imported/folder-open-hover.png-30b298f03eda987ff7b4c29cb81e0196.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/folder-open-hover.png" -dest_files=["res://.godot/imported/folder-open-hover.png-a1ef3a807e674ab8f8806dada553ab61.ctex"] +source_file="res://assets/ui/folder-open-hover.png" +dest_files=["res://.godot/imported/folder-open-hover.png-30b298f03eda987ff7b4c29cb81e0196.ctex"] [params] diff --git a/save_load/assets/folder-open-normal.png b/assets/ui/folder-open-normal.png similarity index 100% rename from save_load/assets/folder-open-normal.png rename to assets/ui/folder-open-normal.png diff --git a/save_load/assets/folder-open-normal.png.import b/assets/ui/folder-open-normal.png.import similarity index 69% rename from save_load/assets/folder-open-normal.png.import rename to assets/ui/folder-open-normal.png.import index 23f63a6..3acb634 100644 --- a/save_load/assets/folder-open-normal.png.import +++ b/assets/ui/folder-open-normal.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cmq51cgasug81" -path="res://.godot/imported/folder-open-normal.png-f7f228a37723c0515dbd7272838372e1.ctex" +path="res://.godot/imported/folder-open-normal.png-f3b3efc8925c789ef79f8d8da6495fd6.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/folder-open-normal.png" -dest_files=["res://.godot/imported/folder-open-normal.png-f7f228a37723c0515dbd7272838372e1.ctex"] +source_file="res://assets/ui/folder-open-normal.png" +dest_files=["res://.godot/imported/folder-open-normal.png-f3b3efc8925c789ef79f8d8da6495fd6.ctex"] [params] diff --git a/save_load/assets/folder-open-pressed.png b/assets/ui/folder-open-pressed.png similarity index 100% rename from save_load/assets/folder-open-pressed.png rename to assets/ui/folder-open-pressed.png diff --git a/save_load/assets/folder-open-pressed.png.import b/assets/ui/folder-open-pressed.png.import similarity index 68% rename from save_load/assets/folder-open-pressed.png.import rename to assets/ui/folder-open-pressed.png.import index 3e826ff..1a93eaa 100644 --- a/save_load/assets/folder-open-pressed.png.import +++ b/assets/ui/folder-open-pressed.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://blyryo60jydgi" -path="res://.godot/imported/folder-open-pressed.png-b69b4af3e2256bb46d3464e4d48a50c0.ctex" +path="res://.godot/imported/folder-open-pressed.png-96c8378f366a7c3f00bd052101358d2d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/folder-open-pressed.png" -dest_files=["res://.godot/imported/folder-open-pressed.png-b69b4af3e2256bb46d3464e4d48a50c0.ctex"] +source_file="res://assets/ui/folder-open-pressed.png" +dest_files=["res://.godot/imported/folder-open-pressed.png-96c8378f366a7c3f00bd052101358d2d.ctex"] [params] diff --git a/save_load/assets/save-hover.png b/assets/ui/save-hover.png similarity index 100% rename from save_load/assets/save-hover.png rename to assets/ui/save-hover.png diff --git a/save_load/assets/save-hover.png.import b/assets/ui/save-hover.png.import similarity index 71% rename from save_load/assets/save-hover.png.import rename to assets/ui/save-hover.png.import index aa0c408..22a9354 100644 --- a/save_load/assets/save-hover.png.import +++ b/assets/ui/save-hover.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://o3l0j53mgkan" -path="res://.godot/imported/save-hover.png-a059532ff43c1b9b7f190c464e6ac95e.ctex" +path="res://.godot/imported/save-hover.png-7fdcaa20e46d61abf1ad21c191339e15.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/save-hover.png" -dest_files=["res://.godot/imported/save-hover.png-a059532ff43c1b9b7f190c464e6ac95e.ctex"] +source_file="res://assets/ui/save-hover.png" +dest_files=["res://.godot/imported/save-hover.png-7fdcaa20e46d61abf1ad21c191339e15.ctex"] [params] diff --git a/save_load/assets/save-normal.png b/assets/ui/save-normal.png similarity index 100% rename from save_load/assets/save-normal.png rename to assets/ui/save-normal.png diff --git a/save_load/assets/save-normal.png.import b/assets/ui/save-normal.png.import similarity index 71% rename from save_load/assets/save-normal.png.import rename to assets/ui/save-normal.png.import index cb6ff20..2d270bf 100644 --- a/save_load/assets/save-normal.png.import +++ b/assets/ui/save-normal.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://ja8bc1h5x85o" -path="res://.godot/imported/save-normal.png-126e9be66da8efc0f0eb84b8cc03c6ff.ctex" +path="res://.godot/imported/save-normal.png-52807bf4c046513286efdc3c8e34024f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/save-normal.png" -dest_files=["res://.godot/imported/save-normal.png-126e9be66da8efc0f0eb84b8cc03c6ff.ctex"] +source_file="res://assets/ui/save-normal.png" +dest_files=["res://.godot/imported/save-normal.png-52807bf4c046513286efdc3c8e34024f.ctex"] [params] diff --git a/save_load/assets/save-pressed.png b/assets/ui/save-pressed.png similarity index 100% rename from save_load/assets/save-pressed.png rename to assets/ui/save-pressed.png diff --git a/save_load/assets/save-pressed.png.import b/assets/ui/save-pressed.png.import similarity index 70% rename from save_load/assets/save-pressed.png.import rename to assets/ui/save-pressed.png.import index 8583721..09d7a2d 100644 --- a/save_load/assets/save-pressed.png.import +++ b/assets/ui/save-pressed.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://crqgyft4gfilt" -path="res://.godot/imported/save-pressed.png-49f5851a0548d3847310651a4ef477c2.ctex" +path="res://.godot/imported/save-pressed.png-2e1c957e7e0122a7212e624479432e6e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/save-pressed.png" -dest_files=["res://.godot/imported/save-pressed.png-49f5851a0548d3847310651a4ef477c2.ctex"] +source_file="res://assets/ui/save-pressed.png" +dest_files=["res://.godot/imported/save-pressed.png-2e1c957e7e0122a7212e624479432e6e.ctex"] [params] diff --git a/save_load/assets/trash-hover.png b/assets/ui/trash-hover.png similarity index 100% rename from save_load/assets/trash-hover.png rename to assets/ui/trash-hover.png diff --git a/save_load/assets/trash-hover.png.import b/assets/ui/trash-hover.png.import similarity index 71% rename from save_load/assets/trash-hover.png.import rename to assets/ui/trash-hover.png.import index 0e256da..816c900 100644 --- a/save_load/assets/trash-hover.png.import +++ b/assets/ui/trash-hover.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cmrtuy0i5qc01" -path="res://.godot/imported/trash-hover.png-0c87af6ed9b10a21de0dd22a56db8a47.ctex" +path="res://.godot/imported/trash-hover.png-c251e165aefa0e6e3b0d1056b13c4069.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/trash-hover.png" -dest_files=["res://.godot/imported/trash-hover.png-0c87af6ed9b10a21de0dd22a56db8a47.ctex"] +source_file="res://assets/ui/trash-hover.png" +dest_files=["res://.godot/imported/trash-hover.png-c251e165aefa0e6e3b0d1056b13c4069.ctex"] [params] diff --git a/save_load/assets/trash-normal.png b/assets/ui/trash-normal.png similarity index 100% rename from save_load/assets/trash-normal.png rename to assets/ui/trash-normal.png diff --git a/save_load/assets/trash-normal.png.import b/assets/ui/trash-normal.png.import similarity index 70% rename from save_load/assets/trash-normal.png.import rename to assets/ui/trash-normal.png.import index 37967e7..6c1b8b1 100644 --- a/save_load/assets/trash-normal.png.import +++ b/assets/ui/trash-normal.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dvp5yeoqw36yt" -path="res://.godot/imported/trash-normal.png-9a70475e0bfa21e155c8f068d078dd58.ctex" +path="res://.godot/imported/trash-normal.png-1b0b4c772e81c3db536c4de9f47346e0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/trash-normal.png" -dest_files=["res://.godot/imported/trash-normal.png-9a70475e0bfa21e155c8f068d078dd58.ctex"] +source_file="res://assets/ui/trash-normal.png" +dest_files=["res://.godot/imported/trash-normal.png-1b0b4c772e81c3db536c4de9f47346e0.ctex"] [params] diff --git a/save_load/assets/trash-pressed.png b/assets/ui/trash-pressed.png similarity index 100% rename from save_load/assets/trash-pressed.png rename to assets/ui/trash-pressed.png diff --git a/save_load/assets/trash-pressed.png.import b/assets/ui/trash-pressed.png.import similarity index 70% rename from save_load/assets/trash-pressed.png.import rename to assets/ui/trash-pressed.png.import index 42246df..2f6a163 100644 --- a/save_load/assets/trash-pressed.png.import +++ b/assets/ui/trash-pressed.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://brwa8yljyrlgy" -path="res://.godot/imported/trash-pressed.png-635c7d9409ea36b0244299e895c300c2.ctex" +path="res://.godot/imported/trash-pressed.png-55019366421198956cc6c4016ef656ac.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://save_load/assets/trash-pressed.png" -dest_files=["res://.godot/imported/trash-pressed.png-635c7d9409ea36b0244299e895c300c2.ctex"] +source_file="res://assets/ui/trash-pressed.png" +dest_files=["res://.godot/imported/trash-pressed.png-55019366421198956cc6c4016ef656ac.ctex"] [params] diff --git a/save_load/components/save_level_data_component.tscn b/save_load/components/save_level_data_component.tscn index 32421fe..bbbb252 100644 --- a/save_load/components/save_level_data_component.tscn +++ b/save_load/components/save_level_data_component.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://c3pqilb6yh5kc"] [ext_resource type="Script" uid="uid://c7x2qvyu62230" path="res://save_load/components/save_level_data_component.gd" id="1_exguq"] -[ext_resource type="Texture2D" uid="uid://60ib8urc8xjo" path="res://save_load/resources/default_save_icon.tres" id="2_hd7aa"] +[ext_resource type="Texture2D" uid="uid://b4lam0dwtv8fq" path="res://save_load/default_icon.svg" id="2_hd7aa"] [ext_resource type="Resource" uid="uid://o32fooj1lxg7" path="res://save_load/resources/save_game_settings_resource.tres" id="2_rkr1f"] [node name="SaveLevelDataComponent" type="Node"] diff --git a/save_load/resources/default_save_icon.tres b/save_load/resources/default_save_icon.tres deleted file mode 100644 index 1921e8e..0000000 --- a/save_load/resources/default_save_icon.tres +++ /dev/null @@ -1,4 +0,0 @@ -[gd_resource type="CompressedTexture2D" format=3 uid="uid://60ib8urc8xjo"] - -[resource] -load_path = "res://.godot/imported/icon.svg-56083ea2a1f1a4f1e49773bdc6d7826c.ctex" diff --git a/save_load/ui/save_file.gd b/scenes/ui/menus/saves_manager/save_file.gd similarity index 100% rename from save_load/ui/save_file.gd rename to scenes/ui/menus/saves_manager/save_file.gd diff --git a/save_load/ui/save_file.gd.uid b/scenes/ui/menus/saves_manager/save_file.gd.uid similarity index 100% rename from save_load/ui/save_file.gd.uid rename to scenes/ui/menus/saves_manager/save_file.gd.uid diff --git a/save_load/ui/save_file.tscn b/scenes/ui/menus/saves_manager/save_file.tscn similarity index 89% rename from save_load/ui/save_file.tscn rename to scenes/ui/menus/saves_manager/save_file.tscn index 274c12a..6af7534 100644 --- a/save_load/ui/save_file.tscn +++ b/scenes/ui/menus/saves_manager/save_file.tscn @@ -1,15 +1,15 @@ [gd_scene load_steps=11 format=3 uid="uid://bb7poutsn4ex2"] [ext_resource type="StyleBox" uid="uid://biousyggn7iua" path="res://save_load/resources/save_file_panel_theme.tres" id="1_cqw77"] -[ext_resource type="Texture2D" uid="uid://cmq51cgasug81" path="res://save_load/assets/folder-open-normal.png" id="1_k6haa"] -[ext_resource type="Script" uid="uid://dcfdyua5gwpw4" path="res://save_load/ui/save_file.gd" id="2_5g2eu"] -[ext_resource type="Texture2D" uid="uid://blyryo60jydgi" path="res://save_load/assets/folder-open-pressed.png" id="2_714lu"] +[ext_resource type="Texture2D" uid="uid://cmq51cgasug81" path="res://assets/ui/folder-open-normal.png" id="1_k6haa"] +[ext_resource type="Script" uid="uid://dcfdyua5gwpw4" path="res://scenes/ui/menus/saves_manager/save_file.gd" id="2_5g2eu"] +[ext_resource type="Texture2D" uid="uid://blyryo60jydgi" path="res://assets/ui/folder-open-pressed.png" id="2_714lu"] [ext_resource type="StyleBox" uid="uid://bwm315lqbbb87" path="res://save_load/resources/save_file_highlight_panel_theme.tres" id="3_om23c"] -[ext_resource type="Texture2D" uid="uid://by4w5ll3le7g6" path="res://save_load/assets/folder-open-hover.png" id="3_ubfnn"] -[ext_resource type="Texture2D" uid="uid://dvp5yeoqw36yt" path="res://save_load/assets/trash-normal.png" id="4_c2bnc"] -[ext_resource type="Texture2D" uid="uid://60ib8urc8xjo" path="res://save_load/resources/default_save_icon.tres" id="4_jgxci"] -[ext_resource type="Texture2D" uid="uid://brwa8yljyrlgy" path="res://save_load/assets/trash-pressed.png" id="5_jgxci"] -[ext_resource type="Texture2D" uid="uid://cmrtuy0i5qc01" path="res://save_load/assets/trash-hover.png" id="6_cqw77"] +[ext_resource type="Texture2D" uid="uid://by4w5ll3le7g6" path="res://assets/ui/folder-open-hover.png" id="3_ubfnn"] +[ext_resource type="Texture2D" uid="uid://dvp5yeoqw36yt" path="res://assets/ui/trash-normal.png" id="4_c2bnc"] +[ext_resource type="Texture2D" uid="uid://dknv7amroftm8" path="res://assets/icon.svg" id="4_vqdx8"] +[ext_resource type="Texture2D" uid="uid://brwa8yljyrlgy" path="res://assets/ui/trash-pressed.png" id="5_jgxci"] +[ext_resource type="Texture2D" uid="uid://cmrtuy0i5qc01" path="res://assets/ui/trash-hover.png" id="6_cqw77"] [node name="SaveFilePanel" type="Panel" node_paths=PackedStringArray("save_name_label", "save_date_label", "save_icon", "load_button", "delete_confirm_ui", "delete_button", "delete_confirm_button", "delete_cancel_button")] custom_minimum_size = Vector2(420, 60) @@ -46,7 +46,7 @@ size_flags_horizontal = 0 [node name="SaveFileIcon" type="TextureRect" parent="HBoxContainer"] layout_mode = 2 -texture = ExtResource("4_jgxci") +texture = ExtResource("4_vqdx8") expand_mode = 3 [node name="NameDate" type="VBoxContainer" parent="HBoxContainer"] diff --git a/save_load/ui/save_files_list.gd b/scenes/ui/menus/saves_manager/save_files_list.gd similarity index 100% rename from save_load/ui/save_files_list.gd rename to scenes/ui/menus/saves_manager/save_files_list.gd diff --git a/save_load/ui/save_files_list.gd.uid b/scenes/ui/menus/saves_manager/save_files_list.gd.uid similarity index 100% rename from save_load/ui/save_files_list.gd.uid rename to scenes/ui/menus/saves_manager/save_files_list.gd.uid diff --git a/save_load/ui/save_files_list.tscn b/scenes/ui/menus/saves_manager/save_files_list.tscn similarity index 72% rename from save_load/ui/save_files_list.tscn rename to scenes/ui/menus/saves_manager/save_files_list.tscn index 136ebdf..0e4ffd0 100644 --- a/save_load/ui/save_files_list.tscn +++ b/scenes/ui/menus/saves_manager/save_files_list.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cyxieflejsggu"] -[ext_resource type="Script" uid="uid://cqabj86bq8whn" path="res://save_load/ui/save_files_list.gd" id="1_sh1p7"] -[ext_resource type="PackedScene" uid="uid://bb7poutsn4ex2" path="res://save_load/ui/save_file.tscn" id="2_kb5u8"] +[ext_resource type="Script" uid="uid://cqabj86bq8whn" path="res://scenes/ui/menus/saves_manager/save_files_list.gd" id="1_sh1p7"] +[ext_resource type="PackedScene" uid="uid://bb7poutsn4ex2" path="res://scenes/ui/menus/saves_manager/save_file.tscn" id="2_kb5u8"] [node name="SaveFilesList" type="VBoxContainer"] clip_contents = true diff --git a/save_load/ui/save_load_ui.gd b/scenes/ui/menus/saves_manager/save_load_ui.gd similarity index 100% rename from save_load/ui/save_load_ui.gd rename to scenes/ui/menus/saves_manager/save_load_ui.gd diff --git a/save_load/ui/save_load_ui.gd.uid b/scenes/ui/menus/saves_manager/save_load_ui.gd.uid similarity index 100% rename from save_load/ui/save_load_ui.gd.uid rename to scenes/ui/menus/saves_manager/save_load_ui.gd.uid diff --git a/save_load/ui/save_load_ui.tscn b/scenes/ui/menus/saves_manager/save_load_ui.tscn similarity index 93% rename from save_load/ui/save_load_ui.tscn rename to scenes/ui/menus/saves_manager/save_load_ui.tscn index 4c5f2f8..74d6a20 100644 --- a/save_load/ui/save_load_ui.tscn +++ b/scenes/ui/menus/saves_manager/save_load_ui.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=7 format=3 uid="uid://dauchkhmnyk7n"] -[ext_resource type="Script" uid="uid://b6831eygibii7" path="res://save_load/ui/save_load_ui.gd" id="1_lo08d"] -[ext_resource type="PackedScene" uid="uid://cyxieflejsggu" path="res://save_load/ui/save_files_list.tscn" id="1_tqtxm"] -[ext_resource type="PackedScene" uid="uid://bb7poutsn4ex2" path="res://save_load/ui/save_file.tscn" id="2_6uxbh"] -[ext_resource type="Texture2D" uid="uid://ja8bc1h5x85o" path="res://save_load/assets/save-normal.png" id="3_lo08d"] -[ext_resource type="Texture2D" uid="uid://crqgyft4gfilt" path="res://save_load/assets/save-pressed.png" id="4_md7la"] -[ext_resource type="Texture2D" uid="uid://o3l0j53mgkan" path="res://save_load/assets/save-hover.png" id="5_hmxxn"] +[ext_resource type="Script" uid="uid://b6831eygibii7" path="res://scenes/ui/menus/saves_manager/save_load_ui.gd" id="1_lo08d"] +[ext_resource type="PackedScene" uid="uid://cyxieflejsggu" path="res://scenes/ui/menus/saves_manager/save_files_list.tscn" id="1_tqtxm"] +[ext_resource type="PackedScene" uid="uid://bb7poutsn4ex2" path="res://scenes/ui/menus/saves_manager/save_file.tscn" id="2_6uxbh"] +[ext_resource type="Texture2D" uid="uid://ja8bc1h5x85o" path="res://assets/ui/save-normal.png" id="3_lo08d"] +[ext_resource type="Texture2D" uid="uid://crqgyft4gfilt" path="res://assets/ui/save-pressed.png" id="4_md7la"] +[ext_resource type="Texture2D" uid="uid://o3l0j53mgkan" path="res://assets/ui/save-hover.png" id="5_hmxxn"] [node name="SaveLoadUI" type="Control" node_paths=PackedStringArray("show_save_ui_button", "new_save_ui", "save_name_input", "create_save_button", "create_save_cancel_button")] process_mode = 3 diff --git a/scenes/ui/ui.tscn b/scenes/ui/ui.tscn index 36fb119..98690a1 100644 --- a/scenes/ui/ui.tscn +++ b/scenes/ui/ui.tscn @@ -5,7 +5,7 @@ [ext_resource type="PackedScene" uid="uid://cbiygbgpfk220" path="res://scenes/ui/quick_slots.tscn" id="4_g5kmx"] [ext_resource type="PackedScene" uid="uid://bopvfwcgnnawg" path="res://scenes/ui/menus/pause_menu.tscn" id="6_7vp6q"] [ext_resource type="PackedScene" uid="uid://4bdgwwx27m71" path="res://scenes/ui/menus/settings_menu.tscn" id="7_7vp6q"] -[ext_resource type="PackedScene" uid="uid://dauchkhmnyk7n" path="res://save_load/ui/save_load_ui.tscn" id="8_jcn1r"] +[ext_resource type="PackedScene" uid="uid://dauchkhmnyk7n" path="res://scenes/ui/menus/saves_manager/save_load_ui.tscn" id="8_jcn1r"] [node name="UI" type="CanvasLayer"] script = ExtResource("1_aac20")