Cleaned and improved some event stuff
This commit is contained in:
@@ -17,41 +17,46 @@ func start() -> void:
|
||||
if interactee && interactor:
|
||||
if turnInteractee && interactee.entityDirection && interactor.characterBody:
|
||||
var turn = EventEntityTurn.new()
|
||||
turn.name = "Conversation Turn Interactee"
|
||||
turn.entity = interactee.entityDirection
|
||||
turn.direction = turn.entity.getDirectionToFace(interactor.characterBody.global_position)
|
||||
addExtraEvent(turn, 0)
|
||||
addChildEvent(turn, 0)
|
||||
|
||||
if turnInteractor && interactor.entityDirection && interactee.characterBody:
|
||||
var turn = EventEntityTurn.new()
|
||||
turn.name = "Conversation Turn Interactor"
|
||||
turn.entity = interactor.entityDirection
|
||||
turn.direction = turn.entity.getDirectionToFace(interactee.characterBody.global_position)
|
||||
addExtraEvent(turn, 0)
|
||||
addChildEvent(turn, 0)
|
||||
|
||||
# Create start pause event
|
||||
if (pauseInteractee && interactee.entity) || (pauseInteractor && interactor.entity):
|
||||
var startPause = EventPause.new()
|
||||
startPause.name = "Conversation Start Pause"
|
||||
startPause.pauseType = startPauseType
|
||||
startPause.entities = entities
|
||||
if pauseInteractee && interactee.entity:
|
||||
startPause.includeInteractee = pauseInteractee
|
||||
if pauseInteractor && interactor.entity:
|
||||
startPause.includeInteractor = pauseInteractor
|
||||
addExtraEvent(startPause, 0)
|
||||
addChildEvent(startPause, 0)
|
||||
|
||||
# Create end pause event.
|
||||
endPauseEvent = EventPause.new()
|
||||
endPauseEvent.name = "Conversation End Pause"
|
||||
endPauseEvent.pauseType = endPauseType
|
||||
endPauseEvent.entities = entities
|
||||
if pauseInteractee && interactee.entity:
|
||||
endPauseEvent.includeInteractee = pauseInteractee
|
||||
if pauseInteractor && interactor.entity:
|
||||
endPauseEvent.includeInteractor = pauseInteractor
|
||||
addExtraEvent(endPauseEvent, -1)
|
||||
addChildEvent(endPauseEvent, -1)
|
||||
|
||||
# Pass off to event group
|
||||
super.start()
|
||||
|
||||
func end() -> void:
|
||||
print("Ending conversation event: ", self)
|
||||
# Manually end pause
|
||||
if endPauseEvent != null && !endPauseEvent.started:
|
||||
endPauseEvent.start()
|
||||
|
Reference in New Issue
Block a user