Prepping cooking
This commit is contained in:
@@ -11,10 +11,15 @@ func isInteractable() -> bool:
|
||||
return false
|
||||
|
||||
if entity.interactType == Entity.InteractType.CONVERSATION:
|
||||
if entity.conversation.size() != 0:
|
||||
return true
|
||||
if entity.conversation.size() == 0:
|
||||
return false
|
||||
return true
|
||||
|
||||
if entity.interactType == Entity.InteractType.TEST_BATTLE:
|
||||
if entity.interactType == Entity.InteractType.CUTSCENE:
|
||||
if entity.cutscene == null:
|
||||
return false
|
||||
if !entity.cutscene.canRun():
|
||||
return false
|
||||
return true
|
||||
|
||||
if entity.interactType == Entity.InteractType.ONE_TIME_ITEM:
|
||||
@@ -53,11 +58,9 @@ func onInteract(other:Entity) -> void:
|
||||
_onItemInteract(other)
|
||||
return
|
||||
|
||||
Entity.InteractType.TEST_BATTLE:
|
||||
Entity.InteractType.CUTSCENE:
|
||||
var cutscene:Cutscene = Cutscene.new()
|
||||
cutscene.addCallable(BattleStartAction.getStartBattleCallable({
|
||||
BATTLE.BattlePosition.RIGHT_TOP_FRONT: PartySingleton.PARTY_JOHN,
|
||||
}))
|
||||
entity.cutscene.queue(cutscene)
|
||||
cutscene.start()
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user