Attempt to fix dialogs "finish_fast" action.

This commit is contained in:
Julian Murgia
2021-01-30 14:00:23 +01:00
parent e6f4af74a8
commit b789490f63
45 changed files with 491 additions and 1114 deletions

View File

@@ -20,7 +20,7 @@ compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/filter=false
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2

View File

@@ -407,8 +407,10 @@ func repeat(command_params : Array):
"""
say speaker_id "text_to_say" [dialog_ui_name]
Make a character say one line.
Usage: say object_id line [dialog_ui_name]
- dialog_ui_name String if set, uses the dialog UI by its name as defined
in game.tscn/dialog_layer/dialog_player
"""
func say(command_params : Array) -> esctypes:
current_context.waiting = true

View File

@@ -190,8 +190,8 @@ func do(action : String, params : Array = []) -> void:
_:
# $esc_runner.activate(action, params[0])
report_warnings("escoria.gd:do()", ["Action received:", action, "with params ", params])
elif current_state == GAME_STATE.DIALOG:
dialog_player.finish_fast()
# elif current_state == GAME_STATE.DIALOG:
# dialog_player.finish_fast()
elif current_state == GAME_STATE.WAIT:
pass

View File

@@ -11,7 +11,7 @@ onready var tween = text_node.get_node("Tween")
export(float, 0.0, 0.3) var text_speed_per_character = 0.1
export(float) var fast_text_speed_per_character = 0.25
export(float) var max_time_to_text_disappear = 2.0
export(float) var max_time_to_text_disappear = 1.0
func _ready():
var centered_position_on_screen = Vector2(
@@ -70,7 +70,10 @@ func _on_dialog_line_typed(object, key):
$Timer.connect("timeout", self, "_on_dialog_finished")
func _on_dialog_finished():
emit_signal("dialog_line_finished")
escoria.esc_level_runner.finished()
escoria.dialog_player.is_speaking = false
escoria.current_state = escoria.GAME_STATE.DEFAULT
# emit_signal("dialog_line_finished")
queue_free()