From a055f6359da2473c087dfdbc7c9512b8fba407f1 Mon Sep 17 00:00:00 2001 From: PersonGuyGit Date: Sun, 7 May 2023 12:26:43 -0600 Subject: [PATCH] Tested the database queries for the SQL needed for the Dialog and Tag system. The next part that will need to be worked on is the actual dialog editor. --- .../.godot/editor/editor_layout.cfg | 2 +- .../.godot/editor/filesystem_cache8 | 14 ++++++++------ .../.godot/editor/filesystem_update4 | 3 ++- .../.godot/editor/project_metadata.cfg | 2 +- .../.godot/editor/script_editor_cache.cfg | 6 +++--- .../.godot/uid_cache.bin | Bin 440 -> 440 bytes .../Dialog/dialog_system.gd | 2 ++ .../databases/dialog_system.db | Bin 53248 -> 53248 bytes .../screens/MainMenu.tscn | 2 ++ 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/editor_layout.cfg b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/editor_layout.cfg index d369e88..51cef18 100644 --- a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/editor_layout.cfg +++ b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/editor_layout.cfg @@ -20,7 +20,7 @@ open_scenes=["res://screens/MainMenu.tscn", "res://GenresSubstitution/TestDB.tsc [ScriptEditor] -open_scripts=["res://GenresSubstitution/genre_sub.gd", "res://Dialog/dialog_system.gd"] +open_scripts=["res://Dialog/dialog_system.gd", "res://GenresSubstitution/genre_sub.gd"] open_help=[] script_split_offset=150 list_split_offset=0 diff --git a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_cache8 b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_cache8 index 49187ff..5d6f0d9 100644 --- a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_cache8 +++ b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ 2a60927148abd1d33b818b535e306557 -::res://::1682875387 +::res://::1683479383 default_env.tres::Environment::-1::1680461469::0::1::::<><>:: icon.png::CompressedTexture2D::1663579034843721578::1659896126::1681665020::1::::<><>:: README.txt::TextFile::-1::1679251181::0::1::::<><>:: @@ -37,12 +37,14 @@ LiberationSerif-BoldItalic.ttf::FontFile::6973589459942031632::1679252065::16816 LiberationSerif-Italic.ttf::FontFile::3429051925918376143::1679252065::1681665020::1::::<><>:: LiberationSerif-Regular.ttf::FontFile::3437532725077625275::1679252065::1681665020::1::::<><>:: ::res://CharacterCreator/::1659895857 -::res://databases/::1682874550 -::res://Dialog/::1659895847 -::res://GenresSubstitution/::1682274676 -genre_sub.gd::GDScript::-1::1682274676::0::1::::<>Node<>:: +::res://databases/::1682876154 +::res://Dialog/::1682880937 +dialog_system.gd::GDScript::-1::1682880527::0::1::::<>Node<>:: +TestDialog.tscn::PackedScene::4730621496714883874::1682880937::0::1::::<><>::res://Dialog/dialog_system.gd +::res://GenresSubstitution/::1682880384 +genre_sub.gd::GDScript::-1::1682880384::0::1::::<>Node<>:: TestDB.tscn::PackedScene::3353206590719512815::1682274676::0::1::::<><>::res://GenresSubstitution/genre_sub.gd -::res://globalScripts/::1679252065 +::res://GenresSubstitution/globalScripts/::1679252065 DiceRoller.gd::GDScript::-1::1679252065::0::1::::<>Control<>:: ::res://Grammar/::1659895937 ::res://RiskFactors/::1659895947 diff --git a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_update4 b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_update4 index 162aee3..082c287 100644 --- a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_update4 +++ b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/filesystem_update4 @@ -1,3 +1,4 @@ res://Dialog/TestDialog.tscn res://Dialog/dialog_system.gd -res://GenresSubstitution/genre_sub.gd +res://screens/MainMenu.tscn +res://GenresSubstitution/TestDB.tscn diff --git a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/project_metadata.cfg b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/project_metadata.cfg index fa3d84f..ae8ffb0 100644 --- a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/project_metadata.cfg +++ b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/project_metadata.cfg @@ -9,7 +9,7 @@ run_reload_scripts=true [recent_files] -scenes=["res://GenresSubstitution/TestDB.tscn", "res://screens/MainMenu.tscn"] +scenes=["res://Dialog/TestDialog.tscn", "res://GenresSubstitution/TestDB.tscn", "res://screens/MainMenu.tscn"] scripts=["res://Dialog/dialog_system.gd", "res://GenresSubstitution/genre_sub.gd"] [script_setup] diff --git a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/script_editor_cache.cfg b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/script_editor_cache.cfg index 5ce2525..b63d928 100644 --- a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/script_editor_cache.cfg +++ b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/editor/script_editor_cache.cfg @@ -17,11 +17,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 13, +"column": 45, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 95, -"scroll_position": 72.0, +"row": 101, +"scroll_position": 79.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/uid_cache.bin b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/.godot/uid_cache.bin index 35fb5b979cf5c1acec0abcadaf0f37170bf610b6..35a8c605ac27e2c5e9a956b69c2efb68007d7512 100644 GIT binary patch delta 15 WcmdnNyn}gzJmcgEj2e^W84Cd^z67@b delta 15 WcmdnNyn}gzJmX|{#=^<+j2Zwa;{S41dTf( zyn*or)X_I^HG$1l76z}y!2wNh{__3K_dDG_>-O1Ap2F?AwFsnGr}xglOpOVQ;q8HD zUg2(dva-6Qu`Dgyms*+-LSe{Y2rnvr0yDpB`J#=y(gWWqqv4ygjql}b}f=~(` z3SNt1Zu5g!3KcCUkO_ead??5}WK){Pn66KQ5rYwoRPYRY`PpzS$4dH~@HF()bccWg zJq165&JJB5kzPT+F0SxvW$0qEky}CrC=2{rM83mg5ploK#BT%BFqJ?JY1y@dW|CeA znUq_Rth;s_3mgMa#5@v_Oo)c2DqH9JA^N^B_;JklQEvoZ6Z2mNu3ariil2IHyWAVa;AOMv3#m~k?m_5mXg$b{6MuE-j2Y&Jc0LbnhDF6Tf diff --git a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/screens/MainMenu.tscn b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/screens/MainMenu.tscn index cf45af3..4323284 100644 --- a/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/screens/MainMenu.tscn +++ b/Phase2/Godot_Toolset/CodeSandboxes/ToolsetProjectTemplate/screens/MainMenu.tscn @@ -5,3 +5,5 @@ layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2