From ab2d1a88407f38fe9542498370065f92fa68d075 Mon Sep 17 00:00:00 2001 From: PersonGuyGit Date: Sun, 10 Jul 2022 12:59:29 -0600 Subject: [PATCH] Added some changes. --- .../SettingsMenuConfig.gd | 26 ++++++++++++----- .../SettingsMenuControl.tscn | 29 ++++++++++++------- .../assets/darktheme_opacity.tres | 4 +++ .../assets/lighttheme_opacity.tres | 4 +++ .../assets/sbf_black.tres | 2 +- .../assets/ui_controlNode_dark_theme.tres | 29 ++++++++++--------- .../assets/ui_controlNode_light_theme.tres | 22 +++++++++----- 7 files changed, 77 insertions(+), 39 deletions(-) create mode 100644 Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/darktheme_opacity.tres create mode 100644 Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/lighttheme_opacity.tres diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd index 8e4f41d..aad8b3c 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuConfig.gd @@ -1,12 +1,19 @@ extends Control +# https://stackoverflow.com/a/65774028 +# Be Sure to make these Vars as OnReadys; you can read up on it here. + +# Items to Fill the dropdown Lists onready var keyboardContents = ["Qwerty", "Dvorak", "Alphabetical"] -onready var themeContents = ["White and Black", "Black and White"] +onready var themeContents = ["White on Black", "Black on White"] + onready var saveObject = get_node('/root/GlobalSaveInstance') + +# Vars For UI Widgets onready var NameVar = get_node('Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/DisplayNameLineEdit') onready var NRiskVar = get_node('Panel/HBoxContainer/RootVboxPlayerPreferences/Label/VBoxPlayerPreferances/VBoxRiskFactor/RiskSlider') @@ -32,9 +39,9 @@ onready var themeChoiceList = get_node('Panel/HBoxContainer/RootVboxVisualContro # Imports related to error handling and popups for said errors -#onready var errorPopup = get_node("Panel/HBoxErrorSignRow/Popup") -# -#onready var errorLabel = get_node("Panel/HBoxErrorSignRow/Popup/ErrorLabel") +onready var errorPopup = get_node("Panel/HBoxErrorRow/CenterContainer/ErrorPopup") + +onready var errorLabel = get_node("Panel/HBoxErrorRow/CenterContainer/ErrorPopup/ErrorLabel") var iniFile = ConfigFile.new() @@ -88,9 +95,11 @@ func _process(delta): if saveButton.pressed == true: if NameVar.text == "": print("Please input a name") - #errorLabel.text = "Please input a name!" - #errorPopup.popup() - else: + errorLabel.text = str("Please Input A Name") + errorPopup.popup() + + + if NameVar.text != "": # Save to the template instance saveToInstance() @@ -100,11 +109,14 @@ func _process(delta): func _ready(): theme=load("res://assets/ui_controlNode_light_theme.tres") +# Init Keyboard Layout List for i in range(3): keyboardLayoutList.add_item(keyboardContents[i],null,true) keyboardLayoutList.select(0,true) +# Init Theme Choice List + for i in range(2): themeChoiceList.add_item(themeContents[i],null,true) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn index 20d958f..b3f3175 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/SettingsMenuControl.tscn @@ -280,24 +280,33 @@ anchor_right = 0.5 margin_left = -48.5 margin_top = 200.0 margin_right = 48.5 -margin_bottom = 25.0 +margin_bottom = 225.0 +__meta__ = { +"_edit_use_anchors_": true +} [node name="SaveButton" type="Button" parent="Panel/HBoxBottomRow"] margin_right = 97.0 margin_bottom = 25.0 text = "Save Settings" -__meta__ = { -"_edit_use_anchors_": false -} [node name="HBoxErrorRow" type="HBoxContainer" parent="Panel"] -margin_right = 40.0 -margin_bottom = 40.0 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -20.0 +margin_top = -100.0 +margin_right = 20.0 +margin_bottom = -100.0 +alignment = 1 -[node name="ErrorPopup" type="Popup" parent="Panel/HBoxErrorRow"] -margin_right = 40.0 -margin_bottom = 40.0 +[node name="CenterContainer" type="CenterContainer" parent="Panel/HBoxErrorRow"] +margin_left = 20.0 +margin_right = 20.0 -[node name="ErrorLabel" type="Label" parent="Panel/HBoxErrorRow/ErrorPopup"] +[node name="ErrorPopup" type="Popup" parent="Panel/HBoxErrorRow/CenterContainer"] + +[node name="ErrorLabel" type="Label" parent="Panel/HBoxErrorRow/CenterContainer/ErrorPopup"] margin_right = 40.0 margin_bottom = 19.0 diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/darktheme_opacity.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/darktheme_opacity.tres new file mode 100644 index 0000000..c7c5c43 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/darktheme_opacity.tres @@ -0,0 +1,4 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 1, 1, 1, 0.0705882 ) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/lighttheme_opacity.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/lighttheme_opacity.tres new file mode 100644 index 0000000..77237c5 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/lighttheme_opacity.tres @@ -0,0 +1,4 @@ +[gd_resource type="StyleBoxFlat" format=2] + +[resource] +bg_color = Color( 0, 0, 0, 0 ) diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres index 859abe4..fa7df50 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/sbf_black.tres @@ -1,7 +1,7 @@ [gd_resource type="StyleBoxFlat" format=2] [resource] -bg_color = Color( 0, 0, 0, 1 ) +bg_color = Color( 0, 0, 0, 0.901961 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres index c308a80..48bf524 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_dark_theme.tres @@ -1,9 +1,10 @@ -[gd_resource type="Theme" load_steps=24 format=2] +[gd_resource type="Theme" load_steps=25 format=2] [ext_resource path="res://assets/sbf_black.tres" type="StyleBox" id=1] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=2] [ext_resource path="res://assets/liberation_serif_20pt.tres" type="DynamicFont" id=3] [ext_resource path="res://assets/liberation_serif.tres" type="DynamicFont" id=4] +[ext_resource path="res://assets/darktheme_opacity.tres" type="StyleBox" id=5] [sub_resource type="Image" id=20] data = { @@ -20,7 +21,7 @@ size = Vector2( 128, 256 ) [sub_resource type="BitmapFont" id=3] textures = [ SubResource( 2 ) ] -chars = PoolIntArray( 64, 0, 72, 34, 10, 11, 1, 1, 12, 224, 0, 85, 180, 5, 11, 1, 0, 7, 192, 0, 32, 16, 11, 13, -1, -2, 9, 96, 0, 2, 216, 3, 2, 3, 0, 8, 160, 0, 1734439808, 0, 0, 0, 0, 11, 4, 32, 0, 0, 0, 0, 0, 0, 11, 4, 33, 0, 65, 234, 2, 10, 1, 1, 4, 225, 0, 112, 169, 5, 11, 1, 0, 7, 193, 0, 17, 16, 11, 13, -1, -2, 9, 161, 0, 2, 222, 2, 11, 1, 3, 4, 65, 0, 2, 16, 11, 10, -1, 1, 9, 97, 0, 76, 188, 5, 8, 1, 3, 7, 98, 0, 102, 165, 6, 11, 1, 0, 8, 226, 0, 72, 143, 6, 11, 1, 0, 7, 194, 0, 113, 2, 11, 13, -1, -2, 9, 66, 0, 46, 109, 7, 10, 1, 1, 9, 162, 0, 12, 136, 6, 10, 1, 1, 8, 34, 0, 49, 187, 5, 4, 1, 1, 6, 35, 0, 78, 66, 8, 10, 0, 1, 9, 163, 0, 22, 167, 6, 10, 1, 1, 8, 195, 0, 53, 2, 11, 14, -1, -3, 9, 227, 0, 2, 155, 6, 12, 1, -1, 7, 67, 0, 68, 115, 7, 10, 1, 1, 8, 99, 0, 40, 179, 5, 8, 1, 3, 7, 228, 0, 121, 169, 5, 11, 1, 0, 7, 196, 0, 98, 2, 11, 13, -1, -2, 9, 36, 0, 102, 137, 6, 12, 1, 0, 8, 100, 0, 82, 150, 6, 11, 1, 0, 8, 68, 0, 90, 66, 8, 10, 1, 1, 10, 164, 0, 14, 79, 8, 7, 0, 3, 8, 37, 0, 2, 30, 10, 10, 1, 1, 12, 69, 0, 29, 191, 5, 10, 1, 1, 7, 165, 0, 79, 98, 7, 10, 0, 1, 8, 229, 0, 20, 196, 5, 12, 1, -1, 7, 197, 0, 83, 2, 11, 12, -1, -1, 9, 101, 0, 32, 124, 6, 8, 1, 3, 8, 38, 0, 67, 49, 9, 10, 1, 1, 10, 70, 0, 101, 105, 6, 10, 1, 1, 7, 198, 0, 21, 2, 12, 10, -1, 1, 12, 166, 0, 95, 228, 2, 14, 3, 0, 7, 102, 0, 2, 201, 5, 11, 0, 0, 4, 230, 0, 58, 34, 10, 8, 1, 3, 12, 71, 0, 66, 65, 8, 10, 1, 1, 10, 231, 0, 2, 186, 5, 11, 1, 3, 7, 199, 0, 57, 97, 7, 13, 1, 1, 8, 103, 0, 13, 107, 7, 11, 1, 3, 7, 167, 0, 112, 131, 6, 11, 0, 0, 7, 39, 0, 119, 219, 2, 4, 1, 1, 3, 72, 0, 54, 65, 8, 10, 1, 1, 10, 232, 0, 62, 143, 6, 11, 1, 0, 8, 200, 0, 47, 195, 5, 13, 1, -2, 7, 40, 0, 93, 212, 4, 12, 1, 1, 4, 104, 0, 72, 158, 6, 11, 1, 0, 8, 168, 0, 77, 217, 4, 2, 2, 0, 8, 73, 0, 38, 191, 5, 10, 0, 1, 5, 169, 0, 44, 34, 10, 10, 1, 1, 12, 233, 0, 52, 142, 6, 11, 1, 0, 8, 201, 0, 56, 197, 5, 13, 1, -2, 7, 41, 0, 51, 226, 3, 12, 0, 1, 4, 105, 0, 109, 213, 3, 11, 0, 0, 4, 106, 0, 101, 213, 4, 14, -1, 0, 4, 74, 0, 92, 195, 5, 13, -2, 1, 3, 202, 0, 65, 202, 5, 13, 1, -2, 7, 42, 0, 108, 80, 7, 6, 0, 0, 8, 170, 0, 29, 205, 4, 5, 0, 1, 5, 234, 0, 12, 181, 6, 11, 1, 0, 8, 171, 0, 22, 181, 5, 6, 1, 4, 7, 43, 0, 101, 94, 7, 7, 0, 3, 8, 107, 0, 112, 92, 7, 11, 1, 0, 7, 203, 0, 83, 200, 5, 13, 1, -2, 7, 235, 0, 2, 171, 6, 11, 1, 0, 8, 75, 0, 102, 66, 8, 10, 1, 1, 8, 44, 0, 107, 231, 2, 3, 1, 9, 4, 172, 0, 2, 104, 7, 4, 0, 6, 8, 108, 0, 113, 228, 2, 11, 1, 0, 4, 204, 0, 101, 196, 5, 13, 0, -2, 5, 236, 0, 30, 214, 3, 11, 0, 0, 4, 76, 0, 22, 124, 6, 10, 1, 1, 7, 173, 0, 16, 229, 3, 2, 1, 7, 5, 45, 0, 123, 201, 3, 2, 1, 7, 5, 109, 0, 68, 2, 11, 8, 1, 3, 13, 205, 0, 11, 211, 5, 13, 0, -2, 5, 237, 0, 37, 214, 3, 11, 1, 0, 4, 77, 0, 62, 20, 10, 10, 1, 1, 12, 46, 0, 101, 231, 2, 2, 1, 9, 4, 110, 0, 111, 107, 6, 8, 1, 3, 8, 206, 0, 20, 212, 5, 13, 0, -2, 5, 238, 0, 11, 196, 5, 11, -1, 0, 4, 174, 0, 30, 33, 10, 10, 1, 1, 12, 78, 0, 2, 79, 8, 10, 1, 1, 10, 175, 0, 35, 111, 7, 1, 0, -1, 7, 111, 0, 102, 153, 6, 8, 1, 3, 8, 207, 0, 119, 184, 5, 13, 0, -2, 5, 239, 0, 69, 219, 4, 11, 0, 0, 4, 79, 0, 41, 66, 9, 10, 1, 1, 11, 47, 0, 90, 105, 7, 10, -1, 1, 5, 176, 0, 61, 219, 4, 4, 1, 1, 6, 112, 0, 32, 150, 6, 11, 1, 3, 8, 240, 0, 82, 165, 6, 11, 1, 0, 8, 208, 0, 86, 33, 9, 10, 0, 1, 10, 80, 0, 52, 128, 6, 10, 1, 1, 8, 48, 0, 42, 135, 6, 10, 1, 1, 8, 177, 0, 46, 97, 7, 8, 0, 3, 8, 113, 0, 22, 152, 6, 11, 1, 3, 8, 241, 0, 2, 112, 6, 12, 1, -1, 8, 81, 0, 15, 59, 9, 13, 1, 1, 11, 209, 0, 74, 80, 8, 14, 1, -3, 10, 49, 0, 45, 212, 4, 10, 2, 1, 8, 178, 0, 58, 187, 5, 6, 0, 1, 5, 114, 0, 85, 217, 4, 8, 1, 3, 5, 210, 0, 2, 62, 9, 13, 1, -2, 11, 242, 0, 62, 165, 6, 11, 1, 0, 8, 82, 0, 35, 97, 7, 10, 1, 1, 8, 50, 0, 57, 114, 7, 10, 1, 1, 8, 179, 0, 53, 214, 4, 6, 0, 1, 5, 115, 0, 112, 146, 6, 8, 0, 3, 7, 211, 0, 106, 49, 9, 13, 1, -2, 11, 243, 0, 52, 172, 6, 11, 1, 0, 8, 83, 0, 24, 96, 7, 10, 0, 1, 7, 51, 0, 22, 138, 6, 10, 1, 1, 8, 180, 0, 9, 228, 3, 2, 3, 0, 8, 116, 0, 67, 188, 5, 10, 0, 1, 5, 212, 0, 93, 49, 9, 13, 1, -2, 11, 244, 0, 42, 164, 6, 11, 1, 0, 8, 84, 0, 13, 93, 7, 10, 0, 1, 7, 52, 0, 24, 110, 7, 10, 1, 1, 8, 213, 0, 2, 44, 9, 14, 1, -3, 11, 85, 0, 114, 66, 8, 10, 1, 1, 10, 53, 0, 92, 119, 6, 10, 1, 1, 8, 245, 0, 12, 165, 6, 12, 1, -1, 8, 181, 0, 2, 140, 6, 11, 1, 3, 8, 117, 0, 42, 123, 6, 8, 1, 3, 8, 54, 0, 82, 121, 6, 10, 1, 1, 8, 86, 0, 76, 18, 10, 10, -1, 1, 8, 246, 0, 72, 173, 6, 11, 1, 0, 8, 214, 0, 80, 49, 9, 13, 1, -2, 11, 182, 0, 68, 98, 7, 13, 1, 0, 9, 118, 0, 15, 47, 9, 8, -1, 3, 7, 55, 0, 72, 129, 6, 10, 1, 1, 8, 87, 0, 2, 2, 15, 10, -1, 1, 13, 119, 0, 37, 2, 12, 8, -1, 3, 10, 247, 0, 90, 94, 7, 7, 0, 3, 8, 215, 0, 2, 93, 7, 7, 0, 3, 8, 183, 0, 77, 223, 2, 2, 1, 5, 4, 56, 0, 62, 129, 6, 10, 1, 1, 8, 88, 0, 90, 19, 10, 10, -1, 1, 8, 216, 0, 99, 33, 9, 12, 1, 0, 11, 248, 0, 2, 128, 6, 8, 1, 3, 8, 120, 0, 119, 80, 7, 8, 0, 3, 7, 184, 0, 116, 212, 3, 3, 0, 11, 3, 89, 0, 28, 65, 9, 10, -1, 1, 7, 217, 0, 38, 80, 8, 13, 1, -2, 10, 249, 0, 52, 157, 6, 11, 1, 0, 8, 121, 0, 112, 33, 9, 11, -1, 3, 7, 57, 0, 12, 122, 6, 10, 1, 1, 8, 185, 0, 23, 229, 3, 6, 0, 1, 5, 218, 0, 26, 79, 8, 13, 1, -2, 10, 250, 0, 42, 149, 6, 11, 1, 0, 8, 90, 0, 32, 136, 6, 10, 1, 1, 8, 122, 0, 112, 119, 6, 8, 1, 3, 7, 58, 0, 89, 229, 2, 8, 1, 3, 4, 186, 0, 37, 205, 4, 5, 0, 1, 5, 219, 0, 50, 80, 8, 13, 1, -2, 10, 91, 0, 58, 227, 3, 12, 1, 1, 4, 123, 0, 103, 180, 5, 12, 0, 1, 5, 251, 0, 12, 150, 6, 11, 1, 0, 8, 59, 0, 71, 234, 2, 9, 1, 3, 4, 187, 0, 31, 181, 5, 6, 1, 4, 7, 188, 0, 16, 33, 10, 10, 0, 1, 10, 124, 0, 83, 229, 2, 14, 3, 0, 7, 220, 0, 62, 79, 8, 13, 1, -2, 10, 252, 0, 92, 133, 6, 11, 1, 0, 8, 92, 0, 97, 80, 7, 10, -1, 1, 5, 60, 0, 92, 153, 6, 7, 1, 3, 8, 189, 0, 47, 20, 11, 10, 0, 1, 10, 253, 0, 28, 47, 9, 14, -1, 0, 7, 221, 0, 54, 48, 9, 13, -1, -2, 7, 93, 0, 44, 226, 3, 12, 0, 1, 4, 125, 0, 110, 196, 5, 12, 0, 1, 5, 61, 0, 79, 112, 7, 5, 0, 4, 8, 190, 0, 104, 19, 10, 10, 0, 1, 10, 222, 0, 32, 165, 6, 10, 1, 1, 8, 254, 0, 102, 119, 6, 14, 1, 0, 8, 62, 0, 112, 158, 6, 7, 1, 3, 8, 94, 0, 86, 80, 7, 6, 0, 1, 7, 126, 0, 62, 158, 6, 3, 1, 5, 8, 223, 0, 82, 135, 6, 11, 1, 0, 8, 255, 0, 41, 48, 9, 14, -1, 0, 7, 191, 0, 94, 180, 5, 11, 0, 3, 6, 63, 0, 74, 202, 5, 10, 0, 1, 6, 95, 0, 92, 148, 6, 1, 0, 12, 6 ) +chars = PoolIntArray( 64, 0, 72, 34, 10, 11, 1, 1, 12, 224, 0, 85, 180, 5, 11, 1, 0, 7, 192, 0, 32, 16, 11, 13, -1, -2, 9, 96, 0, 2, 216, 3, 2, 3, 0, 8, 160, 0, 1734439808, 0, 0, 0, 0, 11, 4, 32, 0, 0, 0, 0, 0, 0, 11, 4, 33, 0, 65, 234, 2, 10, 1, 1, 4, 225, 0, 112, 169, 5, 11, 1, 0, 7, 193, 0, 17, 16, 11, 13, -1, -2, 9, 161, 0, 2, 222, 2, 11, 1, 3, 4, 65, 0, 2, 16, 11, 10, -1, 1, 9, 97, 0, 76, 188, 5, 8, 1, 3, 7, 98, 0, 102, 165, 6, 11, 1, 0, 8, 226, 0, 72, 143, 6, 11, 1, 0, 7, 194, 0, 113, 2, 11, 13, -1, -2, 9, 66, 0, 46, 109, 7, 10, 1, 1, 9, 162, 0, 12, 136, 6, 10, 1, 1, 8, 34, 0, 49, 187, 5, 4, 1, 1, 6, 35, 0, 78, 66, 8, 10, 0, 1, 9, 163, 0, 22, 167, 6, 10, 1, 1, 8, 195, 0, 53, 2, 11, 14, -1, -3, 9, 227, 0, 2, 155, 6, 12, 1, -1, 7, 67, 0, 68, 115, 7, 10, 1, 1, 8, 99, 0, 40, 179, 5, 8, 1, 3, 7, 228, 0, 121, 169, 5, 11, 1, 0, 7, 196, 0, 98, 2, 11, 13, -1, -2, 9, 36, 0, 102, 137, 6, 12, 1, 0, 8, 100, 0, 82, 150, 6, 11, 1, 0, 8, 68, 0, 90, 66, 8, 10, 1, 1, 10, 164, 0, 14, 79, 8, 7, 0, 3, 8, 37, 0, 2, 30, 10, 10, 1, 1, 12, 69, 0, 29, 191, 5, 10, 1, 1, 7, 165, 0, 79, 98, 7, 10, 0, 1, 8, 229, 0, 20, 196, 5, 12, 1, -1, 7, 197, 0, 83, 2, 11, 12, -1, -1, 9, 101, 0, 32, 124, 6, 8, 1, 3, 8, 38, 0, 67, 49, 9, 10, 1, 1, 10, 70, 0, 101, 105, 6, 10, 1, 1, 7, 198, 0, 21, 2, 12, 10, -1, 1, 12, 166, 0, 95, 228, 2, 14, 3, 0, 7, 102, 0, 2, 201, 5, 11, 0, 0, 4, 230, 0, 58, 34, 10, 8, 1, 3, 12, 71, 0, 66, 65, 8, 10, 1, 1, 10, 231, 0, 2, 186, 5, 11, 1, 3, 7, 199, 0, 57, 97, 7, 13, 1, 1, 8, 103, 0, 13, 107, 7, 11, 1, 3, 7, 167, 0, 112, 131, 6, 11, 0, 0, 7, 39, 0, 119, 219, 2, 4, 1, 1, 3, 72, 0, 54, 65, 8, 10, 1, 1, 10, 232, 0, 62, 143, 6, 11, 1, 0, 8, 200, 0, 47, 195, 5, 13, 1, -2, 7, 40, 0, 93, 212, 4, 12, 1, 1, 4, 104, 0, 72, 158, 6, 11, 1, 0, 8, 168, 0, 77, 217, 4, 2, 2, 0, 8, 73, 0, 38, 191, 5, 10, 0, 1, 5, 169, 0, 44, 34, 10, 10, 1, 1, 12, 233, 0, 52, 142, 6, 11, 1, 0, 8, 201, 0, 56, 197, 5, 13, 1, -2, 7, 41, 0, 51, 226, 3, 12, 0, 1, 4, 105, 0, 109, 213, 3, 11, 0, 0, 4, 106, 0, 101, 213, 4, 14, -1, 0, 4, 74, 0, 92, 195, 5, 13, -2, 1, 3, 202, 0, 65, 202, 5, 13, 1, -2, 7, 42, 0, 108, 80, 7, 6, 0, 0, 8, 170, 0, 29, 205, 4, 5, 0, 1, 5, 234, 0, 12, 181, 6, 11, 1, 0, 8, 171, 0, 22, 181, 5, 6, 1, 4, 7, 43, 0, 101, 94, 7, 7, 0, 3, 8, 107, 0, 112, 92, 7, 11, 1, 0, 7, 203, 0, 83, 200, 5, 13, 1, -2, 7, 235, 0, 2, 171, 6, 11, 1, 0, 8, 75, 0, 102, 66, 8, 10, 1, 1, 8, 44, 0, 107, 231, 2, 3, 1, 9, 4, 172, 0, 2, 104, 7, 4, 0, 6, 8, 108, 0, 113, 228, 2, 11, 1, 0, 4, 204, 0, 101, 196, 5, 13, 0, -2, 5, 236, 0, 30, 214, 3, 11, 0, 0, 4, 76, 0, 22, 124, 6, 10, 1, 1, 7, 173, 0, 16, 229, 3, 2, 1, 7, 5, 45, 0, 123, 201, 3, 2, 1, 7, 5, 109, 0, 68, 2, 11, 8, 1, 3, 13, 205, 0, 11, 211, 5, 13, 0, -2, 5, 237, 0, 37, 214, 3, 11, 1, 0, 4, 77, 0, 62, 20, 10, 10, 1, 1, 12, 46, 0, 101, 231, 2, 2, 1, 9, 4, 110, 0, 111, 107, 6, 8, 1, 3, 8, 206, 0, 20, 212, 5, 13, 0, -2, 5, 238, 0, 11, 196, 5, 11, -1, 0, 4, 174, 0, 30, 33, 10, 10, 1, 1, 12, 78, 0, 2, 79, 8, 10, 1, 1, 10, 175, 0, 35, 111, 7, 1, 0, -1, 7, 111, 0, 102, 153, 6, 8, 1, 3, 8, 207, 0, 119, 184, 5, 13, 0, -2, 5, 239, 0, 69, 219, 4, 11, 0, 0, 4, 79, 0, 41, 66, 9, 10, 1, 1, 11, 47, 0, 90, 105, 7, 10, -1, 1, 5, 176, 0, 61, 219, 4, 4, 1, 1, 6, 112, 0, 32, 150, 6, 11, 1, 3, 8, 240, 0, 82, 165, 6, 11, 1, 0, 8, 208, 0, 86, 33, 9, 10, 0, 1, 10, 80, 0, 52, 128, 6, 10, 1, 1, 8, 48, 0, 42, 135, 6, 10, 1, 1, 8, 177, 0, 46, 97, 7, 8, 0, 3, 8, 113, 0, 22, 152, 6, 11, 1, 3, 8, 241, 0, 2, 112, 6, 12, 1, -1, 8, 81, 0, 15, 59, 9, 13, 1, 1, 11, 209, 0, 74, 80, 8, 14, 1, -3, 10, 49, 0, 45, 212, 4, 10, 2, 1, 8, 178, 0, 58, 187, 5, 6, 0, 1, 5, 114, 0, 85, 217, 4, 8, 1, 3, 5, 210, 0, 2, 62, 9, 13, 1, -2, 11, 242, 0, 62, 165, 6, 11, 1, 0, 8, 82, 0, 35, 97, 7, 10, 1, 1, 8, 50, 0, 57, 114, 7, 10, 1, 1, 8, 179, 0, 53, 214, 4, 6, 0, 1, 5, 115, 0, 112, 146, 6, 8, 0, 3, 7, 211, 0, 106, 49, 9, 13, 1, -2, 11, 243, 0, 52, 172, 6, 11, 1, 0, 8, 83, 0, 24, 96, 7, 10, 0, 1, 7, 51, 0, 22, 138, 6, 10, 1, 1, 8, 180, 0, 9, 228, 3, 2, 3, 0, 8, 116, 0, 67, 188, 5, 10, 0, 1, 5, 212, 0, 93, 49, 9, 13, 1, -2, 11, 244, 0, 42, 164, 6, 11, 1, 0, 8, 84, 0, 13, 93, 7, 10, 0, 1, 7, 52, 0, 24, 110, 7, 10, 1, 1, 8, 53, 0, 92, 119, 6, 10, 1, 1, 8, 85, 0, 114, 66, 8, 10, 1, 1, 10, 213, 0, 2, 44, 9, 14, 1, -3, 11, 117, 0, 42, 123, 6, 8, 1, 3, 8, 181, 0, 2, 140, 6, 11, 1, 3, 8, 245, 0, 12, 165, 6, 12, 1, -1, 8, 54, 0, 82, 121, 6, 10, 1, 1, 8, 86, 0, 76, 18, 10, 10, -1, 1, 8, 246, 0, 72, 173, 6, 11, 1, 0, 8, 214, 0, 80, 49, 9, 13, 1, -2, 11, 182, 0, 68, 98, 7, 13, 1, 0, 9, 118, 0, 15, 47, 9, 8, -1, 3, 7, 55, 0, 72, 129, 6, 10, 1, 1, 8, 87, 0, 2, 2, 15, 10, -1, 1, 13, 119, 0, 37, 2, 12, 8, -1, 3, 10, 247, 0, 90, 94, 7, 7, 0, 3, 8, 215, 0, 2, 93, 7, 7, 0, 3, 8, 183, 0, 77, 223, 2, 2, 1, 5, 4, 56, 0, 62, 129, 6, 10, 1, 1, 8, 88, 0, 90, 19, 10, 10, -1, 1, 8, 216, 0, 99, 33, 9, 12, 1, 0, 11, 248, 0, 2, 128, 6, 8, 1, 3, 8, 120, 0, 119, 80, 7, 8, 0, 3, 7, 184, 0, 116, 212, 3, 3, 0, 11, 3, 89, 0, 28, 65, 9, 10, -1, 1, 7, 217, 0, 38, 80, 8, 13, 1, -2, 10, 249, 0, 52, 157, 6, 11, 1, 0, 8, 121, 0, 112, 33, 9, 11, -1, 3, 7, 57, 0, 12, 122, 6, 10, 1, 1, 8, 185, 0, 23, 229, 3, 6, 0, 1, 5, 218, 0, 26, 79, 8, 13, 1, -2, 10, 250, 0, 42, 149, 6, 11, 1, 0, 8, 90, 0, 32, 136, 6, 10, 1, 1, 8, 122, 0, 112, 119, 6, 8, 1, 3, 7, 58, 0, 89, 229, 2, 8, 1, 3, 4, 186, 0, 37, 205, 4, 5, 0, 1, 5, 219, 0, 50, 80, 8, 13, 1, -2, 10, 91, 0, 58, 227, 3, 12, 1, 1, 4, 123, 0, 103, 180, 5, 12, 0, 1, 5, 251, 0, 12, 150, 6, 11, 1, 0, 8, 59, 0, 71, 234, 2, 9, 1, 3, 4, 187, 0, 31, 181, 5, 6, 1, 4, 7, 188, 0, 16, 33, 10, 10, 0, 1, 10, 124, 0, 83, 229, 2, 14, 3, 0, 7, 220, 0, 62, 79, 8, 13, 1, -2, 10, 252, 0, 92, 133, 6, 11, 1, 0, 8, 92, 0, 97, 80, 7, 10, -1, 1, 5, 60, 0, 92, 153, 6, 7, 1, 3, 8, 189, 0, 47, 20, 11, 10, 0, 1, 10, 253, 0, 28, 47, 9, 14, -1, 0, 7, 221, 0, 54, 48, 9, 13, -1, -2, 7, 93, 0, 44, 226, 3, 12, 0, 1, 4, 125, 0, 110, 196, 5, 12, 0, 1, 5, 61, 0, 79, 112, 7, 5, 0, 4, 8, 190, 0, 104, 19, 10, 10, 0, 1, 10, 222, 0, 32, 165, 6, 10, 1, 1, 8, 254, 0, 102, 119, 6, 14, 1, 0, 8, 62, 0, 112, 158, 6, 7, 1, 3, 8, 94, 0, 86, 80, 7, 6, 0, 1, 7, 126, 0, 62, 158, 6, 3, 1, 5, 8, 223, 0, 82, 135, 6, 11, 1, 0, 8, 255, 0, 41, 48, 9, 14, -1, 0, 7, 191, 0, 94, 180, 5, 11, 0, 3, 6, 63, 0, 74, 202, 5, 10, 0, 1, 6, 95, 0, 92, 148, 6, 1, 0, 12, 6 ) height = 14.0 ascent = 11.0 @@ -151,10 +152,10 @@ Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) Button/constants/hseparation = 2 Button/fonts/font = ExtResource( 2 ) -Button/styles/disabled = null +Button/styles/disabled = ExtResource( 5 ) Button/styles/focus = null Button/styles/hover = null -Button/styles/normal = ExtResource( 1 ) +Button/styles/normal = ExtResource( 5 ) Button/styles/pressed = ExtResource( 1 ) CheckBox/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) CheckBox/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) @@ -181,17 +182,17 @@ CheckBox/styles/normal = ExtResource( 1 ) CheckBox/styles/pressed = ExtResource( 1 ) ItemList/colors/font_color = Color( 1, 1, 1, 1 ) ItemList/colors/font_color_selected = Color( 1, 1, 1, 1 ) -ItemList/colors/guide_color = Color( 0.631373, 0.619608, 0.619608, 0.792157 ) +ItemList/colors/guide_color = Color( 0.631373, 0.619608, 0.619608, 0.854902 ) ItemList/constants/hseparation = 4 ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 2 ItemList/constants/vseparation = 3 -ItemList/fonts/font = ExtResource( 3 ) -ItemList/styles/bg = ExtResource( 1 ) -ItemList/styles/bg_focus = ExtResource( 1 ) +ItemList/fonts/font = ExtResource( 4 ) +ItemList/styles/bg = ExtResource( 5 ) +ItemList/styles/bg_focus = ExtResource( 5 ) ItemList/styles/cursor = null -ItemList/styles/cursor_unfocused = ExtResource( 1 ) -ItemList/styles/selected = null +ItemList/styles/cursor_unfocused = ExtResource( 5 ) +ItemList/styles/selected = ExtResource( 5 ) ItemList/styles/selected_focus = null Label/colors/font_color = Color( 1, 1, 1, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) @@ -210,11 +211,11 @@ LineEdit/colors/font_color_selected = Color( 1, 1, 1, 1 ) LineEdit/colors/font_color_uneditable = Color( 0.88, 0.88, 0.88, 0.5 ) LineEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) LineEdit/constants/minimum_spaces = 12 -LineEdit/fonts/font = null +LineEdit/fonts/font = ExtResource( 4 ) LineEdit/icons/clear = null -LineEdit/styles/focus = null -LineEdit/styles/normal = ExtResource( 1 ) -LineEdit/styles/read_only = null +LineEdit/styles/focus = ExtResource( 5 ) +LineEdit/styles/normal = ExtResource( 5 ) +LineEdit/styles/read_only = ExtResource( 5 ) MarginContainer/constants/margin_bottom = 0 MarginContainer/constants/margin_left = 0 MarginContainer/constants/margin_right = 0 diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres index ab742eb..874c414 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/assets/ui_controlNode_light_theme.tres @@ -1,22 +1,30 @@ -[gd_resource type="Theme" load_steps=5 format=2] +[gd_resource type="Theme" load_steps=7 format=2] [ext_resource path="res://assets/sbf_white.tres" type="StyleBox" id=1] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=2] [ext_resource path="res://assets/liberation_serif_20pt.tres" type="DynamicFont" id=3] [ext_resource path="res://assets/liberation_serif.tres" type="DynamicFont" id=4] +[ext_resource path="res://assets/darktheme_opacity.tres" type="StyleBox" id=5] +[ext_resource path="res://assets/lighttheme_opacity.tres" type="StyleBox" id=6] [resource] Button/colors/font_color = Color( 0, 0, 0, 1 ) Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) -Button/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) -Button/colors/font_color_pressed = Color( 1, 1, 1, 1 ) +Button/colors/font_color_focus = Color( 0, 0, 0, 0.666667 ) +Button/colors/font_color_hover = Color( 0, 0, 0, 0.666667 ) +Button/colors/font_color_pressed = Color( 0, 0, 0, 0.666667 ) Button/constants/hseparation = 2 Button/fonts/font = ExtResource( 2 ) -Button/styles/disabled = null +Button/styles/disabled = ExtResource( 6 ) Button/styles/focus = null Button/styles/hover = null -Button/styles/normal = ExtResource( 1 ) -Button/styles/pressed = ExtResource( 1 ) +Button/styles/normal = ExtResource( 6 ) +Button/styles/pressed = ExtResource( 6 ) +CheckBox/styles/disabled = ExtResource( 5 ) +CheckBox/styles/normal = ExtResource( 5 ) +HSlider/styles/grabber_area = ExtResource( 6 ) +HSlider/styles/grabber_area_highlight = ExtResource( 6 ) +HSlider/styles/slider = ExtResource( 6 ) ItemList/colors/font_color = Color( 0, 0, 0, 1 ) ItemList/colors/font_color_selected = Color( 0.227451, 0.227451, 0.227451, 1 ) ItemList/colors/guide_color = Color( 0.235294, 0.231373, 0.231373, 0.847059 ) @@ -25,7 +33,7 @@ ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 2 ItemList/constants/vseparation = 2 ItemList/fonts/font = null -ItemList/styles/bg = ExtResource( 1 ) +ItemList/styles/bg = ExtResource( 5 ) ItemList/styles/bg_focus = ExtResource( 1 ) ItemList/styles/cursor = ExtResource( 1 ) ItemList/styles/cursor_unfocused = ExtResource( 1 )