From 4e92501432b8f19a8d413f2a8fd915ac3a2654b3 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 2 Jun 2023 20:30:42 -0400 Subject: [PATCH] more menu stuf --- graphics/hud/sg_menu.png | Bin 2022 -> 2023 bytes graphics/hud/sg_menu_blink.png | Bin 0 -> 348 bytes graphics/hud/sg_menu_blink.png.import | 35 ++++++++++ maps/global_palette.png | Bin 0 -> 7905 bytes maps/global_palette.png.import | 35 ++++++++++ maps/level_select.tscn | 18 ++++- menus/cool.tscn | 3 +- menus/file_select.tscn | 3 +- menus/main_menu.gd | 12 ++++ menus/main_menu.tscn | 93 ++++++++++++++++++++++++-- objects/hud/pause_screen.tscn | 7 +- ui/arrow_figure_8.tres | 9 +++ 12 files changed, 203 insertions(+), 12 deletions(-) create mode 100644 graphics/hud/sg_menu_blink.png create mode 100644 graphics/hud/sg_menu_blink.png.import create mode 100644 maps/global_palette.png create mode 100644 maps/global_palette.png.import create mode 100644 ui/arrow_figure_8.tres diff --git a/graphics/hud/sg_menu.png b/graphics/hud/sg_menu.png index 57b7176564cd4c5882370993f8457d5cfb5db5b5..90bc921d15f4f8fc90f8efe30c4f2618cb84d333 100644 GIT binary patch delta 1887 zcmV-l2cY=o59be%oqxap01m(bYSxJf000LlNklkY)^B<38kE~{HlbdFfgLjD)TSt;H^ygrZ< z#ARLAWmzs4eDKS|z2=DZf-L0WE3(y+9Fa6bATaVq&2}|GTz@Xt!L*<_?4=r`A+Qh6zN1u(hM3&p zZD=y*v<@-2NPh%9fI78{ydu^vM%nGrLj>Bj54AI?2s|b{Nhzly)Wk?$W`^*AAOT;I z^uq7b;3aACx)AfiJAE|@|fqar}Sn>)et zh6h>@w|_uH8whxa$4YD_wgLq5!$jENp_YvV!8QV+$Px|_fy+gYoAALq3^`yxkx#Kl zLL6y?2V=!ww)Db&jA=O1W{UIh8;h1&sGwzr%2#BsRcEGXDkFr{;7bO!K}3m;`@JAQ zu8`*@h%Y9@NC-}O{Dlc3iU|=qL|hyJ%Jq!%Btgtilf#e0AlAg^dJJhD23w&TEq5k8JF%w!>)Aaw{x zv&+IN^0st7?*Hw+ZOe8{rv}8n^q+?cRjYY?MHwg5zxi$ zx_^y~0TB-hM9asI6hO~7uIY$S7dW0X<3P+pO!1DMMh7R=MXsbtbo|VYAilU)_A8d38g*DGi6^4))@s#63 z9U^?nydsGpfSZbenCNX}M5_c-qs@J=Re$%zW?zjCp-`D+d~}NU@DroAyECMOCwLp2)0 zsSOdA1>aB|D3?g9Mn%NM%Yx}Uq*ZHHVX8Ah6cZf+jMP7K;fV>tGbG4G@#MraM1S+m znZodhGYi6_3@Q;+b3qTqMU0edqaeH%qk2R=3<<=x6WcJt=OMRwC+e2$+VLv3VMH^* zP<~@Xy>QO_CYOv8Z(?!E(1ba9ElM4 zicDt1DbU9On86A>qEQ59F=*cVgMs zhY08)+z2H}TrpZ^&^!Y9w?||FVFI?YavBv(CK3V+T2cuSYsAlkF4Q9L!GC{pnB^QQ zA?$;Q2NBMDEY*Y&IUlOEfPesmmn1#ZrI%&`j1iHyB?OKnT-3Z;3lgS?R9ph&qLl(A zEVba6{@-(S(SVQ(GRo3C5i&#&V%$hN;)+nX2t1MKQk**?e0herjX=a!06`KjaGvrb z&f|40nhPPE<9j4dgK}_)+kY62)qyofh%5(7Ccu3eNQkNdk!)-4M}iKu(}2jeUQR{F7S2_BH?ov<@bRKq64c=UAP${^J5oye!Bya@QaNMjB`YPUGy6v z;TN?SZ8@;&H3A2aZ6W_17mk*+=3!@VxX3n`k(nZ#yEq_*TD*hk_J7Wuw*dmmUsz4& zE{;3-41qO)XahvPgK#(%E_z!-DPFo@0x~{FIGRGj;9|HeCW!t3j@LK%5oZX`QvuGGN=nT;fU}U^S&T7Fm>j1Ygu`wc?!awKZ&s%jRAqE>0#J>Gg z^oL#Ni-4a;g=EbT&VQ%ajh{2Psw2H72*mxNN&?qz#zw|~a9~1sNLUVPEa`}dXum5W z(xEokbU-MCDQ={}N;op+h!8SjFp?|beFT@?|Kg=~jD;L*^$3SZ%n|{Nv8zN zO!(`r1#g`Wh!Uw~3jr_on;dNoE*#Ypyq6+JTOA@r);g3|&sfgN2t~pNchYj}i^Fv$ zDIpyB)+_7i;@wx$p%(AHvN}YHdHw3tBU03>SFZyC%CWQ8pb-J(jQ%y#6d~nIzMg2` Z{{`myMls64b{6uVAkIqh65{!R zoFFdyzHi%hx!{9e9v-zu>=$Gq4_}e3mgI<{6#{{gH*2-41%KjldE4Hcve4ytnaqgG z_Vxs@sK^nqU*4c+E&y??bwC7xkS99$I3Q4mbHt$>BO(FM2?rYkqIrNE{f#PPL^xe? z@LJy?s)@fvI636twQ4mAVt20P;I-b?2wc~=FjJ2GPHP0yg5t2J>Wq%SK0N!1N-;WO zafkPz#hlXy#DC2_=lu zhO}jd?zT}7>0*DsHbtsC5IKp+odkjg@YcazO2&l1K)Zl)Cq}#pqIwGPaSH{)oev^V zogg$DLhua22od}B`uTbLfI33G&ri9~#Y4TteL_SMxR-EY#782cLj*3EB#_Y%AmGiN z;CaIXO@G8kAfgQfJj7!qHWOO`0{LMgZ17NXBSEl@KqxZ9AtG?O=y4N1c!wbe3@Gv` z_DF~$jqqUX_{)}F*pD#{N7_np9)4rdtc41iGgQ4IN9{T@MN<_aqz0cduni(II_~#G zfZQP8n;*zLfdiR!3ZD67-q5%PLKu! zq}gp_6qU>vlb+QxoFxz>{UeErBf7QX+u}JUARzbVNKJe7@ZD*t%Z71o#pG zU4PuJ*O@UP;z5CE`S_9o=o!a#9T5tHZhCrNZv@2Cf*z=eaX=t7#BX`02g)Wm*_smpb2#FC- zIX*NX!l%qDk_ZC0sThcf(MCn|N-#Cr+#Sh2$!uPTt8(8AzVz= z=m@8FL|hhpLv0{0kzS34h>Mp6(|1U#wyb2Tvp}SY0RcwopSkeF0^u1Few2aD(MBMei40OW_JB6MM^7kwif|9^s3#@#`3fT~A9!A)+F9yT%MBmCJz8HI76G z{POO1?fL_i<)i^XsI3eP)665j5WesCdmsRyz`!RscZ~FL0jn zJPF=VeBJ;;C@cecMBH?c~a%7w%#_M9- z2nqi~EpPz!ibwt{E*vdsO}C}jTvQv(7+uhZM7Z47o!o_H7D#cS5Oc-kMD#Fne5+)bZWwAi?6XDK}wfLb6CII0c^&+A! z`fs@4wfOUL4vX^7qG{luGsG}}k@*%ms|D9=1Kh^K#*A!O;C=uzC|#} zgx~I3@HXgx$Ve@l1iaYqa21JQ$b;#Gqu2-rEMZyPn(sSF3!)>Oh zARPJ9tLo_D)mPD>7O%dl21JQ@{u(qQO4PI0r~?A3v8&gl83EOd@wL(tA=OO2zR~0H Y2NNttFohPKDgXcg07*qoM6N<$f>a4&iU0rr diff --git a/graphics/hud/sg_menu_blink.png b/graphics/hud/sg_menu_blink.png new file mode 100644 index 0000000000000000000000000000000000000000..11dd37903e31ddda41797fff1537d296cfe7ad04 GIT binary patch literal 348 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 u_ literal 0 HcmV?d00001 diff --git a/maps/global_palette.png.import b/maps/global_palette.png.import new file mode 100644 index 0000000..b2a9f99 --- /dev/null +++ b/maps/global_palette.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/global_palette.png-5912e6b1a36410a858c7b9382fbf9c96.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://maps/global_palette.png" +dest_files=[ "res://.import/global_palette.png-5912e6b1a36410a858c7b9382fbf9c96.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/maps/level_select.tscn b/maps/level_select.tscn index 5213f4c..217c712 100644 --- a/maps/level_select.tscn +++ b/maps/level_select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=2] @@ -9,6 +9,18 @@ [ext_resource path="res://maps/level_select.gd" type="Script" id=7] [ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=8] [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=9] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=10] +[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=11] + +[sub_resource type="ShaderMaterial" id=3] +shader = ExtResource( 11 ) +shader_param/color_1 = Color( 0.121569, 0.454902, 1, 1 ) +shader_param/color_2 = Color( 0.258824, 0.909804, 0.396078, 1 ) +shader_param/checker_size = Vector2( 8, 8 ) +shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 11, 1 ) +shader_param/cycle_alternation = Vector2( 1, 1 ) +shader_param/uv_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 3 ) @@ -19,9 +31,9 @@ shader_param/border_corners = false script = ExtResource( 7 ) [node name="BackGround" type="ColorRect" parent="."] +material = SubResource( 3 ) margin_right = 256.0 margin_bottom = 192.0 -color = Color( 0, 0, 0, 1 ) [node name="ColorRect2" type="ColorRect" parent="."] margin_left = 43.0 @@ -86,6 +98,7 @@ text = "AAAAAAAAAAAAAAAAAAAAAAAA" align = 1 [node name="EasyModeText" type="Label" parent="."] +material = ExtResource( 10 ) margin_top = 3.0 margin_right = 256.0 margin_bottom = 13.0 @@ -94,6 +107,7 @@ text = "easy is off press c to change this" align = 1 [node name="LivesModeText" type="Label" parent="."] +material = ExtResource( 10 ) margin_left = 2.0 margin_top = 180.0 margin_right = 258.0 diff --git a/menus/cool.tscn b/menus/cool.tscn index d09ad4f..2ac0bd1 100644 --- a/menus/cool.tscn +++ b/menus/cool.tscn @@ -7,8 +7,9 @@ shader = ExtResource( 1 ) shader_param/color_1 = Color( 0.145098, 0.0823529, 0.0823529, 1 ) shader_param/color_2 = Color( 1, 0, 0, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( -8, 0 ) shader_param/pan_speed = Vector2( 0, 8 ) +shader_param/cycle_speed = Vector2( -8, 0 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform2D( 1, 0, 1, 4, 0, 0 ) [node name="Node2D" type="Node2D"] diff --git a/menus/file_select.tscn b/menus/file_select.tscn index 7f7b068..2c6a71e 100644 --- a/menus/file_select.tscn +++ b/menus/file_select.tscn @@ -11,8 +11,9 @@ shader = ExtResource( 11 ) shader_param/color_1 = Color( 0.2, 0.294118, 1, 1 ) shader_param/color_2 = Color( 0, 0.0352941, 0.329412, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( 0, 16 ) shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 0, 16 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform2D( 2, 0, 2, 1, 0, 0 ) [node name="FileSelect" type="Node"] diff --git a/menus/main_menu.gd b/menus/main_menu.gd index 0b62762..2d99b50 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -14,3 +14,15 @@ func _ready(): $Panel/FileSelect.grab_focus() Vector2( 0.83205, 0.5547 ) + + +func _on_Continue_button_down(): + pass # Replace with function body. + + +func _on_FileSelect_button_down(): + SceneManager.current_scene = load("res://menus/file_select.tscn").instance() + + +func _on_Exit_button_down(): + get_tree().quit() diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn index f7fd33d..ff143e7 100644 --- a/menus/main_menu.tscn +++ b/menus/main_menu.tscn @@ -1,18 +1,21 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] +[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=2] [ext_resource path="res://graphics/hud/sg_menu.png" type="Texture" id=3] [ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=4] [ext_resource path="res://menus/main_menu.gd" type="Script" id=5] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=6] +[ext_resource path="res://graphics/hud/sg_menu_blink.png" type="Texture" id=7] [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 6 ) shader_param/color_1 = Color( 1, 0.835294, 0.619608, 1 ) shader_param/color_2 = Color( 1, 0.478431, 0.219608, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( 12, 0 ) shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 12, 0 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform( 1, -2, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 ) [sub_resource type="ShaderMaterial" id=3] @@ -20,10 +23,53 @@ shader = ExtResource( 6 ) shader_param/color_1 = Color( 0.62, 0.797333, 1, 1 ) shader_param/color_2 = Color( 0.22, 0.428, 1, 1 ) shader_param/checker_size = Vector2( 16, 16 ) -shader_param/cycle_speed = Vector2( 24, 0 ) shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/cycle_speed = Vector2( 24, 0 ) +shader_param/cycle_alternation = Vector2( 0, 0 ) shader_param/uv_transform = Transform( 1, 1, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 ) +[sub_resource type="ShaderMaterial" id=6] +shader = ExtResource( 2 ) +shader_param/speed = Vector2( 0, 4 ) +shader_param/ammount = Vector2( 0, 1 ) +shader_param/offset = Vector2( 0, 1 ) + +[sub_resource type="ShaderMaterial" id=4] +shader = ExtResource( 2 ) +shader_param/speed = Vector2( 4, 8 ) +shader_param/ammount = Vector2( 1, 1 ) +shader_param/offset = Vector2( 0, 0 ) + +[sub_resource type="Animation" id=5] +resource_name = "blink" +length = 5.0 +loop = true +step = 0.05 +tracks/0/type = "value" +tracks/0/path = NodePath("SG/Eyes:visible") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 4.3, 4.55 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ false, true, false ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("SG/Eyes:frame") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 4.3, 4.35, 4.4, 4.45, 4.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 0, 1, 2, 1, 0 ] +} + [node name="MainMenu" type="Node"] script = ExtResource( 5 ) @@ -39,39 +85,50 @@ anchor_right = 1.0 anchor_bottom = 1.0 margin_bottom = -56.0 -[node name="TextureRect2" type="TextureRect" parent="."] +[node name="SG" type="TextureRect" parent="."] margin_left = 176.0 margin_top = 40.0 margin_right = 242.0 margin_bottom = 187.0 texture = ExtResource( 3 ) +[node name="Eyes" type="Sprite" parent="SG"] +visible = false +position = Vector2( 33, 38 ) +texture = ExtResource( 7 ) +hframes = 3 + [node name="Panel" type="Panel" parent="."] +material = SubResource( 6 ) margin_left = 16.0 margin_top = 32.0 margin_right = 136.0 -margin_bottom = 112.0 +margin_bottom = 120.0 theme = ExtResource( 1 ) [node name="Body" type="Label" parent="Panel"] +material = SubResource( 6 ) margin_left = 16.0 margin_top = 8.0 margin_right = 112.0 -margin_bottom = 57.0 +margin_bottom = 80.0 text = "continue file select marathon mode augmentations -options" +options +exit" [node name="GreyedContinue" type="Label" parent="Panel/Body"] visible = false +material = SubResource( 6 ) margin_right = 56.0 margin_bottom = 10.0 custom_colors/font_color = Color( 0.690196, 0.690196, 0.690196, 1 ) text = "Continue" [node name="Continue" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 9.0 margin_right = 16.0 @@ -81,6 +138,7 @@ focus_neighbour_bottom = NodePath("../FileSelect") texture_focused = ExtResource( 4 ) [node name="FileSelect" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 22.0 margin_right = 16.0 @@ -90,6 +148,7 @@ focus_neighbour_bottom = NodePath("../MarathonMode") texture_focused = ExtResource( 4 ) [node name="MarathonMode" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 35.0 margin_right = 16.0 @@ -99,6 +158,7 @@ focus_neighbour_bottom = NodePath("../Augmentations") texture_focused = ExtResource( 4 ) [node name="Augmentations" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 48.0 margin_right = 16.0 @@ -108,10 +168,29 @@ focus_neighbour_bottom = NodePath("../Options") texture_focused = ExtResource( 4 ) [node name="Options" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) margin_left = 8.0 margin_top = 61.0 margin_right = 16.0 margin_bottom = 69.0 focus_neighbour_top = NodePath("../Augmentations") +focus_neighbour_bottom = NodePath("../Exit") +texture_focused = ExtResource( 4 ) + +[node name="Exit" type="TextureButton" parent="Panel"] +material = SubResource( 4 ) +margin_left = 8.0 +margin_top = 74.0 +margin_right = 16.0 +margin_bottom = 82.0 +focus_neighbour_top = NodePath("../Options") focus_neighbour_bottom = NodePath("../Continue") texture_focused = ExtResource( 4 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +autoplay = "blink" +anims/blink = SubResource( 5 ) + +[connection signal="button_down" from="Panel/Continue" to="." method="_on_Continue_button_down"] +[connection signal="button_down" from="Panel/FileSelect" to="." method="_on_FileSelect_button_down"] +[connection signal="button_down" from="Panel/Exit" to="." method="_on_Exit_button_down"] diff --git a/objects/hud/pause_screen.tscn b/objects/hud/pause_screen.tscn index 6b12586..deaed7d 100644 --- a/objects/hud/pause_screen.tscn +++ b/objects/hud/pause_screen.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] +[ext_resource path="res://ui/arrow_figure_8.tres" type="Material" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=2] [ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=3] [ext_resource path="res://objects/hud/pause_screen.gd" type="Script" id=4] @@ -58,6 +59,7 @@ align = 1 [node name="Resume" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 36.0 margin_top = 1.0 margin_right = 44.0 @@ -67,6 +69,7 @@ texture_focused = ExtResource( 3 ) [node name="Restart" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 32.0 margin_top = 14.0 margin_right = 40.0 @@ -77,6 +80,7 @@ texture_focused = ExtResource( 3 ) [node name="Settings" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 29.0 margin_top = 27.0 margin_right = 37.0 @@ -87,6 +91,7 @@ texture_focused = ExtResource( 3 ) [node name="ExitLevel" type="TextureButton" parent="Body"] pause_mode = 2 +material = ExtResource( 1 ) margin_left = 22.0 margin_top = 40.0 margin_right = 30.0 diff --git a/ui/arrow_figure_8.tres b/ui/arrow_figure_8.tres new file mode 100644 index 0000000..2843937 --- /dev/null +++ b/ui/arrow_figure_8.tres @@ -0,0 +1,9 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=2] + +[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=1] + +[resource] +shader = ExtResource( 1 ) +shader_param/speed = Vector2( 4, 8 ) +shader_param/ammount = Vector2( 1, 1 ) +shader_param/offset = Vector2( 0, 0 )