Merge branch 'master' of https://github.com/RPG-Research/bcirpg

Phase2/Databases/Sandbox_Test_Godot_Code/Doug/Database_Testing_2023_1001A/MenuScreen.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://userInterface/But_Quit.tscn" type="PackedScene" id=1]
-[ext_resource path="res://userInterface/But_ChangeScene.tscn" type="PackedScene" id=2]
+[ext_resource path="res://userInterface/But_Quit.gd" type="Script" id=3]
+[ext_resource path="res://userInterface/But_ChangeScene.gd" type="Script" id=4]
 
 [node name="MenuScreen" type="Control"]
 anchor_right = 1.0
@@ -25,16 +25,26 @@ margin_right = 65.0
 margin_bottom = -91.0
 rect_scale = Vector2( 1.04675, 1.07389 )
 
-[node name="But_ChangeScene" parent="VBoxContainer" instance=ExtResource( 2 )]
+[node name="But_ChangeScene" type="Button" parent="VBoxContainer"]
 margin_right = 184.0
 margin_bottom = 37.0
+size_flags_vertical = 3
 text = "Test Postgres"
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 next_scene_path = "res://screens/DBTest_Postgres.tscn"
 
-[node name="But_Quit" parent="VBoxContainer" instance=ExtResource( 1 )]
+[node name="But_Quit" type="Button" parent="VBoxContainer"]
 margin_top = 41.0
 margin_right = 184.0
 margin_bottom = 61.0
+text = "Quit"
+script = ExtResource( 3 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Version" type="Label" parent="."]
 anchor_left = 1.0
@@ -49,3 +59,6 @@ text = "Version: 0.0.0"
 __meta__ = {
 "_edit_use_anchors_": false
 }
+
+[connection signal="button_up" from="VBoxContainer/But_ChangeScene" to="VBoxContainer/But_ChangeScene" method="_on_But_NewGame_button_up"]
+[connection signal="button_up" from="VBoxContainer/But_Quit" to="VBoxContainer/But_Quit" method="_on_But_Quit_button_up"]

Phase2/Databases/Sandbox_Test_Godot_Code/Doug/Database_Testing_2023_1001A/export_presets.cfg

@@ -7,7 +7,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../../Godot_Outputs/Godot_35_Outputs/Web/BaseTest/index.html"
+export_path="../../Godot_Outputs/Godot_35_Outputs/Web/Database_Testing_2023_1029A/index.html"
 script_export_mode=1
 script_encryption_key=""
 

Phase2/Databases/Sandbox_Test_Godot_Code/Doug/Database_Testing_2023_1001A/project.godot

@@ -9,18 +9,12 @@
 config_version=4
 
 _global_script_classes=[ {
-"base": "PanelContainer",
-"class": "Locale",
-"language": "GDScript",
-"path": "res://userInterface/Locale.gd"
-}, {
 "base": "Object",
 "class": "PostgreSQLClient",
 "language": "GDScript",
 "path": "res://screens/PostgreSQLClient.gd"
 } ]
 _global_script_class_icons={
-"Locale": "",
 "PostgreSQLClient": ""
 }
 

Phase2/Databases/Sandbox_Test_Godot_Code/Doug/Database_Testing_2023_1001A/screens/DBTest_Postgres.gd

@@ -3,11 +3,11 @@ extends Node
 var database := PostgreSQLClient.new()
 
 #TODO: ADD RELEVANT VALUES BELOW FOR TESTING!
-const USER = ''#"postgres"
-const PASSWORD = ''
-const HOST = ''#"localhost"
+const USER = 'ernie'#"postgres"
+const PASSWORD = 'myPasswordGoesHere' #TODO: replace with correct password
+const HOST = 'localhost'#"localhost"
 const PORT = 5432 # Default postgres port
-const DATABASE = ''#"postgres"
+const DATABASE = 'main'#"postgres"
 
 
 
@@ -16,6 +16,7 @@ func _ready() -> void:
 
 func _init() -> void:
 	print("Init running")
+	print("USER: " + str(USER) + "; HOST: " + str(HOST) + "; PORT: " + str(PORT) + "; DATABASE: " + str(DATABASE))
 	var _error := database.connect("connection_established", self, "_executer")
 	_error = database.connect("authentication_error", self, "_authentication_error")
 	_error = database.connect("connection_closed", self, "_close")
@@ -46,7 +47,7 @@ func _executer() -> void:
 
 	var datas := database.execute("""
 		BEGIN;
-		SELECT * FROM characters;
+		SELECT * FROM test_characters;
 		COMMIT;
 	""")
 

Phase2/Databases/Sandbox_Test_Godot_Code/Doug/Database_Testing_2023_1001A/screens/DBTest_Postgres.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=1]
 [ext_resource path="res://screens/DBTest_Postgres.gd" type="Script" id=2]
+[ext_resource path="res://userInterface/But_ChangeScene.gd" type="Script" id=3]
 
 [node name="Control" type="Node2D"]
 script = ExtResource( 2 )
@@ -20,10 +20,15 @@ margin_top = 133.0
 margin_right = 653.0
 margin_bottom = 233.0
 
