From 5c9bb806b0adfb38758581eb800febb907ec8dcc Mon Sep 17 00:00:00 2001
From: Harmony Honey <HarmonyMonroe97@gmail.com>
Date: Thu, 23 Nov 2023 03:56:16 -0500
Subject: [PATCH] StartMenu WIP! Touch controls coming next (=

---
 media/image/explode2.png  | Bin 350 -> 349 bytes
 media/image/slam.png      | Bin 184 -> 174 bytes
 media/image/tinyArrow.png | Bin 111 -> 111 bytes
 src/map/1-1.tscn          |   4 ----
 src/map/1-2.tscn          |   4 ----
 src/map/1-3.tscn          |   1 -
 src/map/1-4.tscn          |   4 ----
 src/menu/StartMenu.gd     |  27 +++++++--------------------
 src/menu/StartMenu.tscn   |  28 ----------------------------
 9 files changed, 7 insertions(+), 61 deletions(-)

diff --git a/media/image/explode2.png b/media/image/explode2.png
index 3acf8d6b43a8f3f40b0df048f0bccb2b0e9d2bc1..d28f400151daf7d88145143b809aced1bdb28151 100644
GIT binary patch
delta 309
zcmV-50m}Z~0^I_TF@G0HL_t(oh3%L@5`r)cMN{tK2|SF>xX_&*O?R?jMi0XYIEZct
zlh&q5Z7ag`ub`QP_B9Ow1BG-x?q2l%);>+CXU!>gQJd|-0x<NQ3V;jFl@{buHo!Y6
z7amH2NEdy*KP=njw4bge7~CfOBgBshA-tjQ+;JGky^Fv_yMN$ZAxI7e7f137#VQHj
z3e3SHb{OrJpB5g9gCWI<f%vNu(BOpxkJ`8+o+8aApiQc?G?vzfizE3N03AFknu)R5
zhoae(D}w>@l>lu9H@?B8Dzp(XnHZD7s{%NORs|4`8Eu(RF-Mrjk^H7XZ5{NziF4Gj
zTy2mq);BE>jV=@Nt8Gl8Y9pPf`YD&F`ZFO>#U`~B0I7Nd6s#H=Q&BhV00000NkvXX
Hu0mjfnCpnN

delta 310
zcmV-60m=T|0^S0UF@G3IL_t(oh3%Lz7J@JghEwk02|SF0gQHG*CY@w-VDK=UfP?5l
zcxi2#)V3nL{u4AWq5YbMfPq3f9(FH!-#(tE)U)OkyQs}}ZvhzkP6faP=SmB5DI4IO
zlnW0fL8Obm->#PJbiPd25)5t={t@EGgb?1)ckVch<K9K!qJLd*t`H;#gNq~ig<_Qi
zZw2Py5j%`_%TEgr#leu`#6bL2325*_f=6xK5l@k36VN8rSsF|0!^M&O41f+E70txh
z>_gFP%9X(Y`AUE`gB#!AQWe^Wm`sex;8g*fL#qOa$Bed2sF)*6<4AtfptcVB-o!a-
zSgtn67welAh%d$o`PDWiQMHjyRQ;4oRQ;KdsA7{^3V>9-0oPU;hIRo>*Z=?k07*qo
IM6N<$g4xcI<^TWy

diff --git a/media/image/slam.png b/media/image/slam.png
index dd843a4e2c390fbd00da601f3382e19a8498957f..93843cb21d83cb91199ff6c308fe969c62d0dc27 100644
GIT binary patch
delta 132
zcmV-~0DJ$q0j>d%F@0!BL_t(oh3(SO3cw%;h2b2%|0}zj1)~u&b2Z}st|HXpR7wB<
z0Dz0C>WrSP^#l?b-VrruwN(LbLoc2>Yp=KdOS#@C7ZVX_ty{z1YAiE6dgn!-KjQHK
m#r=oO_$}5@{uCYn03%LQ&{NxYOLNQs0000<MNUMnLSTYQCpnk^

delta 143
zcmV;A0C4}V0k{E>F@JJNL_t(oh3(QY4uBvGg<&x6uHOH2tel`uBt|8cf?&x1O@y?C
zJa7&G001zN7^Fwf)Jg(r8Q#)r&}gFqoQA|8nqZ#lw7u5)FRj;&bTPl}KDW*dd#lmR
xuqd6^`urNV2T0C8q{na3hVrNI005|Q0CVnAA0gF>eE<Le00>D%PDHLkV1mALLbCt>

diff --git a/media/image/tinyArrow.png b/media/image/tinyArrow.png
index cf8bb16d5135e0dbefd282ca4b8f0697acf88e6d..7ac2316d02e53adac73f423f86b233f7a72116ee 100644
GIT binary patch
delta 54
zcmd1LpI~SB|G&M_e9rkQT}(NXB-9>+9yoF0gh!8bVN|Oy14EcC|6gm#^S>E@z|+;w
JWt~$(698!d6wUwu

delta 54
zcmd1LpI~SB<B`45e9rkQT}(NXB-9>+9yp<Y(4$AXFsfCUfq`c^e_ta1`Dz9r@O1Ta
JS?83{1OP<g6ITEL

diff --git a/src/map/1-1.tscn b/src/map/1-1.tscn
index b607f75..ad80798 100644
--- a/src/map/1-1.tscn
+++ b/src/map/1-1.tscn
@@ -55,13 +55,9 @@ margin_left = 12.0
 margin_top = -7.0
 margin_right = 42.0
 margin_bottom = 6.0
-custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 )
 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
 custom_constants/shadow_as_outline = 1
 custom_fonts/font = ExtResource( 8 )
 text = "move"
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [editable path="GameCamera"]
diff --git a/src/map/1-2.tscn b/src/map/1-2.tscn
index e017b88..5d62de9 100644
--- a/src/map/1-2.tscn
+++ b/src/map/1-2.tscn
@@ -55,13 +55,9 @@ margin_left = 12.0
 margin_top = -7.0
 margin_right = 50.0
 margin_bottom = 6.0
-custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 )
 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
 custom_constants/shadow_as_outline = 1
 custom_fonts/font = ExtResource( 8 )
 text = "jump"
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [editable path="GameCamera"]
diff --git a/src/map/1-3.tscn b/src/map/1-3.tscn
index 8a41d0a..c5a8a49 100644
--- a/src/map/1-3.tscn
+++ b/src/map/1-3.tscn
@@ -66,7 +66,6 @@ margin_left = 15.0
 margin_top = -6.0
 margin_right = 45.0
 margin_bottom = 7.0
-custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 )
 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
 custom_constants/shadow_as_outline = 1
 custom_fonts/font = ExtResource( 9 )
diff --git a/src/map/1-4.tscn b/src/map/1-4.tscn
index fae27cb..73d3ddc 100644
--- a/src/map/1-4.tscn
+++ b/src/map/1-4.tscn
@@ -62,13 +62,9 @@ margin_left = 12.0
 margin_top = -6.0
 margin_right = 32.0
 margin_bottom = 7.0
-custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 )
 custom_colors/font_color_shadow = Color( 0, 0, 0, 1 )
 custom_constants/shadow_as_outline = 1
 custom_fonts/font = ExtResource( 9 )
 text = "lift"
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [editable path="GameCamera"]
diff --git a/src/menu/StartMenu.gd b/src/menu/StartMenu.gd
index 43b5192..03f6dc2 100644
--- a/src/menu/StartMenu.gd
+++ b/src/menu/StartMenu.gd
@@ -4,12 +4,9 @@ var menu_list : Label
 var menu_items := []
 
 onready var menu_stuff := $Control/Menu.get_children()
-
-onready var main_list : Label = $Menu/List
 var main_items := ["play", "options", "credits"]
 
 onready var quit_menu : Control = $Menu/Quit
-onready var quit_list : Label = $Menu/Quit/List
 var quit_items := ["yes", "no"]
 
 var cursor := 0
@@ -17,7 +14,6 @@ var cursor := 0
 var timer := 0.1
 var clock := 0.0
 
-onready var node_cursor : ColorRect = $Menu/Cursor
 onready var node_audio_scroll : AudioStreamPlayer = $AudioScroll
 onready var node_audio_play : AudioStreamPlayer = $AudioPlay
 onready var node_audio_options : AudioStreamPlayer = $AudioOptions
@@ -29,7 +25,6 @@ onready var node_audio_no : AudioStreamPlayer = $AudioNo
 var is_input = true
 
 func _ready():
-	menu_list = main_list
 	switch_menu("main")
 	UI.keys(true, true, false)
 
@@ -37,9 +32,14 @@ func _input(event):
 	if !is_input:
 		return
 	if event.is_action_pressed("action"):
-		if menu_list == quit_list:
+		if menu_items == quit_items:
 			cursor = 1
 			menu_select()
+		else:
+			cursor = 0
+			write_menu()
+			switch_menu("quit")
+			node_audio_quit.play()
 	elif event.is_action_pressed("jump"):
 		menu_select()
 	else:
@@ -56,7 +56,7 @@ func write_menu():
 		menu_stuff[i].modulate = Color("ff004d") if i == cursor else Color("83769c")
 
 func menu_select():
-	match menu_items[cursor].to_lower():
+	match menu_items[clamp(cursor, 0, menu_items.size() - 1)].to_lower():
 		"play":
 			Shared.wipe_scene(Shared.level_select_path)
 			is_input = false
@@ -69,11 +69,6 @@ func menu_select():
 			Shared.wipe_scene(Shared.credits_path)
 			is_input = false
 			node_audio_credits.play()
-		"quit":
-			cursor = -1
-			write_menu()
-			switch_menu("quit")
-			node_audio_quit.play()
 		"yes":
 			is_input = false
 			node_audio_yes.play()
@@ -92,17 +87,9 @@ func switch_menu(arg):
 	match arg:
 		"main":
 			quit_menu.visible = false
-			menu_list = main_list
 			menu_items = main_items
-			
-			node_cursor.get_parent().remove_child(node_cursor)
-			main_list.add_child(node_cursor)
 		"quit":
 			quit_menu.visible = true
-			menu_list = quit_list
 			menu_items = quit_items
 			cursor = 1
-			
-			node_cursor.get_parent().remove_child(node_cursor)
-			quit_list.add_child(node_cursor)
 	write_menu()
diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn
index 31e561b..90b4ad8 100644
--- a/src/menu/StartMenu.tscn
+++ b/src/menu/StartMenu.tscn
@@ -45,38 +45,10 @@ pause_mode = 2
 script = ExtResource( 3 )
 
 [node name="Menu" type="Node2D" parent="."]
-visible = false
 position = Vector2( -18, 8 )
 z_index = 20
 z_as_relative = false
 
-[node name="Cursor" type="ColorRect" parent="Menu"]
-show_behind_parent = true
-margin_left = 15.0
-margin_top = 47.0
-margin_right = 44.0
-margin_bottom = 57.0
-color = Color( 0.113725, 0.168627, 0.32549, 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="List" type="Label" parent="Menu"]
-margin_left = 12.0
-margin_top = 48.0
-margin_right = 48.0
-margin_bottom = 89.0
-custom_colors/font_color = Color( 1, 0.945098, 0.909804, 1 )
-custom_fonts/font = ExtResource( 1 )
-text = "play
-options
-credits
-quit"
-align = 1
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
 [node name="Quit" type="Control" parent="Menu"]
 visible = false
 margin_left = 80.0