From 1a5efdc8f5d60c7c6690bf9bcce8d782a3c46c6b Mon Sep 17 00:00:00 2001 From: jepsu Date: Fri, 26 Jun 2026 22:43:50 +0300 Subject: [PATCH] Cleaned up project architecture --- .../Styles}/btn_style_box_green_hover.tres | 0 .../Styles}/btn_style_box_red_hover.tres | 0 .../Global/player_data.gd | 0 .../Global/player_data.gd.uid | 0 job_card.gd => Scenes/Job/job_card.gd | 0 job_card.gd.uid => Scenes/Job/job_card.gd.uid | 0 job_card.tscn => Scenes/Job/job_card.tscn | 12 ++--- printer.gd => Scenes/Printer/printer.gd | 0 .../Printer/printer.gd.uid | 0 printer.tscn => Scenes/Printer/printer.tscn | 12 ++--- .../Shop/Printers/printer_card.gd | 0 .../Shop/Printers/printer_card.gd.uid | 0 .../Shop/Printers/printers.gd | 0 .../Shop/Printers/printers.gd.uid | 0 .../Shop/Printers/printers_card.tscn | 8 +-- .../Shop/shop_tab_switcher.gd | 0 .../Shop/shop_tab_switcher.gd.uid | 0 ui.gd => Scenes/UI/ui.gd | 0 ui.gd.uid => Scenes/UI/ui.gd.uid | 0 ui.tscn => Scenes/UI/ui.tscn | 50 +++++++++---------- tab_switcher.gd => Scenes/tab_switcher.gd | 0 .../tab_switcher.gd.uid | 0 22 files changed, 41 insertions(+), 41 deletions(-) rename {Styles => Resources/Styles}/btn_style_box_green_hover.tres (100%) rename {Styles => Resources/Styles}/btn_style_box_red_hover.tres (100%) rename player_data.gd => Scenes/Global/player_data.gd (100%) rename player_data.gd.uid => Scenes/Global/player_data.gd.uid (100%) rename job_card.gd => Scenes/Job/job_card.gd (100%) rename job_card.gd.uid => Scenes/Job/job_card.gd.uid (100%) rename job_card.tscn => Scenes/Job/job_card.tscn (90%) rename printer.gd => Scenes/Printer/printer.gd (100%) rename printer.gd.uid => Scenes/Printer/printer.gd.uid (100%) rename printer.tscn => Scenes/Printer/printer.tscn (91%) rename printer_card.gd => Scenes/Shop/Printers/printer_card.gd (100%) rename printer_card.gd.uid => Scenes/Shop/Printers/printer_card.gd.uid (100%) rename printers.gd => Scenes/Shop/Printers/printers.gd (100%) rename printers.gd.uid => Scenes/Shop/Printers/printers.gd.uid (100%) rename printers_card.tscn => Scenes/Shop/Printers/printers_card.tscn (91%) rename shop_tab_switcher.gd => Scenes/Shop/shop_tab_switcher.gd (100%) rename shop_tab_switcher.gd.uid => Scenes/Shop/shop_tab_switcher.gd.uid (100%) rename ui.gd => Scenes/UI/ui.gd (100%) rename ui.gd.uid => Scenes/UI/ui.gd.uid (100%) rename ui.tscn => Scenes/UI/ui.tscn (86%) rename tab_switcher.gd => Scenes/tab_switcher.gd (100%) rename tab_switcher.gd.uid => Scenes/tab_switcher.gd.uid (100%) diff --git a/Styles/btn_style_box_green_hover.tres b/Resources/Styles/btn_style_box_green_hover.tres similarity index 100% rename from Styles/btn_style_box_green_hover.tres rename to Resources/Styles/btn_style_box_green_hover.tres diff --git a/Styles/btn_style_box_red_hover.tres b/Resources/Styles/btn_style_box_red_hover.tres similarity index 100% rename from Styles/btn_style_box_red_hover.tres rename to Resources/Styles/btn_style_box_red_hover.tres diff --git a/player_data.gd b/Scenes/Global/player_data.gd similarity index 100% rename from player_data.gd rename to Scenes/Global/player_data.gd diff --git a/player_data.gd.uid b/Scenes/Global/player_data.gd.uid similarity index 100% rename from player_data.gd.uid rename to Scenes/Global/player_data.gd.uid diff --git a/job_card.gd b/Scenes/Job/job_card.gd similarity index 100% rename from job_card.gd rename to Scenes/Job/job_card.gd diff --git a/job_card.gd.uid b/Scenes/Job/job_card.gd.uid similarity index 100% rename from job_card.gd.uid rename to Scenes/Job/job_card.gd.uid diff --git a/job_card.tscn b/Scenes/Job/job_card.tscn similarity index 90% rename from job_card.tscn rename to Scenes/Job/job_card.tscn index d390f26..116bc03 100644 --- a/job_card.tscn +++ b/Scenes/Job/job_card.tscn @@ -1,13 +1,13 @@ [gd_scene format=3 uid="uid://dvfcie8hqcb0"] -[ext_resource type="Script" uid="uid://wjam0w8dmel3" path="res://job_card.gd" id="1_vsles"] -[ext_resource type="StyleBox" uid="uid://csahw36txnewl" path="res://Styles/btn_style_box_green_hover.tres" id="2_4nwb4"] -[ext_resource type="StyleBox" uid="uid://b0kxbbhtsbhcr" path="res://Styles/btn_style_box_red_hover.tres" id="3_h28cc"] +[ext_resource type="Script" uid="uid://wjam0w8dmel3" path="res://Scenes/Job/job_card.gd" id="1_hdanx"] +[ext_resource type="StyleBox" uid="uid://csahw36txnewl" path="res://Resources/Styles/btn_style_box_green_hover.tres" id="2_hdanx"] +[ext_resource type="StyleBox" uid="uid://b0kxbbhtsbhcr" path="res://Resources/Styles/btn_style_box_red_hover.tres" id="3_g1ftk"] [node name="JobCard" type="PanelContainer" unique_id=1714388686] offset_right = 40.0 offset_bottom = 40.0 -script = ExtResource("1_vsles") +script = ExtResource("1_hdanx") [node name="MarginContainer" type="MarginContainer" parent="." unique_id=2020543953] layout_mode = 2 @@ -47,7 +47,7 @@ text = "Amount: 1" [node name="AcceptJob" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer3" unique_id=1475207118] layout_mode = 2 size_flags_horizontal = 3 -theme_override_styles/hover = ExtResource("2_4nwb4") +theme_override_styles/hover = ExtResource("2_hdanx") text = "Accept" [node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VBoxContainer" unique_id=1428599849] @@ -67,7 +67,7 @@ text = "Time: 3 min" [node name="SkipJob" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer" unique_id=1848796901] layout_mode = 2 size_flags_horizontal = 3 -theme_override_styles/hover = ExtResource("3_h28cc") +theme_override_styles/hover = ExtResource("3_g1ftk") text = "Skip" [connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer3/AcceptJob" to="." method="_on_accept_job_pressed"] diff --git a/printer.gd b/Scenes/Printer/printer.gd similarity index 100% rename from printer.gd rename to Scenes/Printer/printer.gd diff --git a/printer.gd.uid b/Scenes/Printer/printer.gd.uid similarity index 100% rename from printer.gd.uid rename to Scenes/Printer/printer.gd.uid diff --git a/printer.tscn b/Scenes/Printer/printer.tscn similarity index 91% rename from printer.tscn rename to Scenes/Printer/printer.tscn index aa89fae..dd99fe9 100644 --- a/printer.tscn +++ b/Scenes/Printer/printer.tscn @@ -1,15 +1,15 @@ [gd_scene format=3 uid="uid://33ctlyrpibs3"] -[ext_resource type="Script" uid="uid://dj7pngpg53qdb" path="res://printer.gd" id="1_jhpce"] -[ext_resource type="StyleBox" uid="uid://csahw36txnewl" path="res://Styles/btn_style_box_green_hover.tres" id="2_tnxmo"] -[ext_resource type="StyleBox" uid="uid://b0kxbbhtsbhcr" path="res://Styles/btn_style_box_red_hover.tres" id="3_vtisp"] +[ext_resource type="Script" uid="uid://dj7pngpg53qdb" path="res://Scenes/Printer/printer.gd" id="1_dlbos"] +[ext_resource type="StyleBox" uid="uid://csahw36txnewl" path="res://Resources/Styles/btn_style_box_green_hover.tres" id="2_mmlst"] +[ext_resource type="StyleBox" uid="uid://b0kxbbhtsbhcr" path="res://Resources/Styles/btn_style_box_red_hover.tres" id="3_1ai8v"] [node name="Printer" type="PanelContainer" unique_id=1372437203] custom_minimum_size = Vector2(0, 150) offset_right = 271.0 offset_bottom = 182.0 size_flags_horizontal = 3 -script = ExtResource("1_jhpce") +script = ExtResource("1_dlbos") [node name="MarginContainer" type="MarginContainer" parent="." unique_id=1159449756] layout_mode = 2 @@ -61,7 +61,7 @@ layout_mode = 2 [node name="StartButton" type="Button" parent="MarginContainer/MainArea/Buttons" unique_id=1943803675] layout_mode = 2 size_flags_horizontal = 3 -theme_override_styles/hover = ExtResource("2_tnxmo") +theme_override_styles/hover = ExtResource("2_mmlst") text = "Start print" [node name="UpgradeButton" type="Button" parent="MarginContainer/MainArea/Buttons" unique_id=765929805] @@ -73,7 +73,7 @@ text = "Upgrade" [node name="SellButton" type="Button" parent="MarginContainer/MainArea/Buttons" unique_id=929234066] layout_mode = 2 size_flags_horizontal = 3 -theme_override_styles/hover = ExtResource("3_vtisp") +theme_override_styles/hover = ExtResource("3_1ai8v") text = "Sell printer" [node name="SelectJob" type="OptionButton" parent="MarginContainer/MainArea" unique_id=1500040832] diff --git a/printer_card.gd b/Scenes/Shop/Printers/printer_card.gd similarity index 100% rename from printer_card.gd rename to Scenes/Shop/Printers/printer_card.gd diff --git a/printer_card.gd.uid b/Scenes/Shop/Printers/printer_card.gd.uid similarity index 100% rename from printer_card.gd.uid rename to Scenes/Shop/Printers/printer_card.gd.uid diff --git a/printers.gd b/Scenes/Shop/Printers/printers.gd similarity index 100% rename from printers.gd rename to Scenes/Shop/Printers/printers.gd diff --git a/printers.gd.uid b/Scenes/Shop/Printers/printers.gd.uid similarity index 100% rename from printers.gd.uid rename to Scenes/Shop/Printers/printers.gd.uid diff --git a/printers_card.tscn b/Scenes/Shop/Printers/printers_card.tscn similarity index 91% rename from printers_card.tscn rename to Scenes/Shop/Printers/printers_card.tscn index ea62e99..2428d39 100644 --- a/printers_card.tscn +++ b/Scenes/Shop/Printers/printers_card.tscn @@ -1,12 +1,12 @@ [gd_scene format=3 uid="uid://bdpqvwvwmaian"] -[ext_resource type="Script" uid="uid://ttfk4n2fkifj" path="res://printer_card.gd" id="1_5nuqd"] -[ext_resource type="StyleBox" uid="uid://csahw36txnewl" path="res://Styles/btn_style_box_green_hover.tres" id="2_22or4"] +[ext_resource type="Script" uid="uid://ttfk4n2fkifj" path="res://Scenes/Shop/Printers/printer_card.gd" id="1_tl8ce"] +[ext_resource type="StyleBox" uid="uid://csahw36txnewl" path="res://Resources/Styles/btn_style_box_green_hover.tres" id="2_wluc8"] [node name="PrinterCard" type="PanelContainer" unique_id=1714388686] offset_right = 40.0 offset_bottom = 40.0 -script = ExtResource("1_5nuqd") +script = ExtResource("1_tl8ce") [node name="MarginContainer" type="MarginContainer" parent="." unique_id=2020543953] layout_mode = 2 @@ -55,7 +55,7 @@ text = "Price: 500 €" [node name="BuyButton" type="Button" parent="MarginContainer/VBoxContainer/HBoxContainer" unique_id=1475207118] layout_mode = 2 size_flags_horizontal = 3 -theme_override_styles/hover = ExtResource("2_22or4") +theme_override_styles/hover = ExtResource("2_wluc8") text = "Buy" [connection signal="pressed" from="MarginContainer/VBoxContainer/HBoxContainer/BuyButton" to="." method="_on_buy_button_pressed"] diff --git a/shop_tab_switcher.gd b/Scenes/Shop/shop_tab_switcher.gd similarity index 100% rename from shop_tab_switcher.gd rename to Scenes/Shop/shop_tab_switcher.gd diff --git a/shop_tab_switcher.gd.uid b/Scenes/Shop/shop_tab_switcher.gd.uid similarity index 100% rename from shop_tab_switcher.gd.uid rename to Scenes/Shop/shop_tab_switcher.gd.uid diff --git a/ui.gd b/Scenes/UI/ui.gd similarity index 100% rename from ui.gd rename to Scenes/UI/ui.gd diff --git a/ui.gd.uid b/Scenes/UI/ui.gd.uid similarity index 100% rename from ui.gd.uid rename to Scenes/UI/ui.gd.uid diff --git a/ui.tscn b/Scenes/UI/ui.tscn similarity index 86% rename from ui.tscn rename to Scenes/UI/ui.tscn index 52a4a5e..d8f0808 100644 --- a/ui.tscn +++ b/Scenes/UI/ui.tscn @@ -1,24 +1,24 @@ [gd_scene format=3 uid="uid://d24rvu5c0gd1w"] -[ext_resource type="Script" uid="uid://d0sgvbphgssmi" path="res://ui.gd" id="1_27fn8"] -[ext_resource type="Script" uid="uid://bp1c3unpg2ndn" path="res://Resources/job_data.gd" id="2_etlur"] -[ext_resource type="Resource" uid="uid://0gyhxwe47tby" path="res://Resources/Jobs/job_action_figure.tres" id="3_7rqds"] -[ext_resource type="Script" uid="uid://q8cf21vq4ka6" path="res://tab_switcher.gd" id="3_ibotj"] -[ext_resource type="Resource" uid="uid://cuff7udubpjgk" path="res://Resources/Jobs/job_ad_keychain.tres" id="4_nvb2n"] -[ext_resource type="Resource" uid="uid://ceck7mpy7qnae" path="res://Resources/Jobs/job_cafe_cookie_stamp.tres" id="5_os5c7"] -[ext_resource type="Resource" uid="uid://5ag48elqtpg7" path="res://Resources/Jobs/job_college_electronic_box.tres" id="6_b2p7n"] -[ext_resource type="Resource" uid="uid://dg2ffm3feksrm" path="res://Resources/Jobs/job_cup_holder_seat.tres" id="7_vkygq"] -[ext_resource type="Resource" uid="uid://c3l3haowyo1yc" path="res://Resources/Jobs/job_drone_chassis.tres" id="8_sosvr"] -[ext_resource type="Resource" uid="uid://0wacf77o0vq1" path="res://Resources/Jobs/job_headphone_stand_tableside.tres" id="9_ndy3v"] -[ext_resource type="Resource" uid="uid://dt1hgcy140fpt" path="res://Resources/Jobs/job_modern_cabinet_handle.tres" id="10_x2s2p"] -[ext_resource type="Resource" uid="uid://b0akomrm6gavw" path="res://Resources/Jobs/job_rc_car_control_arm.tres" id="11_v8jk5"] -[ext_resource type="Resource" uid="uid://dy48odm1apexk" path="res://Resources/Jobs/job_zipper_pull_tab.tres" id="12_cka8k"] -[ext_resource type="Script" uid="uid://cg2kskiky8iur" path="res://shop_tab_switcher.gd" id="14_b2p7n"] -[ext_resource type="Script" uid="uid://d3g5e8wjfqy5i" path="res://printers.gd" id="14_etlur"] -[ext_resource type="Script" uid="uid://bed8wdnwod4wu" path="res://Resources/printer_data.gd" id="15_os5c7"] -[ext_resource type="Resource" uid="uid://bdis2u0tfvlch" path="res://Resources/Printers/printer_bambulab_A1_mini.tres" id="16_b2p7n"] -[ext_resource type="Resource" uid="uid://b6x4k150ugskw" path="res://Resources/Printers/printer_creality_ender_3.tres" id="17_vkygq"] -[ext_resource type="Resource" uid="uid://b4v47rpo27kec" path="res://Resources/Printers/printer_prusa_mk4s.tres" id="18_sosvr"] +[ext_resource type="Script" uid="uid://d0sgvbphgssmi" path="res://Scenes/UI/ui.gd" id="1_vqjbf"] +[ext_resource type="Script" uid="uid://bp1c3unpg2ndn" path="res://Resources/job_data.gd" id="2_cqvjp"] +[ext_resource type="Resource" uid="uid://0gyhxwe47tby" path="res://Resources/Jobs/job_action_figure.tres" id="3_hfaco"] +[ext_resource type="Resource" uid="uid://cuff7udubpjgk" path="res://Resources/Jobs/job_ad_keychain.tres" id="4_1eb8u"] +[ext_resource type="Resource" uid="uid://ceck7mpy7qnae" path="res://Resources/Jobs/job_cafe_cookie_stamp.tres" id="5_vhchw"] +[ext_resource type="Resource" uid="uid://5ag48elqtpg7" path="res://Resources/Jobs/job_college_electronic_box.tres" id="6_jx4bj"] +[ext_resource type="Resource" uid="uid://dg2ffm3feksrm" path="res://Resources/Jobs/job_cup_holder_seat.tres" id="7_rdq6y"] +[ext_resource type="Resource" uid="uid://c3l3haowyo1yc" path="res://Resources/Jobs/job_drone_chassis.tres" id="8_l5iwa"] +[ext_resource type="Resource" uid="uid://0wacf77o0vq1" path="res://Resources/Jobs/job_headphone_stand_tableside.tres" id="9_3h0f6"] +[ext_resource type="Resource" uid="uid://dt1hgcy140fpt" path="res://Resources/Jobs/job_modern_cabinet_handle.tres" id="10_unbrw"] +[ext_resource type="Resource" uid="uid://b0akomrm6gavw" path="res://Resources/Jobs/job_rc_car_control_arm.tres" id="11_i1f3g"] +[ext_resource type="Resource" uid="uid://dy48odm1apexk" path="res://Resources/Jobs/job_zipper_pull_tab.tres" id="12_cnm7j"] +[ext_resource type="Script" uid="uid://q8cf21vq4ka6" path="res://Scenes/tab_switcher.gd" id="13_vqjbf"] +[ext_resource type="Script" uid="uid://cg2kskiky8iur" path="res://Scenes/Shop/shop_tab_switcher.gd" id="14_vqjbf"] +[ext_resource type="Script" uid="uid://d3g5e8wjfqy5i" path="res://Scenes/Shop/Printers/printers.gd" id="15_vqjbf"] +[ext_resource type="Script" uid="uid://bed8wdnwod4wu" path="res://Resources/printer_data.gd" id="16_rdojl"] +[ext_resource type="Resource" uid="uid://bdis2u0tfvlch" path="res://Resources/Printers/printer_bambulab_A1_mini.tres" id="17_llrls"] +[ext_resource type="Resource" uid="uid://b6x4k150ugskw" path="res://Resources/Printers/printer_creality_ender_3.tres" id="18_8rt22"] +[ext_resource type="Resource" uid="uid://b4v47rpo27kec" path="res://Resources/Printers/printer_prusa_mk4s.tres" id="19_1ohgd"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8fchy"] bg_color = Color(0.3529412, 0.47843137, 0.7372549, 0.47058824) @@ -35,8 +35,8 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_27fn8") -jobs_array = Array[ExtResource("2_etlur")]([ExtResource("3_7rqds"), ExtResource("4_nvb2n"), ExtResource("5_os5c7"), ExtResource("6_b2p7n"), ExtResource("7_vkygq"), ExtResource("8_sosvr"), ExtResource("9_ndy3v"), ExtResource("10_x2s2p"), ExtResource("11_v8jk5"), ExtResource("12_cka8k")]) +script = ExtResource("1_vqjbf") +jobs_array = Array[ExtResource("2_cqvjp")]([ExtResource("3_hfaco"), ExtResource("4_1eb8u"), ExtResource("5_vhchw"), ExtResource("6_jx4bj"), ExtResource("7_rdq6y"), ExtResource("8_l5iwa"), ExtResource("9_3h0f6"), ExtResource("10_unbrw"), ExtResource("11_i1f3g"), ExtResource("12_cnm7j")]) job_limit = 4 [node name="VBoxContainer" type="VBoxContainer" parent="." unique_id=1634044894] @@ -139,7 +139,7 @@ theme_override_constants/margin_left = 10 theme_override_constants/margin_top = 10 theme_override_constants/margin_right = 10 theme_override_constants/margin_bottom = 10 -script = ExtResource("3_ibotj") +script = ExtResource("13_vqjbf") [node name="TabButtons" type="HBoxContainer" parent="VBoxContainer/MainArea/RightColumn/TabSwitcher" unique_id=454550378] layout_mode = 2 @@ -181,7 +181,7 @@ theme_override_constants/margin_left = 10 theme_override_constants/margin_top = 10 theme_override_constants/margin_right = 10 theme_override_constants/margin_bottom = 10 -script = ExtResource("14_b2p7n") +script = ExtResource("14_vqjbf") [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/MainArea/RightColumn/ShopTab/VBoxContainer/ShopTabSwitcher" unique_id=1669205646] layout_mode = 2 @@ -199,8 +199,8 @@ text = "Filaments" [node name="Printers" type="PanelContainer" parent="VBoxContainer/MainArea/RightColumn/ShopTab/VBoxContainer" unique_id=1896524960] unique_name_in_owner = true layout_mode = 2 -script = ExtResource("14_etlur") -printers_array = Array[ExtResource("15_os5c7")]([ExtResource("16_b2p7n"), ExtResource("17_vkygq"), ExtResource("18_sosvr")]) +script = ExtResource("15_vqjbf") +printers_array = Array[ExtResource("16_rdojl")]([ExtResource("17_llrls"), ExtResource("18_8rt22"), ExtResource("19_1ohgd")]) [node name="PrinterList" type="VBoxContainer" parent="VBoxContainer/MainArea/RightColumn/ShopTab/VBoxContainer/Printers" unique_id=474412195] layout_mode = 2 diff --git a/tab_switcher.gd b/Scenes/tab_switcher.gd similarity index 100% rename from tab_switcher.gd rename to Scenes/tab_switcher.gd diff --git a/tab_switcher.gd.uid b/Scenes/tab_switcher.gd.uid similarity index 100% rename from tab_switcher.gd.uid rename to Scenes/tab_switcher.gd.uid