From 6a8eab1eb7a87c5e7cb8057e8549a91b27e50424 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Sun, 7 Jul 2024 20:42:11 -0400 Subject: [PATCH] stuff' --- graphics/hud/file_select_arrow.png | Bin 185 -> 193 bytes menus/file_select.tscn | 3 +++ menus/file_select_panel.tscn | 8 +++--- menus/main_menu.tscn | 14 +++++------ menus/marathon_start.tscn | 39 ++++++++++++++++------------- 5 files changed, 36 insertions(+), 28 deletions(-) diff --git a/graphics/hud/file_select_arrow.png b/graphics/hud/file_select_arrow.png index 6667a67b86563a6753bda35d49b5d8374afda8ef..111ffcce0bbae70da7d7f3699f62f34ec9de5b0b 100644 GIT binary patch delta 126 zcmdnVc#u)CGr-TCmrII^fq{Y7)59eQNb>+O7Y8$t-2Tb`#6(4(kV6a%e1{lCHM|;t zf<~S$jv*4^$q7zO0({Iof2rwo!S32+{HdpZY^f(+iz@W5IqTv*y79%4EJI{<6 Z3_6Mon_Jgs_XBk^c)I$ztaD0e0st))AKm}} delta 118 zcmX@exRX(_Gr-TCmrII^fq{Y7)59eQNQ2lM9LzxSyUM(liHbfxhZz|74l^FlUy%Y7 z)bez343P+rJ-v|^sE)}o;r~L{4U>+XH+7P`rSWa;HH(`I+RgaiDrFVdQ&MBb@02gv25dZ)H diff --git a/menus/file_select.tscn b/menus/file_select.tscn index 547e9fe..e47036a 100644 --- a/menus/file_select.tscn +++ b/menus/file_select.tscn @@ -87,6 +87,7 @@ margin_bottom = 136.0 number = 3 [node name="SelectFile1" type="TextureButton" parent="."] +material = ExtResource( 3 ) margin_left = 12.0 margin_top = 138.0 margin_right = 84.0 @@ -99,6 +100,7 @@ expand = true stretch_mode = 3 [node name="SelectFile2" type="TextureButton" parent="."] +material = ExtResource( 3 ) margin_left = 92.0 margin_top = 138.0 margin_right = 164.0 @@ -111,6 +113,7 @@ expand = true stretch_mode = 3 [node name="SelectFile3" type="TextureButton" parent="."] +material = ExtResource( 3 ) margin_left = 172.0 margin_top = 138.0 margin_right = 244.0 diff --git a/menus/file_select_panel.tscn b/menus/file_select_panel.tscn index 49cbedd..db17c96 100644 --- a/menus/file_select_panel.tscn +++ b/menus/file_select_panel.tscn @@ -75,13 +75,14 @@ stretch_mode = 4 [node name="ShardCounter" type="Label" parent="FileExists"] unique_name_in_owner = true margin_left = 43.0 -margin_top = 20.0 +margin_top = 27.0 margin_right = 67.0 -margin_bottom = 30.0 +margin_bottom = 37.0 text = "00" [node name="KeyCounter" type="Label" parent="FileExists"] unique_name_in_owner = true +visible = false margin_left = 43.0 margin_top = 33.0 margin_right = 64.0 @@ -89,9 +90,10 @@ margin_bottom = 43.0 text = "000" [node name="Shard" parent="FileExists" instance=ExtResource( 5 )] -position = Vector2( 32, 23 ) +position = Vector2( 32, 29 ) [node name="Key" parent="FileExists" instance=ExtResource( 3 )] +visible = false position = Vector2( 32, 34 ) [node name="DeathsHead" type="Sprite" parent="FileExists"] diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn index a7114ba..f880294 100644 --- a/menus/main_menu.tscn +++ b/menus/main_menu.tscn @@ -105,9 +105,9 @@ hframes = 3 [node name="Panel" type="Panel" parent="."] material = SubResource( 6 ) margin_left = 16.0 -margin_top = 15.0 +margin_top = 24.0 margin_right = 136.0 -margin_bottom = 132.0 +margin_bottom = 129.0 theme = ExtResource( 1 ) [node name="Body" type="Label" parent="Panel"] @@ -119,7 +119,6 @@ margin_bottom = 80.0 text = "continue file select marathon mode -augmentations options high scores sound test @@ -159,10 +158,11 @@ margin_top = 35.0 margin_right = 16.0 margin_bottom = 43.0 focus_neighbour_top = NodePath("../FileSelect") -focus_neighbour_bottom = NodePath("../Augmentations") +focus_neighbour_bottom = NodePath("../Options") texture_focused = ExtResource( 4 ) [node name="Augmentations" type="TextureButton" parent="Panel"] +visible = false material = SubResource( 4 ) margin_left = 8.0 margin_top = 48.0 @@ -178,7 +178,7 @@ margin_left = 8.0 margin_top = 61.0 margin_right = 16.0 margin_bottom = 69.0 -focus_neighbour_top = NodePath("../Augmentations") +focus_neighbour_top = NodePath("../MarathonMode") focus_neighbour_bottom = NodePath("../HighScores") texture_focused = ExtResource( 4 ) @@ -231,9 +231,9 @@ of a new future" [node name="Label2" type="Label" parent="."] material = ExtResource( 8 ) margin_left = 8.0 -margin_top = 3.0 +margin_top = 8.0 margin_right = 218.0 -margin_bottom = 52.0 +margin_bottom = 57.0 theme = ExtResource( 1 ) text = "Welcome to the future... 2083!" align = 1 diff --git a/menus/marathon_start.tscn b/menus/marathon_start.tscn index aa953a1..60eeda7 100644 --- a/menus/marathon_start.tscn +++ b/menus/marathon_start.tscn @@ -99,22 +99,23 @@ custom_constants/separation = 8 alignment = 1 [node name="Beginner" type="VBoxContainer" parent="DifficultySelect/VBoxContainer/HBoxContainer"] -margin_left = 41.0 -margin_right = 76.0 +margin_left = 3.0 +margin_right = 59.0 margin_bottom = 24.0 custom_constants/separation = 2 [node name="Label" type="Label" parent="DifficultySelect/VBoxContainer/HBoxContainer/Beginner"] -margin_right = 35.0 +margin_right = 56.0 margin_bottom = 10.0 custom_fonts/font = ExtResource( 7 ) -text = "Sweet" +text = "Beginner" [node name="BeginnerButton" type="TextureButton" parent="DifficultySelect/VBoxContainer/HBoxContainer/Beginner"] unique_name_in_owner = true -margin_left = 17.0 +material = ExtResource( 5 ) +margin_left = 28.0 margin_top = 12.0 -margin_right = 17.0 +margin_right = 28.0 margin_bottom = 24.0 rect_min_size = Vector2( 0, 12 ) focus_neighbour_right = NodePath("../../Advanced/AdvancedButton") @@ -124,22 +125,23 @@ expand = true stretch_mode = 3 [node name="Advanced" type="VBoxContainer" parent="DifficultySelect/VBoxContainer/HBoxContainer"] -margin_left = 84.0 -margin_right = 119.0 +margin_left = 67.0 +margin_right = 123.0 margin_bottom = 24.0 custom_constants/separation = 2 [node name="Label" type="Label" parent="DifficultySelect/VBoxContainer/HBoxContainer/Advanced"] -margin_right = 35.0 +margin_right = 56.0 margin_bottom = 10.0 custom_fonts/font = ExtResource( 7 ) -text = "Spicy" +text = "Advanced" [node name="AdvancedButton" type="TextureButton" parent="DifficultySelect/VBoxContainer/HBoxContainer/Advanced"] unique_name_in_owner = true -margin_left = 17.0 +material = ExtResource( 5 ) +margin_left = 28.0 margin_top = 12.0 -margin_right = 17.0 +margin_right = 28.0 margin_bottom = 24.0 rect_min_size = Vector2( 0, 12 ) focus_neighbour_left = NodePath("../../Beginner/BeginnerButton") @@ -150,22 +152,23 @@ expand = true stretch_mode = 3 [node name="Professional" type="VBoxContainer" parent="DifficultySelect/VBoxContainer/HBoxContainer"] -margin_left = 127.0 -margin_right = 176.0 +margin_left = 131.0 +margin_right = 215.0 margin_bottom = 24.0 custom_constants/separation = 2 [node name="Label" type="Label" parent="DifficultySelect/VBoxContainer/HBoxContainer/Professional"] -margin_right = 49.0 +margin_right = 84.0 margin_bottom = 10.0 custom_fonts/font = ExtResource( 7 ) -text = "Pungent" +text = "Professional" [node name="ProfessionalButton" type="TextureButton" parent="DifficultySelect/VBoxContainer/HBoxContainer/Professional"] unique_name_in_owner = true -margin_left = 24.0 +material = ExtResource( 5 ) +margin_left = 42.0 margin_top = 12.0 -margin_right = 24.0 +margin_right = 42.0 margin_bottom = 24.0 rect_min_size = Vector2( 0, 12 ) focus_neighbour_left = NodePath("../../Advanced/AdvancedButton")