From a6889b67330e630ae8b2779ba67022f93ad54739 Mon Sep 17 00:00:00 2001 From: PersonGuyGit Date: Sun, 5 Jun 2022 11:42:28 -0600 Subject: [PATCH] test today push --- .../bcirpg_settingsMenuLuke/MenuScreen.tscn | 86 ++++++ .../SettingsMenuConfig.gd | 90 ++++++- .../SettingsMenuControl.tscn | 251 ++++++++++-------- .../globalSaveInstance.gd | 17 ++ .../playerSettingsTemplate.gd | 5 +- .../bcirpg_settingsMenuLuke/project.godot | 2 +- .../screens/LoadGame_temp.tscn | 8 +- .../screens/MenuScreen.tscn | 16 +- .../screens/SettingsMenuControl.tscn | 114 ++++---- .../screens/SettingsMenuScreen.tscn | 2 +- 10 files changed, 398 insertions(+), 193 deletions(-) create mode 100644 Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/MenuScreen.tscn create mode 100644 Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/globalSaveInstance.gd diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/MenuScreen.tscn b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/MenuScreen.tscn new file mode 100644 index 0000000..5c24b8e --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/MenuScreen.tscn @@ -0,0 +1,86 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://userInterface/But_ChangeScene.tscn" type="PackedScene" id=1] +[ext_resource path="res://userInterface/Title.tscn" type="PackedScene" id=5] +[ext_resource path="res://assets/background_demo.png" type="Texture" id=7] +[ext_resource path="res://assets/ui_theme.tres" type="Theme" id=8] +[ext_resource path="res://assets/ui_title_theme.tres" type="Theme" id=9] +[ext_resource path="res://userInterface/But_Quit.tscn" type="PackedScene" id=10] + +[node name="MenuScreen" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +theme = ExtResource( 8 ) + +[node name="background_demo" type="TextureRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +texture = ExtResource( 7 ) +expand = true +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Title" parent="." instance=ExtResource( 5 )] +margin_top = 51.8676 +margin_bottom = 117.868 +theme = ExtResource( 9 ) + +[node name="VBoxContainer" type="VBoxContainer" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -119.0 +margin_top = -152.0 +margin_right = 119.0 +margin_bottom = 152.0 +rect_scale = Vector2( 1.04675, 1.07389 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="But_NewGame" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_right = 238.0 +margin_bottom = 48.0 + +[node name="But_LoadGame" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_top = 52.0 +margin_right = 238.0 +margin_bottom = 101.0 +text = "Load Game" + +[node name="But_Multiplayer" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_top = 105.0 +margin_right = 238.0 +margin_bottom = 154.0 +text = "Multiplayer" + +[node name="But_AddChar" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_top = 158.0 +margin_right = 238.0 +margin_bottom = 207.0 +text = "Add Character" + +[node name="But_Settings" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_top = 211.0 +margin_right = 238.0 +margin_bottom = 259.0 +text = "Settings" + +[node name="But_Quit" parent="VBoxContainer" instance=ExtResource( 10 )] +margin_top = 263.0 +margin_right = 238.0 +margin_bottom = 303.0 + +[node name="Version" type="Label" parent="."] +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -165.0 +margin_top = -38.0 +text = "Version: 0.0.0" +__meta__ = { +"_edit_use_anchors_": false +} 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 18bbd7a..5f97965 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,34 +1,87 @@ extends Control -onready var NameVar = get_node('Panel/Label/VBoxContainer/HBoxDisplayName/LineEdit') -onready var NRiskVar = get_node('Panel/Label/VBoxContainer/VBoxContainer/RiskSlider') +onready var keyboardContents = ["Qwerty", "Dvorak", "Alphabetical"] -onready var FontVar = get_node('Panel/Label2/VBoxContainer/HSlider2') +onready var themeContents = ["White and Black", "Black and White"] -onready var BrightnessVar = get_node('Panel/Label2/VBoxContainer/HSlider3') +onready var saveObject = get_node('/root/GlobalSaveInstance') -onready var VolumeVar = get_node('Panel/Label3/VBoxContainer/HSlider2') +onready var NameVar = get_node('Panel/HBoxContainer/VBoxContainer2/Label/VBoxContainer/LineEdit') -onready var ConsoleCommandVar = get_node('Panel/Label3/VBoxContainer/HBoxDevConsole/CheckBox') +onready var NRiskVar = get_node('Panel/HBoxContainer/VboxContainer2/Label/VBoxContainer/VBoxContainer/RiskSlider') -onready var ClosedCaptionsVar = get_node('Panel/Label3/VBoxContainer/HBoxClosedCaptions/CheckBox') +onready var FontVar = get_node("Panel/HBoxContainer/VBoxContainer/Label2/VBoxContainer/HSlider2") -onready var DarkModeVar = get_node("Panel/Label3/VBoxContainer/HBoxDarkMode/CheckBox") +onready var BrightnessVar = get_node('Panel/HBoxContainer/VBoxContainer/Label2/VBoxContainer/HSlider3') -onready var saveButton = get_node("Panel/Label3/VBoxContainer/SaveButton") +onready var VolumeVar = get_node("Panel/HBoxContainer/Label3/VBoxContainer/HSlider2") + +onready var ConsoleCommandVar = get_node('Panel/HBoxContainer/VBoxContainer3//Label3/VBoxContainer/HBoxDevConsole/CheckBox') + +onready var ClosedCaptionsVar = get_node('Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxClosedCaptions/CheckBox') + +onready var saveButton = get_node("Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/SaveButton") + +onready var bKeyboardEnabled = get_node("Panel/HBoxContainer/VBoxContainer3//Label3/VBoxContainer/HBoxVirtualKeyboardEnabled/CheckBox") + +onready var keyboardLayoutList = get_node('Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/ItemList') + +onready var themeChoiceList = get_node('Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/ItemList2') var iniFile = ConfigFile.new() +func saveToInstance(): + + #Save to Singleton, so saveFile does not need to be constantly read + saveObject.settingsInstance.inputName = NameVar.text + saveObject.settingsInstance.riskFactor = NRiskVar.value + saveObject.settingsInstance.fontSize = FontVar.Value + saveObject.settingsInstance.volume = VolumeVar.value + saveObject.settingsInstance.bClosedCaptions = ClosedCaptionsVar.is_pressed() + saveObject.settingsInstance.bdevConsole = ConsoleCommandVar.is_pressed() + saveObject.settingsInstance.bVirtualKeyboard = bKeyboardEnabled.is_pressed() + +# saveObject.settingsInstance.visualKeyboardLayout = +# saveobject.settingsInstance.themeChoice = + + + ## TO DO + + ## Make Theme and Keyboard Options Tie To Their Enunms + + #Add Theme and Keyboard Selections to singeton + + print(saveObject) + + func saveFile(): iniFile.set_value("player_preferences", "player_name", NameVar.text) iniFile.set_value("player_preferences", "risk_threshold", NRiskVar.value) iniFile.set_value("visual_controls", "font_size", FontVar.value) iniFile.set_value("visual_controls", "brightness", BrightnessVar.value) - iniFile.set_value("visual_controls", "dark_mode", DarkModeVar.is_pressed()) + iniFile.set_value("general_settings", "volume", VolumeVar.value) iniFile.set_value("general_settings", "closed_captions", ClosedCaptionsVar.is_pressed()) iniFile.set_value("general_settings", "dev_console", ConsoleCommandVar.is_pressed()) + + + print(keyboardLayoutList.get_selected_items()) + + var savedKeyboardItems = keyboardLayoutList.get_selected_items() + + var keyboardSelection = savedKeyboardItems[0] + + var savedThemeItems = keyboardLayoutList.get_selected_items() + + var themeSelection = savedThemeItems[0] + + print(typeof(keyboardSelection)) + + iniFile.set_value("virtual_keyboard", "keyboard_layout", keyboardSelection) + + iniFile.set_value("theme", "theme_selection", themeSelection) + iniFile.save("user://PlayerPreferences.cfg") func loadFile(): @@ -36,8 +89,23 @@ func loadFile(): func _process(delta): if saveButton.pressed == true: + + # Save to the template instance + saveToInstance() + saveFile() print('saveFileRan') func _ready(): - pass + + for i in range(3): + keyboardLayoutList.add_item(keyboardContents[i],null,true) + + keyboardLayoutList.select(0,true) + + for i in range(2): + themeChoiceList.add_item(themeContents[i],null,true) + + keyboardLayoutList.select(0,true) + + themeChoiceList.select(0,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 5213804..3b07021 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 @@ -11,9 +11,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 theme = SubResource( 3 ) script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Panel" type="Panel" parent="."] anchor_left = 0.5 @@ -21,223 +18,247 @@ anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 margin_left = -512.0 -margin_top = -300.0 +margin_top = -302.0 margin_right = 512.0 -margin_bottom = 300.0 -__meta__ = { -"_edit_use_anchors_": false -} +margin_bottom = 298.0 -[node name="Label" type="Label" parent="Panel"] +[node name="HBoxContainer" type="HBoxContainer" parent="Panel"] anchor_left = 0.5 anchor_right = 0.5 -margin_left = -59.0 -margin_right = 59.0 -margin_bottom = 14.0 -text = "Player Preferances" -__meta__ = { -"_edit_use_anchors_": false -} +margin_left = -219.5 +margin_right = 219.5 +margin_bottom = 19.0 +custom_constants/separation = 60 -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/Label"] -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = -77.5 -margin_top = 30.0 -margin_right = 77.5 -margin_bottom = 52.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="HBoxDisplayName" type="HBoxContainer" parent="Panel/Label/VBoxContainer"] -margin_right = 157.0 -margin_bottom = 29.0 - -[node name="Label" type="Label" parent="Panel/Label/VBoxContainer/HBoxDisplayName"] -margin_top = 5.0 -margin_right = 95.0 -margin_bottom = 24.0 -text = "Display Name:" - -[node name="LineEdit" type="LineEdit" parent="Panel/Label/VBoxContainer/HBoxDisplayName"] -margin_left = 99.0 -margin_right = 157.0 -margin_bottom = 29.0 - -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/Label/VBoxContainer"] -margin_top = 33.0 -margin_right = 157.0 -margin_bottom = 72.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/Label/VBoxContainer/VBoxContainer"] -margin_right = 157.0 +[node name="VBoxContainer2" type="VBoxContainer" parent="Panel/HBoxContainer"] +margin_right = 98.0 margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/Label/VBoxContainer/VBoxContainer/HBoxFontSize"] -margin_right = 145.0 +[node name="Label2" type="Label" parent="Panel/HBoxContainer/VBoxContainer2"] +margin_right = 98.0 margin_bottom = 19.0 -text = "Risk Factor Threshold:" - -[node name="RiskSlider" type="HSlider" parent="Panel/Label/VBoxContainer/VBoxContainer"] -margin_top = 23.0 -margin_right = 157.0 -margin_bottom = 39.0 -min_value = 1.0 -max_value = 5.0 -value = 5.0 -tick_count = 10 -ticks_on_borders = true - -[node name="Label2" type="Label" parent="Panel"] -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = -47.5 -margin_top = 100.0 -margin_right = 47.5 -margin_bottom = 14.0 text = "Visual Controls" -__meta__ = { -"_edit_use_anchors_": false -} -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/Label2"] +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer2/Label2"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -77.5 margin_top = 30.0 margin_right = 77.5 margin_bottom = 52.0 -__meta__ = { -"_edit_use_anchors_": false -} -[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/Label2/VBoxContainer"] +[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] margin_right = 155.0 margin_bottom = 19.0 -[node name="Label" type="Label" parent="Panel/Label2/VBoxContainer/HBoxFontSize"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer/HBoxFontSize"] margin_right = 64.0 margin_bottom = 19.0 text = "Font Size:" -[node name="HSlider2" type="HSlider" parent="Panel/Label2/VBoxContainer"] +[node name="HSlider2" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] margin_top = 23.0 margin_right = 155.0 margin_bottom = 39.0 min_value = 1.0 max_value = 5.0 value = 5.0 +rounded = true tick_count = 10 ticks_on_borders = true -[node name="Label" type="Label" parent="Panel/Label2/VBoxContainer"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] margin_top = 43.0 margin_right = 155.0 margin_bottom = 62.0 text = "Brightness:" -[node name="HSlider3" type="HSlider" parent="Panel/Label2/VBoxContainer"] +[node name="HSlider3" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer2/Label2/VBoxContainer"] margin_top = 66.0 margin_right = 155.0 margin_bottom = 82.0 min_value = 1.0 max_value = 5.0 value = 5.0 +rounded = true tick_count = 10 ticks_on_borders = true -[node name="Label3" type="Label" parent="Panel"] -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = -52.5 -margin_top = 210.0 -margin_right = 52.5 -text = "General Settings" +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer"] +margin_left = 158.0 +margin_right = 275.0 +margin_bottom = 19.0 + +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer"] +margin_right = 117.0 +margin_bottom = 19.0 +text = "Player Preferances" + +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label"] +margin_left = -18.5 +margin_top = 30.0 +margin_right = 126.5 +margin_bottom = 125.0 + +[node name="HBoxDisplayName" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer"] +margin_right = 145.0 +margin_bottom = 19.0 + +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/HBoxDisplayName"] +margin_right = 95.0 +margin_bottom = 19.0 +text = "Display Name:" + +[node name="LineEdit" type="LineEdit" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer"] +margin_top = 23.0 +margin_right = 145.0 +margin_bottom = 52.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer"] +margin_top = 56.0 +margin_right = 145.0 +margin_bottom = 95.0 __meta__ = { "_edit_use_anchors_": false } -[node name="VBoxContainer" type="VBoxContainer" parent="Panel/Label3"] +[node name="HBoxFontSize" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/VBoxContainer"] +margin_right = 145.0 +margin_bottom = 19.0 + +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/VBoxContainer/HBoxFontSize"] +margin_right = 145.0 +margin_bottom = 19.0 +text = "Risk Factor Threshold:" + +[node name="RiskSlider" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer/Label/VBoxContainer/VBoxContainer"] +margin_top = 23.0 +margin_right = 145.0 +margin_bottom = 39.0 +min_value = 1.0 +max_value = 5.0 +value = 5.0 +rounded = true +tick_count = 10 +ticks_on_borders = true + +[node name="VBoxContainer3" type="VBoxContainer" parent="Panel/HBoxContainer"] +margin_left = 335.0 +margin_right = 439.0 +margin_bottom = 19.0 + +[node name="Label3" type="Label" parent="Panel/HBoxContainer/VBoxContainer3"] +margin_right = 104.0 +margin_bottom = 19.0 +text = "General Settings" + +[node name="VBoxContainer" type="VBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -77.5 margin_top = 30.0 margin_right = 77.5 margin_bottom = 120.0 -__meta__ = { -"_edit_use_anchors_": false -} -[node name="Label" type="Label" parent="Panel/Label3/VBoxContainer"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] margin_right = 155.0 margin_bottom = 19.0 rect_pivot_offset = Vector2( 62, 14 ) text = "Volume:" -[node name="HSlider2" type="HSlider" parent="Panel/Label3/VBoxContainer"] +[node name="HSlider2" type="HSlider" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] margin_top = 23.0 margin_right = 155.0 margin_bottom = 39.0 max_value = 10.0 +rounded = true tick_count = 10 ticks_on_borders = true -[node name="HBoxClosedCaptions" type="HBoxContainer" parent="Panel/Label3/VBoxContainer"] +[node name="HBoxClosedCaptions" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] margin_top = 43.0 margin_right = 155.0 margin_bottom = 70.0 -[node name="Label" type="Label" parent="Panel/Label3/VBoxContainer/HBoxClosedCaptions"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxClosedCaptions"] margin_top = 4.0 margin_right = 108.0 margin_bottom = 23.0 text = "Closed Captions:" -[node name="CheckBox" type="CheckBox" parent="Panel/Label3/VBoxContainer/HBoxClosedCaptions"] +[node name="CheckBox" type="CheckBox" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxClosedCaptions"] margin_left = 112.0 margin_right = 136.0 margin_bottom = 27.0 -[node name="HBoxDevConsole" type="HBoxContainer" parent="Panel/Label3/VBoxContainer"] +[node name="HBoxDevConsole" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] margin_top = 74.0 margin_right = 155.0 margin_bottom = 101.0 -[node name="Label" type="Label" parent="Panel/Label3/VBoxContainer/HBoxDevConsole"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxDevConsole"] margin_top = 4.0 margin_right = 126.0 margin_bottom = 23.0 text = "Developer Console:" -[node name="CheckBox" type="CheckBox" parent="Panel/Label3/VBoxContainer/HBoxDevConsole"] +[node name="CheckBox" type="CheckBox" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxDevConsole"] margin_left = 130.0 margin_right = 154.0 margin_bottom = 27.0 -[node name="HBoxDarkMode" type="HBoxContainer" parent="Panel/Label3/VBoxContainer"] +[node name="HBoxDarkMode" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] margin_top = 105.0 margin_right = 155.0 -margin_bottom = 132.0 +margin_bottom = 124.0 -[node name="Label" type="Label" parent="Panel/Label3/VBoxContainer/HBoxDarkMode"] +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxDarkMode"] +margin_right = 119.0 +margin_bottom = 19.0 +text = "Theme Preferance:" + +[node name="ItemList2" type="ItemList" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +margin_top = 128.0 +margin_right = 155.0 +margin_bottom = 137.0 +auto_height = true + +[node name="HBoxVirtualKeyboardEnabled" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +margin_top = 141.0 +margin_right = 155.0 +margin_bottom = 168.0 + +[node name="Label2" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxVirtualKeyboardEnabled"] margin_top = 4.0 -margin_right = 77.0 +margin_right = 110.0 margin_bottom = 23.0 -text = "Dark Mode:" +text = "Virtual Keyboard" -[node name="CheckBox" type="CheckBox" parent="Panel/Label3/VBoxContainer/HBoxDarkMode"] -margin_left = 81.0 -margin_right = 105.0 +[node name="CheckBox" type="CheckBox" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxVirtualKeyboardEnabled"] +margin_left = 114.0 +margin_right = 138.0 margin_bottom = 27.0 -[node name="SaveButton" type="Button" parent="Panel/Label3/VBoxContainer"] -margin_top = 136.0 +[node name="HBoxKeyboardLayout" type="HBoxContainer" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +margin_top = 172.0 margin_right = 155.0 -margin_bottom = 161.0 +margin_bottom = 191.0 + +[node name="Label" type="Label" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer/HBoxKeyboardLayout"] +margin_right = 120.0 +margin_bottom = 19.0 +text = "Layout Preferance:" + +[node name="ItemList" type="ItemList" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +margin_top = 195.0 +margin_right = 155.0 +margin_bottom = 204.0 +auto_height = true + +[node name="SaveButton" type="Button" parent="Panel/HBoxContainer/VBoxContainer3/Label3/VBoxContainer"] +margin_top = 208.0 +margin_right = 155.0 +margin_bottom = 233.0 text = "Save Settings" __meta__ = { "_edit_use_anchors_": false diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/globalSaveInstance.gd b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/globalSaveInstance.gd new file mode 100644 index 0000000..63c17c5 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/globalSaveInstance.gd @@ -0,0 +1,17 @@ +extends Node + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + +var settingsInstance = PlayerSettingsTemplate.new() + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/playerSettingsTemplate.gd b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/playerSettingsTemplate.gd index 21b9414..70100b5 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/playerSettingsTemplate.gd +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/playerSettingsTemplate.gd @@ -21,8 +21,9 @@ var volume = 6 var bClosedCaptions = true var bdevConsole = false var bVirtualKeyboard = false -var visualKeyboardLayout = KeyboardLayout.QWERTY -var preferredTheme = ThemeChoice.DARKHIGHCONTRAST +var visualKeyboardLayout = 0 +var themeChoice = 0 +#var preferredTheme = ThemeChoice.DARKHIGHCONTRAST # Declare member variables here. Examples: diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/project.godot b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/project.godot index 1ae4430..8e8a817 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/project.godot +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/project.godot @@ -26,7 +26,7 @@ config/icon="res://icon.png" [autoload] -SettingsMenuConfig="*res://SettingsMenuConfig.gd" +GlobalSaveInstance="*res://globalSaveInstance.gd" [physics] diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/LoadGame_temp.tscn b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/LoadGame_temp.tscn index c843e61..4adfa16 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/LoadGame_temp.tscn +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/LoadGame_temp.tscn @@ -1,16 +1,13 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://UserInterface/Title.tscn" type="PackedScene" id=1] -[ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=2] +[ext_resource path="res://userInterface/Title.tscn" type="PackedScene" id=1] +[ext_resource path="res://userInterface/But_ChangeScene.tscn" type="PackedScene" id=2] [ext_resource path="res://screens/grabFocus.gd" type="Script" id=3] [node name="Control" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Title" parent="." instance=ExtResource( 1 )] anchor_left = 0.0 @@ -24,4 +21,3 @@ text = "Multiplayer (temp)" [node name="But_ChangeScene" parent="Title" instance=ExtResource( 2 )] text = "Temp: back to menu" -next_scene_path = "res://Screens/MenuScreen.tscn" diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/MenuScreen.tscn b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/MenuScreen.tscn index a72376d..36a1ea3 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/MenuScreen.tscn +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/MenuScreen.tscn @@ -1,20 +1,17 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=1] -[ext_resource path="res://Screens/MenuScreen.gd" type="Script" id=2] +[ext_resource path="res://userInterface/But_ChangeScene.tscn" type="PackedScene" id=1] +[ext_resource path="res://screens/MenuScreen.gd" type="Script" id=2] [ext_resource path="res://assets/liberation_serif_40pt.tres" type="DynamicFont" id=3] -[ext_resource path="res://UserInterface/Title.tscn" type="PackedScene" id=5] +[ext_resource path="res://userInterface/Title.tscn" type="PackedScene" id=5] [ext_resource path="res://assets/ui_controlNode_dark_theme.tres" type="Theme" id=6] -[ext_resource path="res://UserInterface/But_Quit.tscn" type="PackedScene" id=10] +[ext_resource path="res://userInterface/But_Quit.tscn" type="PackedScene" id=10] [node name="MenuScreen" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 6 ) script = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Background" type="Panel" parent="."] anchor_right = 1.0 @@ -46,35 +43,30 @@ __meta__ = { [node name="But_NewGame" parent="VBoxContainer" instance=ExtResource( 1 )] margin_right = 238.0 margin_bottom = 49.0 -next_scene_path = "res://screens/NewGame_temp.tscn" [node name="But_LoadGame" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 53.0 margin_right = 238.0 margin_bottom = 103.0 text = "Load Game" -next_scene_path = "res://screens/LoadGame_temp.tscn" [node name="But_Multiplayer" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 107.0 margin_right = 238.0 margin_bottom = 156.0 text = "Multiplayer" -next_scene_path = "res://Screens/Multiplayer_temp.tscn" [node name="But_AddChar" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 160.0 margin_right = 238.0 margin_bottom = 210.0 text = "Add Character" -next_scene_path = "res://Screens/AddCharacter_temp.tscn" [node name="But_Settings" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 214.0 margin_right = 238.0 margin_bottom = 263.0 text = "Settings" -next_scene_path = "res://Screens/Settings_temp.tscn" [node name="But_Quit" parent="VBoxContainer" instance=ExtResource( 10 )] margin_top = 267.0 diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuControl.tscn b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuControl.tscn index 11df794..3214b9f 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuControl.tscn +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuControl.tscn @@ -1,8 +1,11 @@ -[gd_scene format=2] +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://SettingsMenuConfig.gd" type="Script" id=1] [node name="Control" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } @@ -14,9 +17,6 @@ margin_left = -12.9719 margin_top = -2.0755 margin_right = -12.9719 margin_bottom = -2.0755 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Label" type="Label" parent="Panel"] anchor_left = 0.5 @@ -36,52 +36,49 @@ margin_left = -77.5 margin_top = 40.0 margin_right = 77.5 margin_bottom = 52.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="HBoxRiskFactor" type="HBoxContainer" parent="Panel/Label/VBoxContainer"] -margin_right = 202.0 -margin_bottom = 24.0 - -[node name="Label" type="Label" parent="Panel/Label/VBoxContainer/HBoxRiskFactor"] -margin_top = 5.0 -margin_right = 140.0 -margin_bottom = 19.0 -text = "Risk Factor Threshold:" - -[node name="LineEdit" type="LineEdit" parent="Panel/Label/VBoxContainer/HBoxRiskFactor"] -margin_left = 144.0 -margin_right = 202.0 -margin_bottom = 24.0 [node name="HBoxDisplayName" type="HBoxContainer" parent="Panel/Label/VBoxContainer"] -margin_top = 28.0 -margin_right = 202.0 -margin_bottom = 52.0 +margin_right = 155.0 +margin_bottom = 14.0 [node name="Label" type="Label" parent="Panel/Label/VBoxContainer/HBoxDisplayName"] -margin_top = 5.0 margin_right = 93.0 -margin_bottom = 19.0 +margin_bottom = 14.0 text = "Display Name:" -[node name="LineEdit" type="LineEdit" parent="Panel/Label/VBoxContainer/HBoxDisplayName"] -margin_left = 97.0 +[node name="LineEdit" type="LineEdit" parent="Panel/Label/VBoxContainer"] +margin_top = 18.0 margin_right = 155.0 -margin_bottom = 24.0 +margin_bottom = 42.0 + +[node name="HBoxRiskFactor" type="HBoxContainer" parent="Panel/Label/VBoxContainer"] +margin_top = 46.0 +margin_right = 155.0 +margin_bottom = 60.0 + +[node name="Label" type="Label" parent="Panel/Label/VBoxContainer/HBoxRiskFactor"] +margin_right = 73.0 +margin_bottom = 14.0 +text = "Risk Factor:" + +[node name="RiskFactor" type="HSlider" parent="Panel/Label/VBoxContainer"] +margin_top = 64.0 +margin_right = 155.0 +margin_bottom = 80.0 +min_value = 1.0 +max_value = 5.0 +value = 1.0 +tick_count = 10 +ticks_on_borders = true [node name="Label2" type="Label" parent="Panel"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -47.5 -margin_top = 100.0 +margin_top = 140.0 margin_right = 47.5 margin_bottom = 14.0 text = "Visual Controls" -__meta__ = { -"_edit_use_anchors_": false -} [node name="VBoxContainer" type="VBoxContainer" parent="Panel/Label2"] anchor_left = 0.5 @@ -90,9 +87,6 @@ margin_left = -77.5 margin_top = 40.0 margin_right = 77.5 margin_bottom = 52.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="HBoxFontSize" type="HBoxContainer" parent="Panel/Label2/VBoxContainer"] margin_right = 155.0 @@ -107,7 +101,9 @@ text = "Font Size:" margin_top = 18.0 margin_right = 155.0 margin_bottom = 34.0 +min_value = 1.0 max_value = 10.0 +value = 1.0 tick_count = 10 ticks_on_borders = true @@ -121,15 +117,34 @@ text = "Brightness:" margin_top = 56.0 margin_right = 155.0 margin_bottom = 72.0 +min_value = 1.0 max_value = 10.0 +value = 1.0 tick_count = 10 ticks_on_borders = true +[node name="HBoxDarkMode" type="HBoxContainer" parent="Panel/Label2/VBoxContainer"] +margin_top = 76.0 +margin_right = 155.0 +margin_bottom = 124.0 + +[node name="Label" type="Label" parent="Panel/Label2/VBoxContainer/HBoxDarkMode"] +margin_right = 73.0 +margin_bottom = 48.0 +text = "Dark Mode: + +" + +[node name="CheckBox" type="CheckBox" parent="Panel/Label2/VBoxContainer/HBoxDarkMode"] +margin_left = 77.0 +margin_right = 101.0 +margin_bottom = 48.0 + [node name="Label3" type="Label" parent="Panel"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -52.5 -margin_top = 220.0 +margin_top = 300.0 margin_right = 52.5 margin_bottom = 14.0 text = "General Settings" @@ -141,9 +156,6 @@ margin_left = -77.5 margin_top = 40.0 margin_right = 77.5 margin_bottom = 52.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="HBoxVolume" type="HBoxContainer" parent="Panel/Label3/VBoxContainer"] margin_right = 157.0 @@ -154,10 +166,16 @@ margin_right = 57.0 margin_bottom = 14.0 text = "Volume::" -[node name="HBoxClosedCaptions" type="HBoxContainer" parent="Panel/Label3/VBoxContainer"] +[node name="HSlider" type="HSlider" parent="Panel/Label3/VBoxContainer"] margin_top = 18.0 margin_right = 157.0 -margin_bottom = 42.0 +margin_bottom = 34.0 +value = 1.0 + +[node name="HBoxClosedCaptions" type="HBoxContainer" parent="Panel/Label3/VBoxContainer"] +margin_top = 38.0 +margin_right = 157.0 +margin_bottom = 62.0 [node name="Label" type="Label" parent="Panel/Label3/VBoxContainer/HBoxClosedCaptions"] margin_top = 5.0 @@ -171,9 +189,9 @@ margin_right = 134.0 margin_bottom = 24.0 [node name="HBoxDevConsole" type="HBoxContainer" parent="Panel/Label3/VBoxContainer"] -margin_top = 46.0 +margin_top = 66.0 margin_right = 157.0 -margin_bottom = 70.0 +margin_bottom = 90.0 [node name="Label" type="Label" parent="Panel/Label3/VBoxContainer/HBoxDevConsole"] margin_top = 5.0 @@ -185,3 +203,9 @@ text = "Developer Console::" margin_left = 133.0 margin_right = 157.0 margin_bottom = 24.0 + +[node name="Button" type="Button" parent="Panel/Label3/VBoxContainer"] +margin_top = 124.0 +margin_right = 157.0 +margin_bottom = 114.0 +text = "Save Changes" diff --git a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuScreen.tscn b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuScreen.tscn index d765b9e..8be352a 100644 --- a/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuScreen.tscn +++ b/Phase2/Godot ===(Game Code)===/MainMenu/GodotUserInterface_Luke_Settings/bcirpg_settingsMenuLuke/screens/SettingsMenuScreen.tscn @@ -1,5 +1,5 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Screens/MenuScreen.tscn" type="PackedScene" id=1] +[ext_resource path="res://screens/MenuScreen.tscn" type="PackedScene" id=1] [node name="MenuScreen" instance=ExtResource( 1 )]