From 9cceb1bb44c200c406218688a2c6aec776d23ee3 Mon Sep 17 00:00:00 2001 From: MacDugRPG <57243055+MacDugRPG@users.noreply.github.com> Date: Sun, 6 Mar 2022 15:37:43 -0500 Subject: [PATCH] Theme updates; minor additional changes This updates the theme-setting across all levels, for dark and light. Also begins a loading process for the module map. --- .../_toArchive/ui_controlNode_dark_theme.tres | 28 ++++++ .../assets/ui_controlNode_dark_theme.tres | 99 ++++++++++++++++++- .../assets/ui_controlNode_light_theme.tres | 97 +++++++++++++++++- .../bcirpg_newGame_20220227A/gamePlay/Game.gd | 21 +++- .../gamePlay/Game.tscn | 73 ++++++-------- .../screens/MenuScreen.gd | 2 + .../screens/MenuScreen.tscn | 1 - .../userInterface/InputResponse.tscn | 11 +-- .../userInterface/Title.tscn | 10 +- 9 files changed, 275 insertions(+), 67 deletions(-) create mode 100644 Godot/NewGame/Doug/bcirpg_newGame_20220227A/_toArchive/ui_controlNode_dark_theme.tres diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/_toArchive/ui_controlNode_dark_theme.tres b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/_toArchive/ui_controlNode_dark_theme.tres new file mode 100644 index 0000000..b606d40 --- /dev/null +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/_toArchive/ui_controlNode_dark_theme.tres @@ -0,0 +1,28 @@ +[gd_resource type="Theme" load_steps=3 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] + +[resource] +Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 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/constants/hseparation = 2 +Button/fonts/font = ExtResource( 2 ) +Button/styles/disabled = null +Button/styles/focus = null +Button/styles/hover = null +Button/styles/normal = ExtResource( 1 ) +Button/styles/pressed = null +Label/colors/font_color = Color( 1, 1, 1, 1 ) +Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) +Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) +Label/constants/line_spacing = 3 +Label/constants/shadow_as_outline = 0 +Label/constants/shadow_offset_x = 1 +Label/constants/shadow_offset_y = 1 +Label/fonts/font = null +Label/styles/normal = null +Panel/styles/panel = ExtResource( 1 ) +VBoxContainer/constants/separation = 4 diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_dark_theme.tres b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_dark_theme.tres index b606d40..c4541e3 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_dark_theme.tres +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_dark_theme.tres @@ -1,10 +1,11 @@ -[gd_resource type="Theme" load_steps=3 format=2] +[gd_resource type="Theme" load_steps=4 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] [resource] -Button/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 ) +Button/colors/font_color = Color( 1, 1, 1, 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 ) @@ -14,7 +15,21 @@ Button/styles/disabled = null Button/styles/focus = null Button/styles/hover = null Button/styles/normal = ExtResource( 1 ) -Button/styles/pressed = null +Button/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, 0, 0, 0.1 ) +ItemList/constants/hseparation = 4 +ItemList/constants/icon_margin = 4 +ItemList/constants/line_separation = 2 +ItemList/constants/vseparation = 2 +ItemList/fonts/font = ExtResource( 3 ) +ItemList/styles/bg = ExtResource( 1 ) +ItemList/styles/bg_focus = ExtResource( 1 ) +ItemList/styles/cursor = null +ItemList/styles/cursor_unfocused = ExtResource( 1 ) +ItemList/styles/selected = null +ItemList/styles/selected_focus = null Label/colors/font_color = Color( 1, 1, 1, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) @@ -23,6 +38,82 @@ Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 Label/fonts/font = null -Label/styles/normal = null +Label/styles/normal = ExtResource( 1 ) +LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) +LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) +LineEdit/colors/cursor_color = Color( 0.94, 0.94, 0.94, 1 ) +LineEdit/colors/font_color = Color( 1, 1, 1, 1 ) +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/icons/clear = null +LineEdit/styles/focus = null +LineEdit/styles/normal = ExtResource( 1 ) +LineEdit/styles/read_only = null +MarginContainer/constants/margin_bottom = 0 +MarginContainer/constants/margin_left = 0 +MarginContainer/constants/margin_right = 0 +MarginContainer/constants/margin_top = 0 Panel/styles/panel = ExtResource( 1 ) +PanelContainer/styles/panel = ExtResource( 1 ) +Tabs/colors/font_color_bg = Color( 1, 1, 1, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 1, 1, 1, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = ExtResource( 3 ) +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = ExtResource( 1 ) +Tabs/styles/button_pressed = null +Tabs/styles/panel = ExtResource( 1 ) +Tabs/styles/tab_bg = ExtResource( 1 ) +Tabs/styles/tab_disabled = null +Tabs/styles/tab_fg = ExtResource( 1 ) +TextEdit/colors/background_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/bookmark_color = Color( 0.08, 0.49, 0.98, 1 ) +TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) +TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) +TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) +TextEdit/colors/caret_color = Color( 0.88, 0.88, 0.88, 1 ) +TextEdit/colors/code_folding_color = Color( 0.8, 0.8, 0.8, 0.8 ) +TextEdit/colors/completion_background_color = Color( 0.17, 0.16, 0.2, 1 ) +TextEdit/colors/completion_existing_color = Color( 0.87, 0.87, 0.87, 0.13 ) +TextEdit/colors/completion_font_color = Color( 0.67, 0.67, 0.67, 1 ) +TextEdit/colors/completion_scroll_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/completion_selected_color = Color( 0.26, 0.26, 0.27, 1 ) +TextEdit/colors/current_line_color = Color( 0.25, 0.25, 0.26, 0.8 ) +TextEdit/colors/executing_line_color = Color( 0.2, 0.8, 0.2, 0.4 ) +TextEdit/colors/font_color = Color( 0.00392157, 0.00392157, 0.00392157, 1 ) +TextEdit/colors/font_color_readonly = Color( 0.88, 0.88, 0.88, 0.5 ) +TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) +TextEdit/colors/function_color = Color( 0.4, 0.64, 0.81, 1 ) +TextEdit/colors/line_number_color = Color( 0.67, 0.67, 0.67, 0.4 ) +TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) +TextEdit/colors/member_variable_color = Color( 0.9, 0.31, 0.35, 1 ) +TextEdit/colors/number_color = Color( 0.92, 0.58, 0.2, 1 ) +TextEdit/colors/safe_line_number_color = Color( 0.67, 0.78, 0.67, 0.6 ) +TextEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) +TextEdit/colors/symbol_color = Color( 0.94, 0.94, 0.94, 1 ) +TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.15 ) +TextEdit/constants/completion_lines = 7 +TextEdit/constants/completion_max_width = 50 +TextEdit/constants/completion_scroll_width = 3 +TextEdit/constants/line_spacing = 4 +TextEdit/fonts/font = ExtResource( 3 ) +TextEdit/icons/fold = null +TextEdit/icons/folded = null +TextEdit/icons/space = null +TextEdit/icons/tab = null +TextEdit/styles/completion = null +TextEdit/styles/focus = null +TextEdit/styles/normal = ExtResource( 1 ) +TextEdit/styles/read_only = null VBoxContainer/constants/separation = 4 diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_light_theme.tres b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_light_theme.tres index 56f546e..a2c76b7 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_light_theme.tres +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/assets/ui_controlNode_light_theme.tres @@ -1,7 +1,8 @@ -[gd_resource type="Theme" load_steps=3 format=2] +[gd_resource type="Theme" load_steps=4 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] [resource] Button/colors/font_color = Color( 0, 0, 0, 1 ) @@ -14,7 +15,21 @@ Button/styles/disabled = null Button/styles/focus = null Button/styles/hover = null Button/styles/normal = ExtResource( 1 ) -Button/styles/pressed = null +Button/styles/pressed = ExtResource( 1 ) +ItemList/colors/font_color = Color( 0, 0, 0, 1 ) +ItemList/colors/font_color_selected = Color( 1, 1, 1, 1 ) +ItemList/colors/guide_color = Color( 0, 0, 0, 0.1 ) +ItemList/constants/hseparation = 4 +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_focus = ExtResource( 1 ) +ItemList/styles/cursor = null +ItemList/styles/cursor_unfocused = ExtResource( 1 ) +ItemList/styles/selected = null +ItemList/styles/selected_focus = null Label/colors/font_color = Color( 0, 0, 0, 1 ) Label/colors/font_color_shadow = Color( 0, 0, 0, 0 ) Label/colors/font_outline_modulate = Color( 1, 1, 1, 1 ) @@ -23,6 +38,82 @@ Label/constants/shadow_as_outline = 0 Label/constants/shadow_offset_x = 1 Label/constants/shadow_offset_y = 1 Label/fonts/font = null -Label/styles/normal = null +Label/styles/normal = ExtResource( 1 ) +LineEdit/colors/clear_button_color = Color( 0.88, 0.88, 0.88, 1 ) +LineEdit/colors/clear_button_color_pressed = Color( 1, 1, 1, 1 ) +LineEdit/colors/cursor_color = Color( 0.94, 0.94, 0.94, 1 ) +LineEdit/colors/font_color = Color( 0, 0, 0, 1 ) +LineEdit/colors/font_color_selected = Color( 0, 0, 0, 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/icons/clear = null +LineEdit/styles/focus = null +LineEdit/styles/normal = ExtResource( 1 ) +LineEdit/styles/read_only = null +MarginContainer/constants/margin_bottom = 0 +MarginContainer/constants/margin_left = 0 +MarginContainer/constants/margin_right = 0 +MarginContainer/constants/margin_top = 0 Panel/styles/panel = ExtResource( 1 ) +PanelContainer/styles/panel = ExtResource( 1 ) +Tabs/colors/font_color_bg = Color( 0, 0, 0, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 0, 0, 0, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = ExtResource( 3 ) +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = ExtResource( 1 ) +Tabs/styles/button_pressed = null +Tabs/styles/panel = ExtResource( 1 ) +Tabs/styles/tab_bg = ExtResource( 1 ) +Tabs/styles/tab_disabled = null +Tabs/styles/tab_fg = ExtResource( 1 ) +TextEdit/colors/background_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/bookmark_color = Color( 0.08, 0.49, 0.98, 1 ) +TextEdit/colors/brace_mismatch_color = Color( 1, 0.2, 0.2, 1 ) +TextEdit/colors/breakpoint_color = Color( 0.8, 0.8, 0.4, 0.2 ) +TextEdit/colors/caret_background_color = Color( 0, 0, 0, 1 ) +TextEdit/colors/caret_color = Color( 0.88, 0.88, 0.88, 1 ) +TextEdit/colors/code_folding_color = Color( 0.8, 0.8, 0.8, 0.8 ) +TextEdit/colors/completion_background_color = Color( 0.17, 0.16, 0.2, 1 ) +TextEdit/colors/completion_existing_color = Color( 0.87, 0.87, 0.87, 0.13 ) +TextEdit/colors/completion_font_color = Color( 0.67, 0.67, 0.67, 1 ) +TextEdit/colors/completion_scroll_color = Color( 1, 1, 1, 1 ) +TextEdit/colors/completion_selected_color = Color( 0.26, 0.26, 0.27, 1 ) +TextEdit/colors/current_line_color = Color( 0.25, 0.25, 0.26, 0.8 ) +TextEdit/colors/executing_line_color = Color( 0.2, 0.8, 0.2, 0.4 ) +TextEdit/colors/font_color = Color( 0.00392157, 0.00392157, 0.00392157, 1 ) +TextEdit/colors/font_color_readonly = Color( 0.88, 0.88, 0.88, 0.5 ) +TextEdit/colors/font_color_selected = Color( 0, 0, 0, 1 ) +TextEdit/colors/function_color = Color( 0.4, 0.64, 0.81, 1 ) +TextEdit/colors/line_number_color = Color( 0.67, 0.67, 0.67, 0.4 ) +TextEdit/colors/mark_color = Color( 1, 0.4, 0.4, 0.4 ) +TextEdit/colors/member_variable_color = Color( 0.9, 0.31, 0.35, 1 ) +TextEdit/colors/number_color = Color( 0.92, 0.58, 0.2, 1 ) +TextEdit/colors/safe_line_number_color = Color( 0.67, 0.78, 0.67, 0.6 ) +TextEdit/colors/selection_color = Color( 0.49, 0.49, 0.49, 1 ) +TextEdit/colors/symbol_color = Color( 0.94, 0.94, 0.94, 1 ) +TextEdit/colors/word_highlighted_color = Color( 0.8, 0.9, 0.9, 0.15 ) +TextEdit/constants/completion_lines = 7 +TextEdit/constants/completion_max_width = 50 +TextEdit/constants/completion_scroll_width = 3 +TextEdit/constants/line_spacing = 4 +TextEdit/fonts/font = ExtResource( 3 ) +TextEdit/icons/fold = null +TextEdit/icons/folded = null +TextEdit/icons/space = null +TextEdit/icons/tab = null +TextEdit/styles/completion = null +TextEdit/styles/focus = null +TextEdit/styles/normal = ExtResource( 1 ) +TextEdit/styles/read_only = null VBoxContainer/constants/separation = 4 diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd index 3475548..182c564 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd @@ -10,7 +10,6 @@ onready var history_source = get_node("/root/History").historyScreensSingleton const TextOutput = preload("res://UserInterface/Response.tscn") const InputResponse = preload("res://UserInterface/InputResponse.tscn") - onready var command_processor = $CommandProcessor onready var current_text = $Background/MarginContainer/Rows/GameInfo/CurrentText onready var history_rows = $Background/MarginContainer/Rows/GameInfo/HistoryRows @@ -20,8 +19,14 @@ onready var option_one = $Background/MarginContainer/Rows/InputArea/VBoxContaine onready var option_two= $Background/MarginContainer/Rows/InputArea/VBoxContainer/option2 onready var option_three = $Background/MarginContainer/Rows/InputArea/VBoxContainer/option3 +#DKM TEMP: this is just a temp file solution for grabbing map/module, will be replaced with DB +# or desired load approach +onready var module_map = "user://temp_map.save" func _ready() -> void: + load_module() + #DKM TEMP: for testing only -- this will be set in settings + theme=load("res://assets/ui_controlNode_dark_theme.tres") history_pager.hide() history_rows.hide() current_text.show() @@ -78,3 +83,17 @@ func _on_option2_button_down() -> void: func _on_option3_button_down() -> void: var option3 = get_node("Background/MarginContainer/Rows/InputArea/VBoxContainer/option3") handleUserInput(option3.get_text()) + +# DKM TEMP: Load module map needs to: +# 1. Add the needed Locale.tsns to the Locale Manager +# 2. Populate their names +# 3. Populate their descriptions +# 4. Populate their options +# 5. Link them directionally +#This will all be part of loading a set game -- built in the toolset. Also +# will need to have dialogues, combats, etc. +func load_module(): + var file = File.net() + if file.file_exists(module_map): + file.open(module_map, File.READ) + file.close() diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn index 4eeafb3..f24e6ca 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=1] [ext_resource path="res://gamePlay/Game.gd" type="Script" id=2] @@ -8,19 +8,9 @@ [ext_resource path="res://gamePlay/LocaleManager.gd" type="Script" id=6] [ext_resource path="res://userInterface/But_History.gd" type="Script" id=7] [ext_resource path="res://userInterface/But_History_Page.gd" type="Script" id=8] -[ext_resource path="res://_toArchive/ui_theme.tres" type="Theme" id=9] [ext_resource path="res://_toArchive/ui_gameplay_theme.tres" type="Theme" id=10] [ext_resource path="res://assets/liberation_serif_30pt.tres" type="DynamicFont" id=11] -[sub_resource type="StyleBoxFlat" id=1] -bg_color = Color( 0.117647, 0.117647, 0.117647, 1 ) - -[sub_resource type="StyleBoxFlat" id=2] -bg_color = Color( 0.243137, 0.235294, 0.235294, 1 ) - -[sub_resource type="StyleBoxFlat" id=3] -bg_color = Color( 0.286275, 0.286275, 0.286275, 1 ) - [node name="Game" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -98,14 +88,15 @@ option1 = "Go: south back to the clearing " [node name="Background" type="PanelContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -custom_styles/panel = SubResource( 1 ) __meta__ = { "_edit_use_anchors_": false } [node name="MarginContainer" type="MarginContainer" parent="Background"] -margin_right = 1024.0 -margin_bottom = 600.0 +margin_left = 1.0 +margin_top = 1.0 +margin_right = 1023.0 +margin_bottom = 599.0 custom_constants/margin_right = 20 custom_constants/margin_top = 10 custom_constants/margin_left = 20 @@ -114,12 +105,12 @@ custom_constants/margin_bottom = 20 [node name="Rows" type="VBoxContainer" parent="Background/MarginContainer"] margin_left = 20.0 margin_top = 10.0 -margin_right = 1004.0 -margin_bottom = 580.0 +margin_right = 1002.0 +margin_bottom = 578.0 custom_constants/separation = 10 [node name="ItemList" type="ItemList" parent="Background/MarginContainer/Rows"] -margin_right = 984.0 +margin_right = 982.0 margin_bottom = 40.0 rect_min_size = Vector2( 0, 40 ) @@ -132,8 +123,8 @@ next_scene_path = "res://Screens/MenuScreen.tscn" [node name="But_History" type="Button" parent="Background/MarginContainer/Rows/ItemList"] margin_left = 96.0 -margin_right = 167.0 -margin_bottom = 33.0 +margin_right = 221.0 +margin_bottom = 30.0 theme = ExtResource( 10 ) text = "Toggle History" script = ExtResource( 7 ) @@ -145,7 +136,7 @@ __meta__ = { anchor_left = 1.0 anchor_right = 1.0 margin_left = -103.0 -margin_bottom = 33.0 +margin_bottom = 30.0 theme = ExtResource( 10 ) text = "Next Page" script = ExtResource( 8 ) @@ -155,62 +146,60 @@ __meta__ = { [node name="GameInfo" type="PanelContainer" parent="Background/MarginContainer/Rows"] margin_top = 50.0 -margin_right = 984.0 -margin_bottom = 440.0 +margin_right = 982.0 +margin_bottom = 438.0 size_flags_vertical = 3 -theme = ExtResource( 9 ) -custom_styles/panel = SubResource( 2 ) [node name="CurrentText" type="VBoxContainer" parent="Background/MarginContainer/Rows/GameInfo"] -margin_right = 984.0 -margin_bottom = 390.0 +margin_left = 1.0 +margin_top = 1.0 +margin_right = 981.0 +margin_bottom = 387.0 size_flags_horizontal = 3 size_flags_vertical = 3 -theme = ExtResource( 9 ) custom_constants/separation = 20 [node name="HistoryRows" type="VBoxContainer" parent="Background/MarginContainer/Rows/GameInfo"] -margin_right = 984.0 -margin_bottom = 390.0 +margin_left = 1.0 +margin_top = 1.0 +margin_right = 981.0 +margin_bottom = 387.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 20 [node name="InputArea" type="PanelContainer" parent="Background/MarginContainer/Rows"] -margin_top = 450.0 -margin_right = 984.0 -margin_bottom = 570.0 +margin_top = 448.0 +margin_right = 982.0 +margin_bottom = 568.0 rect_min_size = Vector2( 0, 120 ) -custom_styles/panel = SubResource( 3 ) [node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/Rows/InputArea"] -margin_right = 984.0 -margin_bottom = 120.0 -theme = ExtResource( 9 ) +margin_left = 1.0 +margin_top = 1.0 +margin_right = 981.0 +margin_bottom = 119.0 custom_constants/separation = 5 [node name="option1" type="Button" parent="Background/MarginContainer/Rows/InputArea/VBoxContainer"] -margin_right = 984.0 +margin_right = 980.0 margin_bottom = 36.0 -theme = ExtResource( 9 ) custom_fonts/font = ExtResource( 11 ) text = "Option 1" align = 0 [node name="option2" type="Button" parent="Background/MarginContainer/Rows/InputArea/VBoxContainer"] margin_top = 41.0 -margin_right = 984.0 +margin_right = 980.0 margin_bottom = 77.0 -theme = ExtResource( 9 ) custom_fonts/font = ExtResource( 11 ) text = "Option 2" align = 0 [node name="option3" type="Button" parent="Background/MarginContainer/Rows/InputArea/VBoxContainer"] margin_top = 82.0 -margin_right = 984.0 +margin_right = 980.0 margin_bottom = 118.0 -theme = ExtResource( 9 ) custom_fonts/font = ExtResource( 11 ) text = "Option 3" align = 0 diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.gd b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.gd index 98fb1ca..702e1b8 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.gd +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.gd @@ -6,4 +6,6 @@ extends Control # Called when the node enters the scene tree for the first time. func _ready() -> void: + #DKM TEMP: for testing only -- this will be set in settings + theme=load("res://assets/ui_controlNode_dark_theme.tres") $VBoxContainer/But_NewGame.grab_focus() diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.tscn b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.tscn index c3cbf45..445d83b 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.tscn +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/screens/MenuScreen.tscn @@ -26,7 +26,6 @@ __meta__ = { [node name="Title" parent="." instance=ExtResource( 5 )] margin_top = 51.8676 margin_bottom = 117.868 -theme = null custom_fonts/font = ExtResource( 3 ) [node name="VBoxContainer" type="VBoxContainer" parent="."] diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/InputResponse.tscn b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/InputResponse.tscn index a0cafa6..8449256 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/InputResponse.tscn +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/InputResponse.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=2] -[ext_resource path="res://assets/liberation_serif_20pt.tres" type="DynamicFont" id=1] [ext_resource path="res://UserInterface/Response.tscn" type="PackedScene" id=2] [ext_resource path="res://UserInterface/InputResponse.gd" type="Script" id=3] @@ -14,12 +13,10 @@ __meta__ = { [node name="InputHistory" type="Label" parent="."] margin_right = 984.0 -margin_bottom = 23.0 -custom_fonts/font = ExtResource( 1 ) -custom_colors/font_color = Color( 0.686275, 0.658824, 0.658824, 1 ) +margin_bottom = 14.0 text = " > This is what user selected" autowrap = true [node name="Response" parent="." instance=ExtResource( 2 )] -margin_top = 27.0 -margin_bottom = 61.0 +margin_top = 18.0 +margin_bottom = 32.0 diff --git a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/Title.tscn b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/Title.tscn index 5b749bd..dc37d75 100644 --- a/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/Title.tscn +++ b/Godot/NewGame/Doug/bcirpg_newGame_20220227A/userInterface/Title.tscn @@ -1,10 +1,4 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://assets/base_dynamicFont_BIG.tres" type="DynamicFont" id=1] -[ext_resource path="res://assets/liberation_serif_40pt.tres" type="DynamicFont" id=2] - -[sub_resource type="Theme" id=1] -default_font = ExtResource( 2 ) +[gd_scene format=2] [node name="Title" type="Label"] anchor_left = 0.5 @@ -13,8 +7,6 @@ margin_left = -110.5 margin_top = 114.422 margin_right = 110.5 margin_bottom = 180.422 -theme = SubResource( 1 ) -custom_fonts/font = ExtResource( 1 ) text = "Main Menu" align = 1 __meta__ = {