Various small changes

Jowan-Spooner · Jowan-Spooner · commit e89d4da911e9 · 2025-02-18T12:43:04.000+01:00
diff --git a/Chapter 10.dtl b/Chapter 10.dtl
@@ -5,4 +5,4 @@ Elina (plot): I'm not so sure yet, what do you think?
 	<Empty Text Event>
 - No way
 - Maybe...
-Alright let's do that then.
+Alright let's do that then.
diff --git a/FakeUnitTests/TC1_Simple.dch b/FakeUnitTests/TC1_Simple.dch
@@ -4,6 +4,7 @@
 "_translation_id": "",
 "color": Color(1, 1, 1, 1),
 "custom_info": {
+"prefix": "",
 "sound_mood_default": "",
 "sound_moods": {
 "Mood1": {
@@ -27,7 +28,8 @@
 "volume_variance": 0.4
 }
 },
-"style": ""
+"style": "",
+"suffix": ""
 },
 "default_portrait": "Default",
 "description": "",
diff --git a/FakeUnitTests/t0_overview.dtl b/FakeUnitTests/t0_overview.dtl
@@ -12,4 +12,4 @@ Choose a timeline to test.
 - Various
 	jump t5_various_events/
 - Audio
-	jump t6_audio/
+	jump t6_audio/
diff --git a/FakeUnitTests/t1_texts.dtl b/FakeUnitTests/t1_texts.dtl
@@ -89,4 +89,4 @@ Lorem EN1 ipsum entry1 dolor entry_one sit amet.
 [i]Text that contains the \entry2 and it's alternatives (not all should count).
 Entry2 entry2 en2 EN2 entry_TWO entry_two entry_2 Entry_2
 
-jump t0_overview/
+jump t0_overview/
diff --git a/FakeUnitTests/t2_characters.dtl b/FakeUnitTests/t2_characters.dtl
@@ -41,4 +41,4 @@ leave TC3_BasicPortraits
 [i]Leave all characters (bounce out).
 leave --All-- [animation="Bounce Out" wait="true"]
 
