From b66828124c61c0aca76e9e5caaaef93b93bd34dd Mon Sep 17 00:00:00 2001 From: PersonGuyGit Date: Sun, 11 Sep 2022 11:56:36 -0600 Subject: [PATCH] Adding Line Edits for Add Character function --- .../.import/.gdignore | 1 + ...e.csv-f593f5b4d0df687ec2043eb45dbff294.md5 | 2 +- .../UserData/Module_Demo_001.json | 26 ---- .../UserData/PlayerPreferences.cfg | 23 ---- .../TestingFiles/UserData/README.txt | 3 - .../characterFiles/testingCSVCharFile.csv | 9 -- .../testingCSVCharFile.csv.import | 13 -- .../screens/Character_Add.gd | 1 - .../screens/Character_Add.tscn | 111 ++++++++++++++++-- .../screens/Character_Load.tscn | 9 +- .../screens/HistoryViewer.tscn | 1 - .../screens/ImportCharacter.tscn | 13 +- .../userInterface/But_ChangeScene.tscn | 5 +- .../userInterface/But_Quit.tscn | 2 +- 14 files changed, 106 insertions(+), 113 deletions(-) create mode 100644 Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/.gdignore delete mode 100644 Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/Module_Demo_001.json delete mode 100644 Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/PlayerPreferences.cfg delete mode 100644 Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/README.txt delete mode 100644 Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv delete mode 100644 Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/.gdignore b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/.gdignore new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/.gdignore @@ -0,0 +1 @@ + diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 index a569579..f4ecee3 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 @@ -1 +1 @@ -source_md5="fe8dea03f3f241ec8c3f199dcd974cbe" +source_md5="21f53e0bac965cda7f61932893c6d36b" diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/Module_Demo_001.json b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/Module_Demo_001.json deleted file mode 100644 index c54cc96..0000000 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/Module_Demo_001.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "Node_Boat1":{ - "Id":"Boat_001", - "Action":"ShowText", - "A_Params":"", - "Text":"The game has begun! You may select from the options below. You are in a boat. You have been shipwrecked. You can leave the boat through a hatch.", - "Option_Labels":["Examine Ship","Climb through hatch"], - "Option_GoTos":["Boat_002","Shore_001"] - }, - "Node_Boat_002":{ - "Id":"Boat_002", - "Action":"ShowText", - "A_Params":"", - "Text":"The boat is old and wrecked.", - "Option_Labels":["Continue"], - "Option_GoTos":["Boat_001"] - }, - "Node_Shore_001":{ - "Id":"Shore_001", - "Action":"ShowText", - "A_Params":"", - "Text":"You've reached the shore!", - "Option_Labels":["Return to boat"], - "Option_GoTos":["Boat_001"] - } -} \ No newline at end of file diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/PlayerPreferences.cfg b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/PlayerPreferences.cfg deleted file mode 100644 index 2097c03..0000000 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/PlayerPreferences.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[player_preferences] - -player_name="Tester the Bold!" -risk_threshold=2.0 - -[visual_controls] - -font_size=3.0 -brightness=5.0 - -[general_settings] - -volume=0.0 -closed_captions=false -dev_console=true - -[virtual_keyboard] - -keyboard_layout=2 - -[theme] - -theme_selection=0 diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/README.txt b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/README.txt deleted file mode 100644 index 3ba6eee..0000000 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -Files for testing only. On deployment, these should be put at the appropriate user:// location for your operating system. For windows this is: - -C:\Users\{username}\AppData\Roaming\Godot\app_userdata\BCIRPGR_mergedDemo \ No newline at end of file diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv deleted file mode 100644 index 1430bbb..0000000 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv +++ /dev/null @@ -1,9 +0,0 @@ -Name,Thickly Goes -Profession,Brawler -Strength,Excessive -Intellect,Diminished -Willpower,Variable -Charm,Lacking -Weapon,Meaty Fists -Armor,Leather Jacket and Chaps -A Quote,You talkin to me?! \ No newline at end of file diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import deleted file mode 100644 index 18b90ee..0000000 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import +++ /dev/null @@ -1,13 +0,0 @@ -[remap] - -importer="csv_translation" -type="Translation" -valid=false - -[deps] - -source_file="res://TestingFiles/UserData/characterFiles/testingCSVCharFile.csv" -[params] - -compress=true -delimiter=0 diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.gd b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.gd index fc7960f..bc9d1b2 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.gd +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.gd @@ -10,7 +10,6 @@ func _ready() -> void: theme=load(settings.themeFile) $Title/But_SaveChar.grab_focus() - func _on_But_SaveChar_pressed() -> void: $Title/FileDialog.popup() diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.tscn b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.tscn index 6a4c54c..98e0607 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.tscn +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Add.tscn @@ -1,7 +1,7 @@ [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/Character_Add.gd" type="Script" id=3] [node name="Control" type="Control"] @@ -17,9 +17,6 @@ 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 @@ -35,9 +32,6 @@ text = "Create Character (temp)" margin_right = 12.0 margin_bottom = 20.0 text = "Save Character" -__meta__ = { -"_edit_use_anchors_": false -} [node name="But_ChangeScene" parent="Title" instance=ExtResource( 2 )] margin_left = -1.0 @@ -45,14 +39,12 @@ margin_top = 48.0 margin_right = 142.0 margin_bottom = 72.0 text = "Temp: Main Menu" -next_scene_path = "res://Screens/MenuScreen.tscn" [node name="But_StartNewGame" parent="Title" instance=ExtResource( 2 )] margin_top = 98.0 margin_right = 159.0 margin_bottom = 122.0 text = "Temp: Start New Game" -next_scene_path = "res://gamePlay/Game.tscn" [node name="FileDialog" type="FileDialog" parent="Title"] margin_left = 164.0 @@ -60,9 +52,102 @@ margin_top = 35.0 margin_right = 741.0 margin_bottom = 426.0 access = 1 -current_dir = "user://characterFiles" -current_file = "characterFiles" -current_path = "user://characterFiles/characterFiles" + +[node name="VBoxContainer" type="VBoxContainer" parent="Title"] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -20.0 +margin_top = 50.0 +margin_right = 20.0 +margin_bottom = 140.0 + +[node name="LabelName" type="Label" parent="Title/VBoxContainer"] +margin_right = 81.0 +margin_bottom = 31.0 +text = "NAME +" + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelName"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelProfession" type="Label" parent="Title/VBoxContainer"] +margin_top = 35.0 +margin_right = 81.0 +margin_bottom = 66.0 +text = "PROFESSION +" + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelProfession"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelStrength" type="Label" parent="Title/VBoxContainer"] +margin_top = 70.0 +margin_right = 81.0 +margin_bottom = 84.0 +text = "STRENGTH" + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelStrength"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelIntellect" type="Label" parent="Title/VBoxContainer"] +margin_top = 88.0 +margin_right = 81.0 +margin_bottom = 119.0 +text = "INTELLECT +" + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelIntellect"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelWillpower" type="Label" parent="Title/VBoxContainer"] +margin_top = 123.0 +margin_right = 81.0 +margin_bottom = 137.0 +text = "WILLPOWER" + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelWillpower"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelCharm" type="Label" parent="Title/VBoxContainer"] +margin_top = 141.0 +margin_right = 81.0 +margin_bottom = 155.0 + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelCharm"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelWeapon" type="Label" parent="Title/VBoxContainer"] +margin_top = 159.0 +margin_right = 81.0 +margin_bottom = 173.0 + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelWeapon"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelArmor" type="Label" parent="Title/VBoxContainer"] +margin_top = 177.0 +margin_right = 81.0 +margin_bottom = 191.0 + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelArmor"] +margin_right = 58.0 +margin_bottom = 24.0 + +[node name="LabelAQuote" type="Label" parent="Title/VBoxContainer"] +margin_top = 195.0 +margin_right = 81.0 +margin_bottom = 209.0 + +[node name="LineEdit" type="LineEdit" parent="Title/VBoxContainer/LabelAQuote"] +margin_right = 58.0 +margin_bottom = 24.0 [connection signal="pressed" from="Title/But_SaveChar" to="." method="_on_But_SaveChar_pressed"] [connection signal="file_selected" from="Title/FileDialog" to="." method="_on_FileDialog_file_selected"] diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Load.tscn b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Load.tscn index b73967e..1a73778 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Load.tscn +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/Character_Load.tscn @@ -1,7 +1,7 @@ [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/Character_Load.gd" type="Script" id=3] [node name="Control" type="Control"] @@ -48,7 +48,6 @@ margin_top = 71.0 margin_right = 181.0 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 @@ -56,7 +55,6 @@ 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 @@ -66,9 +64,6 @@ margin_bottom = 409.0 window_title = "Open a File" mode = 0 access = 1 -current_dir = "user://characterFiles" -current_file = "characterFiles" -current_path = "user://characterFiles/characterFiles" __meta__ = { "_edit_use_anchors_": false } diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/HistoryViewer.tscn b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/HistoryViewer.tscn index a5ff472..9e082de 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/HistoryViewer.tscn +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/HistoryViewer.tscn @@ -47,7 +47,6 @@ rect_min_size = Vector2( 0, 40 ) margin_right = 200.0 margin_bottom = 36.0 text = "More Options" -next_scene_path = "res://screens/MoreOptions.tscn" [node name="But_HistoryPager" type="Button" parent="Background/MarginContainer/Rows/ItemList"] anchor_left = 0.5 diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/ImportCharacter.tscn b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/ImportCharacter.tscn index 6ac7d9a..2de1c88 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/ImportCharacter.tscn +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/screens/ImportCharacter.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 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/ImportCharacter.gd" type="Script" id=3] [ext_resource path="res://userInterface/But_PlayButton.gd" type="Script" id=4] @@ -9,9 +9,6 @@ anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="PopupDialog" type="PopupDialog" parent="."] anchor_top = 0.5 @@ -37,8 +34,6 @@ margin_bottom = 480.0 window_title = "Open a File" mode = 0 access = 1 -current_dir = "user://characterFiles" -current_path = "user://characterFiles/" __meta__ = { "_edit_use_anchors_": false } @@ -65,7 +60,6 @@ margin_top = 78.0 margin_right = 152.0 margin_bottom = 115.0 text = "Back" -next_scene_path = "res://Screens/MenuScreen.tscn" [node name="VBoxContainer2" type="VBoxContainer" parent="."] anchor_left = 0.0634766 @@ -104,9 +98,6 @@ margin_top = -173.0 margin_right = 432.0 margin_bottom = 286.0 follow_focus = true -__meta__ = { -"_edit_use_anchors_": false -} [node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer"] __meta__ = { diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_ChangeScene.tscn b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_ChangeScene.tscn index 80849fc..66070d4 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_ChangeScene.tscn +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_ChangeScene.tscn @@ -1,13 +1,10 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://UserInterface/But_ChangeScene.gd" type="Script" id=1] +[gd_scene format=2] [node name="But_ChangeScene" type="Button"] margin_right = 130.0 margin_bottom = 24.0 size_flags_vertical = 3 text = "New Game" -script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } diff --git a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_Quit.tscn b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_Quit.tscn index e52c053..0bd11ac 100644 --- a/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_Quit.tscn +++ b/Phase2/Godot ===(Game Code)===/MergedDemo/Doug/bcirpg_mergedDemo_20220904A/userInterface/But_Quit.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://UserInterface/But_Quit.gd" type="Script" id=1] +[ext_resource path="res://userInterface/But_Quit.gd" type="Script" id=1] [node name="But_Quit" type="Button"] margin_top = 240.0