-[node name="But_MainMenu" parent="VBoxContainer" instance=ExtResource( 1 )]
+[node name="But_MainMenu" type="Button" parent="VBoxContainer"]
 margin_right = 238.0
 margin_bottom = 100.0
+size_flags_vertical = 3
 text = "Main Menu"
+script = ExtResource( 3 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 next_scene_path = "res://MenuScreen.tscn"
 
 [node name="Version" type="Label" parent="."]
@@ -36,3 +41,5 @@ margin_top = 554.0
 margin_right = 1018.0
 margin_bottom = 592.0
 text = "Version: 0.0.0"
+
+[connection signal="button_up" from="VBoxContainer/But_MainMenu" to="VBoxContainer/But_MainMenu" method="_on_But_NewGame_button_up"]

Phase2/Databases/Sandbox_Test_Godot_Code/Doug/Database_Testing_2023_1001A/userInterface/But_Quit.gd

@@ -4,10 +4,8 @@
 
 extends Button
 
-#var history_JSON = "user://history.json"
 
 
-#DKM TEMP: save history is only here temporarily -- needs to move upstream.
 func _on_But_Quit_button_up():
 	get_tree().quit()
 

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/.import/.gdignore

@@ -0,0 +1 @@
+

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/.import/Background_black.png-56039c85507f66e5b636dc3622fcd7f0.md5

@@ -0,0 +1,3 @@
+source_md5="79d2b9a5284e50d91a97c2dd565f2fa4"
+dest_md5="41051ec7a940540d8c9badbd43d2180f"
+

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/.import/Background_white.png-90278c2837a8c1d366dff638eb6d5498.md5

@@ -0,0 +1,3 @@
+source_md5="13a1e728def8fb06bd8e797fcc392604"
+dest_md5="254ea3ed3a62b36ab206f320d0c51637"
+

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/.import/background_demo.png-bf78baa5e40d24f1836aa08964398dec.md5

@@ -0,0 +1,3 @@
+source_md5="266f789a4e895911161321092c2c2429"
+dest_md5="505d2398da99764a2e0cc067ba291aa1"
+

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/.import/background_demo.png-e30ac367b3596013bad15f6d4bbea075.md5

@@ -0,0 +1,3 @@
+source_md5="266f789a4e895911161321092c2c2429"
+dest_md5="505d2398da99764a2e0cc067ba291aa1"
+

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5

@@ -0,0 +1,3 @@
+source_md5="47313fa4c47a9963fddd764e1ec6e4a8"
+dest_md5="26ea799ea0a3da9e753b3ebe822e0570"
+

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/MenuScreen.gd

@@ -0,0 +1,16 @@
+extends Control
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/MenuScreen.tscn

@@ -0,0 +1,51 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://userInterface/But_Quit.tscn" type="PackedScene" id=1]
+[ext_resource path="res://userInterface/But_ChangeScene.tscn" type="PackedScene" id=2]
+
+[node name="MenuScreen" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+
+[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 = 65.0
+margin_bottom = -91.0
+rect_scale = Vector2( 1.04675, 1.07389 )
+
+[node name="But_ChangeScene" parent="VBoxContainer" instance=ExtResource( 2 )]
+margin_right = 184.0
+margin_bottom = 37.0
+text = "Test Postgres"
+next_scene_path = "res://screens/DBTest_Postgres.tscn"
+
+[node name="But_Quit" parent="VBoxContainer" instance=ExtResource( 1 )]
+margin_top = 41.0
+margin_right = 184.0
+margin_bottom = 61.0
+
+[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
+}

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/Backgrounds/Background_black.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Background_black.png-56039c85507f66e5b636dc3622fcd7f0.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Backgrounds/Background_black.png"
+dest_files=[ "res://.import/Background_black.png-56039c85507f66e5b636dc3622fcd7f0.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/Backgrounds/Background_white.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Background_white.png-90278c2837a8c1d366dff638eb6d5498.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Backgrounds/Background_white.png"
+dest_files=[ "res://.import/Background_white.png-90278c2837a8c1d366dff638eb6d5498.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/Backgrounds/background_demo.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/background_demo.png-e30ac367b3596013bad15f6d4bbea075.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Backgrounds/background_demo.png"
+dest_files=[ "res://.import/background_demo.png-e30ac367b3596013bad15f6d4bbea075.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/base_dynamicFont_BIG.tres

@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/l_10646.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 42
+font_data = ExtResource( 1 )

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/base_dynamicfont.tres

@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/l_10646.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 24
+font_data = ExtResource( 1 )

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/base_dynamicfont_16.tres

@@ -0,0 +1,6 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/l_10646.ttf" type="DynamicFontData" id=1]
+
+[resource]
+font_data = ExtResource( 1 )

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/liberation_serif.tres

@@ -0,0 +1,6 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/Fonts_source/LiberationSerif-Regular.ttf" type="DynamicFontData" id=1]
+
+[resource]
+font_data = ExtResource( 1 )

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/liberation_serif_20pt.tres

@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/Fonts_source/LiberationSerif-Regular.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 20
+font_data = ExtResource( 1 )

Phase2/Databases/Sandbox_Test_Godot_Code/Luke/Database_Testing_2023_1029A/assets/liberation_serif_30pt.tres

@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/Fonts_source/LiberationSerif-Regular.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 30
+font_data = ExtResource( 1 )