-jump t0_overview/
+jump t0_overview/
diff --git a/FakeUnitTests/t3_variables.dtl b/FakeUnitTests/t3_variables.dtl
@@ -49,4 +49,4 @@ Float\: {UnitTest.var_float} | String\: {UnitTest.var_string} | Array[0]\: {Unit
 set UnitTest.var_float += 10
 Float\: {UnitTest.var_float} | String\: {UnitTest.var_string} | Array[0]\: {UnitTest.var_array[0]}
 
-jump t0_overview/
+jump t0_overview/
diff --git a/FakeUnitTests/t4_styles.dtl b/FakeUnitTests/t4_styles.dtl
@@ -37,4 +37,4 @@ Some other text.
 Another text event.
 
 [i]The end.
-jump t0_overview/
+jump t0_overview/
diff --git a/FakeUnitTests/t5_various_events.dtl b/FakeUnitTests/t5_various_events.dtl
@@ -15,4 +15,4 @@ label Wait
 label Wait Input
 [i]Wait input\: Will wait for a click.
 [wait_input]
-jump t0_overview/
+jump t0_overview/
diff --git a/FakeUnitTests/t6_audio.dtl b/FakeUnitTests/t6_audio.dtl
@@ -4,54 +4,54 @@ It will describe the desired effect, then do it.
 
 label Music
 [i]MP3 Music will play (click to end it). It will not fade in and out.
-[music path="res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" fade="0" volume="-15"]
+audio music "res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" [fade="0.0" volume="-15.0"]
 [wait_input]
-[music fade="0"]
+audio music - [fade="0.0"]
 
 [i]WAV Music will play (click to end it). It will not fade in and out.
-[music path="res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" fade="0"  volume="-15"]
+audio music "res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" [fade="0.0" volume="-15.0"]
 [wait_input]
-[music fade="0"]
+audio music - [fade="0.0"]
 
 [i]OGG Music will play (click to end it). It will not fade in and out.
-[music path="res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" fade="0"  volume="-15"]
+audio music "res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" [fade="0.0" volume="-15.0"]
 [wait_input ]
-[music fade="0"]
+audio music - [fade="0.0"]
 
 
 label Music Looping
 [i]Looping OGG Music will play (click to end it). It will fade in and out (1s each).
-[music path="res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" fade="1" loop="true"  volume="-15"]
+audio music "res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" [fade="1.0" volume="-15.0" loop="true"]
 [wait_input ]
-[music fade="1"]
+audio music - [fade="1.0"]
 
 [i]Same file but with looping turned off (click to end it). It will fade in (and out if canceled early).
-[music path="res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" fade="1" loop="false"  volume="-15"]
+audio music "res://FakeUnitTests/Assets/Music/Play Now Bridge Loop.ogg" [fade="1.0" volume="-15.0" loop="false"]
 [wait_input ]
-[music fade="1"]
+audio music - [fade="1.0"]
 
 label Music Channels
 [i]Play an ambient wind sound on a music channel. Then play music on another. On a click stop the music and on another click, stop the wind sound.
-[music path="res://FakeUnitTests/Assets/SFX/wind_ambiance.wav" channel="1"]
+audio music2 "res://FakeUnitTests/Assets/SFX/wind_ambiance.wav"
 [wait time="2"]
-[music path="res://FakeUnitTests/Assets/Music/Play Now.mp3" channel="2" volume="-22"]
+audio music3 "res://FakeUnitTests/Assets/Music/Play Now.mp3" [volume="-22.0"]
 [wait_input]
-[music channel="2"]
+audio music3 -
 [wait_input]
-[music channel="1"]
+audio music2 -
 
 
 label Sound
 [i]Play a bell sound effect.
-[sound path="res://FakeUnitTests/Assets/SFX/bell_03.ogg"]
+audio "res://FakeUnitTests/Assets/SFX/bell_03.ogg"
 [wait_input ]
 
 [i]Play a bell sound effect with -15db volume.
-[sound path="res://FakeUnitTests/Assets/SFX/bell_03.ogg" volume="-15"]
+audio "res://FakeUnitTests/Assets/SFX/bell_03.ogg" [volume="-15.0"]
 [wait_input ]
 
 [i]Play a bell sound effect with -15db volume on an audio bus with reverb.
-[sound path="res://FakeUnitTests/Assets/SFX/bell_03.ogg" volume="-15" bus="UnitTestBus" ]
+audio "res://FakeUnitTests/Assets/SFX/bell_03.ogg" [volume="-15.0" bus="UnitTestBus"]
 [wait_input ]
 
-jump t0_overview/
+jump t0_overview/
diff --git a/MainMenu/Menu.gd b/MainMenu/Menu.gd
@@ -53,6 +53,7 @@ func _on_about_pressed():
 	fade_menu($MainMenu, $AboutScreen)
 	%Back.grab_focus()
 
+
 func _on_back_pressed():
 	display_button_ripple(%Back)
 	fade_menu($AboutScreen, $MainMenu)
diff --git a/SmallRPG/Timelines/rpg_smith.dtl b/SmallRPG/Timelines/rpg_smith.dtl
@@ -73,4 +73,4 @@ Player: I bet that's the key!
 Player: Smith will be happy.
 set {RPG_Example.smiths_key} = 1
 [signal arg="collect"]
-[end_timeline]
+[end_timeline]
diff --git a/Smartphone/Timelines/Claire.dtl b/Smartphone/Timelines/Claire.dtl
@@ -30,4 +30,4 @@ Player: <Hey, you've got time rn?/Time to talk?/You got a moment??>
 Claire: <Nah/Nope./Not right now>
 Claire: <sorry, I gotta study/gotta learn stuff/school>
 Player: <alright/okay/\:(>
-jump Loop
+jump Loop
diff --git a/Smartphone/Timelines/Laurey.dtl b/Smartphone/Timelines/Laurey.dtl
@@ -27,4 +27,4 @@ Laurey: I think I found something.
 Player: Wow.
 Player: What is it?
 Laurey: I think this might be from a secret society.
-Player: [i][b][To be continued]
+Player: [i][b][To be continued]
diff --git a/Smartphone/Timelines/Otto.dtl b/Smartphone/Timelines/Otto.dtl
@@ -27,4 +27,4 @@ Player: <Hey?/whatyoudoin??/otto>
 Otto: <yeah?/?/is this important?>
 Player: <just checkin in/I'm bored/you bored too?>
 Otto: <sry, but no time rn, k?/I have no time for your nonsense xD>
-jump Loop
+jump Loop
diff --git a/SpeakerStyle/speaker_tml_1.dtl b/SpeakerStyle/speaker_tml_1.dtl
@@ -5,4 +5,4 @@ speaker_2: Oh hey Janette, I didn't see you. Yeah I was just getting ready.
 speaker_1 (default): Good. I think we should get going soon.
 speaker_1: You know we have a long way ahead of us.
 speaker_2: I know, I know.[n]But it's weird leaving this place behind...
-speaker_1: Well, there is nothing we can do about it.
+speaker_1: Well, there is nothing we can do about it.
diff --git a/VisualNovel/Assets/UI/VisualNovelStyle.tres b/VisualNovel/Assets/UI/VisualNovelStyle.tres
@@ -30,7 +30,9 @@ overrides = {}
 [sub_resource type="Resource" id="Resource_yaynv"]
 script = ExtResource("3_hr6kc")
 scene = ExtResource("5_pj2gp")
-overrides = {}
+overrides = {
+"box_panel": "\"vn_textbox_default_panel.tres\""
+}
 
 [sub_resource type="Resource" id="Resource_ypuag"]
 script = ExtResource("3_hr6kc")
@@ -74,4 +76,4 @@ layer_info = {
 }
 base_overrides = {}
 layers = Array[ExtResource("3_hr6kc")]([])
-metadata/_latest_layer = -1
+metadata/_latest_layer = "12"
diff --git a/VisualNovel/Timelines/vn_beginning.dtl b/VisualNovel/Timelines/vn_beginning.dtl
@@ -16,4 +16,4 @@ Leon: ...
 Leon (Basic/default): Well, whatever.
 jump vn_chapter1/
 
-Leon (Positive/surprise): Wow, this looks pretty cool[signal=argument].
+Leon (Positive/surprise): Wow, this looks pretty cool[signal=argument].
diff --git a/VisualNovel/Timelines/vn_chapter1.dtl b/VisualNovel/Timelines/vn_chapter1.dtl
@@ -26,4 +26,4 @@ Elina (default): Alright. Why are we standing around here. You were looking for
 update Leon leftmost [animation="Tada"]
 Leon (Positive/surprise): Wait how do you know that?
 Elina: Who cares. Follow me.
-jump vn_ending/
+jump vn_ending/
diff --git a/VisualNovel/Timelines/vn_ending.dtl b/VisualNovel/Timelines/vn_ending.dtl
@@ -1,6 +1,6 @@
-[music fade="0.0" volume="0.0" bus="Master"]
+audio music - [fade="0.0" volume="0.0" bus="Master"]
 [background fade="0.0"]
 leave --All--
 [i]This is the end of the dialogic example visual novel. \
 Thank you for playing.
-[signal arg="end_game"]
+[signal arg="end_game"]
diff --git a/project.godot b/project.godot
@@ -162,6 +162,20 @@ animations/cross_fade_default="Fade Cross"
 animations/join_default="Fade In Up"
 animations/leave_default="Fade Out Down"
 audio/max_channels=4.0
+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]
 
