Almost fixed entities
This commit is contained in:
@@ -12,34 +12,39 @@ class_name EventConversation extends "res://scripts/Event/Flow/EventGroup.gd"
|
||||
|
||||
func start() -> void:
|
||||
# Turn events
|
||||
if interactee != null && interactor != null:
|
||||
if pauseInteractee && turnInteractee:
|
||||
if interactee && interactor:
|
||||
if turnInteractee && interactee.entityDirection && interactor.characterBody:
|
||||
var turn = EventEntityTurn.new()
|
||||
turn.entity = interactee
|
||||
turn.direction = interactee.getDirectionToFace(interactor.position)
|
||||
turn.entity = interactee.entityDirection
|
||||
turn.direction = turn.entity.getDirectionToFace(interactor.characterBody.position)
|
||||
addExtraEvent(turn, 0)
|
||||
|
||||
if pauseInteractor && turnInteractor:
|
||||
if turnInteractor && interactor.entityDirection && interactee.characterBody:
|
||||
var turn = EventEntityTurn.new()
|
||||
turn.entity = interactor
|
||||
turn.direction = interactor.getDirectionToFace(interactee.position)
|
||||
turn.entity = interactor.entityDirection
|
||||
turn.direction = turn.entity.getDirectionToFace(interactee.characterBody.position)
|
||||
addExtraEvent(turn, 0)
|
||||
|
||||
# Create start pause event
|
||||
var startPause = EventPause.new()
|
||||
startPause.pauseType = startPauseType
|
||||
startPause.entities = entities
|
||||
startPause.includeInteractee = pauseInteractee
|
||||
startPause.includeInteractor = pauseInteractor
|
||||
addExtraEvent(startPause, 0)
|
||||
if (pauseInteractee && interactee.entity) || (pauseInteractor && interactor.entity):
|
||||
var startPause = EventPause.new()
|
||||
startPause.pauseType = startPauseType
|
||||
startPause.entities = entities
|
||||
if pauseInteractee && interactee.entity:
|
||||
startPause.includeInteractee = pauseInteractee
|
||||
if pauseInteractor && interactor.entity:
|
||||
startPause.includeInteractor = pauseInteractor
|
||||
addExtraEvent(startPause, 0)
|
||||
|
||||
# Create end pause event.
|
||||
var endPause = EventPause.new()
|
||||
endPause.pauseType = endPauseType
|
||||
endPause.entities = entities
|
||||
endPause.includeInteractee = pauseInteractee
|
||||
endPause.includeInteractor = pauseInteractor
|
||||
addExtraEvent(endPause, -1)
|
||||
# Create end pause event.
|
||||
var endPause = EventPause.new()
|
||||
endPause.pauseType = endPauseType
|
||||
endPause.entities = entities
|
||||
if pauseInteractee && interactee.entity:
|
||||
endPause.includeInteractee = pauseInteractee
|
||||
if pauseInteractor && interactor.entity:
|
||||
endPause.includeInteractor = pauseInteractor
|
||||
addExtraEvent(endPause, -1)
|
||||
|
||||
# Pass off to event group
|
||||
super.start()
|
||||
super.start()
|
||||
|
Reference in New Issue
Block a user