From f8f3c9842fc788619710b661fcd8e1c4e69bf392 Mon Sep 17 00:00:00 2001 From: Zenny Date: Mon, 9 Sep 2024 18:19:32 -0700 Subject: [PATCH] Adjust dialog UI --- ...state-f719b4e70a48c88aaa7ad66a1154c89c.cfg | 2 +- ...state-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg | 6 +- ...lding-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg | 2 +- ...state-cea8947aa3ddd887a1001a5d9a6e95ab.cfg | 2 +- ...state-af264238fd56c207f706f08f8043dda4.cfg | 2 +- ...state-07a7b8096b4c6c1e353874b6ad8a45f0.cfg | 16 +-- ...state-1fe737b5c8d5ce359bff412077728201.cfg | 2 +- ...state-b3392c9bd897cca2494fce089072723c.cfg | 2 +- ...state-d3487f0dc5fa32ba2dfabb0ed4617475.cfg | 12 +-- .godot/editor/create_recent.Node | 1 + .godot/editor/editor_layout.cfg | 10 +- .godot/editor/filesystem_cache8 | 59 ++++++----- .godot/editor/filesystem_update4 | 45 +------- .godot/editor/project_metadata.cfg | 2 +- ...logue-44b9fe9da69f8da8a6bfdeb5429ef4a3.md5 | 4 +- ...ogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.tres | 96 +++++++++++++----- .godot/mono/metadata/ide_messaging_meta.txt | 2 +- .godot/uid_cache.bin | Bin 34349 -> 34135 bytes project.godot | 2 +- src/map/water.gdshader | 4 +- src/npc/rat/ratdialogue.dialogue | 10 +- src/ui/dialogue/DialogueBalloon.tscn | 20 ++-- 22 files changed, 156 insertions(+), 145 deletions(-) diff --git a/.godot/editor/CollisionDetector.tscn-editstate-f719b4e70a48c88aaa7ad66a1154c89c.cfg b/.godot/editor/CollisionDetector.tscn-editstate-f719b4e70a48c88aaa7ad66a1154c89c.cfg index 9ef6c079..dc689165 100644 --- a/.godot/editor/CollisionDetector.tscn-editstate-f719b4e70a48c88aaa7ad66a1154c89c.cfg +++ b/.godot/editor/CollisionDetector.tscn-editstate-f719b4e70a48c88aaa7ad66a1154c89c.cfg @@ -179,4 +179,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/DialogueBalloon.tscn-editstate-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg b/.godot/editor/DialogueBalloon.tscn-editstate-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg index d5898b77..d1123672 100644 --- a/.godot/editor/DialogueBalloon.tscn-editstate-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg +++ b/.godot/editor/DialogueBalloon.tscn-editstate-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-1442.46, -124.72), +"ofs": Vector2(-921.327, 140.791), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -34,7 +34,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 0.594604 +"zoom": 0.629961 } 3D={ "fov": 70.01, @@ -179,4 +179,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/DialogueBalloon.tscn-folding-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg b/.godot/editor/DialogueBalloon.tscn-folding-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg index 8bd4e73e..035292ab 100644 --- a/.godot/editor/DialogueBalloon.tscn-folding-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg +++ b/.godot/editor/DialogueBalloon.tscn-folding-3e4e0ed8798eea3e4d50fcdcc4ae0660.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Layer", "Follow Viewport", "Transform"), NodePath("Balloon"), PackedStringArray("Layout", "Theme", "theme"), NodePath("Balloon/Dialogue"), PackedStringArray("Layout", "Layout/Transform", "Theme Overrides/constants", "Texture", "Ordering", "Material", "Process/Thread Group", "Physics Interpolation"), NodePath("Balloon/Dialogue/VBoxContainer"), PackedStringArray("Layout"), NodePath("Balloon/Dialogue/VBoxContainer/CharacterLabel"), PackedStringArray("Visibility", "Layout", "Theme Overrides/styles", "Markup", "Text Selection", "Displayed Text", "BiDi", "Layout/Container Sizing", "Theme", "Theme Overrides", "theme", "Ordering", "Texture", "Material", "Threading", "Theme Overrides/font_sizes", "Theme Overrides/fonts", "theme_override_fonts/normal_font", "Theme Overrides/colors"), NodePath("Balloon/Dialogue/VBoxContainer/DialogueLabel"), PackedStringArray("Layout", "Theme Overrides", "Theme Overrides/fonts", "Theme Overrides/font_sizes", "Theme Overrides/styles", "Markup", "Threading", "Layout/Container Sizing", "Visibility"), NodePath("Balloon/CenterContainer"), PackedStringArray("Layout"), NodePath("Balloon/CenterContainer/Responses"), PackedStringArray("Layout"), NodePath("Balloon/CenterContainer/Responses/ResponsesMenu"), PackedStringArray("Layout", "Theme Overrides", "Theme Overrides/constants"), NodePath("Balloon/CenterContainer/Responses/ResponsesMenu/ResponseExample"), PackedStringArray("Layout")] +node_unfolds=[NodePath("."), PackedStringArray("Layer", "Follow Viewport", "Transform"), NodePath("Balloon"), PackedStringArray("Layout", "Theme", "theme"), NodePath("Balloon/CenterContainer2"), PackedStringArray("Layout"), NodePath("Balloon/CenterContainer2/Dialogue"), PackedStringArray("Layout", "Layout/Transform", "Theme Overrides/constants", "Texture", "Ordering", "Material", "Process/Thread Group", "Physics Interpolation"), NodePath("Balloon/CenterContainer2/Dialogue/VBoxContainer"), PackedStringArray("Layout"), NodePath("Balloon/CenterContainer2/Dialogue/VBoxContainer/CharacterLabel"), PackedStringArray("Visibility", "Layout", "Theme Overrides/styles", "Markup", "Text Selection", "Displayed Text", "BiDi", "Layout/Container Sizing", "Theme", "Theme Overrides", "theme", "Ordering", "Texture", "Material", "Threading", "Theme Overrides/font_sizes", "Theme Overrides/fonts", "theme_override_fonts/normal_font", "Theme Overrides/colors"), NodePath("Balloon/CenterContainer2/Dialogue/VBoxContainer/DialogueLabel"), PackedStringArray("Layout", "Theme Overrides", "Theme Overrides/fonts", "Theme Overrides/font_sizes", "Theme Overrides/styles", "Markup", "Threading", "Layout/Container Sizing", "Visibility"), NodePath("Balloon/CenterContainer"), PackedStringArray("Layout"), NodePath("Balloon/CenterContainer/Responses"), PackedStringArray("Layout"), NodePath("Balloon/CenterContainer/Responses/ResponsesMenu"), PackedStringArray("Layout", "Theme Overrides", "Theme Overrides/constants"), NodePath("Balloon/CenterContainer/Responses/ResponsesMenu/ResponseExample"), PackedStringArray("Layout")] resource_unfolds=["res://src/ui/dialogue/DialogueBalloon.tscn::Theme_qq3yp", PackedStringArray("Resource", "Panel", "Button", "MarginContainer/constants", "MarginContainer", "Button/styles"), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_8reha", PackedStringArray(), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_cb5sp", PackedStringArray(), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_0trte", PackedStringArray(), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_yxgtq", PackedStringArray(), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_vtj1a", PackedStringArray(), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_c2c5i", PackedStringArray(), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_wv0ko", PackedStringArray(), "res://src/ui/dialogue/DialogueBalloon.tscn::StyleBoxEmpty_dboi3", PackedStringArray()] nodes_folded=[] diff --git a/.godot/editor/FloatingEnemy.tscn-editstate-cea8947aa3ddd887a1001a5d9a6e95ab.cfg b/.godot/editor/FloatingEnemy.tscn-editstate-cea8947aa3ddd887a1001a5d9a6e95ab.cfg index 00b4d806..94cecff6 100644 --- a/.godot/editor/FloatingEnemy.tscn-editstate-cea8947aa3ddd887a1001a5d9a6e95ab.cfg +++ b/.godot/editor/FloatingEnemy.tscn-editstate-cea8947aa3ddd887a1001a5d9a6e95ab.cfg @@ -179,4 +179,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/Main.tscn-editstate-af264238fd56c207f706f08f8043dda4.cfg b/.godot/editor/Main.tscn-editstate-af264238fd56c207f706f08f8043dda4.cfg index 4430daa1..87854386 100644 --- a/.godot/editor/Main.tscn-editstate-af264238fd56c207f706f08f8043dda4.cfg +++ b/.godot/editor/Main.tscn-editstate-af264238fd56c207f706f08f8043dda4.cfg @@ -179,4 +179,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/NPC.tscn-editstate-07a7b8096b4c6c1e353874b6ad8a45f0.cfg b/.godot/editor/NPC.tscn-editstate-07a7b8096b4c6c1e353874b6ad8a45f0.cfg index d22fdea3..0def2f98 100644 --- a/.godot/editor/NPC.tscn-editstate-07a7b8096b4c6c1e353874b6ad8a45f0.cfg +++ b/.godot/editor/NPC.tscn-editstate-07a7b8096b4c6c1e353874b6ad8a45f0.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-26.9633, -2.10108), +"ofs": Vector2(-578.545, 228.121), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -34,7 +34,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 5.03968 +"zoom": 0.793701 } 3D={ "fov": 70.01, @@ -94,13 +94,13 @@ Anim={ "show_origin": true, "snap_enabled": false, "translate_snap": 1.0, -"viewport_mode": 1, +"viewport_mode": 5, "viewports": [{ "auto_orthogonal": false, "auto_orthogonal_enabled": true, "cinematic_preview": false, "display_mode": 21, -"distance": 7.39423, +"distance": 4.0, "doppler": false, "frame_time": false, "gizmos": true, @@ -110,11 +110,11 @@ Anim={ "listener": true, "lock_rotation": false, "orthogonal": false, -"position": Vector3(-0.266643, -0.897296, -2.14589), +"position": Vector3(0, 0, 0), "use_environment": false, "view_type": 0, -"x_rotation": 1.18166, -"y_rotation": -3.13287 +"x_rotation": 0.5, +"y_rotation": -0.5 }, { "auto_orthogonal": false, "auto_orthogonal_enabled": true, @@ -179,4 +179,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/Overworld.tscn-editstate-1fe737b5c8d5ce359bff412077728201.cfg b/.godot/editor/Overworld.tscn-editstate-1fe737b5c8d5ce359bff412077728201.cfg index 1110f643..c30775b3 100644 --- a/.godot/editor/Overworld.tscn-editstate-1fe737b5c8d5ce359bff412077728201.cfg +++ b/.godot/editor/Overworld.tscn-editstate-1fe737b5c8d5ce359bff412077728201.cfg @@ -179,4 +179,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/Player.tscn-editstate-b3392c9bd897cca2494fce089072723c.cfg b/.godot/editor/Player.tscn-editstate-b3392c9bd897cca2494fce089072723c.cfg index 96f5ac7c..ee573f80 100644 --- a/.godot/editor/Player.tscn-editstate-b3392c9bd897cca2494fce089072723c.cfg +++ b/.godot/editor/Player.tscn-editstate-b3392c9bd897cca2494fce089072723c.cfg @@ -180,4 +180,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/ThrowableItem.tscn-editstate-d3487f0dc5fa32ba2dfabb0ed4617475.cfg b/.godot/editor/ThrowableItem.tscn-editstate-d3487f0dc5fa32ba2dfabb0ed4617475.cfg index 71a0bd68..c9267a6d 100644 --- a/.godot/editor/ThrowableItem.tscn-editstate-d3487f0dc5fa32ba2dfabb0ed4617475.cfg +++ b/.godot/editor/ThrowableItem.tscn-editstate-d3487f0dc5fa32ba2dfabb0ed4617475.cfg @@ -1,15 +1,7 @@ [editor_states] Anim={ -"animation": "RESET", -"player": NodePath("AnimationPlayer"), -"track_editor_state": { -"fps_mode": false, -"offset": 0.0, -"v_scroll": 0.0, -"zoom": 1.0 -}, -"visible": true +"visible": false } 2D={ "grid_offset": Vector2(0, 0), @@ -187,4 +179,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/NPC/Collision")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@16932/@Panel@13/@VBoxContainer@14/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@25/DockVSplitCenter/@VSplitContainer@52/@VBoxContainer@53/@PanelContainer@98/MainScreen/@CanvasItemEditor@9272/@VSplitContainer@9094/@HSplitContainer@9096/@HSplitContainer@9098/@Control@9099/@SubViewportContainer@9100/@SubViewport@9101/DialogueBalloon/Balloon/CenterContainer2/Dialogue")]) diff --git a/.godot/editor/create_recent.Node b/.godot/editor/create_recent.Node index 917f3317..2460d943 100644 --- a/.godot/editor/create_recent.Node +++ b/.godot/editor/create_recent.Node @@ -1,3 +1,4 @@ +CenterContainer CollisionShape3D Area3D RigidBody3D diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 85f82ff4..7bcc4839 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -10,15 +10,15 @@ dock_split_2=0 dock_split_3=0 dock_hsplit_1=0 dock_hsplit_2=497 -dock_hsplit_3=-432 +dock_hsplit_3=-467 dock_hsplit_4=0 dock_filesystem_h_split_offset=240 dock_filesystem_v_split_offset=0 dock_filesystem_display_mode=0 dock_filesystem_file_sort=0 dock_filesystem_file_list_display_mode=1 -dock_filesystem_selected_paths=PackedStringArray("res://src/items/throwable/resources/GeomanticDice.tres") -dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://src/", "res://src/items/", "res://src/items/throwable/", "res://src/items/throwable/textures/", "res://src/items/throwable/resources/") +dock_filesystem_selected_paths=PackedStringArray("res://src/npc/rat/ratdialogue.dialogue") +dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://src/", "res://src/npc/", "res://src/npc/rat/") dock_3="Scene,Import" dock_4="FileSystem" dock_5="Inspector,Node,History" @@ -26,10 +26,10 @@ dock_5="Inspector,Node,History" [EditorNode] open_scenes=PackedStringArray("res://src/Main.tscn", "res://src/npc/rat/NPC.tscn", "res://src/ui/dialogue/DialogueBalloon.tscn", "res://src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn", "res://src/player/Player.tscn", "res://src/map/Overworld.tscn", "res://src/enemy/CollisionDetector.tscn", "res://src/items/throwable/ThrowableItem.tscn") -current_scene="res://src/npc/rat/NPC.tscn" +current_scene="res://src/ui/dialogue/DialogueBalloon.tscn" center_split_offset=-286 selected_default_debugger_tab_idx=1 -selected_main_editor_idx=1 +selected_main_editor_idx=0 selected_bottom_panel_item=0 [ScriptEditor] diff --git a/.godot/editor/filesystem_cache8 b/.godot/editor/filesystem_cache8 index 5f2131f5..9328b284 100644 --- a/.godot/editor/filesystem_cache8 +++ b/.godot/editor/filesystem_cache8 @@ -1,13 +1,13 @@ 98a70190bc03ec62debef81a9418c486 -::res://::1725925834 +::res://::1725930477 export_presets.cfg::TextFile::-1::1725570767::0::1::::<><>:: global.json::JSON::-1::1724391347::0::1::::<><>:: icon.svg::CompressedTexture2D::6018698795123526118::1725786528::1725786538::1::::<><>:: README.md::TextFile::-1::1725786528::0::1::::<><>:: ::res://addons/::1725786528 -::res://addons/dialogue_manager/::1725926294 +::res://addons/dialogue_manager/::1725926352 constants.gd::GDScript::-1::1725786528::0::1::::<>Node<>:: -DialogueManager.cs::CSharpScript::-1::1725859763::0::1::::<>Node<>:: +DialogueManager.cs::CSharpScript::-1::1725926352::0::1::::<>Node<>:: dialogue_label.gd::GDScript::-1::1725786528::0::1::::DialogueLabel<>RichTextLabel<>res://addons/dialogue_manager/assets/icon.svg:: dialogue_label.tscn::PackedScene::5518490004210093266::1725850982::0::1::::<><>::res://addons/dialogue_manager/dialogue_label.gd dialogue_line.gd::GDScript::-1::1725786528::0::1::::DialogueLine<>RefCounted<>:: @@ -163,9 +163,9 @@ GameJamDungeon.deps.json::JSON::-1::1725571660::0::1::::<><>:: GameJamDungeon.runtimeconfig.json::JSON::-1::1725571660::0::1::::<><>:: ::res://Properties/::1724392650 launchSettings.json::JSON::-1::1724392702::0::1::::<><>:: -::res://src/::1725925844 +::res://src/::1725930410 Main.cs::CSharpScript::-1::1724376868::0::1::::<>Node<>:: -Main.tscn::PackedScene::8997105139593106383::1725925844::0::1::::<><>::res://src/Main.cs +Main.tscn::PackedScene::8997105139593106383::1725930410::0::1::::<><>::res://src/Main.cs ::res://src/app/::1725858757 App.cs::CSharpScript::-1::1725858757::0::1::::<>CanvasLayer<>:: App.tscn::PackedScene::4785536392792368440::1725786528::0::1::::<><>::res://src/app/App.cs<>uid://rfvnddfqufho::::res://src/menu/Menu.tscn @@ -187,8 +187,8 @@ Dialog.tscn::PackedScene::-1::1725786528::0::1::::<><>:: Dialogue.dialogue::Resource::772972722338988849::1725786528::1725786655::1::::<><>::res://addons/dialogue_manager/dialogue_resource.gd DialogueTest.tscn::PackedScene::4731505655903278712::1725918904::0::1::::<><>:: ::res://src/dialog/npcs/::1725764198 -::res://src/enemy/::1725925845 -CollisionDetector.tscn::PackedScene::3643829753880892212::1725925845::0::1::::<><>:: +::res://src/enemy/::1725930411 +CollisionDetector.tscn::PackedScene::3643829753880892212::1725930411::0::1::::<><>:: Enemy.cs::CSharpScript::-1::1725822169::0::1::::<>CharacterBody3D<>:: EnemyDatabase.cs::CSharpScript::-1::1724907154::0::1::::<>Node<>:: EnemyDatabase.tscn::PackedScene::7273894191719961846::1725839828::0::1::::<><>::res://src/enemy/EnemyDatabase.cs<>uid://dcgj5i52i76gj::::res://src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn @@ -200,10 +200,10 @@ Die.res::Animation::6291953351746771434::1725219666::0::1::::<><>::uid://wrsnwuv EnemyAnimations.res::AnimationLibrary::5933507089708597219::1724910248::0::1::::<><>::res://src/enemy/animations/Hit.res<>res://src/enemy/animations/Die.res Hit.res::Animation::1371739178074632675::1725219666::0::1::::<><>:: ::res://src/enemy/enemy_types/::1725690771 -::res://src/enemy/enemy_types/floating_enemy/::1725925845 +::res://src/enemy/enemy_types/floating_enemy/::1725930410 DISSAPPEARING ENEMY.gltf::PackedScene::5562975418707125188::1724080642::1725432608::1::::<><>:: FloatingEnemy.tres::Resource/EnemyStatInfo::6597025565794689366::1725683223::0::1::::<><>::res://src/enemy/EnemyStatInfo.cs -FloatingEnemy.tscn::PackedScene::7312626499401446193::1725925845::0::1::::<><>::res://src/enemy/Enemy.cs<>uid://c08wbuumw6dk5::::res://src/enemy/enemy_types/floating_enemy/FloatingEnemy.tres<>res://src/hitbox/Hitbox.cs +FloatingEnemy.tscn::PackedScene::7312626499401446193::1725930410::0::1::::<><>::res://src/enemy/Enemy.cs<>uid://c08wbuumw6dk5::::res://src/enemy/enemy_types/floating_enemy/FloatingEnemy.tres<>res://src/hitbox/Hitbox.cs Overworld.gltf::PackedScene::6440603563322738446::1725828877::1725828878::0::::<><>:: ::res://src/enemy/state/::1725513409 EnemyLogic.cs::CSharpScript::-1::1724908556::0::1::::<><>:: @@ -216,8 +216,8 @@ EnemyLogic.State.Alive.cs::CSharpScript::-1::1725761372::0::1::::<><>:: EnemyLogic.State.Attack.cs::CSharpScript::-1::1725514958::0::1::::<><>:: EnemyLogic.State.FollowPlayer.cs::CSharpScript::-1::1725761377::0::1::::<><>:: EnemyLogic.State.Idle.cs::CSharpScript::-1::1725499050::0::1::::<><>:: -::res://src/game/::1725925977 -DialogueController.cs::CSharpScript::-1::1725925977::0::1::::<>Node<>:: +::res://src/game/::1725927404 +DialogueController.cs::CSharpScript::-1::1725927404::0::1::::<>Node<>:: Game.cs::CSharpScript::-1::1725925118::0::1::::<>Node3D<>:: Game.tscn::PackedScene::2023352603925588533::1725918904::0::1::::<><>::res://src/game/Game.cs<>uid://cfecvvav8kkp6::::res://src/player/Player.tscn<>uid://dlj8qdg1c5048::::res://src/inventory_menu/InventoryMenu.tscn<>uid://dvnc26rebk6o0::::res://src/map/Overworld.tscn<>uid://bc1sp6xwe0j65::::res://src/map/dungeon/floors/Floor1.tscn<>uid://bwbofurcvf3yh::::res://src/minimap/Minimap.tscn<>res://src/map/dungeon/floors/Floor2.tscn<>res://src/map/dungeon/floors/Floor3.tscn<>uid://bjqgl5u05ia04::::res://src/map/Teleport.tscn<>res://src/game/DialogueController.cs GameData.cs::CSharpScript::-1::1724392809::0::1::::<><>:: @@ -236,12 +236,12 @@ Paused.cs::CSharpScript::-1::1724392809::0::1::::<><>:: Playing.cs::CSharpScript::-1::1725786528::0::1::::<><>:: ::res://src/hitbox/::1725515235 Hitbox.cs::CSharpScript::-1::1725515235::0::1::::<>Area3D<>:: -::res://src/inventory_menu/::1725925845 +::res://src/inventory_menu/::1725930468 cursor.png::CompressedTexture2D::8421342261926102109::1724175591::1725233827::1::::<><>:: EquippedInventoryLabelSettings.tres::LabelSettings::733058032154573348::1725692718::0::1::::<><>:: InventoryLabelSettings.tres::LabelSettings::3221853452296263287::1725691146::0::1::::<><>:: InventoryMenu.cs::CSharpScript::-1::1725880811::0::1::::<>Control<>:: -InventoryMenu.gdshader::Shader::-1::1725925845::0::1::::<><>:: +InventoryMenu.gdshader::Shader::-1::1725930468::0::1::::<><>:: InventoryMenu.tscn::PackedScene::7951951132372048687::1725918905::0::1::::<><>::res://src/inventory_menu/InventoryMenu.cs<>res://src/inventory_menu/InventoryMenu.gdshader<>uid://cm8j5vcdop5x0::::res://src/ui/fonts/Mrs-Eaves-OT-Roman_31443.ttf<>uid://cb41qqmxqurj8::::res://src/ui/fonts/FT88-Bold.ttf<>uid://dit3vylt7hmmx::::res://src/ui/fonts/FT88-Regular.ttf<>uid://dupifadnagodp::::res://src/ui/label_settings/MainTextRegular.tres<>uid://c4wbba5mo7qcp::::res://src/ui/label_settings/MainTextFontItalicized.tres<>uid://ca1q6yu8blwxf::::res://src/ui/label_settings/InventoryMainTextBold.tres ItemLabel.cs::CSharpScript::-1::1725870402::0::1::::<>Label<>:: ItemSlot.cs::CSharpScript::-1::1725873538::0::1::::<>HBoxContainer<>:: @@ -305,9 +305,9 @@ ConsumableItemInfo.cs::CSharpScript::-1::1725842133::0::1::::ConsumableItemInfo< SteloFragment.tres::Resource/ConsumableItemInfo::2308305260378661504::1725842304::0::1::::<><>::res://src/items/consumable/ConsumableItemInfo.cs<>uid://dbl5v5i1s3m2u::::res://src/items/consumable/textures/stelo fragment.PNG ::res://src/items/consumable/textures/::1725842303 stelo fragment.PNG::CompressedTexture2D::7254019650732419866::1725758019::1725842303::1::::<><>:: -::res://src/items/throwable/::1725858809 -ThrowableItem.cs::CSharpScript::-1::1725841500::0::1::::<>Node3D<>:: -ThrowableItem.tscn::PackedScene::1835956059964782349::1725858809::0::1::::<><>::res://src/items/throwable/ThrowableItem.cs<>res://src/hitbox/Hitbox.cs +::res://src/items/throwable/::1725930411 +ThrowableItem.cs::CSharpScript::-1::1725927145::0::1::::<>Node3D<>:: +ThrowableItem.tscn::PackedScene::1835956059964782349::1725930411::0::1::::<><>::res://src/items/throwable/ThrowableItem.cs<>uid://bph8c6by4s047::::res://src/items/throwable/resources/GeomanticDice.tres<>res://src/hitbox/Hitbox.cs ThrowableItemInfo.cs::CSharpScript::-1::1725840642::0::1::::ThrowableItemInfo<>InventoryItemInfo<>:: ThrowableItemTag.cs::CSharpScript::-1::1725838947::0::1::::<><>:: ::res://src/items/throwable/resources/::1725907993 @@ -342,10 +342,10 @@ sealing rod.PNG::CompressedTexture2D::4244434659642909371::1725769919::172590613 spaded staff.PNG::CompressedTexture2D::5382853176872811491::1725759301::1725906136::1::::<><>:: SWAN SWORD.PNG::CompressedTexture2D::6286184302102439356::1725848780::1725906227::1::::<><>:: talwar.PNG::CompressedTexture2D::8970114679856421089::1725760013::1725906136::1::::<><>:: -::res://src/map/::1725925845 -Overworld.tscn::PackedScene::8660235983370762385::1725925845::0::1::::<><>::res://src/map/dungeon/floors/Overworld.cs<>uid://d4l4qutp8x40c::::res://src/npc/rat/NPC.tscn<>uid://cv70me80rxpem::::res://src/map/overworld/Textures/water.tres<>uid://c3wrhqfpx8th1::::res://src/map/overworld/Textures/ruins.tres<>uid://dw5bnw8bkb6w8::::res://src/map/overworld/Models/block.obj<>uid://b1crojyrqmhql::::res://src/map/overworld/Textures/kenney_prototype-textures/stick.jpeg<>uid://df5fykeos37m1::::res://src/map/overworld/Models/raft.obj<>uid://6pu2bdointq4::::res://src/map/overworld/Textures/premade.tres<>res://src/map/water.gdshader<>uid://bxodl26dnwrkc::::res://src/map/overworld/Textures/SMALLER1/others_0020_color_1k.jpg<>uid://c4iqttgjb0kq3::::res://src/map/overworld/Textures/kenney_prototype-textures/treetexture.png<>uid://bb46flkajcbtd::::res://src/map/overworld/Models/tree.obj +::res://src/map/::1725930468 +Overworld.tscn::PackedScene::8660235983370762385::1725930411::0::1::::<><>::res://src/map/dungeon/floors/Overworld.cs<>uid://d4l4qutp8x40c::::res://src/npc/rat/NPC.tscn<>uid://cv70me80rxpem::::res://src/map/overworld/Textures/water.tres<>uid://c3wrhqfpx8th1::::res://src/map/overworld/Textures/ruins.tres<>uid://dw5bnw8bkb6w8::::res://src/map/overworld/Models/block.obj<>uid://b1crojyrqmhql::::res://src/map/overworld/Textures/kenney_prototype-textures/stick.jpeg<>uid://df5fykeos37m1::::res://src/map/overworld/Models/raft.obj<>uid://6pu2bdointq4::::res://src/map/overworld/Textures/premade.tres<>res://src/map/water.gdshader<>uid://bxodl26dnwrkc::::res://src/map/overworld/Textures/SMALLER1/others_0020_color_1k.jpg<>uid://c4iqttgjb0kq3::::res://src/map/overworld/Textures/kenney_prototype-textures/treetexture.png<>uid://bb46flkajcbtd::::res://src/map/overworld/Models/tree.obj Teleport.tscn::PackedScene::3051535873962785199::1725856011::0::1::::<><>:: -water.gdshader::Shader::-1::1725925845::0::1::::<><>:: +water.gdshader::Shader::-1::1725930468::0::1::::<><>:: ::res://src/map/dungeon/::1725837804 DungeonGenerator.tscn::PackedScene::5818165223193307991::1725837804::0::1::::<><>::res://addons/SimpleDungeons/DungeonGenerator3D.gd<>uid://bn4gslp2gk8ds::::res://src/map/dungeon/corridor/Corridor.tscn Room.tscn::PackedScene::7782205001905008742::1725470773::0::1::::<><>::res://addons/SimpleDungeons/DungeonRoom3D.gd<>uid://twrj4wixcbu7::::res://src/items/ItemDatabase.tscn<>uid://dbvr8ewajja6a::::res://src/enemy/EnemyDatabase.tscn @@ -668,18 +668,18 @@ Splash.cs::CSharpScript::-1::1724392809::0::1::::<>Control<>:: Minimap.tscn::PackedScene::3933499665199969823::1725710018::0::1::::<><>:: ::res://src/minimap/textures/::1724726108 floor_minimap.png::CompressedTexture2D::3823174356126933943::1724183433::1724726108::1::::<><>:: -::res://src/npc/::1725924186 -Npc.cs::CSharpScript::-1::1725924186::0::1::::<>Node3D<>:: +::res://src/npc/::1725927442 +Npc.cs::CSharpScript::-1::1725927442::0::1::::<>Node3D<>:: ::res://src/npc/maiden/::1725918559 maiden.tscn::PackedScene::9119367534756690706::1725918559::0::1::::<><>::uid://c414kvmj6wav6::::res://src/npc/maiden/PUELLA.png PUELLA.png::CompressedTexture2D::6863771427203188521::1725863549::1725916704::1::::<><>:: -::res://src/npc/rat/::1725925844 -NPC.tscn::PackedScene::9219237117914461232::1725925844::0::1::::<><>::uid://t7fbfplu2js7::::res://src/npc/rat/ROYAL_RAT_PRINCEP.png<>res://src/npc/Npc.cs<>uid://cf7ycgdiihyh::::res://src/npc/rat/ratdialogue.dialogue -ratdialogue.dialogue::Resource::152685493331455091::1725922635::1725922635::1::::<><>::res://addons/dialogue_manager/dialogue_resource.gd +::res://src/npc/rat/::1725930410 +NPC.tscn::PackedScene::9219237117914461232::1725930410::0::1::::<><>::uid://t7fbfplu2js7::::res://src/npc/rat/ROYAL_RAT_PRINCEP.png<>res://src/npc/Npc.cs<>uid://cf7ycgdiihyh::::res://src/npc/rat/ratdialogue.dialogue +ratdialogue.dialogue::Resource::152685493331455091::1725930387::1725930387::1::::<><>::res://addons/dialogue_manager/dialogue_resource.gd ROYAL_RAT_PRINCEP.png::CompressedTexture2D::1399953774326670944::1725863292::1725916744::1::::<><>:: -::res://src/player/::1725925845 -Player.cs::CSharpScript::-1::1725864608::0::1::::<>CharacterBody3D<>:: -Player.tscn::PackedScene::5132203136239140037::1725925845::0::1::::<><>::res://src/player/Player.cs<>uid://bokx3h8kfdo5i::::res://src/player/slash_0000_Classic_30.png<>res://src/hitbox/Hitbox.cs<>res://src/player/PlayerStatInfo.cs<>uid://byosr5gk51237::::res://src/player/slash_0001_Classic_29.png<>uid://nh071o6ii03j::::res://src/player/slash_0002_Classic_28.png<>uid://bodfblud4kea3::::res://src/player/slash_0003_Classic_27.png<>uid://de55prolicl0u::::res://src/player/slash_0004_Classic_26.png<>uid://bp0msic3uk3kc::::res://src/player/slash_0005_Layer-1.png<>uid://hg2kraa5nrnl::::res://src/ui/textures/blank level symbol.png<>uid://ca1q6yu8blwxf::::res://src/ui/label_settings/InventoryMainTextBold.tres<>uid://dupifadnagodp::::res://src/ui/label_settings/MainTextRegular.tres +::res://src/player/::1725930410 +Player.cs::CSharpScript::-1::1725927329::0::1::::<>CharacterBody3D<>:: +Player.tscn::PackedScene::5132203136239140037::1725930410::0::1::::<><>::res://src/player/Player.cs<>uid://bokx3h8kfdo5i::::res://src/player/slash_0000_Classic_30.png<>res://src/hitbox/Hitbox.cs<>res://src/player/PlayerStatInfo.cs<>uid://byosr5gk51237::::res://src/player/slash_0001_Classic_29.png<>uid://nh071o6ii03j::::res://src/player/slash_0002_Classic_28.png<>uid://bodfblud4kea3::::res://src/player/slash_0003_Classic_27.png<>uid://de55prolicl0u::::res://src/player/slash_0004_Classic_26.png<>uid://bp0msic3uk3kc::::res://src/player/slash_0005_Layer-1.png<>uid://hg2kraa5nrnl::::res://src/ui/textures/blank level symbol.png<>uid://ca1q6yu8blwxf::::res://src/ui/label_settings/InventoryMainTextBold.tres<>uid://dupifadnagodp::::res://src/ui/label_settings/MainTextRegular.tres PlayerData.cs::CSharpScript::-1::1725786529::0::1::::<><>:: PlayerStatInfo.cs::CSharpScript::-1::1725766875::0::1::::PlayerStatInfo<>Resource<>:: PlayerStats.tres::Resource/PlayerStatInfo::169589321376145159::1725438027::0::1::::<><>::res://src/player/PlayerStatInfo.cs @@ -720,11 +720,10 @@ useless immune system.wav::AudioStreamWAV::2229029779282193598::1725904003::1725 DamageCalculator.cs::CSharpScript::-1::1725821031::0::1::::<><>:: ICharacterStats.cs::CSharpScript::-1::1725696286::0::1::::<><>:: ::res://src/ui/::1725862094 -::res://src/ui/dialogue/::1725925845 +::res://src/ui/dialogue/::1725930461 Balloon.tscn::PackedScene::2304415056852043862::1725918904::0::1::::<><>::res://src/ui/dialogue/DialogueBalloon.cs<>uid://ckvgyvclnwggo::::res://addons/dialogue_manager/dialogue_label.tscn<>uid://cb41qqmxqurj8::::res://src/ui/fonts/FT88-Bold.ttf<>res://addons/dialogue_manager/dialogue_reponses_menu.gd<>res://src/ui/dialogue/ResponseExample.cs DialogueBalloon.cs::CSharpScript::-1::1725873719::0::1::::<>CanvasLayer<>:: -DialogueBalloon.tscn::PackedScene::8389047728616774928::1725925845::0::1::::<><>::res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs<>uid://dit3vylt7hmmx::::res://src/ui/fonts/FT88-Regular.ttf<>uid://ckvgyvclnwggo::::res://addons/dialogue_manager/dialogue_label.tscn<>uid://cb41qqmxqurj8::::res://src/ui/fonts/FT88-Bold.ttf<>res://addons/dialogue_manager/dialogue_reponses_menu.gd<>uid://bohbd123672ea::::res://src/ui/fonts/FT88-Italic.ttf -DialogueControl.dialogue::Resource::4422383207880195605::1725926339::1725926339::1::::<><>::res://addons/dialogue_manager/dialogue_resource.gd +DialogueBalloon.tscn::PackedScene::8389047728616774928::1725930461::0::1::::<><>::res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs<>uid://dit3vylt7hmmx::::res://src/ui/fonts/FT88-Regular.ttf<>uid://ckvgyvclnwggo::::res://addons/dialogue_manager/dialogue_label.tscn<>uid://cb41qqmxqurj8::::res://src/ui/fonts/FT88-Bold.ttf<>res://addons/dialogue_manager/dialogue_reponses_menu.gd<>uid://bohbd123672ea::::res://src/ui/fonts/FT88-Italic.ttf FloorExit.dialogue::Resource::2178352563821461414::1725860783::1725860783::1::::<><>::res://addons/dialogue_manager/dialogue_resource.gd ResponseExample.cs::CSharpScript::-1::1725861801::0::1::::<>Button<>:: ::res://src/ui/fonts/::1725845210 diff --git a/.godot/editor/filesystem_update4 b/.godot/editor/filesystem_update4 index 2674b0fd..abf0573c 100644 --- a/.godot/editor/filesystem_update4 +++ b/.godot/editor/filesystem_update4 @@ -1,51 +1,14 @@ -res://src/npc/rat/NPC.tscn +res://src/ui/dialogue/DialogueBalloon.tscn res://addons/SimpleDungeons/debug_visuals/WireframeColorMat.tres res://src/ui/label_settings/InventoryMainTextBold.tres res://src/ui/label_settings/MainTextRegular.tres -res://src/inventory_menu/InventoryMenu.gdshader +res://src/map/overworld/Textures/water.tres res://src/map/water.gdshader +res://src/inventory_menu/InventoryMenu.gdshader res://src/Main.tscn -res://src/ui/dialogue/DialogueBalloon.tscn +res://src/npc/rat/NPC.tscn res://src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn res://src/player/Player.tscn res://src/map/Overworld.tscn -res://src/map/overworld/Textures/water.tres -res://src/npc/Npc.cs -res://src/app/App.cs -res://src/items/InventoryItemInfo.cs -res://src/hitbox/Hitbox.cs -res://addons/dialogue_manager/example_balloon/ExampleBalloon.cs -res://src/Main.cs -res://src/inventory_menu/ItemLabel.cs -res://src/map/dungeon/floors/DungeonFloor.cs -res://src/inventory_menu/ItemSlot.cs -res://addons/dialogue_manager/DialogueManager.cs -res://src/enemy/EnemyStatInfo.cs -res://src/map/dungeon/floors/Overworld.cs -res://src/items/armor/Armor.cs -res://src/map/dungeon/rooms/DungeonRoom.cs -res://src/enemy/Enemy.cs -res://src/game/DialogueController.cs -res://src/items/ItemDatabase.cs -res://src/player/Player.cs -res://src/items/weapons/Weapon.cs -res://src/utils/FpsCounter.cs -res://src/items/weapons/models/Rigid.cs -res://src/items/throwable/ThrowableItem.cs -res://src/game/Game.cs -res://src/player/PlayerStatInfo.cs -res://src/menu/Menu.cs -res://src/items/armor/ArmorInfo.cs -res://src/items/throwable/ThrowableItemInfo.cs -res://src/enemy/EnemyDatabase.cs -res://src/menu/splash/Splash.cs -res://src/items/consumable/ConsumableItem.cs -res://src/inventory_menu/InventoryMenu.cs -res://src/items/accessory/Accessory.cs -res://src/ui/dialogue/ResponseExample.cs -res://src/items/accessory/AccessoryInfo.cs -res://src/items/weapons/WeaponInfo.cs -res://src/items/consumable/ConsumableItemInfo.cs -res://src/ui/dialogue/DialogueBalloon.cs res://src/enemy/CollisionDetector.tscn res://src/items/throwable/ThrowableItem.tscn diff --git a/.godot/editor/project_metadata.cfg b/.godot/editor/project_metadata.cfg index fc81a9de..b984b58b 100644 --- a/.godot/editor/project_metadata.cfg +++ b/.godot/editor/project_metadata.cfg @@ -8,7 +8,7 @@ show_all_nodes_for_node_selection=true [recent_files] -scenes=["res://src/items/throwable/ThrowableItem.tscn", "res://src/enemy/CollisionDetector.tscn", "res://src/map/Overworld.tscn", "res://src/player/Player.tscn", "res://src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn", "res://src/ui/dialogue/DialogueBalloon.tscn", "res://src/npc/rat/NPC.tscn", "res://src/Main.tscn", "res://demos/0. introduction/introduction.tscn", "res://src/npc/maiden/maiden.tscn"] +scenes=["res://src/ui/dialogue/DialogueBalloon.tscn", "res://src/items/throwable/ThrowableItem.tscn", "res://src/enemy/CollisionDetector.tscn", "res://src/map/Overworld.tscn", "res://src/player/Player.tscn", "res://src/enemy/enemy_types/floating_enemy/FloatingEnemy.tscn", "res://src/npc/rat/NPC.tscn", "res://src/Main.tscn", "res://demos/0. introduction/introduction.tscn", "res://src/npc/maiden/maiden.tscn"] scripts=["res://demos/6. handling metadata/handling_metadata_dialogue.gd", "res://demos/1. simple dialogue/simple_log.gd", "res://demos/1. simple dialogue/simple_dialogue.gd", "res://addons/dialogue_manager/dialogue_manager.gd", "res://addons/dialogue_manager/example_balloon/example_balloon.gd", "res://addons/dialogue_manager/dialogue_label.gd", "res://addons/dialogue_manager/utilities/builtins.gd", "res://addons/dialogue_manager/test_scene.gd", "res://addons/rubonnek.dialogue_engine/runtime/dialogue_engine.gd", "res://addons/SimpleDungeons/DungeonUtils.gd"] [dialog_bounds] diff --git a/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.md5 b/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.md5 index 3fe8cedc..29af3598 100644 --- a/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.md5 +++ b/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.md5 @@ -1,3 +1,3 @@ -source_md5="8629e091f437f3374827a3acb004883d" -dest_md5="ca22e2e134bb8604e32d2372c270d1ee" +source_md5="6bab0c76272d923afb8a2bf713d58112" +dest_md5="a58e8007e6b1516b659ae3b51267bb4b" diff --git a/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.tres b/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.tres index 1109dba0..c454272f 100644 --- a/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.tres +++ b/.godot/imported/ratdialogue.dialogue-44b9fe9da69f8da8a6bfdeb5429ef4a3.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="DialogueResource" load_steps=2 format=3] -[ext_resource type="Script" path="res://addons/dialogue_manager/dialogue_resource.gd" id="1_5qsh7"] +[ext_resource type="Script" path="res://addons/dialogue_manager/dialogue_resource.gd" id="1_llaft"] [resource] -script = ExtResource("1_5qsh7") +script = ExtResource("1_llaft") using_states = PackedStringArray() titles = { "B1": "21", @@ -98,16 +98,36 @@ lines = { "character": "Royal Rat Princep, Tekohcyo", "character_replacements": Array[Dictionary]([]), "id": "21", +"next_id": "22", +"notes": "", +"tags": PackedStringArray(), +"text": "It became too much to bear, imagining what secrets they spoke within the walls.", +"text_replacements": Array[Dictionary]([]), +"translation_key": "It became too much to bear, imagining what secrets they spoke within the walls.", +"type": &"dialogue" +}, +"22": { +"character": "Royal Rat Princep, Tekohcyo", +"character_replacements": Array[Dictionary]([]), +"id": "22", +"next_id": "23", +"notes": "", +"tags": PackedStringArray(), +"text": "The Goddess could change their hearts…", +"text_replacements": Array[Dictionary]([]), +"translation_key": "The Goddess could change their hearts…", +"type": &"dialogue" +}, +"23": { +"character": "Royal Rat Princep, Tekohcyo", +"character_replacements": Array[Dictionary]([]), +"id": "23", "next_id": "24", "notes": "", "tags": PackedStringArray(), -"text": "It became too much to bear, imagining what secrets they spoke within the walls. -The Goddess could change their hearts… -At least, it is what I dreamed of.", +"text": "At least, it is what I dreamed of.", "text_replacements": Array[Dictionary]([]), -"translation_key": "It became too much to bear, imagining what secrets they spoke within the walls. -The Goddess could change their hearts… -At least, it is what I dreamed of.", +"translation_key": "At least, it is what I dreamed of.", "type": &"dialogue" }, "24": { @@ -126,16 +146,36 @@ At least, it is what I dreamed of.", "character": "Royal Rat Princep, Tekohcyo", "character_replacements": Array[Dictionary]([]), "id": "27", +"next_id": "28", +"notes": "", +"tags": PackedStringArray(), +"text": "I knew the Tower would save me. When it showed itself to me, I felt a hope I hadn’t felt since I was a child.", +"text_replacements": Array[Dictionary]([]), +"translation_key": "I knew the Tower would save me. When it showed itself to me, I felt a hope I hadn’t felt since I was a child.", +"type": &"dialogue" +}, +"28": { +"character": "Royal Rat Princep, Tekohcyo", +"character_replacements": Array[Dictionary]([]), +"id": "28", +"next_id": "29", +"notes": "", +"tags": PackedStringArray(), +"text": "Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by?", +"text_replacements": Array[Dictionary]([]), +"translation_key": "Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by?", +"type": &"dialogue" +}, +"29": { +"character": "Royal Rat Princep, Tekohcyo", +"character_replacements": Array[Dictionary]([]), +"id": "29", "next_id": "30", "notes": "", "tags": PackedStringArray(), -"text": "I knew the Tower would save me. When it showed itself to me, I felt a hope I hadn’t felt since I was a child. -Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by? -I was surrounded by love and play. The ideal environment for all living creatures.", +"text": "I was surrounded by love and play. The ideal environment for all living creatures.", "text_replacements": Array[Dictionary]([]), -"translation_key": "I knew the Tower would save me. When it showed itself to me, I felt a hope I hadn’t felt since I was a child. -Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by? -I was surrounded by love and play. The ideal environment for all living creatures.", +"translation_key": "I was surrounded by love and play. The ideal environment for all living creatures.", "type": &"dialogue" }, "3": { @@ -168,14 +208,24 @@ for I am embraced by their brethren.", "character": "Royal Rat Princep, Tekohcyo", "character_replacements": Array[Dictionary]([]), "id": "33", +"next_id": "34", +"notes": "", +"tags": PackedStringArray(), +"text": "Though I am fearful of what my resolve could lead me to, I have yet to step foot in the audience chamber at the top.", +"text_replacements": Array[Dictionary]([]), +"translation_key": "Though I am fearful of what my resolve could lead me to, I have yet to step foot in the audience chamber at the top.", +"type": &"dialogue" +}, +"34": { +"character": "Royal Rat Princep, Tekohcyo", +"character_replacements": Array[Dictionary]([]), +"id": "34", "next_id": "35", "notes": "", "tags": PackedStringArray(), -"text": "Though I am fearful of what my resolve could lead me to, I have yet to step foot in the audience chamber at the top. -The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you...", +"text": "The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you...", "text_replacements": Array[Dictionary]([]), -"translation_key": "Though I am fearful of what my resolve could lead me to, I have yet to step foot in the audience chamber at the top. -The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you...", +"translation_key": "The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you...", "type": &"dialogue" }, "35": { @@ -306,19 +356,19 @@ Royal Rat Princep, Tekohcyo: Alas, the tower has rejected me, so here I reside. ~ B1 Royal Rat Princep, Tekohcyo: It became too much to bear, imagining what secrets they spoke within the walls. - The Goddess could change their hearts… - At least, it is what I dreamed of. +Royal Rat Princep, Tekohcyo: The Goddess could change their hearts… +Royal Rat Princep, Tekohcyo: At least, it is what I dreamed of. => END ~ B2 Royal Rat Princep, Tekohcyo: I knew the Tower would save me. When it showed itself to me, I felt a hope I hadn’t felt since I was a child. - Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by? - I was surrounded by love and play. The ideal environment for all living creatures. +Royal Rat Princep, Tekohcyo: Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by? +Royal Rat Princep, Tekohcyo: I was surrounded by love and play. The ideal environment for all living creatures. => END ~ B3 Royal Rat Princep, Tekohcyo: Though I am fearful of what my resolve could lead me to, I have yet to step foot in the audience chamber at the top. - The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you... +Royal Rat Princep, Tekohcyo: The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you... => END ~ B4 diff --git a/.godot/mono/metadata/ide_messaging_meta.txt b/.godot/mono/metadata/ide_messaging_meta.txt index cb549255..f73cb29a 100644 --- a/.godot/mono/metadata/ide_messaging_meta.txt +++ b/.godot/mono/metadata/ide_messaging_meta.txt @@ -1,2 +1,2 @@ -52553 +55181 C:/Users/Zenny/AppData/Roaming/godotenv/godot/bin/godot.exe diff --git a/.godot/uid_cache.bin b/.godot/uid_cache.bin index aa0b9e2e4425849179756035fa78087616b6cf0a..235ccad83fe060658c4b3ab50ae1047a56dee437 100644 GIT binary patch delta 12 TcmZ46!*soiiSf=x#;{fZB6kG| delta 79 zcmccK#k97EiSfZk#<14O>zVa9f80#H-QvD5Tzm3De-+m9#FEsa$r~zdI7R END ~ B2 Royal Rat Princep, Tekohcyo: I knew the Tower would save me. When it showed itself to me, I felt a hope I hadn’t felt since I was a child. - Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by? - I was surrounded by love and play. The ideal environment for all living creatures. +Royal Rat Princep, Tekohcyo: Though it must have been a false hope in those days. What despairs did I possibly have to define that hope by? +Royal Rat Princep, Tekohcyo: I was surrounded by love and play. The ideal environment for all living creatures. => END ~ B3 Royal Rat Princep, Tekohcyo: Though I am fearful of what my resolve could lead me to, I have yet to step foot in the audience chamber at the top. - The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you... +Royal Rat Princep, Tekohcyo: The thousand hands of the tower have always placed me gently where I fell, where I wished, and where I appear before you... => END ~ B4 diff --git a/src/ui/dialogue/DialogueBalloon.tscn b/src/ui/dialogue/DialogueBalloon.tscn index 116f67dd..b31dc9e2 100644 --- a/src/ui/dialogue/DialogueBalloon.tscn +++ b/src/ui/dialogue/DialogueBalloon.tscn @@ -62,7 +62,7 @@ corner_radius_bottom_left = 5 [sub_resource type="Theme" id="Theme_qq3yp"] default_font = ExtResource("2_c4c1f") -default_font_size = 20 +default_font_size = 34 Button/styles/disabled = SubResource("StyleBoxFlat_spyqn") Button/styles/focus = SubResource("StyleBoxFlat_ri4m3") Button/styles/hover = SubResource("StyleBoxFlat_e0njw") @@ -105,21 +105,24 @@ grow_horizontal = 2 grow_vertical = 2 theme = SubResource("Theme_qq3yp") -[node name="Dialogue" type="MarginContainer" parent="Balloon"] +[node name="CenterContainer2" type="CenterContainer" parent="Balloon"] layout_mode = 1 anchors_preset = 12 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = -124.0 -offset_bottom = 1.0 +offset_top = -331.0 grow_horizontal = 2 grow_vertical = 0 -[node name="VBoxContainer" type="VBoxContainer" parent="Balloon/Dialogue"] +[node name="Dialogue" type="MarginContainer" parent="Balloon/CenterContainer2"] +custom_minimum_size = Vector2(1000, 300) layout_mode = 2 -[node name="CharacterLabel" type="RichTextLabel" parent="Balloon/Dialogue/VBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="Balloon/CenterContainer2/Dialogue"] +layout_mode = 2 + +[node name="CharacterLabel" type="RichTextLabel" parent="Balloon/CenterContainer2/Dialogue/VBoxContainer"] unique_name_in_owner = true modulate = Color(1, 1, 1, 0.501961) layout_mode = 2 @@ -135,7 +138,7 @@ text = "Character" fit_content = true scroll_active = false -[node name="DialogueLabel" parent="Balloon/Dialogue/VBoxContainer" instance=ExtResource("2_jm6sr")] +[node name="DialogueLabel" parent="Balloon/CenterContainer2/Dialogue/VBoxContainer" instance=ExtResource("2_jm6sr")] unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 @@ -146,6 +149,9 @@ theme_override_styles/fill = SubResource("StyleBoxEmpty_vtj1a") theme_override_styles/background = SubResource("StyleBoxEmpty_c2c5i") theme_override_styles/focus = SubResource("StyleBoxEmpty_wv0ko") theme_override_styles/normal = SubResource("StyleBoxEmpty_dboi3") +text = "I do not know thee but I perceive thine sorrows vividly, +for I am embraced by their brethren." +fit_content = false [node name="CenterContainer" type="CenterContainer" parent="Balloon"] layout_mode = 1