diff --git a/3D/Maps/Fusion.map b/3D/Maps/Fusion.map index 01429d48..9ae3c2f4 100644 --- a/3D/Maps/Fusion.map +++ b/3D/Maps/Fusion.map @@ -1623,3 +1623,14 @@ "classname" "actor_door_1" "origin" "-148 -128 32" } +// entity 61 +{ +"classname" "actor_table_002" +"origin" "-48 -24 20" +} +// entity 62 +{ +"classname" "actor_terminal" +"origin" "-48 -24 28" +"timeline" "BBS_Test" +} diff --git a/Dialogue/Styles/Briefing_Style.tres b/Dialogue/Styles/Briefing_Style.tres index c70c76eb..258858f8 100644 --- a/Dialogue/Styles/Briefing_Style.tres +++ b/Dialogue/Styles/Briefing_Style.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="DialogicStyle" load_steps=22 format=3 uid="uid://1360okdjnu04"] -[ext_resource type="Script" uid="uid://dh4po8pgey4yv" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_1na1v"] +[ext_resource type="Script" uid="uid://bwg6yncmh2cml" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_1na1v"] [ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_yysma"] [ext_resource type="PackedScene" uid="uid://cy1y14inwkplb" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.tscn" id="3_tapfv"] [ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="4_c3ltj"] @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="7_tsnk8"] [ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="8_ipd3l"] [ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="9_sowdg"] -[ext_resource type="Script" uid="uid://dfja8ptqdlfix" path="res://addons/dialogic/Resources/dialogic_style.gd" id="10_lggnn"] +[ext_resource type="Script" uid="uid://dv08k6ljua6fm" path="res://addons/dialogic/Resources/dialogic_style.gd" id="10_lggnn"] [ext_resource type="PackedScene" uid="uid://bvoym0jf534us" path="res://Dialogue/Styles/Layers/Image_Layer/Image/custom_image.tscn" id="10_yysma"] [sub_resource type="Resource" id="Resource_1umci"] diff --git a/Dialogue/Styles/Terminal_Style.tres b/Dialogue/Styles/Terminal_Style.tres index 9e9d4893..c0f0242d 100644 --- a/Dialogue/Styles/Terminal_Style.tres +++ b/Dialogue/Styles/Terminal_Style.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="DialogicStyle" load_steps=18 format=3 uid="uid://dt3lvliuoovuh"] -[ext_resource type="Script" uid="uid://dh4po8pgey4yv" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_01ap4"] +[ext_resource type="Script" uid="uid://bwg6yncmh2cml" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_01ap4"] [ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_7kcue"] [ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="3_sjmr0"] [ext_resource type="PackedScene" uid="uid://d3dusydsn1qjd" path="res://Dialogue/Styles/Layers/Terminal_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn" id="4_01ap4"] @@ -8,7 +8,7 @@ [ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="6_g4wyu"] [ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="7_0tq0p"] [ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="8_rq6rw"] -[ext_resource type="Script" uid="uid://dfja8ptqdlfix" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_bq3y2"] +[ext_resource type="Script" uid="uid://dv08k6ljua6fm" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_bq3y2"] [sub_resource type="Resource" id="Resource_egg03"] script = ExtResource("1_01ap4") @@ -31,11 +31,11 @@ scene = ExtResource("3_sjmr0") script = ExtResource("1_01ap4") scene = ExtResource("4_01ap4") overrides = { -"box_distance": "8.0", +"box_distance": "16.0", "box_modulate_custom_color": "Color(1, 1, 1, 1)", "box_modulate_global_color": "false", "box_panel": "\"res://Resources/Styles/Terminal_Style_Box.tres\"", -"box_size": "Vector2(200, 150)", +"box_size": "Vector2(210, 190)", "name_label_hide_when_no_character": "true", "portrait_bg_modulate": "Color(0, 0, 0, 0)", "portrait_stretch_factor": "0.0" diff --git a/Dialogue/Styles/TextBubbleStyle.tres b/Dialogue/Styles/TextBubbleStyle.tres index 2fcddedd..d7d86138 100644 --- a/Dialogue/Styles/TextBubbleStyle.tres +++ b/Dialogue/Styles/TextBubbleStyle.tres @@ -1,9 +1,9 @@ [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="Script" uid="uid://bwg6yncmh2cml" 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"] +[ext_resource type="Script" uid="uid://dv08k6ljua6fm" path="res://addons/dialogic/Resources/dialogic_style.gd" id="4_8lqfv"] [sub_resource type="Resource" id="Resource_dekin"] script = ExtResource("1_4qba7") diff --git a/Dialogue/Styles/Textbox_style.tres b/Dialogue/Styles/Textbox_style.tres index 2d1aa62b..40329276 100644 --- a/Dialogue/Styles/Textbox_style.tres +++ b/Dialogue/Styles/Textbox_style.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="DialogicStyle" load_steps=19 format=3 uid="uid://o7nq8i88igxp"] [ext_resource type="PackedScene" uid="uid://cqpb3ie51rwl5" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.tscn" id="1_4vo3k"] -[ext_resource type="Script" uid="uid://dh4po8pgey4yv" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_5pbjb"] +[ext_resource type="Script" uid="uid://bwg6yncmh2cml" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_5pbjb"] [ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_6fieu"] [ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="3_uwd3s"] [ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="5_xqoux"] @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://cx6y8bri11i6d" path="res://Resources/Styles/Textbox_Style_Custom_Textbox/TextboxWithPortrait/custom_textbox_with_portrait_.tscn" id="6_kdmoh"] [ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="7_qp31f"] [ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="8_ckc0n"] -[ext_resource type="Script" uid="uid://dfja8ptqdlfix" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_qfqf2"] +[ext_resource type="Script" uid="uid://dv08k6ljua6fm" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_qfqf2"] [sub_resource type="Resource" id="Resource_ycww1"] script = ExtResource("1_5pbjb") diff --git a/Dialogue/Styles/VN.tres b/Dialogue/Styles/VN.tres index 832c7c48..cddd3e69 100644 --- a/Dialogue/Styles/VN.tres +++ b/Dialogue/Styles/VN.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="DialogicStyle" load_steps=21 format=3 uid="uid://b6omw5u7u4f3"] [ext_resource type="PackedScene" uid="uid://cqpb3ie51rwl5" path="res://addons/dialogic/Modules/DefaultLayoutParts/Base_Default/default_layout_base.tscn" id="1_1vg82"] -[ext_resource type="Script" uid="uid://dh4po8pgey4yv" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_47mos"] +[ext_resource type="Script" uid="uid://bwg6yncmh2cml" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_47mos"] [ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_obap8"] [ext_resource type="PackedScene" uid="uid://cy1y14inwkplb" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Portraits/vn_portrait_layer.tscn" id="3_kxjow"] [ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="4_d8rd6"] @@ -10,7 +10,7 @@ [ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="7_8cj1f"] [ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="8_aoqfk"] [ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="9_86wuu"] -[ext_resource type="Script" uid="uid://dfja8ptqdlfix" path="res://addons/dialogic/Resources/dialogic_style.gd" id="10_ixmpf"] +[ext_resource type="Script" uid="uid://dv08k6ljua6fm" path="res://addons/dialogic/Resources/dialogic_style.gd" id="10_ixmpf"] [sub_resource type="Resource" id="Resource_mqh25"] script = ExtResource("1_47mos") diff --git a/Dialogue/Timelines/BBS_Test.dtl b/Dialogue/Timelines/BBS_Test.dtl new file mode 100644 index 00000000..4caadbe6 --- /dev/null +++ b/Dialogue/Timelines/BBS_Test.dtl @@ -0,0 +1,33 @@ +[style name="Terminal_Style"] +label Menu +computer: Welcome to the BBS\ +----------------------------\ +1. Email\ +2. Notes\ +3. Exit +[wait_input hide_text="false"] +- Email + label Email + computer: You have 2 new emails\ + ----------------------------\ + 1. Re\: Shortages\ + 2. Immediate Termination Notice\ + 3. Exit + [wait_input hide_text="false"] + - Re: Shortages + computer: From\: John Colleague\ + Heads up, I hear there's another budget shortages, there's a risk a new round of layoffs is coming soon + jump Email + - Immediate Termination Notice + computer: From\: HR\ + Greetings, I hope this email finds you well.\ + Due to budgetary reasons we regret to inform you that your employment is going to be terminated effective immediately.\ + Have a nice day. + jump Email + - Exit + jump Menu +- Notes + computer: Nooo my spaghetti + jump Menu +- Exit + computer: You log off \ No newline at end of file diff --git a/Dialogue/Timelines/BBS_Test.dtl.uid b/Dialogue/Timelines/BBS_Test.dtl.uid new file mode 100644 index 00000000..b9e1d464 --- /dev/null +++ b/Dialogue/Timelines/BBS_Test.dtl.uid @@ -0,0 +1 @@ +uid://dl2famhrxkkb3 diff --git a/IsoTest/Fusion001.tscn b/IsoTest/Fusion001.tscn index 08c5b959..8b68b215 100644 --- a/IsoTest/Fusion001.tscn +++ b/IsoTest/Fusion001.tscn @@ -1536,6 +1536,13 @@ transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2, 2 [node name="entity_60_actor_door_1" parent="FuncGodotMap" instance=ExtResource("57_gw41l")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -8, 2, -9.25) +[node name="entity_61_actor_table_002" parent="FuncGodotMap" instance=ExtResource("49_rllxc")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1.5, 1.25, -3) + +[node name="entity_62_actor_terminal" parent="FuncGodotMap" instance=ExtResource("61_5o6gw")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1.5, 1.75, -3) +TimelineName = &"BBS_Test" + [node name="Enemies" type="Node3D" parent="."] [node name="Laser" type="Area3D" parent="Enemies"] @@ -1576,14 +1583,6 @@ texture = ExtResource("106_fer1b") visible = false navigation_mesh = SubResource("NavigationMesh_xhmq5") -[node name="Terminal" parent="." instance=ExtResource("61_5o6gw")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5675659, 1.6668701, 1.8129272) -CustomDialogue = "[style name=\"Terminal_Style\"] -computer: From\\: J.S.\\ -Subject\\: Pizza\\ -Asdfg -" - [node name="ColorRect" type="ColorRect" parent="."] visible = false material = SubResource("ShaderMaterial_uwu65") diff --git a/project.godot b/project.godot index 8b2fdc49..84cdbda9 100644 --- a/project.godot +++ b/project.godot @@ -72,6 +72,7 @@ directories/dch_directory={ "test": "res://Dialogue/Characters/test.dch" } directories/dtl_directory={ +"BBS_Test": "res://Dialogue/Timelines/BBS_Test.dtl", "Level1_End_Intermission": "res://Dialogue/Timelines/Rebel_Base/Level1_End_Intermission.dtl", "Mission1_Briefing": "res://Dialogue/Timelines/Mission1_Briefing.dtl", "Mission1_Briefing_2": "res://Dialogue/Timelines/Mission1_Briefing_2.dtl", @@ -147,6 +148,28 @@ translation/intern/translation_folder="res://Dialogue/Translations" translation/id_counter=198 translation/locales=["en", "it"] audio/type_sound_bus="Voice" +layout/style_directory={ +"": "res://Dialogue/Styles/Textbox_style.tres", +"Briefing_Style": "res://Dialogue/Styles/Briefing_Style.tres", +"Terminal_Style": "res://Dialogue/Styles/Terminal_Style.tres", +"TextBubbleStyle": "res://Dialogue/Styles/TextBubbleStyle.tres", +"Textbox_style": "res://Dialogue/Styles/Textbox_style.tres", +"VN": "res://Dialogue/Styles/VN.tres" +} +audio/channel_defaults={ +"": { +"audio_bus": "", +"fade_length": 0.0, +"loop": false, +"volume": 0.0 +}, +"music": { +"audio_bus": "", +"fade_length": 0.0, +"loop": true, +"volume": 0.0 +} +} [display]