diff --git a/addons/blockflow b/addons/blockflow index 6cb1dec..90d29f7 160000 --- a/addons/blockflow +++ b/addons/blockflow @@ -1 +1 @@ -Subproject commit 6cb1dec34d210b94b6d467977da2fe6a7e0fcd8d +Subproject commit 90d29f7330aa6c48843c76ca678952cec45ca9fb diff --git a/addons/textalog b/addons/textalog index c55ba59..0512e5d 160000 --- a/addons/textalog +++ b/addons/textalog @@ -1 +1 @@ -Subproject commit c55ba59a356c619cd098fb7595127d448285521e +Subproject commit 0512e5ddee4e9847d9f923c6d862a305c56dd60c diff --git a/project.godot b/project.godot index d5a43ee..e0748ae 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="NovelTest" run/main_scene="res://scenes/main.tscn" -config/features=PackedStringArray("4.2", "GL Compatibility") +config/features=PackedStringArray("4.3", "GL Compatibility") config/icon="res://icon.png" [autoload] @@ -35,47 +35,47 @@ movie_writer/movie_file="D:/Development/Godot/Projects 4.0/NovelTest/dev_footage [editor_plugins] -enabled=PackedStringArray("res://addons/blockflow/plugin.cfg", "res://addons/textalog/plugin.cfg") +enabled=PackedStringArray("res://addons/blockflow/plugin.cfg") [input] next={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null) , Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } previous={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":90,"key_label":0,"unicode":122,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":90,"key_label":0,"unicode":122,"location":0,"echo":false,"script":null) , Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) ] } press={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null) ] } present={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) ] } skip={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } auto={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194328,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194328,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) ] } diff --git a/timelines/choicetest/choices/0.tres b/timelines/choicetest/choices/0.tres index c77529d..65cea76 100644 --- a/timelines/choicetest/choices/0.tres +++ b/timelines/choicetest/choices/0.tres @@ -12,11 +12,13 @@ script = ExtResource("2_eixfw") showname = "" dialog = "You will now enter \"Basic Dialogue\" timeline." additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 diff --git a/timelines/choicetest/choices/1.tres b/timelines/choicetest/choices/1.tres index 7f71279..80d0002 100644 --- a/timelines/choicetest/choices/1.tres +++ b/timelines/choicetest/choices/1.tres @@ -12,11 +12,13 @@ script = ExtResource("2_wfcod") showname = "" dialog = "You will now enter \"Testimony Test\"" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 diff --git a/timelines/choicetest/choices/2.tres b/timelines/choicetest/choices/2.tres index 8981b30..6accd52 100644 --- a/timelines/choicetest/choices/2.tres +++ b/timelines/choicetest/choices/2.tres @@ -11,11 +11,13 @@ script = ExtResource("2_1qiec") showname = "" dialog = "You will now enter \"Investigation Test\"" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 diff --git a/timelines/choicetest/choicetest.tres b/timelines/choicetest/choicetest.tres index 5a5523b..65a4669 100644 --- a/timelines/choicetest/choicetest.tres +++ b/timelines/choicetest/choicetest.tres @@ -30,11 +30,13 @@ script = ExtResource("6_ow41s") showname = "" dialog = "MAKE YOUR CHOICE" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = true background_color = 0 diff --git a/timelines/investigation.tres b/timelines/investigation.tres index f0677b8..d5157f8 100644 --- a/timelines/investigation.tres +++ b/timelines/investigation.tres @@ -21,11 +21,13 @@ script = ExtResource("2_yh0lv") showname = "" dialog = "among us funny moments" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 diff --git a/timelines/test.tres b/timelines/test.tres index 59f105a..422f2ed 100644 --- a/timelines/test.tres +++ b/timelines/test.tres @@ -36,11 +36,14 @@ script = ExtResource("5_6pb2j") showname = "" dialog = "" additive = false +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = false speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = true background_color = 0 @@ -122,11 +125,14 @@ script = ExtResource("5_6pb2j") showname = "Godette" dialog = "Hello there! This is a test." additive = false +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -150,11 +156,14 @@ script = ExtResource("5_6pb2j") showname = "Godette" dialog = "Oh, this is not your first time here! " additive = false +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = true background_color = 0 @@ -189,11 +198,14 @@ script = ExtResource("5_6pb2j") showname = "Godette" dialog = "Guess I'll be brief." additive = true +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -238,11 +250,14 @@ script = ExtResource("5_6pb2j") showname = "Godette" dialog = "I am speaking to you... " additive = false +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = true background_color = 0 @@ -277,11 +292,14 @@ script = ExtResource("5_6pb2j") showname = "Godette" dialog = "Right now." additive = true +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -370,11 +388,14 @@ script = ExtResource("5_6pb2j") showname = "Dale" dialog = "Dale Jumpscare" additive = false +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = true background_color = 0 @@ -420,11 +441,14 @@ script = ExtResource("5_6pb2j") showname = "Godette" dialog = "Anyway, bye!" additive = false +text_speed = 6 letter_delay = 0.02 +blip_sound = "male" wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 diff --git a/timelines/testimony1/present1.tres b/timelines/testimony1/present1.tres index 291fd6d..3e763ea 100644 --- a/timelines/testimony1/present1.tres +++ b/timelines/testimony1/present1.tres @@ -25,11 +25,13 @@ script = ExtResource("1_dnfd8") showname = "Godette" dialog = "What is this? Huh?" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -72,11 +74,13 @@ script = ExtResource("1_dnfd8") showname = "Godette" dialog = "oh shit you presented the right evidence, great job" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 diff --git a/timelines/testimony1/press1.tres b/timelines/testimony1/press1.tres index 3b26184..f736f30 100644 --- a/timelines/testimony1/press1.tres +++ b/timelines/testimony1/press1.tres @@ -9,11 +9,13 @@ script = ExtResource("1_ffunr") showname = "Godette" dialog = "what" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 diff --git a/timelines/testimony1/testimony.tres b/timelines/testimony1/testimony.tres index 4586406..1b08c2b 100644 --- a/timelines/testimony1/testimony.tres +++ b/timelines/testimony1/testimony.tres @@ -48,11 +48,13 @@ script = ExtResource("4_i05au") showname = "" dialog = "I arrived at the scene to witness a gruesome event!" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -73,11 +75,13 @@ script = ExtResource("4_i05au") showname = "" dialog = "I don't know for how long I was unconscious, but I woke up in the parking lot." additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -98,11 +102,13 @@ script = ExtResource("4_i05au") showname = "" dialog = "The defendant plunged his knife into the victim's throat!!" additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -123,11 +129,13 @@ script = ExtResource("4_i05au") showname = "" dialog = "Scared for my life, I turned around and ran, but slammed into the door..." additive = false +text_speed = 6 letter_delay = 0.02 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -235,11 +243,13 @@ script = ExtResource("4_i05au") showname = "Godette" dialog = "[color=lime]When I arrived at the scene, there Tim was, laying face-first in the pool of his own blood!" additive = false +text_speed = 5 letter_delay = 0.0 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -308,11 +318,13 @@ script = ExtResource("4_i05au") showname = "Godette" dialog = "[color=lime]I was horrified and didn't know what to do! I ran towards Tim, but I slipped on his blood and fell right on top of him..." additive = false +text_speed = 5 letter_delay = 0.0 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -381,11 +393,13 @@ script = ExtResource("4_i05au") showname = "Godette" dialog = "[color=lime]I screamed out, all of a sudden I heard footsteps from behind the door fading away!" additive = false +text_speed = 5 letter_delay = 0.0 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0 @@ -454,11 +468,13 @@ script = ExtResource("4_i05au") showname = "Godette" dialog = "[color=lime]At this point, everyone else rushed in behind me, and pinned me down as the culprit... But I didn't do it!" additive = false +text_speed = 5 letter_delay = 0.0 wait_until_finished = true speaking_character = "" bump_speaker = false highlight_speaker = false +hide_dialog = false bookmark = &"" continue_at_end = false background_color = 0