Made extra events more generic.

scripts/Events/EventConversation.gd

@@ -5,64 +5,41 @@ class_name EventConversation extends "res://scripts/Events/Flow/EventGroup.gd"
 
 @export var entities:Array[OverworldEntity] = []
 
-@export var includeInteractee:bool = true
-@export var includeInteractor:bool = true
-
-var extraEvents:Array[Event] = []
+@export var pauseInteractee:bool = true
+@export var pauseInteractor:bool = true
+@export var turnInteractee:bool = true
+@export var turnInteractor:bool = true
 
 func start() -> void:
-
 	# Turn events
 	if interactee != null && interactor != null:
-		if includeInteractee:
-			var turninteractee = EventEntityTurn.new()
-			turninteractee.entity = interactee
-			turninteractee.direction = interactee.getDirectionToFace(interactor.position)
-			self.add_child(turninteractee)
-			extraEvents.append(turninteractee)
-			self.move_child(turninteractee, 0)
+		if pauseInteractee && turnInteractee:
+			var turn = EventEntityTurn.new()
+			turn.entity = interactee
+			turn.direction = interactee.getDirectionToFace(interactor.position)
+			addExtraEvent(turn, 0)
 
-		if includeInteractor:
-			var turninteractor = EventEntityTurn.new()
-			turninteractor.entity = interactor
-			turninteractor.direction = interactor.getDirectionToFace(interactee.position)
-			self.add_child(turninteractor)
-			extraEvents.append(turninteractor)
-			self.move_child(turninteractor, 0)
+		if pauseInteractor && turnInteractor:
+			var turn = EventEntityTurn.new()
+			turn.entity = interactor
+			turn.direction = interactor.getDirectionToFace(interactee.position)
+			addExtraEvent(turn, 0)
 
 	# Create start pause event
 	var startPause = EventPause.new()
 	startPause.pauseType = startPauseType
 	startPause.entities = entities
-	self.add_child(startPause)
-	extraEvents.append(startPause)
-	self.move_child(startPause, 0)
+	startPause.includeInteractee = pauseInteractee
+	startPause.includeInteractor = pauseInteractor
+	addExtraEvent(startPause, 0)
 
 	# Create end pause event.
 	var endPause = EventPause.new()
 	endPause.pauseType = endPauseType
 	endPause.entities = entities
-	self.add_child(endPause)
-	extraEvents.append(endPause)
-	self.move_child(endPause, get_child_count() - 1)
+	endPause.includeInteractee = pauseInteractee
+	endPause.includeInteractor = pauseInteractor
+	addExtraEvent(endPause, -1)
 
 	# Pass off to event group
-	super.start()
-
-func reset() -> void:
-	# Let event group reset normally
-	super.reset()
-
-	# Remove the events we created.
-	cleanupExtraEvents()
-
-func end() -> void:
-	# Let event group end normally
-	super.end()
-	# Remove the events we created.
-	cleanupExtraEvents()
-
-func cleanupExtraEvents():
-	for event in extraEvents:
-		event.queue_free()
-	extraEvents = []
+	super.start()