diff --git a/addons/dialogic/Core/DialogicResourceUtil.gd b/addons/dialogic/Core/DialogicResourceUtil.gd index e5449c8c5..a15806168 100644 --- a/addons/dialogic/Core/DialogicResourceUtil.gd +++ b/addons/dialogic/Core/DialogicResourceUtil.gd @@ -106,7 +106,7 @@ static func resource_exists_from_identifier(identifier:String, extension:String) ## Editor Only static func change_unique_identifier(file_path:String, new_identifier:String) -> void: var directory := get_directory(file_path.get_extension()) - var key: String = directory.find_key(file_path) + var key: Variant = directory.find_key(file_path) while key != null: if key == new_identifier: break @@ -118,7 +118,7 @@ static func change_unique_identifier(file_path:String, new_identifier:String) -> static func change_resource_path(old_path:String, new_path:String) -> void: var directory := get_directory(new_path.get_extension()) - var key: String = directory.find_key(old_path) + var key: Variant = directory.find_key(old_path) while key != null: directory[key] = new_path key = directory.find_key(old_path) @@ -127,7 +127,7 @@ static func change_resource_path(old_path:String, new_path:String) -> void: static func remove_resource(file_path:String) -> void: var directory := get_directory(file_path.get_extension()) - var key: String = directory.find_key(file_path) + var key: Variant = directory.find_key(file_path) while key != null: directory.erase(key) key = directory.find_key(file_path) diff --git a/addons/dialogic/Editor/CharacterEditor/character_editor.gd b/addons/dialogic/Editor/CharacterEditor/character_editor.gd index daf69a8f2..675474d69 100644 --- a/addons/dialogic/Editor/CharacterEditor/character_editor.gd +++ b/addons/dialogic/Editor/CharacterEditor/character_editor.gd @@ -149,7 +149,7 @@ func _ready() -> void: if DialogicUtil.get_dialogic_plugin().has_signal("scene_saved"): DialogicUtil.get_dialogic_plugin().scene_saved.connect(_on_some_resource_saved) - $NoCharacterScreen.color = get_theme_color("dark_color_3", "Editor") + $NoCharacterScreen.add_theme_stylebox_override("panel", get_theme_stylebox("Background", "EditorStyles")) $NoCharacterScreen.show() setup_portrait_list_tab() diff --git a/addons/dialogic/Editor/CharacterEditor/character_editor.tscn b/addons/dialogic/Editor/CharacterEditor/character_editor.tscn index 8bd30f125..4553927c2 100644 --- a/addons/dialogic/Editor/CharacterEditor/character_editor.tscn +++ b/addons/dialogic/Editor/CharacterEditor/character_editor.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=8 format=3 uid="uid://dlskc36c5hrwv"] +[gd_scene load_steps=9 format=3 uid="uid://dlskc36c5hrwv"] [ext_resource type="Script" uid="uid://cwhe7tpe75oh7" path="res://addons/dialogic/Editor/CharacterEditor/character_editor.gd" id="2"] [ext_resource type="PackedScene" uid="uid://dbpkta2tjsqim" path="res://addons/dialogic/Editor/Common/hint_tooltip_icon.tscn" id="2_uhhqs"] [ext_resource type="Script" uid="uid://deliic6d8vajo" path="res://addons/dialogic/Editor/CharacterEditor/character_editor_portrait_tree.gd" id="2_vad0i"] [ext_resource type="Texture2D" uid="uid://bff65e82555qr" path="res://addons/dialogic/Editor/Images/Pieces/close-icon.svg" id="3_2ogmx"] [ext_resource type="Texture2D" uid="uid://dx3o2ild56i76" path="res://addons/dialogic/Editor/Images/Pieces/closed-icon.svg" id="4_wg7ys"] +[ext_resource type="Texture2D" uid="uid://my600mb32ydt" path="res://addons/dialogic/Editor/Images/Toolbar/add-character.svg" id="6_2ogmx"] [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_es2rd"] @@ -409,8 +410,7 @@ visible = false custom_minimum_size = Vector2(0, 20) layout_mode = 2 -[node name="NoCharacterScreen" type="ColorRect" parent="." unique_id=2122222002] -visible = false +[node name="NoCharacterScreen" type="PanelContainer" parent="." unique_id=190821474] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -418,15 +418,9 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 size_flags_horizontal = 3 -color = Color(0, 0, 0, 1) [node name="CenterContainer" type="CenterContainer" parent="NoCharacterScreen" unique_id=1885703718] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 +layout_mode = 2 [node name="VBoxContainer" type="VBoxContainer" parent="NoCharacterScreen/CenterContainer" unique_id=135127017] custom_minimum_size = Vector2(250, 0) @@ -441,7 +435,9 @@ autowrap_mode = 3 [node name="CreateCharacterButton" type="Button" parent="NoCharacterScreen/CenterContainer/VBoxContainer" unique_id=1496778365] layout_mode = 2 +size_flags_horizontal = 4 text = "Create New Character" +icon = ExtResource("6_2ogmx") [connection signal="pressed" from="Scroll/VBox/MainHSplit/MainSettingsPanel/MainSettings/HBoxContainer/CloseButton" to="." method="hide_main_settings"] [connection signal="pressed" from="Scroll/VBox/MainHSplit/MainSettingsPanel/MainSettingsHidden/OpenButton" to="." method="show_main_settings"] diff --git a/addons/dialogic/Editor/Common/side_bar.tscn b/addons/dialogic/Editor/Common/side_bar.tscn index 0666383b2..fc1581b03 100644 --- a/addons/dialogic/Editor/Common/side_bar.tscn +++ b/addons/dialogic/Editor/Common/side_bar.tscn @@ -157,7 +157,7 @@ text = "Trim Folder Paths" unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 -theme_type_variation = &"DialogicSidebarTree" +theme_type_variation = &"TreeSecondary" allow_rmb_select = true hide_root = true scroll_horizontal_enabled = false @@ -190,7 +190,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 3 tooltip_text = "Label events in your timeline will appear here, allowing you to jump to them." -theme_type_variation = &"DialogicSidebarList" +theme_type_variation = &"ItemListSecondary" theme_override_styles/selected = SubResource("StyleBoxEmpty_gxwm6") theme_override_styles/selected_focus = SubResource("StyleBoxEmpty_n8rql") allow_reselect = true @@ -199,6 +199,7 @@ same_column_width = true [node name="CurrentVersion" type="Button" parent="VBoxPrimary" unique_id=2110656799] unique_name_in_owner = true layout_mode = 2 +mouse_default_cursor_shape = 2 text = "Some Version" flat = true clip_text = true diff --git a/addons/dialogic/Editor/Common/sidebar.gd b/addons/dialogic/Editor/Common/sidebar.gd index b67594dbc..3e9b2ff9f 100644 --- a/addons/dialogic/Editor/Common/sidebar.gd +++ b/addons/dialogic/Editor/Common/sidebar.gd @@ -86,6 +86,10 @@ func _ready() -> void: %MainVSplit.split_offset = DialogicUtil.get_editor_setting("sidebar_v_split", 0) group_mode = DialogicUtil.get_editor_setting("sidebar_group_mode", 0) %GroupingOptions.select(%GroupingOptions.get_item_index(group_mode)) + if %GroupingOptions.get_item_id(%GroupingOptions.selected) == GroupMode.NONE: + %ResourceTree.add_theme_constant_override("item_margin", 0) + else: + %ResourceTree.remove_theme_constant_override("item_margin") %FolderColors.button_pressed = DialogicUtil.get_editor_setting("sidebar_use_folder_colors", true) %TrimFolderPaths.button_pressed = DialogicUtil.get_editor_setting("sidebar_trim_folder_paths", true) diff --git a/addons/dialogic/Editor/HomePage/home_page.tscn b/addons/dialogic/Editor/HomePage/home_page.tscn index 967231e27..758fac6a5 100644 --- a/addons/dialogic/Editor/HomePage/home_page.tscn +++ b/addons/dialogic/Editor/HomePage/home_page.tscn @@ -1,9 +1,18 @@ -[gd_scene load_steps=21 format=3 uid="uid://cqy73hshqqgga"] +[gd_scene load_steps=17 format=3 uid="uid://cqy73hshqqgga"] [ext_resource type="Script" uid="uid://bl3vudjf3wn2x" path="res://addons/dialogic/Editor/HomePage/home_page.gd" id="1_6g38w"] [ext_resource type="Texture2D" uid="uid://cvmlp5nxb2rer" path="res://addons/dialogic/Editor/HomePage/icon_bg.png" id="1_ed1g1"] [ext_resource type="Texture2D" uid="uid://bt87p6qlso0ya" path="res://addons/dialogic/Editor/Images/dialogic-logo.svg" id="3_3leok"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ipcwk"] +draw_center = false +corner_radius_top_left = 15 +corner_radius_top_right = 15 +corner_radius_bottom_right = 15 +corner_radius_bottom_left = 15 +shadow_color = Color(0.38859996, 0.43326005, 0.58, 0.13725491) +shadow_size = 75 + [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_imi2d"] draw_center = false corner_radius_top_left = 15 @@ -55,53 +64,17 @@ corner_radius_bottom_left = 15 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ce6uo"] content_margin_left = 7.0 -content_margin_top = 7.0 +content_margin_top = 10.0 content_margin_right = 7.0 content_margin_bottom = 14.0 -bg_color = Color(0.803922, 0.352941, 1, 0.141176) +bg_color = Color(1, 1, 1, 0.05882353) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="FontVariation" id="FontVariation_elu6e"] -variation_embolden = 1.1 - -[sub_resource type="FontVariation" id="FontVariation_g0m61"] -variation_embolden = 1.43 -variation_transform = Transform2D(1, 0.343, 0, 1, 0, 0) - -[sub_resource type="FontVariation" id="FontVariation_5kbdj"] -variation_transform = Transform2D(1, 0.239, 0, 1, 0, 0) - [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_a8dvw"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ckyhx"] -content_margin_left = 4.0 -content_margin_top = 4.0 -content_margin_right = 4.0 -content_margin_bottom = 4.0 -bg_color = Color(0.470588, 0.196078, 0.6, 1) -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_l1doy"] -content_margin_left = 4.0 -content_margin_top = 4.0 -content_margin_right = 4.0 -content_margin_bottom = 4.0 -bg_color = Color(0.470588, 0.196078, 0.6, 1) -border_width_left = 1 -border_width_top = 1 -border_width_right = 1 -border_width_bottom = 1 -corner_radius_top_left = 5 -corner_radius_top_right = 5 -corner_radius_bottom_right = 5 -corner_radius_bottom_left = 5 - [node name="HomePage" type="TextureRect" unique_id=1709118815] self_modulate = Color(1, 1, 1, 0.2) clip_contents = true @@ -124,19 +97,23 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="HomePageBox" type="VBoxContainer" parent="CenterContainer" unique_id=2038439013] +[node name="PanelContainer" type="PanelContainer" parent="CenterContainer" unique_id=371856246] +layout_mode = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_ipcwk") + +[node name="HomePageBox" type="VBoxContainer" parent="CenterContainer/PanelContainer" unique_id=2038439013] unique_name_in_owner = true custom_minimum_size = Vector2(600, 350) layout_mode = 2 theme_override_constants/separation = 0 -[node name="TopPanel" type="Panel" parent="CenterContainer/HomePageBox" unique_id=1010710484] +[node name="TopPanel" type="Panel" parent="CenterContainer/PanelContainer/HomePageBox" unique_id=1010710484] unique_name_in_owner = true custom_minimum_size = Vector2(0, 100) layout_mode = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_imi2d") -[node name="Header2" type="Panel" parent="CenterContainer/HomePageBox/TopPanel" unique_id=477441375] +[node name="Header2" type="Panel" parent="CenterContainer/PanelContainer/HomePageBox/TopPanel" unique_id=477441375] clip_children = 1 clip_contents = true layout_mode = 1 @@ -149,7 +126,7 @@ size_flags_vertical = 3 size_flags_stretch_ratio = 0.4 theme_override_styles/panel = SubResource("StyleBoxFlat_n2afh") -[node name="BG" type="TextureRect" parent="CenterContainer/HomePageBox/TopPanel/Header2" unique_id=198765188] +[node name="BG" type="TextureRect" parent="CenterContainer/PanelContainer/HomePageBox/TopPanel/Header2" unique_id=198765188] modulate = Color(0.65098, 0.65098, 0.65098, 1) layout_mode = 1 anchors_preset = 15 @@ -162,7 +139,7 @@ size_flags_stretch_ratio = 0.3 texture = SubResource("GradientTexture2D_2klx3") expand_mode = 1 -[node name="Vignette" type="TextureRect" parent="CenterContainer/HomePageBox/TopPanel/Header2" unique_id=1688431700] +[node name="Vignette" type="TextureRect" parent="CenterContainer/PanelContainer/HomePageBox/TopPanel/Header2" unique_id=1688431700] modulate = Color(0, 0, 0, 1) layout_mode = 1 anchors_preset = 15 @@ -175,7 +152,7 @@ grow_vertical = 2 texture = SubResource("GradientTexture2D_u0aw3") expand_mode = 1 -[node name="Logo" type="TextureRect" parent="CenterContainer/HomePageBox/TopPanel" unique_id=1945233535] +[node name="Logo" type="TextureRect" parent="CenterContainer/PanelContainer/HomePageBox/TopPanel" unique_id=1945233535] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -192,7 +169,7 @@ texture = ExtResource("3_3leok") expand_mode = 1 stretch_mode = 5 -[node name="Label" type="Label" parent="CenterContainer/HomePageBox/TopPanel/Logo" unique_id=1415255007] +[node name="Label" type="Label" parent="CenterContainer/PanelContainer/HomePageBox/TopPanel/Logo" unique_id=1415255007] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 @@ -209,14 +186,15 @@ rotation = -0.201447 text = "2" label_settings = SubResource("LabelSettings_w8q1h") -[node name="BottomPanel" type="PanelContainer" parent="CenterContainer/HomePageBox" unique_id=330996494] +[node name="BottomPanel" type="PanelContainer" parent="CenterContainer/PanelContainer/HomePageBox" unique_id=330996494] unique_name_in_owner = true self_modulate = Color(0.1021275, 0.1021275, 0.1021275, 1) +show_behind_parent = true layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_p7ka2") -[node name="VersionLabel" type="Label" parent="CenterContainer/HomePageBox/BottomPanel" unique_id=949857528] +[node name="VersionLabel" type="Label" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel" unique_id=949857528] unique_name_in_owner = true modulate = Color(1, 1, 1, 0.501961) layout_mode = 2 @@ -225,122 +203,121 @@ theme_override_font_sizes/font_size = 10 text = "2.0-Alpha-19 WIP (Godot 4.3+)" horizontal_alignment = 2 -[node name="ScrollContainer" type="ScrollContainer" parent="CenterContainer/HomePageBox/BottomPanel" unique_id=557763215] +[node name="ScrollContainer" type="ScrollContainer" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel" unique_id=557763215] layout_mode = 2 -[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer" unique_id=15728145] +[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer" unique_id=15728145] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme_override_constants/separation = 50 -[node name="CenterContainer" type="VBoxContainer" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer" unique_id=1137363955] +[node name="CenterContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer" unique_id=1137363955] layout_mode = 2 size_flags_stretch_ratio = 0.4 -[node name="Label" type="Label" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=982557830] +[node name="Label" type="Label" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=982557830] layout_mode = 2 theme_type_variation = &"DialogicSection" theme_override_constants/line_spacing = 0 text = "Documentation" -[node name="WikiButton" type="LinkButton" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=1030865985] +[node name="WikiButton" type="LinkButton" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=1030865985] layout_mode = 2 theme_type_variation = &"DialogicLink" text = " Wiki" underline = 2 uri = "https://docs.dialogic.pro/" -[node name="WikiGettingStartedButton" type="LinkButton" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=2077412255] +[node name="WikiGettingStartedButton" type="LinkButton" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=2077412255] layout_mode = 2 theme_type_variation = &"DialogicLink" text = " Getting Started" underline = 2 uri = "https://docs.dialogic.pro/getting-started.html" -[node name="Separator" type="Control" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=783926543] +[node name="Separator" type="Control" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=783926543] custom_minimum_size = Vector2(0, 10) layout_mode = 2 -[node name="Label2" type="Label" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=2037021503] +[node name="Label2" type="Label" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=2037021503] layout_mode = 2 theme_type_variation = &"DialogicSection" text = "Get in touch" -[node name="BugRequestButton" type="LinkButton" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=1518203797] +[node name="BugRequestButton" type="LinkButton" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=1518203797] layout_mode = 2 theme_type_variation = &"DialogicLink" text = " Bug / Request" underline = 2 uri = "https://github.com/dialogic-godot/dialogic/issues/new/choose" -[node name="DiscordButton" type="LinkButton" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=637273404] +[node name="DiscordButton" type="LinkButton" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=637273404] layout_mode = 2 theme_type_variation = &"DialogicLink" text = " Discord" underline = 2 uri = "https://discord.gg/2hHQzkf2pX" -[node name="Website" type="LinkButton" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=379796324] +[node name="Website" type="LinkButton" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=379796324] layout_mode = 2 theme_type_variation = &"DialogicLink" text = " Website" underline = 2 uri = "https://dialogic.pro/" -[node name="DonateButton" type="LinkButton" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=997916665] +[node name="DonateButton" type="LinkButton" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer" unique_id=997916665] layout_mode = 2 theme_type_variation = &"DialogicLink" text = " Donate" underline = 2 uri = "https://www.patreon.com/JowanSpooner" -[node name="CenterContainer2" type="VBoxContainer" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer" unique_id=1248291817] +[node name="CenterContainer2" type="VBoxContainer" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer" unique_id=1248291817] layout_mode = 2 size_flags_horizontal = 3 theme_override_constants/separation = 15 -[node name="Control" type="Control" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2" unique_id=1975904286] +[node name="Control" type="Control" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2" unique_id=1975904286] layout_mode = 2 -[node name="WelcomeText" type="RichTextLabel" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2" unique_id=1779879348] +[node name="WelcomeText" type="RichTextLabel" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2" unique_id=1779879348] layout_mode = 2 theme_override_styles/normal = SubResource("StyleBoxEmpty_es88k") bbcode_enabled = true -text = "[center]Welcome to dialogic, a plugin that lets you easily create stories and dialogs for your game!" +text = "[center]Welcome to dialogic, a plugin that lets you easily create stories and dialogs for your game! + +If you are new, start by creating a timeline or character!" fit_content = true -[node name="RandomTipSection" type="VBoxContainer" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2" unique_id=21727726] +[node name="RandomTipSection" type="VBoxContainer" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2" unique_id=21727726] unique_name_in_owner = true layout_mode = 2 theme_override_constants/separation = -4 alignment = 1 -[node name="RandomTipLabel" type="Label" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection" unique_id=520311592] +[node name="RandomTipLabel" type="Label" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection" unique_id=520311592] unique_name_in_owner = true layout_mode = 2 theme_type_variation = &"DialogicSection" theme_override_colors/font_color = Color(0.42, 0.67, 0.96, 1) text = "Random Tip" -[node name="TipBox" type="PanelContainer" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection" unique_id=1833114158] +[node name="TipBox" type="PanelContainer" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection" unique_id=1833114158] unique_name_in_owner = true layout_mode = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_ce6uo") -[node name="RandomTip" type="RichTextLabel" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection/TipBox" unique_id=603572674] +[node name="RandomTip" type="RichTextLabel" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection/TipBox" unique_id=603572674] unique_name_in_owner = true clip_contents = false layout_mode = 2 -theme_override_fonts/bold_font = SubResource("FontVariation_elu6e") -theme_override_fonts/bold_italics_font = SubResource("FontVariation_g0m61") -theme_override_fonts/italics_font = SubResource("FontVariation_5kbdj") theme_override_styles/normal = SubResource("StyleBoxEmpty_a8dvw") bbcode_enabled = true text = "[i]You can[/i] [b]create custom[/b] events, [i][b]subsystems, text effects and even editors for[/b][i] [code]dialogic!" fit_content = true -[node name="RandomTipMoreButton" type="Button" parent="CenterContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection/TipBox/RandomTip" unique_id=327297471] +[node name="RandomTipMoreButton" type="Button" parent="CenterContainer/PanelContainer/HomePageBox/BottomPanel/ScrollContainer/HBoxContainer/CenterContainer2/RandomTipSection/TipBox/RandomTip" unique_id=327297471] unique_name_in_owner = true layout_mode = 1 anchors_preset = 3 @@ -349,11 +326,9 @@ anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = -30.0 -offset_top = 1.0 +offset_top = 2.0 offset_right = -8.0 -offset_bottom = 23.0 +offset_bottom = 24.0 grow_horizontal = 0 grow_vertical = 0 tooltip_text = "Check it out!" -theme_override_styles/normal = SubResource("StyleBoxFlat_ckyhx") -theme_override_styles/hover = SubResource("StyleBoxFlat_l1doy") diff --git a/addons/dialogic/Editor/TimelineEditor/TextEditor/timeline_editor_text.gd b/addons/dialogic/Editor/TimelineEditor/TextEditor/timeline_editor_text.gd index a49ed7367..d71676f59 100644 --- a/addons/dialogic/Editor/TimelineEditor/TextEditor/timeline_editor_text.gd +++ b/addons/dialogic/Editor/TimelineEditor/TextEditor/timeline_editor_text.gd @@ -10,6 +10,9 @@ var label_regex := RegEx.create_from_string('label +(?[^\n]+)') var channel_regex := RegEx.create_from_string(r'audio +(?[\w-]{2,}|[\w]+)') func _ready() -> void: + if get_parent() is SubViewport or owner.get_parent() is SubViewport: + return + await find_parent('EditorView').ready syntax_highlighter = code_completion_helper.syntax_highlighter timeline_editor.editors_manager.sidebar.content_item_activated.connect(_on_content_item_clicked) diff --git a/addons/dialogic/Editor/TimelineEditor/VisualEditor/TimelineArea.gd b/addons/dialogic/Editor/TimelineEditor/VisualEditor/TimelineArea.gd index d95062a1c..ca6203a3b 100644 --- a/addons/dialogic/Editor/TimelineEditor/VisualEditor/TimelineArea.gd +++ b/addons/dialogic/Editor/TimelineEditor/VisualEditor/TimelineArea.gd @@ -22,6 +22,9 @@ signal drag_canceled() func _ready() -> void: + if owner.get_parent() is SubViewport: + return + resized.connect(add_extra_scroll_area_to_timeline) %Timeline.child_entered_tree.connect(add_extra_scroll_area_to_timeline) diff --git a/addons/dialogic/Editor/TimelineEditor/VisualEditor/timeline_editor_visual.gd b/addons/dialogic/Editor/TimelineEditor/VisualEditor/timeline_editor_visual.gd index 34615790a..816b86616 100644 --- a/addons/dialogic/Editor/TimelineEditor/VisualEditor/timeline_editor_visual.gd +++ b/addons/dialogic/Editor/TimelineEditor/VisualEditor/timeline_editor_visual.gd @@ -175,6 +175,9 @@ func clear_timeline_nodes() -> void: ################################################################################ func _ready() -> void: + if get_parent() is SubViewport or owner.get_parent() is SubViewport: + return + event_node = load("res://addons/dialogic/Editor/Events/EventBlock/event_block.tscn") batch_loaded.connect(_on_batch_loaded) diff --git a/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn b/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn index 517da01b6..83f755ac4 100644 --- a/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn +++ b/addons/dialogic/Editor/TimelineEditor/timeline_editor.tscn @@ -4,6 +4,7 @@ [ext_resource type="PackedScene" uid="uid://ysqbusmy0qma" path="res://addons/dialogic/Editor/TimelineEditor/VisualEditor/timeline_editor_visual.tscn" id="2_qs7vc"] [ext_resource type="PackedScene" uid="uid://dbpkta2tjsqim" path="res://addons/dialogic/Editor/Common/hint_tooltip_icon.tscn" id="2_yqd26"] [ext_resource type="PackedScene" uid="uid://defdeav8rli6o" path="res://addons/dialogic/Editor/TimelineEditor/TextEditor/timeline_editor_text.tscn" id="3_up2bn"] +[ext_resource type="Texture2D" uid="uid://bymlbr4o2m3jc" path="res://addons/dialogic/Editor/Images/Toolbar/add-timeline.svg" id="5_u2118"] [ext_resource type="Script" uid="uid://b35hvsvrvjjl4" path="res://addons/dialogic/Editor/TimelineEditor/shortcut_popup.gd" id="6_rfuk0"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_boacm"] @@ -14,14 +15,6 @@ content_margin_bottom = 6.0 bg_color = Color(0.153, 0.153, 0.153, 1) corner_detail = 4 -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_suoo8"] -content_margin_left = 0.0 -content_margin_top = 0.0 -content_margin_right = 0.0 -content_margin_bottom = 0.0 -bg_color = Color(0.083385, 0.083385, 0.083385, 1) -corner_detail = 4 - [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_4bvbc"] content_margin_left = 0.0 content_margin_top = 0.0 @@ -219,14 +212,12 @@ unique_name_in_owner = true layout_mode = 2 [node name="NoTimelineScreen" type="PanelContainer" parent="." unique_id=946023967] -visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_suoo8") [node name="CenterContainer" type="CenterContainer" parent="NoTimelineScreen" unique_id=1698409400] layout_mode = 2 @@ -244,7 +235,9 @@ autowrap_mode = 3 [node name="CreateTimelineButton" type="Button" parent="NoTimelineScreen/CenterContainer/VBoxContainer" unique_id=1761424501] layout_mode = 2 +size_flags_horizontal = 4 text = "Create New Timeline" +icon = ExtResource("5_u2118") [node name="ShortcutsPanel" type="PanelContainer" parent="." unique_id=1337371675] unique_name_in_owner = true diff --git a/addons/dialogic/Modules/Audio/event_audio.gd b/addons/dialogic/Modules/Audio/event_audio.gd index cd4f8cc32..fec8b1030 100644 --- a/addons/dialogic/Modules/Audio/event_audio.gd +++ b/addons/dialogic/Modules/Audio/event_audio.gd @@ -47,8 +47,8 @@ var set_sync_channel := false var regex := RegEx.create_from_string(r'(?:audio)\s*(?[\w-]{2,}|[\w]*)?\s*(")?(?(?(2)[^"\n]*|[^(: \n]*))(?(2)"|)(?:\s*\[(?.*)\])?') var channel_name_regex := RegEx.create_from_string(r'(?^-$)|(?[^\w-]{1})') -################################################################################ -## EXECUTE + +#region EXECUTE ################################################################################ func _execute() -> void: @@ -66,8 +66,10 @@ func _execute() -> void: finish() -################################################################################ -## INITIALIZE +#endregion + + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -80,8 +82,10 @@ func _init() -> void: func _get_icon() -> Resource: return load(this_folder.path_join('icon_music.png')) -################################################################################ -## SAVING/LOADING +#endregion + + +#region SAVING/LOADING ################################################################################ func to_text () -> String: @@ -253,11 +257,10 @@ func _sound_from_text(string:String) -> void: loop = str_to_var(data['loop']) update_text_version() - #endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -353,9 +356,10 @@ func get_audio_channel_suggestions(filter:String) -> Dictionary: func get_sync_audio_channel_suggestions(filter:="") -> Dictionary: return DialogicUtil.get_audio_channel_suggestions(filter) +#endregion -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, word:String, symbol:String) -> void: @@ -380,8 +384,10 @@ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:Str func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void: TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'audio', 'audio ', event_color.lerp(TextNode.syntax_highlighter.normal_color, 0.3)) +#endregion + -#################### SYNTAX HIGHLIGHTING ####################################### +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: @@ -395,3 +401,5 @@ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, li dict = Highlighter.color_shortcode_content(dict, line, result.get_start("shortcode"), 0, event_color) return dict + +#endregion diff --git a/addons/dialogic/Modules/Background/event_background.gd b/addons/dialogic/Modules/Background/event_background.gd index f2c0c4c1e..f8adb7c3f 100644 --- a/addons/dialogic/Modules/Background/event_background.gd +++ b/addons/dialogic/Modules/Background/event_background.gd @@ -65,6 +65,7 @@ func _execute() -> void: #endregion + #region INITIALIZE ################################################################################ @@ -76,6 +77,7 @@ func _init() -> void: #endregion + #region SAVE & LOAD ################################################################################ @@ -93,9 +95,9 @@ func get_shortcode_parameters() -> Dictionary: "suggestions": get_transition_suggestions}, } - #endregion + #region EDITOR REPRESENTATION ################################################################################ diff --git a/addons/dialogic/Modules/Call/event_call.gd b/addons/dialogic/Modules/Call/event_call.gd index e00a63e6d..9f5cf912e 100644 --- a/addons/dialogic/Modules/Call/event_call.gd +++ b/addons/dialogic/Modules/Call/event_call.gd @@ -24,8 +24,8 @@ var arguments := []: var _current_method_arg_hints := {'a':null, 'm':null, 'info':{}} -################################################################################ -## EXECUTION + +#region EXECUTION ################################################################################ func _execute() -> void: @@ -62,9 +62,10 @@ func _execute() -> void: finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -73,9 +74,10 @@ func _init() -> void: event_category = "Logic" event_sorting_index = 10 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func to_text() -> String: @@ -131,9 +133,10 @@ func get_shortcode_parameters() -> Dictionary: "args" : {"property": "arguments", "default": []}, } +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -197,7 +200,10 @@ func check_arguments_and_update_warning() -> void: return ui_update_warning.emit() -####################### CODE COMPLETION ######################################## +#endregion + + +#region CODE COMPLETION ################################################################################ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void: @@ -220,8 +226,10 @@ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:Str func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void: TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'do', 'do ', event_color.lerp(TextNode.syntax_highlighter.normal_color, 0.3), _get_icon()) +#endregion + -#################### SYNTAX HIGHLIGHTING ####################################### +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: @@ -233,3 +241,5 @@ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, li Highlighter.color_word(dict, Highlighter.boolean_operator_color, line, 'true') Highlighter.color_word(dict, Highlighter.boolean_operator_color, line, 'false') return dict + +#endregion diff --git a/addons/dialogic/Modules/Character/event_character.gd b/addons/dialogic/Modules/Character/event_character.gd index 752692bee..545bb95f9 100644 --- a/addons/dialogic/Modules/Character/event_character.gd +++ b/addons/dialogic/Modules/Character/event_character.gd @@ -95,8 +95,8 @@ var character_identifier: String: var regex := RegEx.create_from_string(r'(?join|update|leave)\s*(")?(?(?(2)[^"\n]*|[^(: \n]*))(?(2)"|)(\W*\((?.*)\))?(\s*(?[^\[]*))?(\s*\[(?.*)\])?') -################################################################################ -## EXECUTION + +#region EXECUTION ################################################################################ func _execute() -> void: @@ -191,6 +191,8 @@ func _execute() -> void: finish() +#endregion + #region INITIALIZE ############################################################################### @@ -200,6 +202,7 @@ func _init() -> void: set_default_color('Color2') event_category = "Main" event_sorting_index = 2 + help_page_path = "https://docs.dialogic.pro/event-character.html" func _get_icon() -> Resource: @@ -207,6 +210,7 @@ func _get_icon() -> Resource: #endregion + #region SAVING, LOADING, DEFAULTS ################################################################################ @@ -331,8 +335,8 @@ func is_valid_event(string:String) -> bool: #endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -475,8 +479,10 @@ func get_animation_suggestions(search_text:String='') -> Dictionary: func get_fade_suggestions(search_text:String='') -> Dictionary: return DialogicPortraitAnimationUtil.get_suggestions(search_text, fade_animation, "Default", DialogicPortraitAnimationUtil.AnimationType.CROSSFADE) +#endregion + -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void: @@ -553,8 +559,10 @@ func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) - TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'leave', 'leave ', event_color, load('res://addons/dialogic/Editor/Images/Dropdown/leave.svg')) TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'update', 'update ', event_color, load('res://addons/dialogic/Editor/Images/Dropdown/update.svg')) +#endregion + -#################### SYNTAX HIGHLIGHTING ####################################### +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: @@ -582,3 +590,5 @@ func list_to_suggestions(list:Array) -> Dictionary: accum[value.label]["text_alt"] = [value.label.to_lower()] return accum, {}) + +#endregion diff --git a/addons/dialogic/Modules/Clear/event_clear.gd b/addons/dialogic/Modules/Clear/event_clear.gd index 5338162e1..3e89cda9a 100644 --- a/addons/dialogic/Modules/Clear/event_clear.gd +++ b/addons/dialogic/Modules/Clear/event_clear.gd @@ -15,8 +15,7 @@ var clear_music := true var clear_portrait_positions := true var clear_background := true -################################################################################ -## EXECUTE +#region EXECUTE ################################################################################ func _execute() -> void: @@ -62,9 +61,10 @@ func _execute() -> void: finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -73,9 +73,10 @@ func _init() -> void: event_category = "Other" event_sorting_index = 2 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: @@ -95,9 +96,10 @@ func get_shortcode_parameters() -> Dictionary: "style" : {"property": "clear_style", "default": true}, } +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -114,3 +116,5 @@ func build_event_editor() -> void: add_body_edit('clear_music', ValueType.BOOL_BUTTON, {'icon':load("res://addons/dialogic/Modules/Clear/clear_music.svg"), 'tooltip':'Clear Audio'}) add_body_edit('clear_style', ValueType.BOOL_BUTTON, {'icon':load("res://addons/dialogic/Modules/Clear/clear_style.svg"), 'tooltip':'Clear Style'}) add_body_edit('clear_portrait_positions', ValueType.BOOL_BUTTON, {'icon':load("res://addons/dialogic/Modules/Clear/clear_positions.svg"), 'tooltip':'Clear Portrait Positions'}) + +#endregion diff --git a/addons/dialogic/Modules/Comment/event_comment.gd b/addons/dialogic/Modules/Comment/event_comment.gd index ad0b1dd2b..0633219bf 100644 --- a/addons/dialogic/Modules/Comment/event_comment.gd +++ b/addons/dialogic/Modules/Comment/event_comment.gd @@ -11,17 +11,17 @@ extends DialogicEvent var text := "" -################################################################################ -## EXECUTE +#region EXECUTE ################################################################################ func _execute() -> void: print("[Dialogic Comment] #", text) finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -30,9 +30,10 @@ func _init() -> void: event_category = "Helpers" event_sorting_index = 0 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func to_text() -> String: @@ -48,18 +49,23 @@ func is_valid_event(string:String) -> bool: return true return false +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: add_header_edit('text', ValueType.SINGLELINE_TEXT, {'left_text':'#', 'autofocus':true}) +#endregion -#################### SYNTAX HIGHLIGHTING ####################################### + +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, _line:String) -> Dictionary: dict[0] = {'color':event_color.lerp(Highlighter.normal_color, 0.3)} return dict + +#endregion diff --git a/addons/dialogic/Modules/Condition/event_condition.gd b/addons/dialogic/Modules/Condition/event_condition.gd index 936a690cb..ce23ce4dd 100644 --- a/addons/dialogic/Modules/Condition/event_condition.gd +++ b/addons/dialogic/Modules/Condition/event_condition.gd @@ -14,8 +14,7 @@ var condition_type := ConditionTypes.IF var condition := "" -################################################################################ -## EXECUTE +#region EXECUTE ################################################################################ func _execute() -> void: @@ -35,9 +34,10 @@ func _execute() -> void: func _is_branch_starter() -> bool: return condition_type == ConditionTypes.IF +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -52,8 +52,10 @@ func _init() -> void: func _get_end_branch_control() -> Control: return load(get_script().resource_path.get_base_dir().path_join('ui_condition_end.tscn')).instantiate() -################################################################################ -## SAVING/LOADING +#endregion + + +#region SAVING/LOADING ################################################################################ func to_text() -> String: @@ -87,9 +89,10 @@ func is_valid_event(string:String) -> bool: return true return false +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -110,8 +113,10 @@ func build_event_editor() -> void: ], 'disabled':true}) add_header_edit('condition', ValueType.CONDITION, {}, 'condition_type != %s'%ConditionTypes.ELSE) +#endregion + -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void: @@ -124,8 +129,10 @@ func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) - TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'elif', 'elif ', TextNode.syntax_highlighter.code_flow_color) TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'else', 'else:\n ', TextNode.syntax_highlighter.code_flow_color) +#endregion -#################### SYNTAX HIGHLIGHTING ####################################### + +#region SYNTAX HIGHLIGHTING ################################################################################ @@ -135,3 +142,5 @@ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, li dict[line.find(word)+len(word)] = {"color":Highlighter.normal_color} dict = Highlighter.color_condition(dict, line) return dict + +#endregion diff --git a/addons/dialogic/Modules/Glossary/event_glossary.gd b/addons/dialogic/Modules/Glossary/event_glossary.gd index d8fce3ac2..e66a5ff91 100644 --- a/addons/dialogic/Modules/Glossary/event_glossary.gd +++ b/addons/dialogic/Modules/Glossary/event_glossary.gd @@ -5,16 +5,17 @@ extends DialogicEvent ## Event that does nothing right now. -################################################################################ -## EXECUTE + +#region EXECUTE ################################################################################ func _execute() -> void: pass +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -23,9 +24,10 @@ func _init() -> void: event_category = "Other" event_sorting_index = 0 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: return "glossary" @@ -34,9 +36,13 @@ func get_shortcode_parameters() -> Dictionary: return { } -################################################################################ -## EDITOR REPRESENTATION +#endregion + + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: pass + +#endregion diff --git a/addons/dialogic/Modules/History/event_history.gd b/addons/dialogic/Modules/History/event_history.gd index 180d7f095..f162ebe9f 100644 --- a/addons/dialogic/Modules/History/event_history.gd +++ b/addons/dialogic/Modules/History/event_history.gd @@ -12,8 +12,7 @@ enum Actions {CLEAR, PAUSE, RESUME} var action := Actions.PAUSE -################################################################################ -## EXECUTION +#region EXECUTION ################################################################################ func _execute() -> void: @@ -27,9 +26,10 @@ func _execute() -> void: finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -38,9 +38,10 @@ func _init() -> void: event_category = "Other" event_sorting_index = 20 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: @@ -53,8 +54,10 @@ func get_shortcode_parameters() -> Dictionary: "suggestions": func(): return {"Clear":{'value':0, 'text_alt':['clear']}, "Pause":{'value':1, 'text_alt':['pause']}, "Resume":{'value':2, 'text_alt':['resume', 'start']}}}, } -################################################################################ -## EDITOR REPRESENTATION +#endregion + + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -74,3 +77,5 @@ func build_event_editor() -> void: }, ] }) + +#endregion diff --git a/addons/dialogic/Modules/Jump/event_jump.gd b/addons/dialogic/Modules/Jump/event_jump.gd index 9566e4600..267b2bac5 100644 --- a/addons/dialogic/Modules/Jump/event_jump.gd +++ b/addons/dialogic/Modules/Jump/event_jump.gd @@ -32,8 +32,7 @@ var timeline_identifier := "": ui_update_needed.emit() -################################################################################ -## EXECUTION +#region EXECUTION ################################################################################ func _execute() -> void: @@ -48,9 +47,10 @@ func _execute() -> void: else: dialogic.start_timeline(dialogic.current_timeline) +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -58,14 +58,16 @@ func _init() -> void: set_default_color('Color4') event_category = "Flow" event_sorting_index = 4 + help_page_path = "https://docs.dialogic.pro/jump-event.html" func _get_icon() -> Resource: return load(self.get_script().get_path().get_base_dir().path_join('icon_jump.png')) +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func to_text() -> String: var result := "jump " @@ -99,9 +101,10 @@ func get_shortcode_parameters() -> Dictionary: "label" : {"property": "label_name", "default": ""}, } +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -139,8 +142,10 @@ func get_label_suggestions(_filter:String="") -> Dictionary: suggestions["{"+var_path+"}"] = {'value':"{"+var_path+"}", 'icon':load("res://addons/dialogic/Editor/Images/Pieces/variable.svg")} return suggestions +#endregion + -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void: @@ -156,11 +161,15 @@ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:Str func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void: TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'jump', 'jump ', event_color.lerp(TextNode.syntax_highlighter.normal_color, 0.3)) +#endregion -#################### SYNTAX HIGHLIGHTING ####################################### + +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: dict[line.find('jump')] = {"color":event_color.lerp(Highlighter.normal_color, 0.3)} dict[line.find('jump')+4] = {"color":event_color.lerp(Highlighter.normal_color, 0.5)} return dict + +#endregion diff --git a/addons/dialogic/Modules/Jump/event_label.gd b/addons/dialogic/Modules/Jump/event_label.gd index e324739b6..2a72b5ac1 100644 --- a/addons/dialogic/Modules/Jump/event_label.gd +++ b/addons/dialogic/Modules/Jump/event_label.gd @@ -12,9 +12,7 @@ var name := "" var display_name := "" - -################################################################################ -## EXECUTE +#region EXECUTE ################################################################################ func _execute() -> void: @@ -29,8 +27,7 @@ func _execute() -> void: finish() -################################################################################ -## INITIALIZE +#region INITIALIZE ################################################################################ func _init() -> void: @@ -38,14 +35,16 @@ func _init() -> void: set_default_color('Color4') event_category = "Flow" event_sorting_index = 3 + help_page_path = "https://docs.dialogic.pro/jump-event.html" func _get_icon() -> Resource: return load(self.get_script().get_path().get_base_dir().path_join('icon_label.png')) +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func to_text() -> String: if display_name.is_empty(): @@ -89,26 +88,34 @@ func _get_property_original_translation(property_name:String) -> String: return display_name return '' -################################################################################ -## EDITOR REPRESENTATION +#endregion + + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: add_header_edit('name', ValueType.SINGLELINE_TEXT, {'left_text':'Label', 'autofocus':true}) add_body_edit('display_name', ValueType.SINGLELINE_TEXT, {'left_text':'Display Name:'}) +#endregion + -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void: TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'label', 'label ', event_color.lerp(TextNode.syntax_highlighter.normal_color, 0.3)) +#endregion -#################### SYNTAX HIGHLIGHTING ####################################### + +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: dict[line.find('label')] = {"color":event_color.lerp(Highlighter.normal_color, 0.3)} dict[line.find('label')+5] = {"color":event_color.lerp(Highlighter.normal_color, 0.5)} return dict + +#endregion diff --git a/addons/dialogic/Modules/Jump/event_return.gd b/addons/dialogic/Modules/Jump/event_return.gd index 33f02234d..1d24ed6d9 100644 --- a/addons/dialogic/Modules/Jump/event_return.gd +++ b/addons/dialogic/Modules/Jump/event_return.gd @@ -6,8 +6,7 @@ extends DialogicEvent -################################################################################ -## EXECUTION +#region EXECUTION ################################################################################ func _execute() -> void: @@ -16,9 +15,10 @@ func _execute() -> void: else: dialogic.end_timeline() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -26,14 +26,16 @@ func _init() -> void: set_default_color('Color4') event_category = "Flow" event_sorting_index = 5 + help_page_path = "https://docs.dialogic.pro/jump-event.html" func _get_icon() -> Resource: return load(self.get_script().get_path().get_base_dir().path_join('icon_return.svg')) +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func to_text() -> String: return "return" @@ -48,26 +50,33 @@ func is_valid_event(string:String) -> bool: return true return false +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: add_header_label('Return') +#endregion + -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void: TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'return', 'return\n', event_color.lerp(TextNode.syntax_highlighter.normal_color, 0.3)) +#endregion -#################### SYNTAX HIGHLIGHTING ####################################### + +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: dict[line.find('return')] = {"color":event_color.lerp(Highlighter.normal_color, 0.3)} dict[line.find('return')+6] = {"color":event_color.lerp(Highlighter.normal_color, 0.5)} return dict + +#endregion diff --git a/addons/dialogic/Modules/Save/event_save.gd b/addons/dialogic/Modules/Save/event_save.gd index 4fed7a44a..cfc90a978 100644 --- a/addons/dialogic/Modules/Save/event_save.gd +++ b/addons/dialogic/Modules/Save/event_save.gd @@ -12,8 +12,7 @@ extends DialogicEvent var slot_name := "" -################################################################################ -## INITIALIZE +#region EXECUTE ################################################################################ func _execute() -> void: @@ -26,9 +25,10 @@ func _execute() -> void: dialogic.Save.save(slot_name) finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -41,9 +41,10 @@ func _init() -> void: func _get_icon() -> Resource: return load(self.get_script().get_path().get_base_dir().path_join('icon.svg')) +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: @@ -56,10 +57,13 @@ func get_shortcode_parameters() -> Dictionary: "slot" : {"property": "slot_name", "default": "Default"}, } +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: add_header_edit('slot_name', ValueType.SINGLELINE_TEXT, {'left_text':'Save to slot'}) + +#endregion diff --git a/addons/dialogic/Modules/Settings/event_setting.gd b/addons/dialogic/Modules/Settings/event_setting.gd index 16dfa14de..6d218460d 100644 --- a/addons/dialogic/Modules/Settings/event_setting.gd +++ b/addons/dialogic/Modules/Settings/event_setting.gd @@ -38,8 +38,8 @@ var mode := Modes.SET ## This is only used when initializing the event_variable. var _suppress_default_value: bool = false -################################################################################ -## INITIALIZE + +#region EXECUTE ################################################################################ func _execute() -> void: @@ -62,9 +62,10 @@ func _execute() -> void: dialogic.Settings.set(name, dialogic.VAR.get_variable(value)) finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -77,9 +78,10 @@ func _init() -> void: func _get_icon() -> Resource: return load(self.get_script().get_path().get_base_dir().path_join('icon.svg')) +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func to_text() -> String: @@ -140,9 +142,10 @@ func from_text(string:String) -> void: func is_valid_event(string:String) -> bool: return string.begins_with('setting') +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -208,9 +211,10 @@ func get_value_suggestions(_filter:String) -> Dictionary: suggestions[var_path] = {'value':var_path, 'editor_icon':["ClassList", "EditorIcons"]} return suggestions +#endregion -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void: @@ -231,7 +235,10 @@ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:Str func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void: TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'setting', 'setting ', event_color) -#################### SYNTAX HIGHLIGHTING ####################################### +#endregion + + +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: @@ -241,3 +248,5 @@ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, li dict = Highlighter.color_region(dict, Highlighter.string_color, line, '"', '"') dict = Highlighter.color_region(dict, Highlighter.variable_color, line, '{', '}') return dict + +#endregion diff --git a/addons/dialogic/Modules/Signal/event_signal.gd b/addons/dialogic/Modules/Signal/event_signal.gd index 2923f5890..69c51e3f7 100644 --- a/addons/dialogic/Modules/Signal/event_signal.gd +++ b/addons/dialogic/Modules/Signal/event_signal.gd @@ -14,8 +14,8 @@ var argument_type := ArgumentTypes.STRING ## The argument that will be provided with the signal. var argument: Variant = "" -################################################################################ -## EXECUTE + +#region EXECUTE ################################################################################ func _execute() -> void: @@ -31,9 +31,10 @@ func _execute() -> void: dialogic.emit_signal('signal_event', argument) finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -43,10 +44,10 @@ func _init() -> void: event_sorting_index = 8 help_page_path = "https://docs.dialogic.pro/dialogic-signals.html#1-signal-event" +#endregion -################################################################################ -## SAVING/LOADING +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: @@ -61,8 +62,10 @@ func get_shortcode_parameters() -> Dictionary: "arg" : {"property": "argument", "default": ""} } -################################################################################ -## EDITOR REPRESENTATION +#endregion + + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -81,3 +84,5 @@ func build_event_editor() -> void: ]}) add_body_line_break('argument_type == ArgumentTypes.DICTIONARY') add_body_edit('argument', ValueType.DICTIONARY, {'left_text': 'Dictionary'},'argument_type == ArgumentTypes.DICTIONARY') + +#endregion diff --git a/addons/dialogic/Modules/Style/event_style.gd b/addons/dialogic/Modules/Style/event_style.gd index 9264b416d..2229ed21d 100644 --- a/addons/dialogic/Modules/Style/event_style.gd +++ b/addons/dialogic/Modules/Style/event_style.gd @@ -11,8 +11,7 @@ extends DialogicEvent var style_name := "" -################################################################################ -## EXECUTE +#region EXECUTE ################################################################################ func _execute() -> void: @@ -21,9 +20,10 @@ func _execute() -> void: await dialogic.get_tree().process_frame finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -32,9 +32,10 @@ func _init() -> void: event_category = "Visuals" event_sorting_index = 1 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: return "style" @@ -46,9 +47,10 @@ func get_shortcode_parameters() -> Dictionary: "name" : {"property": "style_name", "default": "", 'suggestions':get_style_suggestions}, } +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -69,3 +71,5 @@ func get_style_suggestions(_filter := "") -> Dictionary: var style: DialogicStyle = load(i) suggestions[style.name] = {'value': style.name, 'editor_icon': ["PopupMenu", "EditorIcons"]} return suggestions + +#endregion diff --git a/addons/dialogic/Modules/Text/subsystem_text.gd b/addons/dialogic/Modules/Text/subsystem_text.gd index b4d1bec1d..2d943e06d 100644 --- a/addons/dialogic/Modules/Text/subsystem_text.gd +++ b/addons/dialogic/Modules/Text/subsystem_text.gd @@ -16,7 +16,7 @@ extends DialogicSubsystem @warning_ignore("unused_signal") # This is emitted by the text event. signal about_to_show_text(info:Dictionary) ## Emitted when a text event (or a new text section) starts displaying. -## This will be AFTER the textox animation, while [signal about_to_show_text] is before. +## This will be AFTER the textbox animation, while [signal about_to_show_text] is before. ## Gives a dictionary with the same values as [signal about_to_show_text] @warning_ignore("unused_signal") # This is emitted by the text event. signal text_started(info:Dictionary) diff --git a/addons/dialogic/Modules/TextInput/event_text_input.gd b/addons/dialogic/Modules/TextInput/event_text_input.gd index 387e375fd..ee40a3748 100644 --- a/addons/dialogic/Modules/TextInput/event_text_input.gd +++ b/addons/dialogic/Modules/TextInput/event_text_input.gd @@ -42,6 +42,8 @@ func _on_DialogicTextInput_input_confirmed(input:String) -> void: dialogic.current_state = DialogicGameHandler.States.IDLE finish() +#endregion + #region SETUP ################################################################################ @@ -52,6 +54,8 @@ func _init() -> void: event_category = "Logic" event_sorting_index = 6 +#endregion + #region SAVING/LOADING ################################################################################ @@ -85,6 +89,8 @@ func _get_property_original_translation(property_name:String) -> String: return default return "" +#endregion + #region EDITOR ################################################################################ @@ -111,3 +117,5 @@ func get_var_suggestions(filter: String = "") -> Dictionary: for var_path in DialogicUtil.list_variables(vars, "", DialogicUtil.VarTypes.STRING): suggestions[var_path] = {'value':var_path, 'icon':load("res://addons/dialogic/Editor/Images/Pieces/variable.svg")} return suggestions + +#endregion diff --git a/addons/dialogic/Modules/Variable/event_variable.gd b/addons/dialogic/Modules/Variable/event_variable.gd index f23c347db..8ec9630ef 100644 --- a/addons/dialogic/Modules/Variable/event_variable.gd +++ b/addons/dialogic/Modules/Variable/event_variable.gd @@ -68,8 +68,8 @@ var random_max: int = 100 var _suppress_default_value := false -################################################################################ -## EXECUTE + +#region EXECUTE ################################################################################ func _execute() -> void: @@ -126,9 +126,10 @@ func _execute() -> void: finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -138,9 +139,10 @@ func _init() -> void: event_sorting_index = 0 help_page_path = "https://docs.dialogic.pro/variables.html#23-set-variable-event" +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func to_text() -> String: @@ -223,9 +225,10 @@ func from_text(string:String) -> void: func is_valid_event(string:String) -> bool: return string.begins_with('set') +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -352,9 +355,10 @@ func update_editor_warning() -> void: else: ui_update_warning.emit('') +#endregion -####################### CODE COMPLETION ######################################## +#region CODE COMPLETION ################################################################################ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:String, _word:String, symbol:String) -> void: @@ -380,8 +384,10 @@ func _get_code_completion(CodeCompletionHelper:Node, TextNode:TextEdit, line:Str func _get_start_code_completion(_CodeCompletionHelper:Node, TextNode:TextEdit) -> void: TextNode.add_code_completion_option(CodeEdit.KIND_PLAIN_TEXT, 'set', 'set ', event_color.lerp(TextNode.syntax_highlighter.normal_color, 0.5)) +#endregion -#################### SYNTAX HIGHLIGHTING ####################################### + +#region SYNTAX HIGHLIGHTING ################################################################################ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, line:String) -> Dictionary: @@ -390,3 +396,5 @@ func _get_syntax_highlighting(Highlighter:SyntaxHighlighter, dict:Dictionary, li dict = Highlighter.color_region(dict, Highlighter.string_color, line, '"', '"', line.find('set')) dict = Highlighter.color_region(dict, Highlighter.variable_color, line, '{', '}', line.find('set')) return dict + +#endregion diff --git a/addons/dialogic/Modules/Voice/event_voice.gd b/addons/dialogic/Modules/Voice/event_voice.gd index ddc214f12..8c14d502a 100644 --- a/addons/dialogic/Modules/Voice/event_voice.gd +++ b/addons/dialogic/Modules/Voice/event_voice.gd @@ -19,8 +19,7 @@ var volume: float = 0 var audio_bus := "Master" -################################################################################ -## EXECUTE +#region EXECUTE ################################################################################ func _execute() -> void: @@ -37,9 +36,10 @@ func _execute() -> void: finish() # the rest is executed by a text event +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -48,9 +48,10 @@ func _init() -> void: event_category = "Audio" event_sorting_index = 5 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: @@ -65,9 +66,10 @@ func get_shortcode_parameters() -> Dictionary: "bus" : {"property": "audio_bus", "default": "Master"} } +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -80,3 +82,5 @@ func build_event_editor() -> void: add_header_edit('file_path', ValueType.AUDIO_PREVIEW) add_body_edit('volume', ValueType.NUMBER, {'left_text':'Volume:', 'mode':2}, '!file_path.is_empty()') add_body_edit('audio_bus', ValueType.SINGLELINE_TEXT, {'left_text':'Audio Bus:'}, '!file_path.is_empty()') + +#endregion diff --git a/addons/dialogic/Modules/Wait/event_wait.gd b/addons/dialogic/Modules/Wait/event_wait.gd index 86b4c70b5..3380ba175 100644 --- a/addons/dialogic/Modules/Wait/event_wait.gd +++ b/addons/dialogic/Modules/Wait/event_wait.gd @@ -16,8 +16,8 @@ var skippable := false var _tween: Tween -################################################################################ -## EXECUTE + +#region EXECUTE ################################################################################ func _execute() -> void: @@ -55,9 +55,10 @@ func _on_finish() -> void: finish() +#endregion -################################################################################ -## INITIALIZE + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -66,9 +67,10 @@ func _init() -> void: event_category = "Flow" event_sorting_index = 11 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: @@ -83,9 +85,10 @@ func get_shortcode_parameters() -> Dictionary: "skippable" : {"property": "skippable", "default": false}, } +#endregion -################################################################################ -## EDITOR REPRESENTATION + +#region EDITOR REPRESENTATION ################################################################################ func build_event_editor() -> void: @@ -94,3 +97,5 @@ func build_event_editor() -> void: add_header_label('second', 'time == 1') add_body_edit('hide_text', ValueType.BOOL, {'left_text':'Hide text box:'}) add_body_edit('skippable', ValueType.BOOL, {'left_text':'Skippable:'}) + +#endregion diff --git a/addons/dialogic/Modules/WaitInput/event_wait_input.gd b/addons/dialogic/Modules/WaitInput/event_wait_input.gd index 07515d029..a3dc23924 100644 --- a/addons/dialogic/Modules/WaitInput/event_wait_input.gd +++ b/addons/dialogic/Modules/WaitInput/event_wait_input.gd @@ -6,8 +6,8 @@ extends DialogicEvent var hide_textbox := true -################################################################################ -## EXECUTE + +#region EXECUTE ################################################################################ func _execute() -> void: @@ -18,8 +18,10 @@ func _execute() -> void: await dialogic.Inputs.dialogic_action finish() -################################################################################ -## INITIALIZE +#endregion + + +#region INITIALIZE ################################################################################ func _init() -> void: @@ -28,9 +30,10 @@ func _init() -> void: event_category = "Flow" event_sorting_index = 12 +#endregion -################################################################################ -## SAVING/LOADING + +#region SAVING/LOADING ################################################################################ func get_shortcode() -> String: @@ -46,3 +49,5 @@ func get_shortcode_parameters() -> Dictionary: func build_event_editor() -> void: add_header_label('Wait for input') add_body_edit('hide_textbox', ValueType.BOOL, {'left_text':'Hide text box:'}) + +#endregion