Reverted some changes involving DialogicSubsystem. WARNING: this comm…

…it will raise GDScript errors until the subsystems get types.
nlupugla · Jan 9, 2024 · f54738b · f54738b
1 parent ebb0e71
commit f54738b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.gd b/addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.gd
@@ -78,8 +78,7 @@ func _ready() -> void:
 
 ## Method that shows the bubble and fills in the info
 func _on_dialogic_display_dialog_text_meta_hover_started(meta:String) -> void:
-	var glossary_system: Node = DialogicUtil.autoload().get(&'Glossary')
-	var info: Dictionary = glossary_system.call(&'get_entry', meta)
+	var info: Dictionary = DialogicUtil.autoload().Glossary.get_entry(meta)
 
 	if not info:
 		return
@@ -104,8 +103,7 @@ func _on_dialogic_display_dialog_text_meta_hover_started(meta:String) -> void:
 			get_panel().self_modulate = info.get(&'color', Color.WHITE)
 			get_panel_point().self_modulate = info.get(&'color', Color.WHITE)
 
-	var input_system: Node = DialogicUtil.autoload().get(&'Input')
-	input_system.set(&'action_was_consumed', true)
+	DialogicUtil.autoload().Input.action_was_consumed = true
 
 
 ## Method that keeps the bubble at mouse position when visible
@@ -121,13 +119,11 @@ func _process(_delta : float) -> void:
 ## Method that hides the bubble
 func _on_dialogic_display_dialog_text_meta_hover_ended(_meta:String) -> void:
 	get_pointer().hide()
-	var input_system: Node = DialogicUtil.autoload().get(&'Input')
-	input_system.set(&'action_was_consumed', false)
+	DialogicUtil.autoload().Input.action_was_consumed = false
 
 
 func _on_dialogic_display_dialog_text_meta_clicked(_meta:String) -> void:
-	var input_system: Node = DialogicUtil.autoload().get(&'Input')
-	input_system.set(&'action_was_consumed', true)
+	DialogicUtil.autoload().Input.action_was_consumed = true
 
 
 func _apply_export_overrides() -> void:

diff --git a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/animations.gd b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/animations.gd
@@ -68,9 +68,7 @@ func _on_about_to_show_text(info:Dictionary) -> void:
 
 
 func _on_textbox_new_text() -> void:
-	var input_system: Node = DialogicUtil.autoload().get(&'Input')
-	var auto_skip: DialogicAutoAdvance = input_system.get(&'auto_skip')
-	if auto_skip.get(&'enabled'):
+	if DialogicUtil.autoload().Input.auto_skip.enabled:
 		return
 
 	if animation_new_text == AnimationsNewText.NONE:

diff --git a/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/autoadvance_indicator.gd b/addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Textbox/autoadvance_indicator.gd
@@ -6,10 +6,8 @@ func _process(_delta : float) -> void:
 	if !enabled:
 		hide()
 		return
-	var input_system : Node = DialogicUtil.autoload().get(&'Input')
-	var auto_advance : DialogicAutoAdvance = input_system.get(&'auto_advance')
-	if auto_advance.get_progress() < 0:
+	if DialogicUtil.autoload().Input.auto_advance.get_progress() < 0:
 		hide()
 	else:
 		show()
-		value = auto_advance.get_progress()
+		value = DialogicUtil.autoload().Input.auto_advance.get_progress()