RPGResearch/bcirpggithubmirror
7
0
Fork 0
mirror of https://github.com/RPG-Research/bcirpg.git synced 2024-04-16 14:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Theme updates; minor additional changes

Browse Source 
This updates the theme-setting across all levels, for dark and light. Also begins a loading process for the module map.
This commit is contained in:
MacDugRPG
2022-03-06 15:37:43 -05:00
parent 5b15df8862
commit 9cceb1bb44
9 changed files with 275 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd
View File

@ -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()

73
Godot/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn
View File

@ -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