Remove all direct references of Dialogic (#1953)

* Remove all direct references of Dialogic

This is to prevent errors when first importing dialogic.

* Make dialogic variable typed

Author: Jowan-Spooner

addons/dialogic/Editor/TimelineEditor/test_timeline_scene.gd

@@ -6,7 +6,7 @@ func _ready() -> void:
 		print("Testing locale is: ", ProjectSettings.get_setting('internationalization/locale/test'))
 	$PauseIndictator.hide()
 
-	var scene: Node = Dialogic.Styles.load_style(DialogicUtil.get_editor_setting('current_test_style', ''))
+	var scene: Node = DialogicUtil.autoload().Styles.load_style(DialogicUtil.get_editor_setting('current_test_style', ''))
 	if not scene is CanvasLayer:
 		if scene is Control:
 			scene.position = get_viewport_rect().size/2.0
@@ -17,10 +17,10 @@ func _ready() -> void:
 	var current_timeline: String = DialogicUtil.get_editor_setting('current_timeline_path', null)
 	if !current_timeline:
 		get_tree().quit()
-	Dialogic.start(current_timeline)
-	Dialogic.timeline_ended.connect(get_tree().quit)
-	Dialogic.signal_event.connect(recieve_event_signal)
-	Dialogic.text_signal.connect(recieve_text_signal)
+	DialogicUtil.autoload().start(current_timeline)
+	DialogicUtil.autoload().timeline_ended.connect(get_tree().quit)
+	DialogicUtil.autoload().signal_event.connect(recieve_event_signal)
+	DialogicUtil.autoload().text_signal.connect(recieve_text_signal)
 
 func recieve_event_signal(argument:String) -> void:
 	print("[Dialogic] Encountered a signal event: ", argument)
@@ -30,13 +30,13 @@ func recieve_text_signal(argument:String) -> void:
 
 func _input(event:InputEvent) -> void:
 	if event is InputEventKey and event.pressed and event.keycode == KEY_ESCAPE:
-		Dialogic.paused = !Dialogic.paused
-		$PauseIndictator.visible = Dialogic.paused
+		DialogicUtil.autoload().paused = !DialogicUtil.autoload().paused
+		$PauseIndictator.visible = DialogicUtil.autoload().paused
 
 	if (event is InputEventMouseButton
 	and event.is_pressed()
 	and event.button_index == MOUSE_BUTTON_MIDDLE):
-		var auto_skip: DialogicAutoSkip = Dialogic.Input.auto_skip
+		var auto_skip: DialogicAutoSkip = DialogicUtil.autoload().Input.auto_skip
 		var is_auto_skip_enabled := auto_skip.enabled
 
 		auto_skip.disable_on_unread_text = false

addons/dialogic/Example Assets/already_read_indicator.gd

@@ -1,9 +1,9 @@
 extends Control
 
 func _ready():
-	if Dialogic.has_subsystem('History'):
-		Dialogic.History.already_read_event_reached.connect(_on_already_read_event)
-		Dialogic.History.not_read_event_reached.connect(_on_not_read_event)
+	if DialogicUtil.autoload().has_subsystem('History'):
+		DialogicUtil.autoload().History.already_read_event_reached.connect(_on_already_read_event)
+		DialogicUtil.autoload().History.not_read_event_reached.connect(_on_not_read_event)
 
 func _on_already_read_event() -> void:
 	show()

addons/dialogic/Example Assets/portraits/simple_highlight_portrait.gd

@@ -20,10 +20,10 @@ func _ready() -> void:
 
 func _highlight():
 	create_tween().tween_property(self, 'modulate', Color.WHITE, 0.15)
-	prev_z_index = Dialogic.Portraits.get_character_info(character).get('z_index', 0)
-	Dialogic.Portraits.change_character_z_index(character, 10)
+	prev_z_index = DialogicUtil.autoload().Portraits.get_character_info(character).get('z_index', 0)
+	DialogicUtil.autoload().Portraits.change_character_z_index(character, 10)
 
 
 func _unhighlight():
 	create_tween().tween_property(self, 'modulate', unhighlighted_color, 0.15)
-	Dialogic.Portraits.change_character_z_index(character, prev_z_index)
+	DialogicUtil.autoload().Portraits.change_character_z_index(character, prev_z_index)

addons/dialogic/Modules/Audio/subsystem_audio.gd

@@ -12,7 +12,7 @@ var base_sound_player := AudioStreamPlayer.new()
 ##					STATE
 ####################################################################################################
 
-func clear_game_state(clear_flag:=Dialogic.ClearFlags.FULL_CLEAR):
+func clear_game_state(clear_flag:=DialogicGameHandler.ClearFlags.FULL_CLEAR):
 	update_music()
 	stop_all_sounds()
 

addons/dialogic/Modules/Background/event_background.gd

@@ -27,8 +27,8 @@ var transition: String = ""
 func _execute() -> void:
 	var final_fade_duration := fade
 
-	if Dialogic.Input.auto_skip.enabled:
-		var time_per_event: float = Dialogic.Input.auto_skip.time_per_event
+	if dialogic.Input.auto_skip.enabled:
+		var time_per_event: float = dialogic.Input.auto_skip.time_per_event
 		final_fade_duration = min(fade, time_per_event)
 
 	dialogic.Backgrounds.update_background(scene, argument, final_fade_duration, transition)

addons/dialogic/Modules/Background/subsystem_backgrounds.gd

@@ -14,7 +14,7 @@ var default_transition: String = get_script().resource_path.get_base_dir().path_
 ##					STATE
 ####################################################################################################
 
-func clear_game_state(clear_flag:=Dialogic.ClearFlags.FULL_CLEAR):
+func clear_game_state(clear_flag:=DialogicGameHandler.ClearFlags.FULL_CLEAR):
 	update_background()
 
 

addons/dialogic/Modules/Character/event_character.gd

@@ -76,8 +76,8 @@ func _execute() -> void:
 
 				var final_animation_length: float = animation_length
 
-				if Dialogic.Input.auto_skip.enabled:
-					var max_time: float = Dialogic.Input.auto_skip.time_per_event
+				if dialogic.Input.auto_skip.enabled:
+					var max_time: float = dialogic.Input.auto_skip.time_per_event
 					final_animation_length = min(max_time, animation_length)
 
 				await dialogic.Portraits.join_character(
@@ -88,8 +88,8 @@ func _execute() -> void:
 		Actions.LEAVE:
 			var final_animation_length: float = animation_length
 
-			if Dialogic.Input.auto_skip.enabled:
-				var max_time: float = Dialogic.Input.auto_skip.time_per_event
+			if dialogic.Input.auto_skip.enabled:
+				var max_time: float = dialogic.Input.auto_skip.time_per_event
 				final_animation_length = min(max_time, animation_length)
 
 			if character_identifier == '--All--':
@@ -131,8 +131,8 @@ func _execute() -> void:
 			if set_position:
 				var final_position_move_time: float = position_move_time
 
-				if Dialogic.Input.auto_skip.enabled:
-					var max_time: float = Dialogic.Input.auto_skip.time_per_event
+				if dialogic.Input.auto_skip.enabled:
+					var max_time: float = dialogic.Input.auto_skip.time_per_event
 					final_position_move_time = min(max_time, position_move_time)
 
 				dialogic.Portraits.move_character(character, position, final_position_move_time)
@@ -141,8 +141,8 @@ func _execute() -> void:
 				var final_animation_length: float = animation_length
 				var final_animation_repitions: int = animation_repeats
 
-				if Dialogic.Input.auto_skip.enabled:
-					var time_per_event: float = Dialogic.Input.auto_skip.time_per_event
+				if dialogic.Input.auto_skip.enabled:
+					var time_per_event: float = dialogic.Input.auto_skip.time_per_event
 					var time_for_repitions: float = time_per_event / animation_repeats
 					final_animation_length = time_for_repitions
 
@@ -154,9 +154,9 @@ func _execute() -> void:
 				)
 
 				if animation_wait:
-					dialogic.current_state = Dialogic.States.ANIMATING
+					dialogic.current_state = DialogicGameHandler.States.ANIMATING
 					await anim.finished
-					dialogic.current_state = Dialogic.States.IDLE
+					dialogic.current_state = DialogicGameHandler.States.IDLE
 
 	finish()
 

addons/dialogic/Modules/Character/event_position.gd

@@ -26,8 +26,8 @@ var movement_time: float = 0
 func _execute() -> void:
 	var final_movement_time: float = movement_time
 
-	if Dialogic.Input.auto_skip.enabled:
-		var time_per_event: float = Dialogic.Input.auto_skip.time_per_event
+	if dialogic.Input.auto_skip.enabled:
+		var time_per_event: float = dialogic.Input.auto_skip.time_per_event
 		final_movement_time = max(movement_time, time_per_event)
 
 	match action:

addons/dialogic/Modules/Character/node_portrait_container.gd

@@ -99,7 +99,7 @@ func _ready():
 
 func update_portrait_transforms():
 	for child in get_children():
-		Dialogic.Portraits._update_portrait_transform(child)
+		DialogicUtil.autoload().Portraits._update_portrait_transform(child)
 
 ## Returns a Rect2 with the position as the position and the scale as the size.
 func get_local_portrait_transform(portrait_rect:Rect2, character_scale:=1.0) -> Rect2:

addons/dialogic/Modules/Character/subsystem_portraits.gd

@@ -19,7 +19,7 @@ var _portrait_holder_reference: Node = null
 ##					STATE
 ####################################################################################################
 
-func clear_game_state(clear_flag:=Dialogic.ClearFlags.FULL_CLEAR):
+func clear_game_state(clear_flag:=DialogicGameHandler.ClearFlags.FULL_CLEAR):
 	for character in dialogic.current_state_info.get('portraits', {}).keys():
 		remove_character(load(character))
 	dialogic.current_state_info['portraits'] = {}
@@ -279,9 +279,9 @@ func join_character(character:DialogicCharacter, portrait:String,  position_idx:
 		if animation_name.is_empty():
 			animation_length = _get_join_default_length()
 		if animation_wait:
-			dialogic.current_state = Dialogic.States.ANIMATING
+			dialogic.current_state = DialogicGameHandler.States.ANIMATING
 			await get_tree().create_timer(animation_length).timeout
-			dialogic.current_state = Dialogic.States.IDLE
+			dialogic.current_state = DialogicGameHandler.States.IDLE
 		move_character(character, position_idx, animation_length)
 		change_character_mirror(character, mirrored)
 		return
@@ -311,9 +311,9 @@ func join_character(character:DialogicCharacter, portrait:String,  position_idx:
 		var anim:DialogicAnimation = _animate_portrait(character_node, animation_name, animation_length)
 
 		if animation_wait:
-			dialogic.current_state = Dialogic.States.ANIMATING
+			dialogic.current_state = DialogicGameHandler.States.ANIMATING
 			await anim.finished
-			dialogic.current_state = Dialogic.States.IDLE
+			dialogic.current_state = DialogicGameHandler.States.IDLE
 
 	return character_node
 
@@ -445,9 +445,9 @@ func leave_character(character:DialogicCharacter, animation_name :String = "", a
 		anim.finished.connect(remove_character.bind(character))
 
 		if animation_wait:
-			dialogic.current_state = Dialogic.States.ANIMATING
+			dialogic.current_state = DialogicGameHandler.States.ANIMATING
 			await anim.finished
-			dialogic.current_state = Dialogic.States.IDLE
+			dialogic.current_state = DialogicGameHandler.States.IDLE
 	else:
 		remove_character(character)
 
@@ -462,9 +462,9 @@ func leave_all_characters(animation_name:String="", animation_length:float= 0, a
 		animation_wait = ProjectSettings.get_setting('dialogic/animations/leave_default_wait', true)
 
 	if animation_wait:
-		dialogic.current_state = Dialogic.States.ANIMATING
+		dialogic.current_state = DialogicGameHandler.States.ANIMATING
 		await get_tree().create_timer(animation_length).timeout
-		dialogic.current_state = Dialogic.States.IDLE
+		dialogic.current_state = DialogicGameHandler.States.IDLE
 
 
 ## Removes the given characters portrait. Only works with joined characters
@@ -615,6 +615,6 @@ func change_speaker(speaker:DialogicCharacter= null, portrait:= ""):
 ## Called from the [portrait=something] text effect.
 func text_effect_portrait(text_node:Control, skipped:bool, argument:String) -> void:
 	if argument:
-		if Dialogic.current_state_info.get('speaker', null):
-			change_character_portrait(load(Dialogic.current_state_info.speaker), argument)
-			change_speaker(load(Dialogic.current_state_info.speaker), argument)
+		if dialogic.current_state_info.get('speaker', null):
+			change_character_portrait(load(dialogic.current_state_info.speaker), argument)
+			change_speaker(load(dialogic.current_state_info.speaker), argument)