From 28fb9adf286fd7a7d439f2acd0cc70ecc2445240 Mon Sep 17 00:00:00 2001
From: Haze Weathers <hazel.lsnider@gmail.com>
Date: Sat, 13 Jul 2024 00:16:08 -0400
Subject: [PATCH] yipeegit statusgit status

---
 menus/level_select_scholar.gd   |   6 +-
 menus/level_select_scholar.tscn | 122 ++++++++++++++++++++++++++++++--
 2 files changed, 119 insertions(+), 9 deletions(-)

diff --git a/menus/level_select_scholar.gd b/menus/level_select_scholar.gd
index 5fbdf48..47e2e0a 100644
--- a/menus/level_select_scholar.gd
+++ b/menus/level_select_scholar.gd
@@ -1,6 +1,7 @@
 extends Control
 
 export var travel_time: float = 1.0
+export var can_menu: bool = true
 
 var selected_level: int = 0
 var made_selection: bool = false
@@ -96,8 +97,9 @@ func _input(event: InputEvent) -> void:
 	pass
 
 func _gui_input(event: InputEvent) -> void:
-	if event.is_action_pressed("ui_cancel") or event.is_action_pressed("pause") && $"%MenuPopup".visible == false:
-		animation_player.play("show_menu")
+	if event.is_action_pressed("ui_cancel") or event.is_action_pressed("pause") and $"%MenuPopup".visible == false:
+		if can_menu:
+			animation_player.play("show_menu")
 	if not made_selection: # player is walking around
 		if event.is_action_pressed("ui_accept"):
 			_update_stats()
diff --git a/menus/level_select_scholar.tscn b/menus/level_select_scholar.tscn
index 627a711..bfd8429 100644
--- a/menus/level_select_scholar.tscn
+++ b/menus/level_select_scholar.tscn
@@ -133,6 +133,18 @@ tracks/5/keys = {
 "update": 0,
 "values": [ Vector2( 1, 1 ) ]
 }
+tracks/6/type = "value"
+tracks/6/path = NodePath(".:can_menu")
+tracks/6/interp = 1
+tracks/6/loop_wrap = true
+tracks/6/imported = false
+tracks/6/enabled = true
+tracks/6/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
 
 [sub_resource type="Animation" id=16]
 resource_name = "hide_boss"
@@ -161,6 +173,18 @@ tracks/1/keys = {
 "update": 0,
 "values": [ Vector2( 1, 1 ), Vector2( 1, 0.04 ), Vector2( 0, 0.04 ) ]
 }
+tracks/2/type = "value"
+tracks/2/path = NodePath(".:can_menu")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0.4 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
 
 [sub_resource type="Animation" id=11]
 resource_name = "hide_exit"
@@ -214,6 +238,18 @@ tracks/3/keys = {
 "transitions": PoolRealArray(  ),
 "values": [  ]
 }
+tracks/4/type = "value"
+tracks/4/path = NodePath(".:can_menu")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/keys = {
+"times": PoolRealArray( 0.4 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
 
 [sub_resource type="Animation" id=13]
 resource_name = "hide_menu"
@@ -256,6 +292,18 @@ tracks/2/keys = {
 "method": "grab_focus"
 } ]
 }
+tracks/3/type = "value"
+tracks/3/path = NodePath(".:can_menu")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/keys = {
+"times": PoolRealArray( 0.4 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
 
 [sub_resource type="Animation" id=8]
 resource_name = "hide_stats"
@@ -284,6 +332,18 @@ tracks/1/keys = {
 "update": 0,
 "values": [ Vector2( 1, 1 ), Vector2( 1, 0.02 ), Vector2( 0, 0.02 ) ]
 }
+tracks/2/type = "value"
+tracks/2/path = NodePath(".:can_menu")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0.4 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
 
 [sub_resource type="Animation" id=17]
 resource_name = "show_boss"
@@ -312,6 +372,18 @@ tracks/1/keys = {
 "update": 0,
 "values": [ Vector2( 0, 0.04 ), Vector2( 1, 0.04 ), Vector2( 1, 1 ) ]
 }
+tracks/2/type = "value"
+tracks/2/path = NodePath(".:can_menu")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
 
 [sub_resource type="Animation" id=12]
 resource_name = "show_exit"
@@ -354,6 +426,18 @@ tracks/2/keys = {
 "method": "grab_focus"
 } ]
 }
+tracks/3/type = "value"
+tracks/3/path = NodePath(".:can_menu")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
 
 [sub_resource type="Animation" id=14]
 resource_name = "show_menu"
@@ -396,6 +480,18 @@ tracks/2/keys = {
 "method": "grab_focus"
 } ]
 }
+tracks/3/type = "value"
+tracks/3/path = NodePath(".:can_menu")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
 
 [sub_resource type="Animation" id=7]
 resource_name = "show_stats"
@@ -424,6 +520,18 @@ tracks/1/keys = {
 "update": 0,
 "values": [ Vector2( 0, 0.02 ), Vector2( 1, 0.02 ), Vector2( 1, 1 ) ]
 }
+tracks/2/type = "value"
+tracks/2/path = NodePath(".:can_menu")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
 
 [sub_resource type="Animation" id=18]
 length = 0.001
@@ -1200,9 +1308,9 @@ texture = ExtResource( 14 )
 offset = Vector2( 5, 0 )
 
 [node name="BossCenter" type="Control" parent="."]
-visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
+rect_scale = Vector2( 1e-05, 0.04 )
 rect_pivot_offset = Vector2( 128, 96 )
 
 [node name="PressStartBoss" type="Label" parent="BossCenter"]
@@ -1449,25 +1557,25 @@ margin_bottom = 99.0
 [node name="VBoxContainer" type="VBoxContainer" parent="ExitPopup/PanelContainer"]
 margin_left = 3.0
 margin_top = 3.0
-margin_right = 116.0
+margin_right = 108.0
 margin_bottom = 27.0
 
 [node name="Label" type="Label" parent="ExitPopup/PanelContainer/VBoxContainer"]
-margin_right = 113.0
+margin_right = 105.0
 margin_bottom = 10.0
 text = "Return to menu?"
 align = 1
 
 [node name="HBoxContainer" type="HBoxContainer" parent="ExitPopup/PanelContainer/VBoxContainer"]
 margin_top = 14.0
-margin_right = 113.0
+margin_right = 105.0
 margin_bottom = 24.0
 custom_constants/separation = 8
 alignment = 1
 
 [node name="StayHere" type="Button" parent="ExitPopup/PanelContainer/VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
-margin_right = 49.0
+margin_right = 48.0
 margin_bottom = 10.0
 focus_neighbour_top = NodePath(".")
 focus_neighbour_bottom = NodePath(".")
@@ -1475,8 +1583,8 @@ size_flags_horizontal = 3
 text = "NO"
 
 [node name="ExitMenu" type="Button" parent="ExitPopup/PanelContainer/VBoxContainer/HBoxContainer"]
-margin_left = 57.0
-margin_right = 113.0
+margin_left = 56.0
+margin_right = 105.0
 margin_bottom = 10.0
 focus_neighbour_top = NodePath(".")
 focus_neighbour_bottom = NodePath(".")