diff --git a/cutscene/item/ItemAction.gd b/cutscene/item/ItemAction.gd index 1759136..d7d382e 100644 --- a/cutscene/item/ItemAction.gd +++ b/cutscene/item/ItemAction.gd @@ -5,8 +5,7 @@ static func itemGetCallable(params:Dictionary) -> int: assert(params.has('stack')) PARTY.BACKPACK.addStack(params['stack']) - # var text = "Obtained %s x%d." % [Item.getItemName(params['stack'].item), params['stack'].quantity] - var text = Item.getItemName(Item.Id.POTION) + var text = "Obtained %s x%d." % [Item.getItemName(params['stack'].item), params['stack'].quantity] params['cutscene'].addCallable(ConversationAction.getTextboxCallable(text).merged({ 'position': Cutscene.CUTSCENE_ADD_NEXT, })) diff --git a/item/Item.gd b/item/Item.gd index aa191be..d0bc217 100644 --- a/item/Item.gd +++ b/item/Item.gd @@ -21,7 +21,6 @@ static func itemDefine(params:Dictionary) -> Dictionary: assert(params.has('id')) assert(params.has('handle')) assert(params.has('type')) - assert(!ITEM_DATA.has(params['id'])) var obj:Dictionary = {} ITEM_DATA.insert(params['id'], obj) diff --git a/overworld/entity/EntityInteractableArea.gd b/overworld/entity/EntityInteractableArea.gd index 896431e..aee43b4 100644 --- a/overworld/entity/EntityInteractableArea.gd +++ b/overworld/entity/EntityInteractableArea.gd @@ -37,8 +37,8 @@ func _onItemInteract(_other:Entity) -> void: assert(entity.oneTimeItem != null) var cutscene:Cutscene = Cutscene.new() cutscene.addCallable(ItemAction.getItemCallable(entity.oneTimeItem.toItemStack())) - cutscene.addCallable(ConversationAction.getTextboxCallable('This should be last')) - cutscene.start() + await cutscene.start() + entity.queue_free() func onInteract(other:Entity) -> void: if entity.interactType == Entity.InteractType.NONE: