From b69e705ea3d1cff49d7be843be566c8e15b4552d Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 10 Apr 2023 23:31:07 +0200 Subject: [PATCH] Fixing Up UI --- Assets/{Temp Music => Music}/awesomeness.wav | Bin .../awesomeness.wav.import | 6 +- .../default_bus_layout.tres | 0 .../omw-to-beat-the-big-bad.wav | Bin .../omw-to-beat-the-big-bad.wav.import | 6 +- Assets/Sprites/Start Menu Old/Cake.png | Bin 1280 -> 0 bytes Assets/Sprites/Start Menu Old/Cake.png.import | 34 -- Assets/Sprites/Start Menu Old/Cross.png | Bin 1673 -> 0 bytes .../Sprites/Start Menu Old/Cross.png.import | 34 -- Assets/Sprites/Start Menu Old/Jesus.png | Bin 563 -> 0 bytes .../Sprites/Start Menu Old/Jesus.png.import | 34 -- Assets/UI/Tab/tap_selected.tres | 1 + Assets/UI/{UI_Theme.tres => Theme.tres} | 214 ++++++------- Assets/UI_Theme.tres | 109 ------- Prefabs/Settings Menu.tscn | 219 ++++++------- Scenes/Main Menu.tscn | 301 +++++++++--------- Scenes/Main Menu.tscn.save | 282 ++++++++++++++++ Scenes/Test.tscn | 169 ---------- Scripts/UI/MainMenuManager.gd | 2 +- Scripts/UI/SettingsMenu.gd | 2 +- project.godot | 14 +- 21 files changed, 648 insertions(+), 779 deletions(-) rename Assets/{Temp Music => Music}/awesomeness.wav (100%) rename Assets/{Temp Music => Music}/awesomeness.wav.import (54%) rename Assets/{Temp Music => Music}/default_bus_layout.tres (100%) rename Assets/{Temp Music => Music}/omw-to-beat-the-big-bad.wav (100%) rename Assets/{Temp Music => Music}/omw-to-beat-the-big-bad.wav.import (50%) delete mode 100644 Assets/Sprites/Start Menu Old/Cake.png delete mode 100644 Assets/Sprites/Start Menu Old/Cake.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Cross.png delete mode 100644 Assets/Sprites/Start Menu Old/Cross.png.import delete mode 100644 Assets/Sprites/Start Menu Old/Jesus.png delete mode 100644 Assets/Sprites/Start Menu Old/Jesus.png.import rename Assets/UI/{UI_Theme.tres => Theme.tres} (61%) delete mode 100644 Assets/UI_Theme.tres create mode 100644 Scenes/Main Menu.tscn.save delete mode 100644 Scenes/Test.tscn diff --git a/Assets/Temp Music/awesomeness.wav b/Assets/Music/awesomeness.wav similarity index 100% rename from Assets/Temp Music/awesomeness.wav rename to Assets/Music/awesomeness.wav diff --git a/Assets/Temp Music/awesomeness.wav.import b/Assets/Music/awesomeness.wav.import similarity index 54% rename from Assets/Temp Music/awesomeness.wav.import rename to Assets/Music/awesomeness.wav.import index ef0f2c9..a86cfc0 100644 --- a/Assets/Temp Music/awesomeness.wav.import +++ b/Assets/Music/awesomeness.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://dpbyjnyg765r7" -path="res://.godot/imported/awesomeness.wav-59f1c1423f54ec46cf96ddbcf1a5f126.sample" +path="res://.godot/imported/awesomeness.wav-a3e25c2b7cc98b82991938c6ea85b10b.sample" [deps] -source_file="res://Assets/Temp Music/awesomeness.wav" -dest_files=["res://.godot/imported/awesomeness.wav-59f1c1423f54ec46cf96ddbcf1a5f126.sample"] +source_file="res://Assets/Music/awesomeness.wav" +dest_files=["res://.godot/imported/awesomeness.wav-a3e25c2b7cc98b82991938c6ea85b10b.sample"] [params] diff --git a/Assets/Temp Music/default_bus_layout.tres b/Assets/Music/default_bus_layout.tres similarity index 100% rename from Assets/Temp Music/default_bus_layout.tres rename to Assets/Music/default_bus_layout.tres diff --git a/Assets/Temp Music/omw-to-beat-the-big-bad.wav b/Assets/Music/omw-to-beat-the-big-bad.wav similarity index 100% rename from Assets/Temp Music/omw-to-beat-the-big-bad.wav rename to Assets/Music/omw-to-beat-the-big-bad.wav diff --git a/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import b/Assets/Music/omw-to-beat-the-big-bad.wav.import similarity index 50% rename from Assets/Temp Music/omw-to-beat-the-big-bad.wav.import rename to Assets/Music/omw-to-beat-the-big-bad.wav.import index 87f4127..b03e350 100644 --- a/Assets/Temp Music/omw-to-beat-the-big-bad.wav.import +++ b/Assets/Music/omw-to-beat-the-big-bad.wav.import @@ -3,12 +3,12 @@ importer="wav" type="AudioStreamWAV" uid="uid://c6nf5s6xy2uii" -path="res://.godot/imported/omw-to-beat-the-big-bad.wav-7f8a9a2e19afe1786d6b9f29ff762163.sample" +path="res://.godot/imported/omw-to-beat-the-big-bad.wav-c6b466e6681b770ddf1c916b506747ec.sample" [deps] -source_file="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" -dest_files=["res://.godot/imported/omw-to-beat-the-big-bad.wav-7f8a9a2e19afe1786d6b9f29ff762163.sample"] +source_file="res://Assets/Music/omw-to-beat-the-big-bad.wav" +dest_files=["res://.godot/imported/omw-to-beat-the-big-bad.wav-c6b466e6681b770ddf1c916b506747ec.sample"] [params] diff --git a/Assets/Sprites/Start Menu Old/Cake.png b/Assets/Sprites/Start Menu Old/Cake.png deleted file mode 100644 index 0e508de5f11110b65e5e1858cbec34fe6f800c66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1280 zcmV+b1^@bqP)Px(x=BPqRCr$PnoVmIK@f%~1W}OH5P}3kkcb~Aje?*ef*=Uu!9ULrjbM&m;gL@crv+j`$MWd7KA7O5PbqbFM`lG01&?opy>{1 zd<}@1|CD}FiXaW#_+^koh_wRrjRRtCh@zwb?7#c^aC-x|@nkj1hA0{Uh(C1Xa2vwh z-FH3T5Jd&R#S?{X0NV~|SPGEsw|ouY8yu=?bbVWp1i+9iZiRKLaQN!VN&?dC{ozDAwTs=?d-$xWQ8w zOaO>}m1y&cepy~h51+kXX%|7h8>E||P!Y7!3Eycckq2SR0N{`ahSvo_0HMfR%bF)b zh^@M~J6Ebgpj!R4IBSj5`40sTSY`;Z>tw zG!@(qs0tti;rHNXvU77VW8*5;FS9a41rSPL3qb4q4z(_FEI0KFCf~XfvXfdek~wCC>_&hyrXR> z+S(jK5X@zeI?@2hL3)`UWyI4pZUEF6F7N_Cdeq?xEvKdH(2hS0;VzXy>KXuEC^cu$ zWMz>GrBM+}^QiK1wP%!l51^=c4ggLK)hlZ+pgs@qqyUH(NfS?z^jf+IfI_PPuK^2- zkJC9%jNizt0@mQxWAa7-unJKg0O=~t(xG;|@70aJ$%WIm+NZQfW4S4?{&Obnq_tz~`3wyWv{N@a01{>uODm#s z7pm1C1c8L(h1yjc0Cc?a<5&7|ZLR&c|MWOCSxmSW03d#3@2*VhmIiQa;$_;=oB72| z{Q>|9!2>|1iGRQW$rK zM>KCED>{8Ah4ZN6+C1^p&i(Va1b{(2Ztw`^fJiWod2Vx85dbafJq5s1!s`YP5UmYF zhaxVosl@>@6>w~&L=}OaYf<1d!8o7y-vCz%cmZe=mrJNepeMSaeh~4l0FVRnC&yZS z@QNi!T2%A;;G#Vdm;L1yL2Uwc0>~3-eIE?~pOp1a(W>sCaiq2R*kz*5uP^NYFMul1 q^<3K*0IZ2x?(hhtHdRGhPx*LrFwIRA@u(m}_hl*A>TqcV>2W*Sq%GUcVM&du^6Dw1AZo8d4=~(^PSaA*GR$ zrfsCQgyc*6rHay$6erH334P>ar79^XO4F7`YUKbX;6!R3%7-+N$R!m*;1>qg54`p+ zUa!5gGq;*q3@pZU?M6aX_kJ18z2~0uzyEvAnKMUlork#2_9*};Fi>FNf0Kc2ZS8*( zn3$GzDUB#9ySsjI?_%@Hq8NCv^@&ix>-#X7o~;`*%UKp`xoA(uK0sIGP$HGO<+Vf4 zNAm@;C;&g&@`8-bq?uCd2-Vz(Wo0g7z=fPRg2y_~Z#y5)TW{Wiwxz9YJLJH0fR!t5 z!!(Wghg95H!~59X^<3V1^A@zNJ=E4NPo;`!XxOkI!*cX3c6B|Qx8A%33jhiX{C_a8 zt?kLq_^e4Llg{>m2RSqCN0i;{oN%EbCqAOKXo|bmG|&+AJ7THX89Z(e zKYjfOzM2gPSD7bpUjxd8g7OK1w;lARpxBIx(h+U)0s`Y^}(ds!X1 z0n0LZ^e;#7`^pjJS=pSS=*V;LGnI_-;Ljt}-bU{nE5?>&kcyaO(rZVrST=|)pk zp1NlZrUXk$P7V#y+|Y=;;K-ut>yA@r>3dS4 zKEdZ2BWRlKc-i73;C1onpFV)#6`>gagct9>nRqIVMDnk`UP}GN)Kyn=VmQGcKkTPg zQ8;ZRk<#i$D`NNl=UQ{T$#%%QrJK0Fm^Wi1{BT_v^}zsTfdGanolvstz{3OMC{}JH zq%D;%G?d|X>5RuGNzF{tTpuPnndIl4pRlR2mKJw_-^F@!>V3a_6?g^te`!0#=>>r$DVI-lbL?3BR>HB_Uj#pnf`pyhF z*R!^%iS2*=nAr)Kg4FfhCkG*~vudbcVkoET4rCy_%mJ$xuqH8X8ojbWOfQL7C$S+Hs3V$haMUC%? z^>%h1{M8TUPW$ktCnwj}c>-x8gHTjwdU<8F^UOxdEc<)T#9!Y3OzGU7`#0}+WrK8Y zDYIlCQc=&V69c@wuj8Wc&t#P%*3whmGW~ySsn0=W?naYHNQWWyn9DOM9rS zY<8A1=B0lF8UH869_>53x}MG1_pP?}2i7Y3V}9MoiFCsL3a*>en*-p%*6ooocXsK} z-km4sUG#<0d@xl)IQ*q~%XS)Hs3dQ_XM1Eekzl#Igx3yT(!Hp%+_reFqGYlE1Ww|; z+9|I!R{&68puj+ZfdT^s1_}&ZcLo-0RxY7QxukmF%66@-#IpMVOK8(B3BZ*NYg%J5ao^3Pg%KKcp_6d3q7f>L9A TjpRg_00000NkvXXu0mjfWKuot diff --git a/Assets/Sprites/Start Menu Old/Cross.png.import b/Assets/Sprites/Start Menu Old/Cross.png.import deleted file mode 100644 index 57b6643..0000000 --- a/Assets/Sprites/Start Menu Old/Cross.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://6snf183fgfo5" -path="res://.godot/imported/Cross.png-0ee19fa549405b3294c8343e3a8bf496.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Sprites/Start Menu Old/Cross.png" -dest_files=["res://.godot/imported/Cross.png-0ee19fa549405b3294c8343e3a8bf496.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/Sprites/Start Menu Old/Jesus.png b/Assets/Sprites/Start Menu Old/Jesus.png deleted file mode 100644 index 15b21a20494c9001565a745b64a809e74cf79053..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 563 zcmV-30?hr1P)YqFm(edAHl%H*iT?Uotc;s1L6z%1q^&dq_TBlV9Jb`5mM1vxp2AK zXZsoy0#B-1oqT@xY{$M7U;s=sM(;0=8?D2G<8#sHR71A7T4_1kJt^`%$%%zfYtNp> zo!Ckk;`Z*8RVym}36Lk*Riy`~Hd#oN6AqR`sz_60v5kgY%&CUZYM&&H9iWP$6xSr; zL8{kGy0~~yt@TRU2X=mBtc3=W(%c3i?IV@CF2Z#sYK@CPFTIyjV2y~F)7T-U%Gp?m zlT$vo@uxxyziPCFu&R|*f~3?Du5aGd&m!6trFfBJNyCjAVo!(=h}oM1I;blo^q5^A z;&&MC_At?;LDUr)>NIJyF(eMjSu%liE4&>-2JImPJ1)%Gj|>vmRo32)bXFx1Vh;?p zq&N!mIBpIxa>6`p8x*THkyp^lOQQAWVk3^{wsk{!W6emFDAk@@C7I`55-h^jhFxc002ovPDHLkV1itt B`KAB> diff --git a/Assets/Sprites/Start Menu Old/Jesus.png.import b/Assets/Sprites/Start Menu Old/Jesus.png.import deleted file mode 100644 index 44ad03a..0000000 --- a/Assets/Sprites/Start Menu Old/Jesus.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cp84ssaqs3pmp" -path="res://.godot/imported/Jesus.png-1b5efe2b1083942c332ddea70bb782c5.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://Assets/Sprites/Start Menu Old/Jesus.png" -dest_files=["res://.godot/imported/Jesus.png-1b5efe2b1083942c332ddea70bb782c5.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/Assets/UI/Tab/tap_selected.tres b/Assets/UI/Tab/tap_selected.tres index c014c5e..357fbaf 100644 --- a/Assets/UI/Tab/tap_selected.tres +++ b/Assets/UI/Tab/tap_selected.tres @@ -11,4 +11,5 @@ border_width_top = 4 border_width_right = 4 border_color = Color(0.227451, 0.172549, 0.290196, 1) expand_margin_left = 4.0 +expand_margin_top = 4.0 expand_margin_bottom = 4.0 diff --git a/Assets/UI/UI_Theme.tres b/Assets/UI/Theme.tres similarity index 61% rename from Assets/UI/UI_Theme.tres rename to Assets/UI/Theme.tres index 5c2d7c9..8fa7dc9 100644 --- a/Assets/UI/UI_Theme.tres +++ b/Assets/UI/Theme.tres @@ -1,47 +1,47 @@ -[gd_resource type="Theme" load_steps=47 format=3 uid="uid://bui1mmatapmc8"] +[gd_resource type="Theme" load_steps=47 format=3 uid="uid://babphdknr2kkd"] -[ext_resource type="StyleBox" uid="uid://bb7opkg3aneg4" path="res://Assets/UI/Button/normal.tres" id="1_re3m3"] -[ext_resource type="StyleBox" uid="uid://bmeh7kt6t886w" path="res://Assets/UI/Button/disabled.tres" id="1_wt1wr"] -[ext_resource type="StyleBox" uid="uid://cjyijxvb4qfwy" path="res://Assets/UI/Button/hover.tres" id="2_h7pgg"] -[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="2_j8kea"] -[ext_resource type="StyleBox" uid="uid://gxy851bdkmb0" path="res://Assets/UI/Button/focus.tres" id="2_nf3et"] -[ext_resource type="StyleBox" uid="uid://cu2rciarim0cc" path="res://Assets/UI/Button/pressed.tres" id="4_de308"] -[ext_resource type="StyleBox" uid="uid://cx486vo60qcpp" path="res://Assets/UI/Edit/normal.tres" id="6_lnycp"] -[ext_resource type="Texture2D" uid="uid://c18dqb1wy3its" path="res://Assets/UI/Check Box/checked.png" id="6_srlcu"] -[ext_resource type="Texture2D" uid="uid://cl8b7x3q77gm0" path="res://Assets/UI/Slider/handle.png" id="6_tsx7l"] -[ext_resource type="StyleBox" uid="uid://cgdxtbanwi5gp" path="res://Assets/UI/Scrollbar/h/grabber.tres" id="6_vjj3k"] -[ext_resource type="StyleBox" uid="uid://dvj15u41tqtnm" path="res://Assets/UI/Edit/readonly.tres" id="7_k2jlw"] -[ext_resource type="Texture2D" uid="uid://b388qxyyqx8q2" path="res://Assets/UI/Slider/handle_disabled.png" id="7_m4hfs"] -[ext_resource type="Texture2D" uid="uid://jta11o1n4c3d" path="res://Assets/UI/Check Box/unchecked.png" id="7_p4k8i"] -[ext_resource type="StyleBox" uid="uid://b5e35dfka2svr" path="res://Assets/UI/Scrollbar/h/grabber_highlight.tres" id="7_yv3p6"] -[ext_resource type="Texture2D" uid="uid://o3ufhj36lo0r" path="res://Assets/UI/Slider/handle_highlight.png" id="8_4qpd7"] -[ext_resource type="StyleBox" uid="uid://b6gse1t3c8ibf" path="res://Assets/UI/Scrollbar/h/grabber_pressed.tres" id="8_dr3de"] -[ext_resource type="Texture2D" uid="uid://je3kjtfx1kr3" path="res://Assets/UI/Button/checked.png" id="8_r3sw2"] -[ext_resource type="Texture2D" uid="uid://dklqdwoqhjm5i" path="res://Assets/UI/Button/unchecked.png" id="9_iytk4"] -[ext_resource type="StyleBox" uid="uid://04efvhwskbr6" path="res://Assets/UI/Scrollbar/h/background.tres" id="9_lv5dx"] -[ext_resource type="StyleBox" uid="uid://b1huhquesnexy" path="res://Assets/UI/Scrollbar/h/background_focus.tres" id="10_npblq"] -[ext_resource type="StyleBox" uid="uid://bwlxiw44285g1" path="res://Assets/UI/Slider/h/fill.tres" id="14_b0thp"] -[ext_resource type="StyleBox" uid="uid://b8mdovvxl7lfl" path="res://Assets/UI/Slider/h/background.tres" id="15_4oqlg"] -[ext_resource type="Texture2D" uid="uid://bj8jxblqmsubn" path="res://Assets/UI/Button/arrow_down.png" id="18_jqhuv"] -[ext_resource type="StyleBox" uid="uid://dhna0fajb2uei" path="res://Assets/UI/Progress/background.tres" id="18_ymgal"] -[ext_resource type="StyleBox" uid="uid://b3i7tjv3ok85r" path="res://Assets/UI/Progress/fill.tres" id="19_1x1m2"] -[ext_resource type="Texture2D" uid="uid://de5dv104noe06" path="res://Assets/UI/Tab/left.png" id="20_skg1s"] -[ext_resource type="StyleBox" uid="uid://cm4uy16ypsdyi" path="res://Assets/UI/Scrollbar/v/grabber.tres" id="20_uo4of"] -[ext_resource type="Texture2D" uid="uid://ce87u4fp6tnik" path="res://Assets/UI/Tab/left_highlight.png" id="21_ivr4w"] -[ext_resource type="StyleBox" uid="uid://cmiivkeqn03sa" path="res://Assets/UI/Scrollbar/v/grabber_highlight.tres" id="21_pjklk"] -[ext_resource type="StyleBox" uid="uid://j31rmst7m2q7" path="res://Assets/UI/Scrollbar/v/grabber_pressed.tres" id="22_rcema"] -[ext_resource type="Texture2D" uid="uid://bqpbxb5whco41" path="res://Assets/UI/Tab/right.png" id="22_tbsa0"] -[ext_resource type="StyleBox" uid="uid://de0w7yppc7e0l" path="res://Assets/UI/Scrollbar/v/background.tres" id="23_1wjoi"] -[ext_resource type="Texture2D" uid="uid://ds6cfed3dmyr3" path="res://Assets/UI/Tab/right_highligh.png" id="23_meyle"] -[ext_resource type="StyleBox" uid="uid://15jbtuchd7r6" path="res://Assets/UI/Scrollbar/v/background_focus.tres" id="24_64ah6"] -[ext_resource type="StyleBox" uid="uid://dnwseiejbfrqq" path="res://Assets/UI/Tab/panel.tres" id="24_ypm5h"] -[ext_resource type="StyleBox" uid="uid://bgecjuqm2jv0w" path="res://Assets/UI/Tab/tab_disabled.tres" id="25_2cr8y"] -[ext_resource type="StyleBox" uid="uid://byrx7smwgsuf0" path="res://Assets/UI/Tab/tap_selected.tres" id="25_ou2yk"] -[ext_resource type="StyleBox" uid="uid://bumc1mixgglv8" path="res://Assets/UI/Slider/v/fill.tres" id="25_pdk86"] -[ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="26_1odpk"] -[ext_resource type="StyleBox" uid="uid://ddfin4k7slkmn" path="res://Assets/UI/Tab/tap_unselected.tres" id="26_pgono"] +[ext_resource type="StyleBox" uid="uid://bmeh7kt6t886w" path="res://Assets/UI/Button/disabled.tres" id="1_n3up8"] +[ext_resource type="StyleBox" uid="uid://gxy851bdkmb0" path="res://Assets/UI/Button/focus.tres" id="2_ukct7"] +[ext_resource type="StyleBox" uid="uid://cjyijxvb4qfwy" path="res://Assets/UI/Button/hover.tres" id="3_ukadi"] +[ext_resource type="StyleBox" uid="uid://bb7opkg3aneg4" path="res://Assets/UI/Button/normal.tres" id="4_b2mp2"] +[ext_resource type="StyleBox" uid="uid://cu2rciarim0cc" path="res://Assets/UI/Button/pressed.tres" id="5_6rmq1"] +[ext_resource type="Texture2D" uid="uid://c18dqb1wy3its" path="res://Assets/UI/Check Box/checked.png" id="6_re2fr"] +[ext_resource type="Texture2D" uid="uid://jta11o1n4c3d" path="res://Assets/UI/Check Box/unchecked.png" id="7_as124"] +[ext_resource type="Texture2D" uid="uid://je3kjtfx1kr3" path="res://Assets/UI/Button/checked.png" id="8_g1dhe"] +[ext_resource type="Texture2D" uid="uid://dklqdwoqhjm5i" path="res://Assets/UI/Button/unchecked.png" id="9_trcl3"] +[ext_resource type="StyleBox" uid="uid://cgdxtbanwi5gp" path="res://Assets/UI/Scrollbar/h/grabber.tres" id="10_cb1fp"] +[ext_resource type="StyleBox" uid="uid://b5e35dfka2svr" path="res://Assets/UI/Scrollbar/h/grabber_highlight.tres" id="11_s21yb"] +[ext_resource type="StyleBox" uid="uid://b6gse1t3c8ibf" path="res://Assets/UI/Scrollbar/h/grabber_pressed.tres" id="12_fd8p2"] +[ext_resource type="StyleBox" uid="uid://04efvhwskbr6" path="res://Assets/UI/Scrollbar/h/background.tres" id="13_s3ehx"] +[ext_resource type="StyleBox" uid="uid://b1huhquesnexy" path="res://Assets/UI/Scrollbar/h/background_focus.tres" id="14_fwmx8"] +[ext_resource type="Texture2D" uid="uid://cl8b7x3q77gm0" path="res://Assets/UI/Slider/handle.png" id="15_ocljk"] +[ext_resource type="Texture2D" uid="uid://b388qxyyqx8q2" path="res://Assets/UI/Slider/handle_disabled.png" id="16_rbxnn"] +[ext_resource type="Texture2D" uid="uid://o3ufhj36lo0r" path="res://Assets/UI/Slider/handle_highlight.png" id="17_8a3cc"] +[ext_resource type="StyleBox" uid="uid://bwlxiw44285g1" path="res://Assets/UI/Slider/h/fill.tres" id="18_fueyy"] +[ext_resource type="StyleBox" uid="uid://b8mdovvxl7lfl" path="res://Assets/UI/Slider/h/background.tres" id="19_ccnyp"] +[ext_resource type="StyleBox" uid="uid://cx486vo60qcpp" path="res://Assets/UI/Edit/normal.tres" id="20_1xrl8"] +[ext_resource type="StyleBox" uid="uid://dvj15u41tqtnm" path="res://Assets/UI/Edit/readonly.tres" id="21_1jd57"] +[ext_resource type="Texture2D" uid="uid://bj8jxblqmsubn" path="res://Assets/UI/Button/arrow_down.png" id="22_qar1e"] +[ext_resource type="StyleBox" uid="uid://dhna0fajb2uei" path="res://Assets/UI/Progress/background.tres" id="23_r3p5f"] +[ext_resource type="StyleBox" uid="uid://b3i7tjv3ok85r" path="res://Assets/UI/Progress/fill.tres" id="24_twflh"] +[ext_resource type="Texture2D" uid="uid://de5dv104noe06" path="res://Assets/UI/Tab/left.png" id="25_tp1la"] +[ext_resource type="Texture2D" uid="uid://ce87u4fp6tnik" path="res://Assets/UI/Tab/left_highlight.png" id="26_b6do7"] +[ext_resource type="Texture2D" uid="uid://bqpbxb5whco41" path="res://Assets/UI/Tab/right.png" id="27_apyeg"] +[ext_resource type="Texture2D" uid="uid://ds6cfed3dmyr3" path="res://Assets/UI/Tab/right_highligh.png" id="28_h4oun"] +[ext_resource type="StyleBox" uid="uid://dnwseiejbfrqq" path="res://Assets/UI/Tab/panel.tres" id="29_uo2g8"] +[ext_resource type="StyleBox" uid="uid://bgecjuqm2jv0w" path="res://Assets/UI/Tab/tab_disabled.tres" id="30_e041s"] +[ext_resource type="StyleBox" uid="uid://byrx7smwgsuf0" path="res://Assets/UI/Tab/tap_selected.tres" id="31_0n7gu"] +[ext_resource type="StyleBox" uid="uid://ddfin4k7slkmn" path="res://Assets/UI/Tab/tap_unselected.tres" id="32_a2a8b"] +[ext_resource type="StyleBox" uid="uid://cm4uy16ypsdyi" path="res://Assets/UI/Scrollbar/v/grabber.tres" id="33_wjjme"] +[ext_resource type="StyleBox" uid="uid://cmiivkeqn03sa" path="res://Assets/UI/Scrollbar/v/grabber_highlight.tres" id="34_y2stj"] +[ext_resource type="StyleBox" uid="uid://j31rmst7m2q7" path="res://Assets/UI/Scrollbar/v/grabber_pressed.tres" id="35_q0217"] +[ext_resource type="StyleBox" uid="uid://de0w7yppc7e0l" path="res://Assets/UI/Scrollbar/v/background.tres" id="36_bu6rt"] +[ext_resource type="StyleBox" uid="uid://15jbtuchd7r6" path="res://Assets/UI/Scrollbar/v/background_focus.tres" id="37_yr206"] +[ext_resource type="StyleBox" uid="uid://bumc1mixgglv8" path="res://Assets/UI/Slider/v/fill.tres" id="38_wuc1e"] +[ext_resource type="StyleBox" uid="uid://0jfr1uwuog0s" path="res://Assets/UI/Slider/v/background.tres" id="39_dl1e4"] +[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="40_bmcvq"] -[sub_resource type="Image" id="Image_rlyln"] +[sub_resource type="Image" id="Image_hhwo6"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 64, 255, 255, 255, 64, 255, 255, 255, 0), "format": "RGBA8", @@ -51,7 +51,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_g5bup"] -image = SubResource("Image_rlyln") +image = SubResource("Image_hhwo6") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sj7h5"] @@ -68,7 +68,7 @@ corner_detail = 1 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_rhkly"] [resource] -default_font = ExtResource("2_j8kea") +default_font = ExtResource("40_bmcvq") Button/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) Button/colors/font_disabled_color = Color(0.227451, 0.172549, 0.290196, 1) Button/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) @@ -85,11 +85,11 @@ Button/colors/icon_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) Button/constants/h_separation = 8 Button/constants/outline_size = 0 Button/font_sizes/font_size = 32 -Button/styles/disabled = ExtResource("1_wt1wr") -Button/styles/focus = ExtResource("2_nf3et") -Button/styles/hover = ExtResource("2_h7pgg") -Button/styles/normal = ExtResource("1_re3m3") -Button/styles/pressed = ExtResource("4_de308") +Button/styles/disabled = ExtResource("1_n3up8") +Button/styles/focus = ExtResource("2_ukct7") +Button/styles/hover = ExtResource("3_ukadi") +Button/styles/normal = ExtResource("4_b2mp2") +Button/styles/pressed = ExtResource("5_6rmq1") CheckBox/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) CheckBox/colors/font_disabled_color = Color(0.875, 0.875, 0.875, 0.5) CheckBox/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) @@ -100,40 +100,40 @@ CheckBox/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) CheckBox/constants/check_v_offset = 0 CheckBox/constants/h_separation = 4 CheckBox/constants/outline_size = 0 -CheckBox/icons/checked = ExtResource("6_srlcu") -CheckBox/icons/unchecked = ExtResource("7_p4k8i") -CheckBox/styles/disabled = ExtResource("1_wt1wr") -CheckBox/styles/focus = ExtResource("2_nf3et") -CheckBox/styles/hover = ExtResource("2_h7pgg") -CheckBox/styles/hover_pressed = ExtResource("4_de308") -CheckBox/styles/normal = ExtResource("1_re3m3") -CheckBox/styles/pressed = ExtResource("4_de308") +CheckBox/icons/checked = ExtResource("6_re2fr") +CheckBox/icons/unchecked = ExtResource("7_as124") +CheckBox/styles/disabled = ExtResource("1_n3up8") +CheckBox/styles/focus = ExtResource("2_ukct7") +CheckBox/styles/hover = ExtResource("3_ukadi") +CheckBox/styles/hover_pressed = ExtResource("5_6rmq1") +CheckBox/styles/normal = ExtResource("4_b2mp2") +CheckBox/styles/pressed = ExtResource("5_6rmq1") CheckButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) CheckButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) -CheckButton/icons/checked = ExtResource("8_r3sw2") -CheckButton/icons/unchecked = ExtResource("9_iytk4") -CheckButton/styles/disabled = ExtResource("1_wt1wr") -CheckButton/styles/focus = ExtResource("2_nf3et") -CheckButton/styles/hover = ExtResource("2_h7pgg") -CheckButton/styles/hover_pressed = ExtResource("4_de308") -CheckButton/styles/normal = ExtResource("1_re3m3") -CheckButton/styles/pressed = ExtResource("4_de308") -HScrollBar/styles/grabber = ExtResource("6_vjj3k") -HScrollBar/styles/grabber_highlight = ExtResource("7_yv3p6") -HScrollBar/styles/grabber_pressed = ExtResource("8_dr3de") -HScrollBar/styles/scroll = ExtResource("9_lv5dx") -HScrollBar/styles/scroll_focus = ExtResource("10_npblq") -HSlider/icons/grabber = ExtResource("6_tsx7l") -HSlider/icons/grabber_disabled = ExtResource("7_m4hfs") -HSlider/icons/grabber_highlight = ExtResource("8_4qpd7") +CheckButton/icons/checked = ExtResource("8_g1dhe") +CheckButton/icons/unchecked = ExtResource("9_trcl3") +CheckButton/styles/disabled = ExtResource("1_n3up8") +CheckButton/styles/focus = ExtResource("2_ukct7") +CheckButton/styles/hover = ExtResource("3_ukadi") +CheckButton/styles/hover_pressed = ExtResource("5_6rmq1") +CheckButton/styles/normal = ExtResource("4_b2mp2") +CheckButton/styles/pressed = ExtResource("5_6rmq1") +HScrollBar/styles/grabber = ExtResource("10_cb1fp") +HScrollBar/styles/grabber_highlight = ExtResource("11_s21yb") +HScrollBar/styles/grabber_pressed = ExtResource("12_fd8p2") +HScrollBar/styles/scroll = ExtResource("13_s3ehx") +HScrollBar/styles/scroll_focus = ExtResource("14_fwmx8") +HSlider/icons/grabber = ExtResource("15_ocljk") +HSlider/icons/grabber_disabled = ExtResource("16_rbxnn") +HSlider/icons/grabber_highlight = ExtResource("17_8a3cc") HSlider/icons/tick = SubResource("ImageTexture_g5bup") -HSlider/styles/grabber_area = ExtResource("14_b0thp") -HSlider/styles/grabber_area_highlight = ExtResource("14_b0thp") -HSlider/styles/slider = ExtResource("15_4oqlg") +HSlider/styles/grabber_area = ExtResource("18_fueyy") +HSlider/styles/grabber_area_highlight = ExtResource("18_fueyy") +HSlider/styles/slider = ExtResource("19_ccnyp") Label/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) Label/colors/font_outline_color = Color(0.745098, 0.760784, 0.721569, 1) Label/colors/font_shadow_color = Color(0.745098, 0.760784, 0.721569, 1) @@ -151,57 +151,57 @@ LineEdit/colors/font_uneditable_color = Color(0.745098, 0.760784, 0.721569, 1) LineEdit/colors/selection_color = Color(0.745098, 0.760784, 0.721569, 1) LineEdit/font_sizes/font_size = 24 LineEdit/styles/focus = SubResource("StyleBoxEmpty_jl30t") -LineEdit/styles/normal = ExtResource("6_lnycp") -LineEdit/styles/read_only = ExtResource("7_k2jlw") +LineEdit/styles/normal = ExtResource("20_1xrl8") +LineEdit/styles/read_only = ExtResource("21_1jd57") MenuButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) MenuButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) -MenuButton/styles/disabled = ExtResource("1_wt1wr") -MenuButton/styles/focus = ExtResource("2_nf3et") -MenuButton/styles/hover = ExtResource("2_h7pgg") -MenuButton/styles/normal = ExtResource("1_re3m3") -MenuButton/styles/pressed = ExtResource("4_de308") +MenuButton/styles/disabled = ExtResource("1_n3up8") +MenuButton/styles/focus = ExtResource("2_ukct7") +MenuButton/styles/hover = ExtResource("3_ukadi") +MenuButton/styles/normal = ExtResource("4_b2mp2") +MenuButton/styles/pressed = ExtResource("5_6rmq1") OptionButton/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_focus_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_hover_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_hover_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_outline_color = Color(0.941176, 0.964706, 0.909804, 1) OptionButton/colors/font_pressed_color = Color(0.941176, 0.964706, 0.909804, 1) -OptionButton/icons/arrow = ExtResource("18_jqhuv") +OptionButton/icons/arrow = ExtResource("22_qar1e") Panel/styles/panel = SubResource("StyleBoxFlat_v2px0") ProgressBar/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) ProgressBar/font_sizes/font_size = 16 -ProgressBar/styles/background = ExtResource("18_ymgal") -ProgressBar/styles/fill = ExtResource("19_1x1m2") +ProgressBar/styles/background = ExtResource("23_r3p5f") +ProgressBar/styles/fill = ExtResource("24_twflh") TabContainer/colors/font_selected_color = Color(0.941176, 0.964706, 0.909804, 1) TabContainer/colors/font_unselected_color = Color(0.941176, 0.964706, 0.909804, 1) TabContainer/font_sizes/font_size = 16 -TabContainer/icons/decrement = ExtResource("20_skg1s") -TabContainer/icons/decrement_highlight = ExtResource("21_ivr4w") -TabContainer/icons/increment = ExtResource("22_tbsa0") -TabContainer/icons/increment_highlight = ExtResource("23_meyle") -TabContainer/styles/panel = ExtResource("24_ypm5h") -TabContainer/styles/tab_disabled = ExtResource("25_2cr8y") -TabContainer/styles/tab_selected = ExtResource("25_ou2yk") -TabContainer/styles/tab_unselected = ExtResource("26_pgono") +TabContainer/icons/decrement = ExtResource("25_tp1la") +TabContainer/icons/decrement_highlight = ExtResource("26_b6do7") +TabContainer/icons/increment = ExtResource("27_apyeg") +TabContainer/icons/increment_highlight = ExtResource("28_h4oun") +TabContainer/styles/panel = ExtResource("29_uo2g8") +TabContainer/styles/tab_disabled = ExtResource("30_e041s") +TabContainer/styles/tab_selected = ExtResource("31_0n7gu") +TabContainer/styles/tab_unselected = ExtResource("32_a2a8b") TextEdit/colors/caret_color = Color(0.168627, 0.662745, 0.705882, 1) TextEdit/colors/font_color = Color(0.941176, 0.964706, 0.909804, 1) TextEdit/colors/font_selected_color = Color(0.168627, 0.662745, 0.705882, 1) TextEdit/colors/selection_color = Color(0.745098, 0.760784, 0.721569, 1) TextEdit/font_sizes/font_size = 24 TextEdit/styles/focus = SubResource("StyleBoxEmpty_rhkly") -TextEdit/styles/normal = ExtResource("6_lnycp") -TextEdit/styles/read_only = ExtResource("7_k2jlw") -VScrollBar/styles/grabber = ExtResource("20_uo4of") -VScrollBar/styles/grabber_highlight = ExtResource("21_pjklk") -VScrollBar/styles/grabber_pressed = ExtResource("22_rcema") -VScrollBar/styles/scroll = ExtResource("23_1wjoi") -VScrollBar/styles/scroll_focus = ExtResource("24_64ah6") -VSlider/icons/grabber = ExtResource("6_tsx7l") -VSlider/icons/grabber_disabled = ExtResource("7_m4hfs") -VSlider/icons/grabber_highlight = ExtResource("8_4qpd7") -VSlider/styles/grabber_area = ExtResource("25_pdk86") -VSlider/styles/grabber_area_highlight = ExtResource("25_pdk86") -VSlider/styles/slider = ExtResource("26_1odpk") +TextEdit/styles/normal = ExtResource("20_1xrl8") +TextEdit/styles/read_only = ExtResource("21_1jd57") +VScrollBar/styles/grabber = ExtResource("33_wjjme") +VScrollBar/styles/grabber_highlight = ExtResource("34_y2stj") +VScrollBar/styles/grabber_pressed = ExtResource("35_q0217") +VScrollBar/styles/scroll = ExtResource("36_bu6rt") +VScrollBar/styles/scroll_focus = ExtResource("37_yr206") +VSlider/icons/grabber = ExtResource("15_ocljk") +VSlider/icons/grabber_disabled = ExtResource("16_rbxnn") +VSlider/icons/grabber_highlight = ExtResource("17_8a3cc") +VSlider/styles/grabber_area = ExtResource("38_wuc1e") +VSlider/styles/grabber_area_highlight = ExtResource("38_wuc1e") +VSlider/styles/slider = ExtResource("39_dl1e4") diff --git a/Assets/UI_Theme.tres b/Assets/UI_Theme.tres deleted file mode 100644 index b6ea9a3..0000000 --- a/Assets/UI_Theme.tres +++ /dev/null @@ -1,109 +0,0 @@ -[gd_resource type="Theme" load_steps=13 format=3 uid="uid://o3vg845para"] - -[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="1_43hgj"] - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0, 0, 0, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] -bg_color = Color(0.427451, 0.423529, 0.8, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.317647, 0.301961, 0.658824, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -border_width_left = 4 -border_width_bottom = 4 -border_color = Color(0.262745, 0.243137, 0.556863, 1) -corner_radius_top_left = 2 -corner_radius_bottom_right = 2 -expand_margin_left = 10.0 -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_left = 7.0 -expand_margin_right = 7.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) -expand_margin_right = 10.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] -bg_color = Color(0.392157, 0.380392, 0.760784, 1) - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] -bg_color = Color(0.313726, 0.231373, 0.4, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_width_bottom = 4 -border_color = Color(0.313726, 0.231373, 0.4, 1) -corner_radius_top_left = 2 -corner_radius_top_right = 2 -corner_radius_bottom_right = 2 -corner_radius_bottom_left = 2 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 5 -border_width_top = 5 -border_width_right = 5 -border_width_bottom = 5 -border_color = Color(0.65098, 0.741176, 0.509804, 1) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] -bg_color = Color(0.941176, 0.964706, 0.909804, 1) -border_width_left = 3 -border_width_top = 3 -border_width_right = 3 -border_color = Color(0.658824, 0.74902, 0.517647, 1) -expand_margin_left = 5.0 -expand_margin_top = 5.0 -expand_margin_right = 5.0 -expand_margin_bottom = 5.0 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] -bg_color = Color(0.894118, 0.94902, 0.835294, 1) -border_width_left = 4 -border_width_top = 4 -border_width_right = 4 -border_color = Color(0.635294, 0.756863, 0.482353, 1) -expand_margin_left = 4.0 -expand_margin_top = 4.0 -expand_margin_right = 4.0 - -[resource] -default_font = ExtResource("1_43hgj") -Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") -Button/styles/hover = SubResource("StyleBoxFlat_47cud") -Button/styles/normal = SubResource("StyleBoxFlat_2i81h") -Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") -CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") -HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") -HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") -HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") -TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) -TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) -TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") -TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") -TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") diff --git a/Prefabs/Settings Menu.tscn b/Prefabs/Settings Menu.tscn index e827acc..463ba22 100644 --- a/Prefabs/Settings Menu.tscn +++ b/Prefabs/Settings Menu.tscn @@ -1,59 +1,62 @@ -[gd_scene load_steps=4 format=3 uid="uid://cbfcolm6mjolp"] +[gd_scene load_steps=5 format=3 uid="uid://cbfcolm6mjolp"] [ext_resource type="Script" path="res://Scripts/UI/SettingsMenu.gd" id="1_2rgd2"] [ext_resource type="Script" path="res://Scripts/UI/Remaping/RemapController.gd" id="2_2f8ap"] [ext_resource type="Script" path="res://Scripts/UI/Remaping/RemapButton.gd" id="2_4asaa"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_02uod"] +bg_color = Color(0.439216, 0.631373, 0.537255, 1) + [node name="SettingsMenu" type="Node" node_paths=PackedStringArray("back_button", "tab_container", "bottom_item_video", "bottom_item_audio", "bottom_item_controls", "display_options_button", "vsync_toggle", "resolutions_options_button", "master_volume_slider", "music_volume_slider", "sfx_volume_slider")] script = ExtResource("1_2rgd2") back_button = NodePath("Back Button") -tab_container = NodePath("CenterContainer/SettingsTabs") -bottom_item_video = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions") -bottom_item_audio = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider") -bottom_item_controls = NodePath("CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton") -display_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/DisplayModeOptions") -vsync_toggle = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/VsyncButton") -resolutions_options_button = NodePath("CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions") -master_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider") -music_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider") -sfx_volume_slider = NodePath("CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider") +tab_container = NodePath("SettingsTabs") +bottom_item_video = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") +bottom_item_audio = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") +bottom_item_controls = NodePath("SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton") +display_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions") +vsync_toggle = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton") +resolutions_options_button = NodePath("SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions") +master_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider") +music_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider") +sfx_volume_slider = NodePath("SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider") -[node name="ColorRect" type="ColorRect" parent="."] +[node name="Remap Controller" type="Control" parent="."] +visible = false +layout_mode = 3 +anchors_preset = 0 +offset_left = 12.0 +offset_top = 12.0 +offset_right = 12.0 +offset_bottom = 12.0 +script = ExtResource("2_2f8ap") + +[node name="Panel" type="Panel" parent="."] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -color = Color(0.576471, 0.831373, 0.709804, 1) +theme_override_styles/panel = SubResource("StyleBoxFlat_02uod") -[node name="Label" type="Label" parent="."] -anchors_preset = 10 -anchor_right = 1.0 -offset_bottom = 95.0 -grow_horizontal = 2 -theme_override_font_sizes/font_size = 35 -text = "SETTINGS MENU" -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="CenterContainer" type="CenterContainer" parent="."] -custom_minimum_size = Vector2(0, 475) -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="SettingsTabs" type="TabContainer" parent="CenterContainer"] +[node name="SettingsTabs" type="TabContainer" parent="."] custom_minimum_size = Vector2(1050, 475) -layout_mode = 2 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 12.0 +offset_top = 12.0 +offset_right = -12.0 +offset_bottom = -109.0 +grow_horizontal = 2 +grow_vertical = 2 theme_override_font_sizes/font_size = 29 -[node name="Video" type="VBoxContainer" parent="CenterContainer/SettingsTabs"] +[node name="Video" type="VBoxContainer" parent="SettingsTabs"] layout_mode = 2 focus_neighbor_left = NodePath("../Controls") -[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Video"] +[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Video"] custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -61,22 +64,19 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="VideoSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Video/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Video/MarginContainer"] layout_mode = 2 columns = 2 -[node name="DisplayModeLabel" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] +[node name="DisplayModeLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Display Mode" vertical_alignment = 1 -[node name="DisplayModeOptions" type="OptionButton" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="DisplayModeOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 item_count = 5 selected = 0 popup/item_0/text = "Full-Screen" @@ -90,42 +90,36 @@ popup/item_3/id = 3 popup/item_4/text = "Exclusive Full-Screen" popup/item_4/id = 4 -[node name="VSync Label" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] +[node name="VSync Label" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "VSync " vertical_alignment = 1 -[node name="VsyncButton" type="CheckButton" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="VsyncButton" type="CheckButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 text = "Vsync" -[node name="ResolutionsLabel" type="Label" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] +[node name="ResolutionsLabel" type="Label" parent="SettingsTabs/Video/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Resolutions " vertical_alignment = 1 -[node name="ResolutionsOptions" type="OptionButton" parent="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="ResolutionsOptions" type="OptionButton" parent="SettingsTabs/Video/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 -focus_neighbor_bottom = NodePath("../../../../../../Back Button") +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") fit_to_longest_item = false -[node name="Audio" type="VBoxContainer" parent="CenterContainer/SettingsTabs"] +[node name="Audio" type="VBoxContainer" parent="SettingsTabs"] visible = false layout_mode = 2 -[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Audio"] +[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Audio"] custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -133,67 +127,55 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="AudioSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Audio/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Audio/MarginContainer"] layout_mode = 2 columns = 2 -[node name="MasterVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="MasterVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Master Volume " vertical_alignment = 1 -[node name="MasterVolumeSlider" type="HSlider" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="MasterVolumeSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="MusicVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="MusicVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Music Volume " vertical_alignment = 1 -[node name="MusicVolSlider" type="HSlider" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] -custom_minimum_size = Vector2(500, 40) +[node name="MusicVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 min_value = -72.0 max_value = 0.0 -[node name="SFXVolLabel" type="Label" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="SFXVolLabel" type="Label" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "SFX Volume" vertical_alignment = 1 -[node name="SFXVolSlider" type="HSlider" parent="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings"] +[node name="SFXVolSlider" type="HSlider" parent="SettingsTabs/Audio/MarginContainer/GridContainer"] custom_minimum_size = Vector2(500, 40) layout_mode = 2 -size_flags_horizontal = 10 -focus_neighbor_bottom = NodePath("../../../../../../Back Button") +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") min_value = -72.0 max_value = 0.0 -[node name="Controls" type="VBoxContainer" parent="CenterContainer/SettingsTabs"] +[node name="Controls" type="VBoxContainer" parent="SettingsTabs"] visible = false layout_mode = 2 -[node name="Remap Controller" type="Control" parent="CenterContainer/SettingsTabs/Controls"] -layout_mode = 2 -script = ExtResource("2_2f8ap") - -[node name="MarginContainer" type="MarginContainer" parent="CenterContainer/SettingsTabs/Controls"] +[node name="MarginContainer" type="MarginContainer" parent="SettingsTabs/Controls"] custom_minimum_size = Vector2(0, 425) layout_mode = 2 theme_override_constants/margin_left = 25 @@ -201,78 +183,65 @@ theme_override_constants/margin_top = 25 theme_override_constants/margin_right = 25 theme_override_constants/margin_bottom = 25 -[node name="ControlSettings" type="GridContainer" parent="CenterContainer/SettingsTabs/Controls/MarginContainer"] +[node name="GridContainer" type="GridContainer" parent="SettingsTabs/Controls/MarginContainer"] layout_mode = 2 columns = 2 -[node name="MoveUpLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveUpLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move Up" vertical_alignment = 1 -[node name="MoveUpRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveUpRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_up" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") -[node name="MoveLeftLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveLeftLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move Left" vertical_alignment = 1 -[node name="MoveLeftRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveLeftRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_left" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") -[node name="MoveDownLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveDownLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move Down" vertical_alignment = 1 -[node name="MoveDownRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveDownRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 +size_flags_horizontal = 3 toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_down" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") -[node name="MoveRightLabel" type="Label" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings"] +[node name="MoveRightLabel" type="Label" parent="SettingsTabs/Controls/MarginContainer/GridContainer"] custom_minimum_size = Vector2(400, 40) layout_mode = 2 -theme_override_colors/font_color = Color(0, 0, 0, 1) -theme_override_font_sizes/font_size = 20 text = "Move RIght" vertical_alignment = 1 -[node name="MoveRightRemapButton" type="Button" parent="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings" node_paths=PackedStringArray("remap_controller")] -custom_minimum_size = Vector2(500, 40) +[node name="MoveRightRemapButton" type="Button" parent="SettingsTabs/Controls/MarginContainer/GridContainer" node_paths=PackedStringArray("remap_controller")] layout_mode = 2 -size_flags_horizontal = 10 -focus_neighbor_bottom = NodePath("../../../../../../Back Button") +size_flags_horizontal = 3 +focus_neighbor_bottom = NodePath("../../../../../Back Button") toggle_mode = true script = ExtResource("2_4asaa") input_action_name = "move_right" -remap_controller = NodePath("../../../Remap Controller") +remap_controller = NodePath("../../../../../Remap Controller") [node name="Back Button" type="Button" parent="."] custom_minimum_size = Vector2(500, 40) @@ -290,17 +259,17 @@ grow_vertical = 0 theme_override_font_sizes/font_size = 23 text = "Back" -[connection signal="item_selected" from="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] -[connection signal="toggled" from="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/VsyncButton" to="." method="_on_vsync_button_toggled"] -[connection signal="item_selected" from="CenterContainer/SettingsTabs/Video/MarginContainer/VideoSettings/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] -[connection signal="drag_ended" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] -[connection signal="value_changed" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] -[connection signal="drag_ended" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] -[connection signal="value_changed" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] -[connection signal="drag_ended" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] -[connection signal="value_changed" from="CenterContainer/SettingsTabs/Audio/MarginContainer/AudioSettings/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveUpRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveUpRemapButton" method="_on_pressed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveLeftRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveLeftRemapButton" method="_on_pressed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveDownRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveDownRemapButton" method="_on_pressed"] -[connection signal="pressed" from="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton" to="CenterContainer/SettingsTabs/Controls/MarginContainer/ControlSettings/MoveRightRemapButton" method="_on_pressed"] +[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/DisplayModeOptions" to="." method="_on_display_mode_options_item_selected"] +[connection signal="toggled" from="SettingsTabs/Video/MarginContainer/GridContainer/VsyncButton" to="." method="_on_vsync_button_toggled"] +[connection signal="item_selected" from="SettingsTabs/Video/MarginContainer/GridContainer/ResolutionsOptions" to="." method="_on_resolutions_options_item_selected"] +[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_drag_ended"] +[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MasterVolumeSlider" to="." method="_on_master_volume_slider_value_changed"] +[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_drag_ended"] +[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/MusicVolSlider" to="." method="_on_music_vol_slider_value_changed"] +[connection signal="drag_ended" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_drag_ended"] +[connection signal="value_changed" from="SettingsTabs/Audio/MarginContainer/GridContainer/SFXVolSlider" to="." method="_on_sfx_vol_slider_value_changed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveUpRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveLeftRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveDownRemapButton" method="_on_pressed"] +[connection signal="pressed" from="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" to="SettingsTabs/Controls/MarginContainer/GridContainer/MoveRightRemapButton" method="_on_pressed"] [connection signal="pressed" from="Back Button" to="." method="_on_back_pressed"] diff --git a/Scenes/Main Menu.tscn b/Scenes/Main Menu.tscn index a38e2fd..0c7bb4f 100644 --- a/Scenes/Main Menu.tscn +++ b/Scenes/Main Menu.tscn @@ -1,18 +1,125 @@ -[gd_scene load_steps=14 format=3 uid="uid://4fysk8vaw3e1"] +[gd_scene load_steps=25 format=3 uid="uid://cukyb513fah1u"] [ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] [ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] [ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] [ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] [ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] -[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Start Menu Old/Cake.png" id="5_7ull8"] +[ext_resource type="Theme" uid="uid://babphdknr2kkd" path="res://Assets/UI/Theme.tres" id="4_bmt8e"] [ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] -[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/Start Menu Old/Jesus.png" id="6_wnx18"] [ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] -[ext_resource type="Theme" uid="uid://o3vg845para" path="res://Assets/UI_Theme.tres" id="8_lr748"] -[ext_resource type="Script" path="res://Scripts/UI/MenuButton.gd" id="9_2cu5l"] -[ext_resource type="Texture2D" uid="uid://6snf183fgfo5" path="res://Assets/Sprites/Start Menu Old/Cross.png" id="12_dhfc0"] -[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="13_3j724"] +[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="7_g28i1"] +[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="10_seibg"] +[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Music/omw-to-beat-the-big-bad.wav" id="12_i62fw"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5uvie"] +bg_color = Color(0.439216, 0.631373, 0.537255, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0, 0, 0, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.317647, 0.301961, 0.658824, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.262745, 0.243137, 0.556863, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 10.0 +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] +bg_color = Color(0.313726, 0.231373, 0.4, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0.313726, 0.231373, 0.4, 1) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 5 +border_width_top = 5 +border_width_right = 5 +border_width_bottom = 5 +border_color = Color(0.65098, 0.741176, 0.509804, 1) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_color = Color(0.658824, 0.74902, 0.517647, 1) +expand_margin_left = 5.0 +expand_margin_top = 5.0 +expand_margin_right = 5.0 +expand_margin_bottom = 5.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] +bg_color = Color(0.894118, 0.94902, 0.835294, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color(0.635294, 0.756863, 0.482353, 1) +expand_margin_left = 4.0 +expand_margin_top = 4.0 +expand_margin_right = 4.0 + +[sub_resource type="Theme" id="Theme_w723v"] +default_font = ExtResource("10_seibg") +Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") +Button/styles/hover = SubResource("StyleBoxFlat_47cud") +Button/styles/normal = SubResource("StyleBoxFlat_2i81h") +Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") +CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") +HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") +HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") +HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") +TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) +TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) +TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") +TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") +TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") [node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] script = ExtResource("1_qepq0") @@ -20,13 +127,14 @@ game_scene = ExtResource("2_28004") settings_scene = ExtResource("3_r3r61") default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") -[node name="ColorRect" type="ColorRect" parent="."] +[node name="ColorRect" type="Panel" parent="."] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -color = Color(0.576471, 0.831373, 0.709804, 1) +theme = ExtResource("4_bmt8e") +theme_override_styles/panel = SubResource("StyleBoxFlat_5uvie") [node name="Decorations" type="Control" parent="."] layout_mode = 3 @@ -48,21 +156,18 @@ position = Vector2(226.563, 338.875) scale = Vector2(22.7773, 15.6953) texture = ExtResource("2_8o6th") +[node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(231.625, 327.793) +scale = Vector2(8.16379, 8.16379) +texture = ExtResource("7_g28i1") +hframes = 8 +vframes = 4 + [node name="Egg3" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(134, 477) +position = Vector2(132, 530) scale = Vector2(4.6875, 4.625) texture = ExtResource("3_1e3fe") -[node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(220, 335) -scale = Vector2(7.0431, 6.97321) -texture = ExtResource("6_wnx18") - -[node name="Cake" type="Sprite2D" parent="Decorations/Left Decor"] -position = Vector2(310, 491) -scale = Vector2(2.59375, 2.32031) -texture = ExtResource("5_7ull8") - [node name="Right Decor" type="CenterContainer" parent="Decorations"] custom_minimum_size = Vector2(576, 0) layout_mode = 1 @@ -98,16 +203,19 @@ hframes = 6 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = 31.0 +offset_top = 22.0 +offset_right = -31.0 +offset_bottom = -22.0 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("8_lr748") +theme = SubResource("Theme_w723v") -[node name="CenterContainer" type="CenterContainer" parent="MainVBox"] -custom_minimum_size = Vector2(0, 150) -layout_mode = 2 - -[node name="Label" type="Label" parent="MainVBox/CenterContainer"] +[node name="Label" type="Label" parent="MainVBox"] layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 8 +theme = ExtResource("4_bmt8e") theme_override_font_sizes/font_size = 50 text = "HOPPY EASTER GAME THING" horizontal_alignment = 1 @@ -116,10 +224,13 @@ vertical_alignment = 1 [node name="ButtonsVbox" type="VBoxContainer" parent="MainVBox"] custom_minimum_size = Vector2(0, 495) layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 3 +theme = ExtResource("4_bmt8e") theme_override_constants/separation = 10 alignment = 1 -[node name="PlayButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="PlayButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../QuitButton") @@ -128,39 +239,11 @@ focus_neighbor_right = NodePath("../SettingsButton") focus_neighbor_bottom = NodePath("../SettingsButton") focus_next = NodePath("../SettingsButton") focus_previous = NodePath("../QuitButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "Play" -pointer_margin_from_center = 80 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/PlayButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]Play[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/PlayButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/PlayButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") - -[node name="SettingsButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="SettingsButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../PlayButton") @@ -169,39 +252,11 @@ focus_neighbor_right = NodePath("../AboutButton") focus_neighbor_bottom = NodePath("../AboutButton") focus_next = NodePath("../AboutButton") focus_previous = NodePath("../PlayButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "Settings" -pointer_margin_from_center = 130 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/SettingsButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]Settings[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/SettingsButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/SettingsButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") - -[node name="AboutButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="AboutButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../SettingsButton") @@ -210,39 +265,11 @@ focus_neighbor_right = NodePath("../QuitButton") focus_neighbor_bottom = NodePath("../QuitButton") focus_next = NodePath("../QuitButton") focus_previous = NodePath("../SettingsButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "About" -pointer_margin_from_center = 95 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/AboutButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]About[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/AboutButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/AboutButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") - -[node name="QuitButton" type="TextureButton" parent="MainVBox/ButtonsVbox" node_paths=PackedStringArray("leftPointer", "rightPointer", "textBox")] +[node name="QuitButton" type="Button" parent="MainVBox/ButtonsVbox"] custom_minimum_size = Vector2(0, 40) layout_mode = 2 focus_neighbor_left = NodePath("../AboutButton") @@ -251,40 +278,12 @@ focus_neighbor_right = NodePath("../PlayButton") focus_neighbor_bottom = NodePath("../PlayButton") focus_next = NodePath("../PlayButton") focus_previous = NodePath("../AboutButton") -mouse_default_cursor_shape = 2 -script = ExtResource("9_2cu5l") +theme = ExtResource("4_bmt8e") +theme_override_font_sizes/font_size = 64 text = "Quit" -pointer_margin_from_center = 80 -leftPointer = NodePath("LeftPointer") -rightPointer = NodePath("RightPointer") -textBox = NodePath("RichTextLabel") - -[node name="RichTextLabel" type="RichTextLabel" parent="MainVBox/ButtonsVbox/QuitButton"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 -theme_override_font_sizes/normal_font_size = 30 -bbcode_enabled = true -text = "[center]Quit[/center]" - -[node name="LeftPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/QuitButton"] -visible = false -position = Vector2(502, 12) -rotation = 1.5708 -texture = ExtResource("12_dhfc0") - -[node name="RightPointer" type="Sprite2D" parent="MainVBox/ButtonsVbox/QuitButton"] -visible = false -position = Vector2(650, 12) -rotation = -1.5708 -texture = ExtResource("12_dhfc0") [node name="MusicPlayer" type="AudioStreamPlayer" parent="."] -stream = ExtResource("13_3j724") +stream = ExtResource("12_i62fw") autoplay = true bus = &"Music" diff --git a/Scenes/Main Menu.tscn.save b/Scenes/Main Menu.tscn.save new file mode 100644 index 0000000..f01e73c --- /dev/null +++ b/Scenes/Main Menu.tscn.save @@ -0,0 +1,282 @@ +[gd_scene load_steps=24 format=3 uid="uid://4fysk8vaw3e1"] + +[ext_resource type="Script" path="res://Scripts/UI/MainMenuManager.gd" id="1_qepq0"] +[ext_resource type="Texture2D" uid="uid://tjxkew3m4v8m" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Shadow.png" id="2_8o6th"] +[ext_resource type="PackedScene" uid="uid://c4btepmue6d7p" path="res://Scenes/Game.tscn" id="2_28004"] +[ext_resource type="Texture2D" uid="uid://daat37cyg0go5" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 3.png" id="3_1e3fe"] +[ext_resource type="PackedScene" uid="uid://cbfcolm6mjolp" path="res://Prefabs/Settings Menu.tscn" id="3_r3r61"] +[ext_resource type="Texture2D" uid="uid://dhvvw4yckl8x7" path="res://Assets/Sprites/Start Menu Old/Cake.png" id="5_7ull8"] +[ext_resource type="Texture2D" uid="uid://c3yg6u8yncau3" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 2.png" id="6_45o7d"] +[ext_resource type="Texture2D" uid="uid://cp84ssaqs3pmp" path="res://Assets/Sprites/Start Menu Old/Jesus.png" id="6_wnx18"] +[ext_resource type="Texture2D" uid="uid://dkotcqflp3e32" path="res://Assets/Sprites/Start Menu Old/Easter Egg/Egg 1.png" id="7_285vd"] +[ext_resource type="FontFile" uid="uid://dqdeftjkwxe64" path="res://Assets/Fonts/Dogica/dogicapixel.ttf" id="10_seibg"] +[ext_resource type="AudioStream" uid="uid://c6nf5s6xy2uii" path="res://Assets/Temp Music/omw-to-beat-the-big-bad.wav" id="13_3j724"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rmi2t"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0, 0, 0, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47cud"] +bg_color = Color(0.427451, 0.423529, 0.8, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.317647, 0.301961, 0.658824, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2i81h"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +border_width_left = 4 +border_width_bottom = 4 +border_color = Color(0.262745, 0.243137, 0.556863, 1) +corner_radius_top_left = 2 +corner_radius_bottom_right = 2 +expand_margin_left = 10.0 +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vel2s"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_left = 7.0 +expand_margin_right = 7.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7k6ml"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) +expand_margin_right = 10.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_11k4d"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nyi0q"] +bg_color = Color(0.392157, 0.380392, 0.760784, 1) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_qky0m"] +bg_color = Color(0.313726, 0.231373, 0.4, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color(0.313726, 0.231373, 0.4, 1) +corner_radius_top_left = 2 +corner_radius_top_right = 2 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lleuj"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 5 +border_width_top = 5 +border_width_right = 5 +border_width_bottom = 5 +border_color = Color(0.65098, 0.741176, 0.509804, 1) +corner_radius_top_left = 5 +corner_radius_top_right = 5 +corner_radius_bottom_right = 5 +corner_radius_bottom_left = 5 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rcukk"] +bg_color = Color(0.941176, 0.964706, 0.909804, 1) +border_width_left = 3 +border_width_top = 3 +border_width_right = 3 +border_color = Color(0.658824, 0.74902, 0.517647, 1) +expand_margin_left = 5.0 +expand_margin_top = 5.0 +expand_margin_right = 5.0 +expand_margin_bottom = 5.0 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_44exv"] +bg_color = Color(0.894118, 0.94902, 0.835294, 1) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color(0.635294, 0.756863, 0.482353, 1) +expand_margin_left = 4.0 +expand_margin_top = 4.0 +expand_margin_right = 4.0 + +[sub_resource type=" +Theme" id="Theme_w723v"] +default_font = ExtResource("10_seibg") +Button/styles/focus = SubResource("StyleBoxFlat_rmi2t") +Button/styles/hover = SubResource("StyleBoxFlat_47cud") +Button/styles/normal = SubResource("StyleBoxFlat_2i81h") +Button/styles/pressed = SubResource("StyleBoxFlat_vel2s") +CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_7k6ml") +HSlider/styles/grabber_area = SubResource("StyleBoxFlat_11k4d") +HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_nyi0q") +HSlider/styles/slider = SubResource("StyleBoxFlat_qky0m") +TabContainer/colors/font_selected_color = Color(0.0980392, 0.0980392, 0.0980392, 1) +TabContainer/colors/font_unselected_color = Color(0.435294, 0.435294, 0.435294, 1) +TabContainer/styles/panel = SubResource("StyleBoxFlat_lleuj") +TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_rcukk") +TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_44exv") + +[node name="MainMenu" type="Node" node_paths=PackedStringArray("default_focus")] +script = ExtResource("1_qepq0") +game_scene = ExtResource("2_28004") +settings_scene = ExtResource("3_r3r61") +default_focus = NodePath("MainVBox/ButtonsVbox/PlayButton") + +[node name="ColorRect" type="Panel" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Decorations" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="Left Decor" type="CenterContainer" parent="Decorations"] +custom_minimum_size = Vector2(576, 0) +layout_mode = 1 +anchors_preset = 9 +anchor_bottom = 1.0 +grow_vertical = 2 + +[node name="Shadow" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(226.563, 338.875) +scale = Vector2(22.7773, 15.6953) +texture = ExtResource("2_8o6th") + +[node name="Egg3" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(134, 477) +scale = Vector2(4.6875, 4.625) +texture = ExtResource("3_1e3fe") + +[node name="Jesus" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(220, 335) +scale = Vector2(7.0431, 6.97321) +texture = ExtResource("6_wnx18") + +[node name="Cake" type="Sprite2D" parent="Decorations/Left Decor"] +position = Vector2(310, 491) +scale = Vector2(2.59375, 2.32031) +texture = ExtResource("5_7ull8") + +[node name="Right Decor" type="CenterContainer" parent="Decorations"] +custom_minimum_size = Vector2(576, 0) +layout_mode = 1 +anchors_preset = 11 +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 0 +grow_vertical = 2 + +[node name="Shadow2" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(351, 403) +scale = Vector2(19.0938, 11.8125) +texture = ExtResource("2_8o6th") + +[node name="Egg2" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(294, 487) +rotation = -1.5708 +scale = Vector2(4.89203, 5.21732) +texture = ExtResource("6_45o7d") + +[node name="Egg1" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(420.75, 471.25) +scale = Vector2(4.89062, 4.95313) +texture = ExtResource("7_285vd") + +[node name="GoodBunny" type="Sprite2D" parent="Decorations/Right Decor"] +position = Vector2(331, 458.5) +scale = Vector2(7.14286, 7.02941) +hframes = 6 + +[node name="MainVBox" type="VBoxContainer" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = 31.0 +offset_top = 22.0 +offset_right = -31.0 +offset_bottom = -22.0 +grow_horizontal = 2 +grow_vertical = 2 +theme = SubResource("Theme_w723v") + +[node name="Label" type="Label" parent="MainVBox"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 8 +theme_override_font_sizes/font_size = 50 +text = "HOPPY EASTER GAME THING" +horizontal_alignment = 1 +vertical_alignment = 1 + +[node name="ButtonsVbox" type="VBoxContainer" parent="MainVBox"] +custom_minimum_size = Vector2(0, 495) +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 3 +theme_override_constants/separation = 10 +alignment = 1 + +[node name="PlayButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../QuitButton") +focus_neighbor_top = NodePath("../QuitButton") +focus_neighbor_right = NodePath("../SettingsButton") +focus_neighbor_bottom = NodePath("../SettingsButton") +focus_next = NodePath("../SettingsButton") +focus_previous = NodePath("../QuitButton") +text = "Play" + +[node name="SettingsButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../PlayButton") +focus_neighbor_top = NodePath("../PlayButton") +focus_neighbor_right = NodePath("../AboutButton") +focus_neighbor_bottom = NodePath("../AboutButton") +focus_next = NodePath("../AboutButton") +focus_previous = NodePath("../PlayButton") +text = "Settings" + +[node name="AboutButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../SettingsButton") +focus_neighbor_top = NodePath("../SettingsButton") +focus_neighbor_right = NodePath("../QuitButton") +focus_neighbor_bottom = NodePath("../QuitButton") +focus_next = NodePath("../QuitButton") +focus_previous = NodePath("../SettingsButton") +text = "About" + +[node name="QuitButton" type="Button" parent="MainVBox/ButtonsVbox"] +custom_minimum_size = Vector2(0, 40) +layout_mode = 2 +focus_neighbor_left = NodePath("../AboutButton") +focus_neighbor_top = NodePath("../AboutButton") +focus_neighbor_right = NodePath("../PlayButton") +focus_neighbor_bottom = NodePath("../PlayButton") +focus_next = NodePath("../PlayButton") +focus_previous = NodePath("../AboutButton") +text = "Quit" + +[node name="MusicPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("13_3j724") +autoplay = true +bus = &"Music" + +[connection signal="pressed" from="MainVBox/ButtonsVbox/PlayButton" to="." method="_on_play_button_pressed"] +[connection signal="pressed" from="MainVBox/ButtonsVbox/SettingsButton" to="." method="_on_settings_button_pressed"] +[connection signal="pressed" from="MainVBox/ButtonsVbox/AboutButton" to="." method="_on_about_button_pressed"] +[connection signal="pressed" from="MainVBox/ButtonsVbox/QuitButton" to="." method="_on_quit_button_pressed"] diff --git a/Scenes/Test.tscn b/Scenes/Test.tscn deleted file mode 100644 index 55d7259..0000000 --- a/Scenes/Test.tscn +++ /dev/null @@ -1,169 +0,0 @@ -[gd_scene load_steps=16 format=3 uid="uid://cugui0mjc6cfe"] - -[ext_resource type="TileSet" uid="uid://bj7uu2180mie3" path="res://Assets/Tileset.tres" id="1_s4utw"] -[ext_resource type="Script" path="res://Scripts/MapGenerator.gd" id="2_yhpwh"] -[ext_resource type="Script" path="res://Scripts/EntitySystem/BunnyGenerator.gd" id="3_dvklj"] -[ext_resource type="PackedScene" uid="uid://cpl4tllohhyel" path="res://Prefabs/bunny.tscn" id="4_0fyd5"] -[ext_resource type="Script" path="res://Scripts/PlayerController.gd" id="5_uv7bh"] -[ext_resource type="Texture2D" uid="uid://ojlfqxj5bilo" path="res://Assets/Sprites/Jesus/jesus_spritesheet.png" id="6_es2l8"] -[ext_resource type="Script" path="res://Scripts/WeaponSystem/WeaponController.gd" id="7_8kdie"] -[ext_resource type="PackedScene" uid="uid://csxh42o8twxwn" path="res://Prefabs/projectile.tscn" id="8_wx0kk"] - -[sub_resource type="Animation" id="Animation_kdxam"] -resource_name = "Idle" -length = 0.1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] -} - -[sub_resource type="Animation" id="Animation_dwpep"] -resource_name = "MoveDown" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = false -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [0, 1, 2, 3, 4, 5, 6, 7] -} - -[sub_resource type="Animation" id="Animation_2jvl5"] -resource_name = "MoveLeft" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [24, 25, 26, 27, 28, 29, 30, 31] -} - -[sub_resource type="Animation" id="Animation_4ig1u"] -resource_name = "MoveRight" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [8, 9, 10, 11, 12, 13, 14, 15] -} - -[sub_resource type="Animation" id="Animation_pswkh"] -resource_name = "MoveUp" -length = 0.8 -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7), -"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1), -"update": 1, -"values": [16, 17, 18, 19, 20, 21, 22, 23] -} - -[sub_resource type="Animation" id="Animation_o3hln"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Player Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_bi1h3"] -_data = { -"Idle": SubResource("Animation_kdxam"), -"MoveDown": SubResource("Animation_dwpep"), -"MoveLeft": SubResource("Animation_2jvl5"), -"MoveRight": SubResource("Animation_4ig1u"), -"MoveUp": SubResource("Animation_pswkh"), -"RESET": SubResource("Animation_o3hln") -} - -[node name="Player Movement" type="Node2D"] - -[node name="Map Generator" type="TileMap" parent="."] -scale = Vector2(1.5, 1.5) -tile_set = ExtResource("1_s4utw") -cell_quadrant_size = 32 -format = 2 -script = ExtResource("2_yhpwh") -start_area_corner_size = 3 - -[node name="Bunny Generator" type="Node" parent="." node_paths=PackedStringArray("player")] -script = ExtResource("3_dvklj") -bunny_prefab = ExtResource("4_0fyd5") -player = NodePath("../Player") - -[node name="Player" type="CharacterBody2D" parent="." node_paths=PackedStringArray("animation_player")] -position = Vector2(1440, 810) -collision_layer = 0 -script = ExtResource("5_uv7bh") -speed = 60 -animation_player = NodePath("Player Animator") - -[node name="Player Sprite" type="Sprite2D" parent="Player"] -position = Vector2(0, -20) -texture = ExtResource("6_es2l8") -hframes = 8 -vframes = 4 - -[node name="Player Collider" type="CollisionPolygon2D" parent="Player"] -position = Vector2(2, -24) -polygon = PackedVector2Array(12, 32, -16, 32, -16, -24, 12, -24) - -[node name="Player Camera" type="Camera2D" parent="Player"] -position = Vector2(-1, -25) -zoom = Vector2(3, 3) -position_smoothing_enabled = true -drag_horizontal_enabled = true -drag_vertical_enabled = true -editor_draw_drag_margin = true - -[node name="Player Animator" type="AnimationPlayer" parent="Player"] -libraries = { -"": SubResource("AnimationLibrary_bi1h3") -} - -[node name="WeaponController" type="Node2D" parent="Player"] -position = Vector2(0, -16) -script = ExtResource("7_8kdie") -projectile_prefab = ExtResource("8_wx0kk") diff --git a/Scripts/UI/MainMenuManager.gd b/Scripts/UI/MainMenuManager.gd index cd71434..16405f1 100644 --- a/Scripts/UI/MainMenuManager.gd +++ b/Scripts/UI/MainMenuManager.gd @@ -2,7 +2,7 @@ extends Node @export var game_scene : Resource @export var settings_scene : Resource -@export var default_focus : TextureButton +@export var default_focus : Control # Engine Callbackss func _ready(): diff --git a/Scripts/UI/SettingsMenu.gd b/Scripts/UI/SettingsMenu.gd index 4368726..dba1764 100644 --- a/Scripts/UI/SettingsMenu.gd +++ b/Scripts/UI/SettingsMenu.gd @@ -38,7 +38,7 @@ func _ready(): GlobalSettings.update_sfx_volume(Save.game_data.sfx_volume) pass -func _process(delta): +func _process(_delta): update_change_tab() pass diff --git a/project.godot b/project.godot index a013de7..12f6809 100644 --- a/project.godot +++ b/project.godot @@ -17,7 +17,7 @@ config/icon="res://icon.svg" [audio] -buses/default_bus_layout="res://Assets/Temp Music/default_bus_layout.tres" +buses/default_bus_layout="res://Assets/Music/default_bus_layout.tres" [autoload] @@ -37,7 +37,7 @@ project/assembly_name="HoppyEaster" [gui] -theme/custom="res://Assets/UI/UI_Theme.tres" +theme/custom="res://Assets/UI/Theme.tres" [input] @@ -168,16 +168,14 @@ aim_down_controller={ } ui_tab_left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":9,"pressure":0.0,"pressed":true,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"echo":false,"script":null) ] } ui_tab_right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":10,"pressure":0.0,"pressed":true,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"echo":false,"script":null) ] }