Patient ITL beginning
This commit is contained in:
+5
-1
@@ -12,7 +12,11 @@ func _ready() -> void:
|
||||
load_slot.resize(Globals.save_slot_count + 1) #Resizes save_slot
|
||||
|
||||
#Connecting signals
|
||||
back.pressed.connect(func(): self.hide())
|
||||
back.pressed.connect(func():
|
||||
self.hide()
|
||||
if UI.in_title_screen:
|
||||
UI.masks.mask.hide()
|
||||
)
|
||||
|
||||
#Sets up save_slot array
|
||||
for i in range(1, Globals.save_slot_count + 1): #Goes from 1 to 4
|
||||
|
||||
@@ -21,6 +21,7 @@ func _ready() -> void:
|
||||
menu_button.pressed.connect(func():
|
||||
submenu.show()
|
||||
ui_main.masks.mask.show()
|
||||
ui_main.in_title_screen = false
|
||||
)
|
||||
submenu.resume.pressed.connect(func():
|
||||
reset()
|
||||
|
||||
@@ -37,7 +37,11 @@ var resolution_list: Dictionary = {
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready() -> void:
|
||||
|
||||
back.pressed.connect(func(): self.hide()) #Back button
|
||||
back.pressed.connect(func():
|
||||
self.hide()
|
||||
if UI.in_title_screen:
|
||||
UI.masks.mask.hide()
|
||||
) #Back button
|
||||
|
||||
#Text settings
|
||||
#Signals
|
||||
@@ -106,9 +110,12 @@ func _on_display_selected(index: int):
|
||||
1: #Borderless mode
|
||||
DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_MAXIMIZED)
|
||||
DisplayServer.window_set_flag(DisplayServer.WINDOW_FLAG_BORDERLESS, true)
|
||||
resolution_button.select(resolution_list.find_key(screen_size)) #Selects screen size as resolution
|
||||
2: #Fullscreen mode
|
||||
DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN)
|
||||
print("window setting changed")
|
||||
DisplayServer.window_set_flag(DisplayServer.WINDOW_FLAG_BORDERLESS, false)
|
||||
resolution_button.select(resolution_list.find_key(screen_size)) #Selects screen size as resolution
|
||||
print("Window setting changed")
|
||||
|
||||
|
||||
#Shows selected resolution
|
||||
|
||||
@@ -22,6 +22,9 @@ signal main_menu_pressed
|
||||
signal text_value_changed
|
||||
signal auto_value_changed
|
||||
|
||||
#Boolean to differentiate in-game UI from title_screen UI
|
||||
var in_title_screen = false
|
||||
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready() -> void:
|
||||
|
||||
+49
-16
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=29 format=3 uid="uid://dy40jygog8t3k"]
|
||||
[gd_scene load_steps=32 format=3 uid="uid://dy40jygog8t3k"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://c0q67t6m1i4dl" path="res://Scenes/UI/ui.gd" id="1_mg12k"]
|
||||
[ext_resource type="FontFile" uid="uid://dv8ppra5tgn1t" path="res://Art/Fonts/PixelatedEleganceRegular-ovyAA.ttf" id="2_vb7na"]
|
||||
@@ -67,6 +67,9 @@ _data = {
|
||||
&"fade_out": SubResource("Animation_in743")
|
||||
}
|
||||
|
||||
[sub_resource type="Theme" id="Theme_h6tq4"]
|
||||
OptionButton/fonts/font = ExtResource("2_vb7na")
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_fo2i3"]
|
||||
border_width_left = 2
|
||||
border_width_top = 2
|
||||
@@ -74,28 +77,53 @@ border_width_right = 2
|
||||
border_width_bottom = 2
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h6tq4"]
|
||||
bg_color = Color(0, 0, 0, 1)
|
||||
border_width_left = 2
|
||||
border_width_top = 2
|
||||
border_width_right = 2
|
||||
border_width_bottom = 2
|
||||
border_color = Color(0.78431374, 0.78431374, 0.78431374, 1)
|
||||
bg_color = Color(0.39215687, 0.39215687, 0.39215687, 1)
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
border_width_right = 4
|
||||
border_width_bottom = 4
|
||||
border_color = Color(0.5882353, 0.5882353, 0.5882353, 1)
|
||||
border_blend = true
|
||||
corner_radius_top_left = 4
|
||||
corner_radius_top_right = 4
|
||||
corner_radius_bottom_right = 4
|
||||
corner_radius_bottom_left = 4
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_t7te2"]
|
||||
bg_color = Color(0.78431374, 0.78431374, 0.78431374, 1)
|
||||
border_color = Color(1, 1, 1, 1)
|
||||
bg_color = Color(0, 0, 0, 1)
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
border_width_right = 4
|
||||
border_width_bottom = 4
|
||||
border_color = Color(0.39215687, 0.39215687, 0.39215687, 1)
|
||||
border_blend = true
|
||||
corner_radius_top_left = 4
|
||||
corner_radius_top_right = 4
|
||||
corner_radius_bottom_right = 4
|
||||
corner_radius_bottom_left = 4
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_56q1t"]
|
||||
bg_color = Color(0.5882353, 0.5882353, 0.5882353, 1)
|
||||
border_width_left = 4
|
||||
border_width_top = 4
|
||||
border_width_right = 4
|
||||
border_width_bottom = 4
|
||||
border_color = Color(0.78431374, 0.78431374, 0.78431374, 1)
|
||||
border_blend = true
|
||||
corner_radius_top_left = 4
|
||||
corner_radius_top_right = 4
|
||||
corner_radius_bottom_right = 4
|
||||
corner_radius_bottom_left = 4
|
||||
|
||||
[sub_resource type="Theme" id="Theme_fevae"]
|
||||
Button/styles/hover = SubResource("StyleBoxFlat_h6tq4")
|
||||
Button/styles/normal = SubResource("StyleBoxFlat_t7te2")
|
||||
Button/styles/pressed = SubResource("StyleBoxFlat_56q1t")
|
||||
|
||||
[sub_resource type="Theme" id="Theme_27bfm"]
|
||||
default_font = ExtResource("2_vb7na")
|
||||
default_font_size = 18
|
||||
OptionButton/fonts/font = null
|
||||
OptionButton/fonts/font = ExtResource("2_vb7na")
|
||||
|
||||
[sub_resource type="Theme" id="Theme_k8uqd"]
|
||||
default_font = ExtResource("2_vb7na")
|
||||
@@ -237,6 +265,7 @@ anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
mouse_filter = 2
|
||||
theme = SubResource("Theme_h6tq4")
|
||||
script = ExtResource("4_s3gqk")
|
||||
|
||||
[node name="Submenu" type="PanelContainer" parent="PauseMenu"]
|
||||
@@ -503,7 +532,7 @@ text_slider = NodePath("MarginContainer/VBoxContainer/GridContainer/DialogueCont
|
||||
auto_slider = NodePath("MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/Control/AutoSpeed/AutoSlider")
|
||||
text_counter = NodePath("MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/TextSpeed/TextCounter")
|
||||
auto_counter = NodePath("MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/Control/AutoSpeed/AutoCounter")
|
||||
autoplay = NodePath("MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/AutoPlay/AutoPlayCheckBox")
|
||||
autoplay = NodePath("MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/AutoPlay/AutoPlayCheckbox")
|
||||
auto_mask = NodePath("MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/Control/AutoMask")
|
||||
display_button = NodePath("MarginContainer/VBoxContainer/GridContainer/ScreenContainer/VBoxContainer2/ScreenSettings/VBoxContainer/Display/DisplayButton")
|
||||
resolution_button = NodePath("MarginContainer/VBoxContainer/GridContainer/ScreenContainer/VBoxContainer2/ScreenSettings/VBoxContainer/Resolution/ResolutionButton")
|
||||
@@ -597,6 +626,7 @@ size_flags_vertical = 4
|
||||
theme_override_fonts/normal_font = ExtResource("2_vb7na")
|
||||
theme_override_font_sizes/normal_font_size = 16
|
||||
bbcode_enabled = true
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="Control" type="Control" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer"]
|
||||
custom_minimum_size = Vector2(0, 50)
|
||||
@@ -641,6 +671,7 @@ size_flags_vertical = 4
|
||||
theme_override_fonts/normal_font = ExtResource("2_vb7na")
|
||||
theme_override_font_sizes/normal_font_size = 16
|
||||
bbcode_enabled = true
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="AutoMask" type="ColorRect" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/Control"]
|
||||
layout_mode = 1
|
||||
@@ -666,14 +697,13 @@ bbcode_enabled = true
|
||||
text = "AUTOPLAY"
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="AutoPlayCheckBox" type="CheckBox" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/AutoPlay"]
|
||||
[node name="AutoPlayCheckbox" type="Button" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer/DialogueContainer/VBoxContainer2/DialogueOptions/VBoxContainer/AutoPlay"]
|
||||
custom_minimum_size = Vector2(25, 25)
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 4
|
||||
size_flags_vertical = 4
|
||||
theme_override_styles/normal = SubResource("StyleBoxFlat_h6tq4")
|
||||
theme_override_styles/pressed = SubResource("StyleBoxFlat_t7te2")
|
||||
theme_override_styles/hover = SubResource("StyleBoxFlat_t7te2")
|
||||
theme = SubResource("Theme_fevae")
|
||||
toggle_mode = true
|
||||
|
||||
[node name="ScreenContainer" type="MarginContainer" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer"]
|
||||
layout_mode = 2
|
||||
@@ -714,12 +744,12 @@ theme_override_fonts/normal_font = ExtResource("2_vb7na")
|
||||
theme_override_font_sizes/normal_font_size = 16
|
||||
bbcode_enabled = true
|
||||
text = "DISPLAY"
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="DisplayButton" type="OptionButton" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer/ScreenContainer/VBoxContainer2/ScreenSettings/VBoxContainer/Display"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
theme = SubResource("Theme_27bfm")
|
||||
theme_override_fonts/font = ExtResource("2_vb7na")
|
||||
theme_override_font_sizes/font_size = 16
|
||||
selected = 2
|
||||
item_count = 3
|
||||
@@ -742,6 +772,7 @@ theme_override_fonts/normal_font = ExtResource("2_vb7na")
|
||||
theme_override_font_sizes/normal_font_size = 16
|
||||
bbcode_enabled = true
|
||||
text = "RESOLUTION"
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="ResolutionButton" type="OptionButton" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer/ScreenContainer/VBoxContainer2/ScreenSettings/VBoxContainer/Resolution"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
@@ -787,6 +818,7 @@ theme_override_fonts/normal_font = ExtResource("2_vb7na")
|
||||
theme_override_font_sizes/normal_font_size = 16
|
||||
bbcode_enabled = true
|
||||
text = "MASTER"
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="MasterVolume" type="HSlider" parent="PauseMenu/Settings/MarginContainer/VBoxContainer/GridContainer/SoundContainer/VBoxContainer2/DialogueOptions/VBoxContainer/TextSpeed"]
|
||||
layout_mode = 2
|
||||
@@ -806,6 +838,7 @@ size_flags_vertical = 4
|
||||
theme_override_fonts/normal_font = ExtResource("2_vb7na")
|
||||
theme_override_font_sizes/normal_font_size = 16
|
||||
bbcode_enabled = true
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="Back" type="Button" parent="PauseMenu/Settings/MarginContainer/VBoxContainer"]
|
||||
custom_minimum_size = Vector2(80, 40)
|
||||
|
||||
Reference in New Issue
Block a user