Refactor signal logic

Scripts/Maps/Connectors/chest_interaction_connector.gd

@@ -1,53 +1,20 @@
 extends Node
 
-# Drop-in that automatically connects signals from player to chest objects
-signal ChestInteractedWith(chest: BaseChest)
+# Signals
 signal OpeningOfOpenedChestAttempted
 
+# Exports
+@export var player: PlayerCharacter
 @export var auto_connect_all_chests := true
 
-var chests_in_range: Array[BaseChest] = []
-
-# Public Methods
-func OnPlayerInteractScannerAreaEntered(area: Area2D) -> void:
-	var chest = area.get_parent()
-	if chest == null or chest is not BaseChest:
-		return
-	if chests_in_range.has(chest):
-		return
-	chests_in_range.append(chest)
-
-
-func OnPlayerInteractScannerAreaExited(area: Area2D) -> void:
-	var chest = area.get_parent()
-	if chest == null or chest is not BaseChest:
-		return
-	if !chests_in_range.has(chest):
-		return
-	chests_in_range.erase(chest)
-
-
-func OnPlayerInteractionActionTriggered() -> void:
-	if chests_in_range.is_empty():
-		return
-	
-	var chest := chests_in_range[0]
-	if !chest.is_open:
-		chest.Open()
-	else:
-		chest.OpenAlreadyOpened()
-		OpeningOfOpenedChestAttempted.emit()
-
+# Private Variables
+var _chests_in_range: Array[BaseChest] = []
 
 # Private Methods
 func _ready() -> void:
-	var player := GroupUtils.GetPlayer()
-	if player == null:
-		return
-	
-	player.InteractScannerAreaEntered.connect(OnPlayerInteractScannerAreaEntered)
-	player.InteractScannerAreaExited.connect(OnPlayerInteractScannerAreaExited)
-	player.InteractionActionTriggered.connect(OnPlayerInteractionActionTriggered)
+	player.interact_scanner.area_entered.connect(_on_interact_scanned)
+	player.interact_scanner.area_exited.connect(_on_interact_unscanned)
+	player.interact_scanner.InteractionActionTriggered.connect(_on_interact_triggered)
 	
 	var chests := GroupUtils.GetAllTreasureChests()
 	for chest in chests:
@@ -58,7 +25,7 @@ func _on_chest_opening_animation_started() -> void:
 	var player := GroupUtils.GetPlayer()
 	var children := player.get_children()
 	
-	player.OnCutsceneStarted()
+	player.QueueCutsceneState()
 	
 	var camera_idx := children.find_custom(func(x): return x is Camera2D)
 	if camera_idx == -1: return
@@ -77,4 +44,33 @@ func _on_chest_opening_animation_started() -> void:
 	
 	# Zoom back out
 	await get_tree().create_tween().tween_property(camera, "zoom", current_zoom, 0.5).finished
+
+
+func _on_interact_scanned(area: Area2D) -> void:
+	var chest = area.get_parent()
+	if chest == null or chest is not BaseChest:
+		return
+	if _chests_in_range.has(chest):
+		return
+	_chests_in_range.append(chest)
+
+
+func _on_interact_unscanned(area: Area2D) -> void:
+	var chest = area.get_parent()
+	if chest == null or chest is not BaseChest:
+		return
+	if !_chests_in_range.has(chest):
+		return
+	_chests_in_range.erase(chest)
+
+
+func _on_interact_triggered() -> void:
+	if _chests_in_range.is_empty():
+		return
 	
+	var chest := _chests_in_range[0]
+	if !chest.is_open:
+		chest.Open()
+	else:
+		chest.OpenAlreadyOpened()
+		OpeningOfOpenedChestAttempted.emit()