Skip to content

Commit 114b781

Browse files
Pre alpha13 fixes (#2058)
* Simplify and fix text speed changes * Update Version number
1 parent f1d4a70 commit 114b781

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

addons/dialogic/Modules/Text/node_dialog_text.gd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ enum Alignment {LEFT, CENTER, RIGHT}
1818
var revealing := false
1919
var base_visible_characters := 0
2020

21-
# Letter speed used per revealed character.
22-
var lspeed: float = 0.01
2321
# The used speed per revealed character.
2422
# May be overwritten when syncing reveal speed to voice.
25-
var active_speed: float = lspeed
23+
var active_speed: float = 0.01
24+
2625
var speed_counter: float = 0
2726

2827
func _set(property: StringName, what: Variant) -> bool:
@@ -80,19 +79,20 @@ func reveal_text(_text: String, keep_previous:=false) -> void:
8079
visible_characters = 1
8180
return
8281

82+
revealing = true
83+
speed_counter = 0
84+
started_revealing_text.emit()
85+
86+
87+
func set_speed(delay_per_character:float) -> void:
8388
if DialogicUtil.autoload().Text.is_text_voice_synced() and DialogicUtil.autoload().Voice.is_running():
8489
var total_characters := get_total_character_count() as float
8590
var remaining_time: float = DialogicUtil.autoload().Voice.get_remaining_time()
8691
var synced_speed := remaining_time / total_characters
8792
active_speed = synced_speed
8893

8994
else:
90-
active_speed = lspeed
91-
92-
93-
revealing = true
94-
speed_counter = 0
95-
started_revealing_text.emit()
95+
active_speed = delay_per_character
9696

9797

9898
## Reveals one additional character.

addons/dialogic/Modules/Text/subsystem_text.gd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ func update_dialog_text(text: String, instant := false, additional := false) ->
139139

140140
dialogic.current_state_info['text_parsed'] = (text_node as RichTextLabel).get_parsed_text()
141141

142+
# Reset speed multiplier
143+
update_text_speed(-1, false, 1)
142144
# Reset Auto-Advance temporarily and the No-Skip setting:
143-
update_text_speed(-1, false, 1, -1)
144145
dialogic.Inputs.auto_advance.enabled_until_next_event = false
145146
dialogic.Inputs.auto_advance.override_delay_for_current_event = -1
146147
dialogic.Inputs.set_manualadvance(true, true)
@@ -278,9 +279,9 @@ func update_text_speed(letter_speed: float = -1,
278279

279280
for text_node in get_tree().get_nodes_in_group('dialogic_dialog_text'):
280281
if absolute:
281-
text_node.lspeed = letter_speed
282+
text_node.set_speed(letter_speed)
282283
else:
283-
text_node.lspeed = letter_speed * _speed_multiplier * user_speed
284+
text_node.set_speed(letter_speed * _speed_multiplier * user_speed)
284285

285286

286287
func set_text_reveal_skippable(skippable:= true, temp:=false) -> void:
@@ -491,9 +492,9 @@ func effect_speed(text_node:Control, skipped:bool, argument:String) -> void:
491492
if skipped:
492493
return
493494
if argument:
494-
update_text_speed(-1, false, float(argument), -1)
495+
update_text_speed(-1, false, float(argument))
495496
else:
496-
update_text_speed(-1, false, 1, -1)
497+
update_text_speed(-1, false, 1)
497498

498499

499500
func effect_lspeed(text_node:Control, skipped:bool, argument:String) -> void:

addons/dialogic/plugin.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ name="Dialogic"
44
description="Create dialogs, characters and scenes to display conversations in your Godot games.
55
https://github.com/dialogic-godot/dialogic"
66
author="Emi, Jowan Spooner, Exelia, and more!"
7-
version="2.0-Alpha-13 (WIP! Godot 4.2+)"
7+
version="2.0-Alpha-13 (Godot 4.2+)"
88
script="plugin.gd"

0 commit comments

Comments
 (0)