From 6b1d5b8b63efdb02137790cec63a5a0e97ff40bf Mon Sep 17 00:00:00 2001 From: MacDugRPG <57243055+MacDugRPG@users.noreply.github.com> Date: Sun, 24 Apr 2022 15:13:24 -0400 Subject: [PATCH] More Options; Char Sheet and Chat Update adds More Options submenu, character sheet and chat. Note that loaded character not yet displaying on character sheet. --- .../bcirpg_newGame_20220227A/gamePlay/Game.gd | 2 + .../gamePlay/Game.tscn | 134 ++++++++++++++++-- .../screens/Character_Add.tscn | 3 + .../screens/Character_Load.tscn | 17 +-- .../screens/MoreOptions.gd | 11 ++ .../screens/MoreOptions.tscn | 76 ++++++++++ 6 files changed, 220 insertions(+), 23 deletions(-) create mode 100644 Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.gd create mode 100644 Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.tscn diff --git a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd index 490bbe7..1b5faad 100644 --- a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd +++ b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.gd @@ -13,6 +13,7 @@ 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 +onready var history_on= $Background/MarginContainer/Rows/ItemList/But_History onready var history_pager = $Background/MarginContainer/Rows/ItemList/But_History_Page onready var locale_manager = $LocaleManager onready var option_one = $Background/MarginContainer/Rows/InputArea/VBoxContainer/option1 @@ -29,6 +30,7 @@ func _ready() -> void: theme=load("res://assets/ui_controlNode_dark_theme.tres") history_pager.hide() history_rows.hide() + history_on.hide() current_text.show() option_one.show() option_two.show() diff --git a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn index f24e6ca..0027356 100644 --- a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn +++ b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/gamePlay/Game.tscn @@ -88,6 +88,7 @@ option1 = "Go: south back to the clearing " [node name="Background" type="PanelContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 +margin_right = -274.0 __meta__ = { "_edit_use_anchors_": false } @@ -95,7 +96,7 @@ __meta__ = { [node name="MarginContainer" type="MarginContainer" parent="Background"] margin_left = 1.0 margin_top = 1.0 -margin_right = 1023.0 +margin_right = 749.0 margin_bottom = 599.0 custom_constants/margin_right = 20 custom_constants/margin_top = 10 @@ -105,12 +106,12 @@ custom_constants/margin_bottom = 20 [node name="Rows" type="VBoxContainer" parent="Background/MarginContainer"] margin_left = 20.0 margin_top = 10.0 -margin_right = 1002.0 +margin_right = 728.0 margin_bottom = 578.0 custom_constants/separation = 10 [node name="ItemList" type="ItemList" parent="Background/MarginContainer/Rows"] -margin_right = 982.0 +margin_right = 708.0 margin_bottom = 40.0 rect_min_size = Vector2( 0, 40 ) @@ -118,12 +119,12 @@ rect_min_size = Vector2( 0, 40 ) margin_right = 82.0 margin_bottom = 30.0 theme = ExtResource( 10 ) -text = "Menu" -next_scene_path = "res://Screens/MenuScreen.tscn" +text = "More Options" +next_scene_path = "res://Screens/MoreOptions.tscn" [node name="But_History" type="Button" parent="Background/MarginContainer/Rows/ItemList"] -margin_left = 96.0 -margin_right = 221.0 +margin_left = 148.756 +margin_right = 273.756 margin_bottom = 30.0 theme = ExtResource( 10 ) text = "Toggle History" @@ -146,14 +147,14 @@ __meta__ = { [node name="GameInfo" type="PanelContainer" parent="Background/MarginContainer/Rows"] margin_top = 50.0 -margin_right = 982.0 +margin_right = 708.0 margin_bottom = 438.0 size_flags_vertical = 3 [node name="CurrentText" type="VBoxContainer" parent="Background/MarginContainer/Rows/GameInfo"] margin_left = 1.0 margin_top = 1.0 -margin_right = 981.0 +margin_right = 707.0 margin_bottom = 387.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -162,7 +163,7 @@ custom_constants/separation = 20 [node name="HistoryRows" type="VBoxContainer" parent="Background/MarginContainer/Rows/GameInfo"] margin_left = 1.0 margin_top = 1.0 -margin_right = 981.0 +margin_right = 707.0 margin_bottom = 387.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -170,19 +171,19 @@ custom_constants/separation = 20 [node name="InputArea" type="PanelContainer" parent="Background/MarginContainer/Rows"] margin_top = 448.0 -margin_right = 982.0 +margin_right = 708.0 margin_bottom = 568.0 rect_min_size = Vector2( 0, 120 ) [node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer/Rows/InputArea"] margin_left = 1.0 margin_top = 1.0 -margin_right = 981.0 +margin_right = 707.0 margin_bottom = 119.0 custom_constants/separation = 5 [node name="option1" type="Button" parent="Background/MarginContainer/Rows/InputArea/VBoxContainer"] -margin_right = 980.0 +margin_right = 706.0 margin_bottom = 36.0 custom_fonts/font = ExtResource( 11 ) text = "Option 1" @@ -190,7 +191,7 @@ align = 0 [node name="option2" type="Button" parent="Background/MarginContainer/Rows/InputArea/VBoxContainer"] margin_top = 41.0 -margin_right = 980.0 +margin_right = 706.0 margin_bottom = 77.0 custom_fonts/font = ExtResource( 11 ) text = "Option 2" @@ -198,12 +199,115 @@ align = 0 [node name="option3" type="Button" parent="Background/MarginContainer/Rows/InputArea/VBoxContainer"] margin_top = 82.0 -margin_right = 980.0 +margin_right = 706.0 margin_bottom = 118.0 custom_fonts/font = ExtResource( 11 ) text = "Option 3" align = 0 +[node name="Con_charSheet" type="PanelContainer" parent="."] +anchor_left = 1.0 +anchor_right = 1.0 +margin_left = -294.0 +margin_bottom = 406.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="MarginContainer" type="MarginContainer" parent="Con_charSheet"] +margin_left = 1.0 +margin_top = 1.0 +margin_right = 293.0 +margin_bottom = 405.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="Con_charSheet/MarginContainer"] +margin_right = 292.0 +margin_bottom = 404.0 + +[node name="IL_cs_label" type="ItemList" parent="Con_charSheet/MarginContainer/VBoxContainer"] +margin_right = 292.0 +margin_bottom = 40.0 +rect_min_size = Vector2( 0, 40 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="Con_charSheet/MarginContainer/VBoxContainer/IL_cs_label"] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -141.0 +margin_right = 141.0 +margin_bottom = 43.0 +text = "Character Sheet" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="CharacterSheet" type="TextEdit" parent="Con_charSheet/MarginContainer/VBoxContainer"] +margin_top = 44.0 +margin_right = 292.0 +margin_bottom = 404.0 +size_flags_vertical = 3 +readonly = true +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Con_chatScreen" type="PanelContainer" parent="."] +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -292.0 +margin_top = -196.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="VBoxContainer" type="VBoxContainer" parent="Con_chatScreen"] +margin_left = 1.0 +margin_top = 1.0 +margin_right = 291.0 +margin_bottom = 195.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="IL_cs_label" type="ItemList" parent="Con_chatScreen/VBoxContainer"] +margin_right = 290.0 +margin_bottom = 40.0 +rect_min_size = Vector2( 0, 40 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="Con_chatScreen/VBoxContainer/IL_cs_label"] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -142.0 +margin_right = 142.0 +margin_bottom = 43.0 +text = "Chat" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ChatScreen" type="TextEdit" parent="Con_chatScreen/VBoxContainer"] +margin_top = 44.0 +margin_right = 290.0 +margin_bottom = 194.0 +size_flags_vertical = 3 +text = "Char1: What do you think? +Char2: Huh? About what? +" +readonly = true +__meta__ = { +"_edit_use_anchors_": false +} + [connection signal="button_up" from="Background/MarginContainer/Rows/ItemList/But_History" to="Background/MarginContainer/Rows/ItemList/But_History" method="_on_But_History_button_up"] [connection signal="button_up" from="Background/MarginContainer/Rows/ItemList/But_History_Page" to="Background/MarginContainer/Rows/ItemList/But_History_Page" method="_on_But_History_Page_button_up"] [connection signal="button_down" from="Background/MarginContainer/Rows/InputArea/VBoxContainer/option1" to="." method="_on_option1_button_down"] diff --git a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Add.tscn b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Add.tscn index 92fc993..0740f00 100644 --- a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Add.tscn +++ b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Add.tscn @@ -17,6 +17,9 @@ margin_left = 215.0 margin_top = 23.0 margin_right = 997.0 margin_bottom = 447.0 +__meta__ = { +"_edit_use_anchors_": false +} [node name="Title" parent="." instance=ExtResource( 1 )] anchor_left = 0.0 diff --git a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Load.tscn b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Load.tscn index 5ca364e..42ff205 100644 --- a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Load.tscn +++ b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/Character_Load.tscn @@ -17,6 +17,7 @@ margin_left = 189.0 margin_top = 18.0 margin_right = 989.0 margin_bottom = 461.0 +readonly = true __meta__ = { "_edit_use_anchors_": false } @@ -41,14 +42,6 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="But_ChangeScene" parent="Title" instance=ExtResource( 2 )] -margin_left = 25.0 -margin_top = 111.0 -margin_right = 168.0 -margin_bottom = 135.0 -text = "Temp: Main Menu " -next_scene_path = "res://Screens/MenuScreen.tscn" - [node name="But_StartNewGame" parent="Title" instance=ExtResource( 2 )] margin_left = 22.0 margin_top = 71.0 @@ -57,6 +50,14 @@ margin_bottom = 95.0 text = "Temp: Start New Game" next_scene_path = "res://gamePlay/Game.tscn" +[node name="But_ChangeScene" parent="Title" instance=ExtResource( 2 )] +margin_left = 21.0 +margin_top = 109.0 +margin_right = 164.0 +margin_bottom = 133.0 +text = "Temp: Main Menu " +next_scene_path = "res://Screens/MenuScreen.tscn" + [node name="LoadCharacter_FileDialog" type="FileDialog" parent="."] margin_left = 193.0 margin_top = 33.0 diff --git a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.gd b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.gd new file mode 100644 index 0000000..aa9b21b --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.gd @@ -0,0 +1,11 @@ +#MOREOPTIONS: +# Script purely to grab focus for tabbing control + +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_ResumeGame.grab_focus() diff --git a/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.tscn b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.tscn new file mode 100644 index 0000000..9d81f30 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/NewGame/Doug/bcirpg_newGame_20220227A/screens/MoreOptions.tscn @@ -0,0 +1,76 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=1] +[ext_resource path="res://screens/MoreOptions.gd" type="Script" id=2] +[ext_resource path="res://assets/ui_controlNode_dark_theme.tres" type="Theme" id=6] + +[node name="MoreOptions" 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 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[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_ResumeGame" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_right = 238.0 +margin_bottom = 73.0 +text = "Resume Game" +next_scene_path = "res://gamePlay/Game.tscn" + +[node name="But_ShowHistory" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_top = 77.0 +margin_right = 238.0 +margin_bottom = 150.0 +text = "Show History" +next_scene_path = "res://gamePlay/Game.tscn" + +[node name="But_Chat" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_top = 154.0 +margin_right = 238.0 +margin_bottom = 227.0 +text = "Chat" +next_scene_path = "res://Screens/MenuScreen.tscn" + +[node name="But_MainMenu" parent="VBoxContainer" instance=ExtResource( 1 )] +margin_top = 231.0 +margin_right = 238.0 +margin_bottom = 304.0 +text = "Main Menu" +next_scene_path = "res://Screens/MenuScreen.tscn" + +[node name="Version" type="Label" parent="."] +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -177.0 +margin_top = -44.0 +margin_right = -5.0 +margin_bottom = -6.0 +text = "Version: 0.0.0" +__meta__ = { +"_edit_use_anchors_": false +}