From 733195593d3faefa1e860cbc813a11750c60cc92 Mon Sep 17 00:00:00 2001 From: PersonGuyGit Date: Sun, 2 Oct 2022 12:51:55 -0600 Subject: [PATCH] Added some changes to the CSV system for Add Character --- ...t.csv-6828cb1a69df1af9479e2aa693ac7602.md5 | 1 + ...e.csv-f248b3401a97fc55d69177d777df35f5.md5 | 3 ++ .../_userFiles/CharacterOutput.csv | 9 ++++ .../_userFiles/CharacterOutput.csv.import | 13 ++++++ .../_userFiles/characterFiles/Template.csv | 10 +++++ .../characterFiles/Template.csv.import | 16 +++++++ .../characterFiles/Template.en.translation | Bin 0 -> 681 bytes .../screens/Character_Add.gd | 42 +++++++++++++----- .../screens/Character_Add.tscn | 34 ++++++++------ 9 files changed, 103 insertions(+), 25 deletions(-) create mode 100644 Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/CharacterOutput.csv-6828cb1a69df1af9479e2aa693ac7602.md5 create mode 100644 Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/Template.csv-f248b3401a97fc55d69177d777df35f5.md5 create mode 100644 Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv create mode 100644 Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv.import create mode 100644 Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv create mode 100644 Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv.import create mode 100644 Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.en.translation diff --git a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/CharacterOutput.csv-6828cb1a69df1af9479e2aa693ac7602.md5 b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/CharacterOutput.csv-6828cb1a69df1af9479e2aa693ac7602.md5 new file mode 100644 index 0000000..343f0af --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/CharacterOutput.csv-6828cb1a69df1af9479e2aa693ac7602.md5 @@ -0,0 +1 @@ +source_md5="0300125e58b492e346b177ce259fd215" diff --git a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/Template.csv-f248b3401a97fc55d69177d777df35f5.md5 b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/Template.csv-f248b3401a97fc55d69177d777df35f5.md5 new file mode 100644 index 0000000..8cd8255 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/.import/Template.csv-f248b3401a97fc55d69177d777df35f5.md5 @@ -0,0 +1,3 @@ +source_md5="3b37741efaad37471d3be79926341120" +dest_md5="6703f1e11659db139e8690f3df1a5a0d" + diff --git a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv new file mode 100644 index 0000000..f7eb8e9 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv @@ -0,0 +1,9 @@ +Name, +Profession, +Strength, +Intellegence, +Willpower, +Charm, +Weapon, +Armor, +Quote, diff --git a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv.import b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv.import new file mode 100644 index 0000000..df8cf87 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/CharacterOutput.csv.import @@ -0,0 +1,13 @@ +[remap] + +importer="csv_translation" +type="Translation" +valid=false + +[deps] + +source_file="res://_userFiles/CharacterOutput.csv" +[params] + +compress=true +delimiter=0 diff --git a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv new file mode 100644 index 0000000..80bc4f9 --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv @@ -0,0 +1,10 @@ +keys,en +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)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv.import b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv.import new file mode 100644 index 0000000..7aaf8fb --- /dev/null +++ b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.csv.import @@ -0,0 +1,16 @@ +[remap] + +importer="csv_translation" +type="Translation" + +[deps] + +files=[ "res://_userFiles/characterFiles/Template.en.translation" ] + +source_file="res://_userFiles/characterFiles/Template.csv" +dest_files=[ "res://_userFiles/characterFiles/Template.en.translation" ] + +[params] + +compress=true +delimiter=0 diff --git a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.en.translation b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/_userFiles/characterFiles/Template.en.translation new file mode 100644 index 0000000000000000000000000000000000000000..3abaa887fcaab9c3b0b26324e08557a884bcc0b5 GIT binary patch literal 681 zcmbu7IZFgV5QWS2T6Mh;FGO5XK@2=XMG(C4LRRs>VC@|mcbwT7ogS~$L^DB93k=WeeYQ z9i;weQIyvKPbzoIGi1_s4PhsJH>nKiNGkii=7@}>B4jdBDX}IM6(Y!1NGgGw#@8i% zk+LO~B1~-=mh^)JcT&D*I%_{=%J9q$A4#GdPzuaiP>fTsKWFC4$OCb}ZP*IH zS6~%^UjvN?en+6;9==pw>jvD5Y43cwtA+BJOayTL;r-@x1j>^$qtEwOtQy@Q8S3SmT&3!BKEi##5{Jm?>73`fROkMrsm-6Wc61Z_St;h-tR>| z7QnMNfixKO#EvaJ(#tDlOWHD*?XSo{GtH+>!?O3{V=f*|PwnPR>WMdPMOq3;52gBx sHBC$5@5M(= void: theme=load(settings.themeFile) - $Title/But_SaveChar.grab_focus() - -func _on_But_SaveChar_pressed() -> void: - $Title/FileDialog.popup() - + #DKM TEMP: just text for now from text edit func _on_FileDialog_file_selected(path: String) -> void: var pc = get_node("/root/PlayerCharacter") diff --git a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/screens/Character_Add.tscn b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/screens/Character_Add.tscn index ccd1d91..786edc2 100644 --- a/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/screens/Character_Add.tscn +++ b/Phase2/Godot ===(Game Code)===/MergedMaster/bcirpg_mergedMaster_20220918ALuke/screens/Character_Add.tscn @@ -63,12 +63,12 @@ margin_bottom = 388.0 custom_constants/separation = 40 [node name="VBoxContainer" type="VBoxContainer" parent="HBoxContainer"] -margin_right = 81.0 +margin_right = 105.0 margin_bottom = 358.0 custom_constants/separation = 20 [node name="LabelName" type="Label" parent="HBoxContainer/VBoxContainer"] -margin_right = 81.0 +margin_right = 105.0 margin_bottom = 31.0 text = "NAME " @@ -79,8 +79,8 @@ margin_right = 58.0 margin_bottom = 24.0 [node name="LabelProfession" type="Label" parent="HBoxContainer/VBoxContainer"] -margin_top = 60.0 -margin_right = 81.0 +margin_top = 51.0 +margin_right = 105.0 margin_bottom = 82.0 text = "PROFESSION " @@ -91,8 +91,8 @@ margin_right = 58.0 margin_bottom = 24.0 [node name="LabelStrength" type="Label" parent="HBoxContainer/VBoxContainer"] -margin_top = 120.0 -margin_right = 81.0 +margin_top = 102.0 +margin_right = 105.0 margin_bottom = 133.0 text = "STRENGTH " @@ -103,8 +103,8 @@ margin_right = 58.0 margin_bottom = 24.0 [node name="LabelIntellect" type="Label" parent="HBoxContainer/VBoxContainer"] -margin_top = 180.0 -margin_right = 81.0 +margin_top = 153.0 +margin_right = 105.0 margin_bottom = 184.0 text = "INTELLECT " @@ -114,9 +114,15 @@ margin_top = 25.0 margin_right = 58.0 margin_bottom = 24.0 +[node name="SaveButton" type="Button" parent="HBoxContainer/VBoxContainer"] +margin_top = 204.0 +margin_right = 105.0 +margin_bottom = 224.0 +text = "Save Character" + [node name="VBoxContainer2" type="VBoxContainer" parent="HBoxContainer"] -margin_left = 121.0 -margin_right = 200.0 +margin_left = 145.0 +margin_right = 224.0 margin_bottom = 358.0 custom_constants/separation = 30 @@ -132,7 +138,7 @@ margin_right = 58.0 margin_bottom = 24.0 [node name="LabelCharm" type="Label" parent="HBoxContainer/VBoxContainer2"] -margin_top = 60.0 +margin_top = 61.0 margin_right = 79.0 margin_bottom = 75.0 text = "CHARM" @@ -143,7 +149,7 @@ margin_right = 58.0 margin_bottom = 24.0 [node name="LabelWeapon" type="Label" parent="HBoxContainer/VBoxContainer2"] -margin_top = 120.0 +margin_top = 105.0 margin_right = 79.0 margin_bottom = 136.0 text = "WEAPON @@ -155,7 +161,7 @@ margin_right = 58.0 margin_bottom = 24.0 [node name="LabelArmor" type="Label" parent="HBoxContainer/VBoxContainer2"] -margin_top = 180.0 +margin_top = 166.0 margin_right = 79.0 margin_bottom = 180.0 text = "ARMOR" @@ -166,7 +172,7 @@ margin_right = 58.0 margin_bottom = 24.0 [node name="LabelQuote" type="Label" parent="HBoxContainer/VBoxContainer2"] -margin_top = 240.0 +margin_top = 210.0 margin_right = 79.0 margin_bottom = 224.0 text = "QUOTE"