diff --git a/addons/escoria-dialog-simple/types/floating.gd b/addons/escoria-dialog-simple/types/floating.gd index 959cadb8..29c4472a 100644 --- a/addons/escoria-dialog-simple/types/floating.gd +++ b/addons/escoria-dialog-simple/types/floating.gd @@ -46,7 +46,7 @@ onready var is_paused: bool = true # Enable bbcode and catch the signal when a tween completed func _ready(): _text_time_per_character = ProjectSettings.get_setting( - SimpleDialogSettings.TEXT_TIME_PER_LETTER_MS + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS ) if _text_time_per_character < 0: @@ -54,15 +54,15 @@ func _ready(): self, "%s setting must be a non-negative number. Will use default value of %s." % [ - SimpleDialogSettings.TEXT_TIME_PER_LETTER_MS, - SimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS, + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE ] ) - _text_time_per_character = SimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + _text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE _fast_text_time_per_character = ProjectSettings.get_setting( - SimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST ) if _fast_text_time_per_character < 0: @@ -75,10 +75,10 @@ func _ready(): ] ) - _fast_text_time_per_character = SimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE + _fast_text_time_per_character = RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE _reading_speed_in_wpm = ProjectSettings.get_setting( - SimpleDialogSettings.READING_SPEED_IN_WPM + RTMISimpleDialogSettings.READING_SPEED_IN_WPM ) if _reading_speed_in_wpm <= 0: @@ -86,12 +86,12 @@ func _ready(): self, "%s setting must be a positive number. Will use default value of %s." % [ - SimpleDialogSettings.READING_SPEED_IN_WPM, - SimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE + RTMISimpleDialogSettings.READING_SPEED_IN_WPM, + RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE ] ) - _reading_speed_in_wpm = SimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE + _reading_speed_in_wpm = RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE _word_regex.compile("\\S+") @@ -217,7 +217,7 @@ func _get_number_of_words() -> int: # Ending the dialog func _on_dialog_finished(): # Only trigger to clear the text if we aren't limiting the clearing trigger to a click. - if not ESCProjectSettingsManager.get_setting(SimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY): + if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY): emit_signal("say_finished") diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd index e2051ad9..d2ca1bdc 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state_machine.gd" +extends "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd" func _init(): @@ -14,14 +14,14 @@ func _init(): # Creates the states for this state machine. func _create_states() -> void: states_map = { - "idle": preload("res://addons/escoria-dialog-simple/states/dialog_idle.gd").new(), - "say": preload("res://addons/escoria-dialog-simple/states/dialog_say.gd").new(), - "say_fast": preload("res://addons/escoria-dialog-simple/states/dialog_say_fast.gd").new(), - "say_finish": preload("res://addons/escoria-dialog-simple/states/dialog_say_finish.gd").new(), - "visible": preload("res://addons/escoria-dialog-simple/states/dialog_visible.gd").new(), - "finish": preload("res://addons/escoria-dialog-simple/states/dialog_finish.gd").new(), - "interrupt": preload("res://addons/escoria-dialog-simple/states/dialog_interrupt.gd").new(), - "choices": preload("res://addons/escoria-dialog-simple/states/dialog_choices.gd").new(), + "idle": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd").new(), + "say": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd").new(), + "say_fast": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd").new(), + "say_finish": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd").new(), + "visible": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd").new(), + "finish": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd").new(), + "interrupt": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd").new(), + "choices": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd").new(), } diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd index a057f4f3..5f14cc24 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd @@ -36,7 +36,7 @@ func initialize(dialog_manager: ESCDialogManager, character: String, text: Strin _text = text _type = type _stop_talking_animation_on_option = \ - ESCProjectSettingsManager.get_setting(SimpleDialogSettings.STOP_TALKING_ANIMATION_ON) + ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON) func handle_input(_event): @@ -45,20 +45,20 @@ func handle_input(_event): escoria.inputs_manager.INPUT_NONE and \ _dialog_manager != null: - var left_click_action = ESCProjectSettingsManager.get_setting(SimpleDialogSettings.LEFT_CLICK_ACTION) + var left_click_action = ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.LEFT_CLICK_ACTION) _handle_left_click_action(left_click_action) func _handle_left_click_action(left_click_action: String) -> void: match left_click_action: - SimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP: + RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP: if _dialog_manager.is_connected("say_visible", self, "_on_say_visible"): _dialog_manager.disconnect("say_visible", self, "_on_say_visible") escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'say_fast'") emit_signal("finished", "say_fast") - SimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH: + RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH: if _dialog_manager.is_connected("say_visible", self, "_on_say_visible"): _dialog_manager.disconnect("say_visible", self, "_on_say_visible") @@ -100,7 +100,7 @@ func enter(): as ESCSpeechPlayer ).set_state(_speech_resource) - if _stop_talking_animation_on_option == SimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO: + if _stop_talking_animation_on_option == RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO: if not ( escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\ as ESCSpeechPlayer