diff --git a/Dialogue/Styles/TextBubbleStyle.tres b/Dialogue/Styles/TextBubbleStyle.tres new file mode 100644 index 00000000..33ce5e7e --- /dev/null +++ b/Dialogue/Styles/TextBubbleStyle.tres @@ -0,0 +1,33 @@ +[gd_resource type="Resource" script_class="DialogicStyle" load_steps=8 format=3 uid="uid://vsixw62hsvkx"] + +[ext_resource type="Script" uid="uid://dh4po8pgey4yv" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_4qba7"] +[ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="2_ha15j"] +[ext_resource type="PackedScene" uid="uid://d2it0xiap3gnt" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Textbubble/text_bubble_layer.tscn" id="3_k85uv"] +[ext_resource type="Script" uid="uid://dfja8ptqdlfix" path="res://addons/dialogic/Resources/dialogic_style.gd" id="4_8lqfv"] + +[sub_resource type="Resource" id="Resource_dekin"] +script = ExtResource("1_4qba7") +overrides = {} + +[sub_resource type="Resource" id="Resource_o1mph"] +script = ExtResource("1_4qba7") +scene = ExtResource("2_ha15j") +overrides = {} + +[sub_resource type="Resource" id="Resource_i8sxs"] +script = ExtResource("1_4qba7") +scene = ExtResource("3_k85uv") +overrides = {} + +[resource] +script = ExtResource("4_8lqfv") +name = "TextBubbleStyle" +layer_list = Array[String](["10", "11"]) +layer_info = { +"": SubResource("Resource_dekin"), +"10": SubResource("Resource_o1mph"), +"11": SubResource("Resource_i8sxs") +} +base_overrides = {} +layers = Array[ExtResource("1_4qba7")]([]) +metadata/_latest_layer = "" diff --git a/Dialogue/Timelines/testbubble.dtl b/Dialogue/Timelines/testbubble.dtl new file mode 100644 index 00000000..4cbce58b --- /dev/null +++ b/Dialogue/Timelines/testbubble.dtl @@ -0,0 +1,4 @@ +[style name="TextBubbleStyle"] +test without character +ICE: yo cirno +Cirno: I'm baka diff --git a/Dialogue/Timelines/testbubble.dtl.uid b/Dialogue/Timelines/testbubble.dtl.uid new file mode 100644 index 00000000..ea5a735c --- /dev/null +++ b/Dialogue/Timelines/testbubble.dtl.uid @@ -0,0 +1 @@ +uid://df7w0k1g3jib diff --git a/Scenes/Maps/Level2.tscn b/Scenes/Maps/Level2.tscn index a2cfe206..aefb8c57 100644 --- a/Scenes/Maps/Level2.tscn +++ b/Scenes/Maps/Level2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=90 format=4 uid="uid://6a6tjohypmmb"] +[gd_scene load_steps=93 format=4 uid="uid://6a6tjohypmmb"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"] @@ -45,6 +45,8 @@ [ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="42_joghw"] [ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="42_nq7r5"] [ext_resource type="Resource" uid="uid://b0xtpdb4by8mm" path="res://Resources/Maps/Level3.tres" id="43_joghw"] +[ext_resource type="PackedScene" uid="uid://fxvlaidieiv7" path="res://Scenes/Interactable/ScriptableAreaTrigger.tscn" id="43_q1ysg"] +[ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="44_1gtgk"] [ext_resource type="Script" uid="uid://upq0b4sx7nhw" path="res://Scripts/Misc/CameraTarget.cs" id="44_5t0ab"] [ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="44_q1ysg"] [ext_resource type="PackedScene" uid="uid://bmif3jo03yuol" path="res://Scenes/camera_controller.tscn" id="47_nq7r5"] @@ -319,6 +321,11 @@ _data = { } point_count = 2 +[sub_resource type="Resource" id="Resource_f2fbs"] +script = ExtResource("44_1gtgk") +TimelineName = &"testbubble" +WaitForCompletion = true + [node name="GameScene" type="Node2D" node_paths=PackedStringArray("NavigationTilemap")] script = ExtResource("1_t2k72") MapResource = ExtResource("2_5t0ab") @@ -633,6 +640,11 @@ position = Vector2(-224, 256) [node name="HorizontalDoor3" parent="Tilemaps/Actors" instance=ExtResource("42_joghw")] position = Vector2(-112, 256) +[node name="Bubbletest" parent="Tilemaps/Actors" instance=ExtResource("43_q1ysg")] +position = Vector2(400, 316) +scale = Vector2(1.455, 1.455) +Events = Array[ExtResource("13_5t0ab")]([SubResource("Resource_f2fbs")]) + [node name="ReferenceRect" type="ReferenceRect" parent="."] visible = false offset_left = -38.0 diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 531174c0..c43fce4e 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -300,7 +300,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_w8skm"] +[sub_resource type="Resource" id="Resource_7lma1"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -1247,7 +1247,7 @@ Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_068l7"), SubResou [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_w8skm")]) +Events = Array[ExtResource("62_w8skm")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_7lma1")]) [node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) diff --git a/project.godot b/project.godot index 289a852a..7e92d7b0 100644 --- a/project.godot +++ b/project.godot @@ -78,6 +78,7 @@ directories/dtl_directory={ "laser_tutorial": "res://Dialogue/Timelines/laser_tutorial.dtl", "rumia_defeat": "res://Dialogue/Timelines/rumia_defeat.dtl", "rumia_rebel_base_1": "res://Dialogue/Timelines/rumia_rebel_base_1.dtl", +"testbubble": "res://Dialogue/Timelines/testbubble.dtl", "testintro": "res://Dialogue/Timelines/testintro.dtl", "timeline": "res://Dialogue/timeline.dtl", "tutorial_barrels": "res://Dialogue/Timelines/Tutorial/tutorial_barrels.dtl", @@ -90,7 +91,7 @@ directories/dtl_directory={ "tutorial_teleporter_2": "res://Dialogue/Timelines/Tutorial/tutorial_teleporter_2.dtl" } glossary/default_case_sensitive=true -layout/style_list=["res://Dialogue/Styles/Textbox_style.tres", "res://Dialogue/Styles/VN.tres", "res://Dialogue/Styles/Terminal_Style.tres", "res://Dialogue/Styles/Briefing_Style.tres"] +layout/style_list=["res://Dialogue/Styles/Textbox_style.tres", "res://Dialogue/Styles/VN.tres", "res://Dialogue/Styles/Terminal_Style.tres", "res://Dialogue/Styles/Briefing_Style.tres", "res://Dialogue/Styles/TextBubbleStyle.tres"] layout/default_style="res://Dialogue/Styles/Textbox_style.tres" variables={ "Buttons": {