Merge pull request dialogic-godot#2735 from salianifo/wait-subsystem

Fix Wait Event not pausing when Dialogic is paused

Author: zaknafean

addons/dialogic/Core/DialogicGameHandler.gd

@@ -148,6 +148,9 @@ var VAR := preload("res://addons/dialogic/Modules/Variable/subsystem_variables.g
 var Voice := preload("res://addons/dialogic/Modules/Voice/subsystem_voice.gd").new():
 	get: return get_subsystem("Voice")
 
+var Wait := preload("res://addons/dialogic/Modules/Wait/subsystem_wait.gd").new():
+	get: return get_subsystem("Wait")
+
 #endregion
 
 

addons/dialogic/Modules/Wait/event_wait.gd

@@ -14,40 +14,12 @@ extends DialogicEvent
 ## If true the wait can be skipped with user input
 @export var skippable := false
 
-var _tween: Tween
-
 
 #region EXECUTE
 ################################################################################
 
 func _execute() -> void:
-	var final_wait_time := time
-
-	if dialogic.Inputs.auto_skip.enabled:
-		var time_per_event: float = dialogic.Inputs.auto_skip.time_per_event
-		final_wait_time = min(time, time_per_event)
-
-	dialogic.current_state = dialogic.States.WAITING
-
-	if hide_text and dialogic.has_subsystem("Text"):
-		dialogic.Text.update_dialog_text('', true)
-		dialogic.Text.hide_textbox()
-
-	_tween = dialogic.get_tree().create_tween()
-	if DialogicUtil.is_physics_timer():
-		_tween.set_process_mode(Tween.TWEEN_PROCESS_PHYSICS)
-	_tween.tween_callback(_on_finish).set_delay(final_wait_time)
-
-	if skippable:
-		dialogic.Inputs.dialogic_action.connect(_on_finish)
-
-
-func _on_finish() -> void:
-	if is_instance_valid(_tween):
-		_tween.kill()
-
-	if skippable:
-		dialogic.Inputs.dialogic_action.disconnect(_on_finish)
+	await dialogic.Wait.update_wait(time, hide_text, skippable)
 
 	if dialogic.Animations.is_animating():
 		dialogic.Animations.stop_animation()

addons/dialogic/Modules/Wait/index.gd

@@ -4,3 +4,7 @@ extends DialogicIndexer
 
 func _get_events() -> Array:
 	return [this_folder.path_join('event_wait.gd')]
+
+
+func _get_subsystems() -> Array:
+	return [{'name':'Wait', 'script':this_folder.path_join('subsystem_wait.gd')}]

addons/dialogic/Modules/Wait/subsystem_wait.gd

@@ -0,0 +1,62 @@
+extends DialogicSubsystem
+
+## Subsystem that manages wait events.
+
+signal timeout
+
+var _timer: Timer = Timer.new()
+
+
+#region STATE
+####################################################################################################
+
+func clear_game_state(clear_flag:=Dialogic.ClearFlags.FULL_CLEAR) -> void:
+	_timer.stop()
+
+
+func pause() -> void:
+	_timer.paused = true
+
+
+func resume() -> void:
+	_timer.paused = false
+
+#endregion
+
+
+#region MAIN METHODS
+####################################################################################################
+
+func _ready() -> void:
+	_timer.one_shot = true
+	if DialogicUtil.is_physics_timer():
+		_timer.process_callback = Timer.TIMER_PROCESS_PHYSICS
+	add_child(_timer)
+	_timer.timeout.connect(timeout.emit)
+
+
+func update_wait(time: float, hide_text: bool, skippable: bool) -> void:
+	var final_wait_time := time
+
+	if dialogic.Inputs.auto_skip.enabled:
+		var time_per_event: float = dialogic.Inputs.auto_skip.time_per_event
+		final_wait_time = min(time, time_per_event)
+
+	dialogic.current_state = dialogic.States.WAITING
+
+	if hide_text and dialogic.has_subsystem("Text"):
+		dialogic.Text.update_dialog_text('', true)
+		dialogic.Text.hide_textbox()
+
+	_timer.start(final_wait_time)
+
+	if skippable:
+		dialogic.Inputs.dialogic_action.connect(timeout.emit)
+
+	await timeout
+	_timer.stop()
+
+	if skippable:
+		dialogic.Inputs.dialogic_action.disconnect(timeout.emit)
+
+#endregion

addons/dialogic/Modules/Wait/subsystem_wait.gd.uid

@@ -0,0 +1 @@
+uid://db2kljpe5lv1x