From 555612a39349544b348112c6fbfa6d5c0ee234e2 Mon Sep 17 00:00:00 2001 From: Jowan-Spooner Date: Wed, 24 Jan 2024 12:43:17 +0100 Subject: [PATCH] Fix history event - fixes #2033 --- addons/dialogic/Modules/History/event_history.gd | 8 ++++---- addons/dialogic/Modules/History/subsystem_history.gd | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/addons/dialogic/Modules/History/event_history.gd b/addons/dialogic/Modules/History/event_history.gd index 3ff20f500..0b0297d7c 100644 --- a/addons/dialogic/Modules/History/event_history.gd +++ b/addons/dialogic/Modules/History/event_history.gd @@ -19,11 +19,11 @@ var action := Actions.PAUSE func _execute() -> void: match action: Actions.CLEAR: - dialogic.History.full_history = [] + dialogic.History.simple_history_content = [] Actions.PAUSE: - dialogic.History.full_history_enabled = false + dialogic.History.simple_history_enabled = false Actions.RESUME: - dialogic.History.full_history_enabled = true + dialogic.History.simple_history_enabled = true finish() @@ -50,7 +50,7 @@ func get_shortcode_parameters() -> Dictionary: return { #param_name : property_info "action" : {"property": "action", "default": Actions.PAUSE, - "suggestions": func(): return {"Clear":{'value':0}, "Pause":{'value':1}, "Resume":{'value':2}}}, + "suggestions": func(): return {"Clear":{'value':0, 'text_alt':['clear']}, "Pause":{'value':1, 'text_alt':['pause']}, "Resume":{'value':2, 'text_alt':['resume', 'start']}}}, } ################################################################################ diff --git a/addons/dialogic/Modules/History/subsystem_history.gd b/addons/dialogic/Modules/History/subsystem_history.gd index d103f2086..89630c2e8 100644 --- a/addons/dialogic/Modules/History/subsystem_history.gd +++ b/addons/dialogic/Modules/History/subsystem_history.gd @@ -2,9 +2,6 @@ extends DialogicSubsystem ## Subsystem that manages history storing. -signal already_read_event_reached -signal not_read_event_reached - signal open_requested signal close_requested @@ -25,6 +22,8 @@ signal full_event_history_changed var already_read_history_enabled := false var already_read_history_content := {} var _was_last_event_already_read := false +signal already_read_event_reached +signal not_read_event_reached #region INITIALIZE @@ -69,7 +68,7 @@ func get_simple_history() -> Array: #region FULL EVENT HISTORY #################################################################################################### -# called on each event +## Called on each event func store_full_event(event:DialogicEvent) -> void: if !full_event_history_enabled: return full_event_history_content.append(event)