Improved UI textbox

overworld/entity/Entity.gd

@@ -14,9 +14,8 @@ enum InteractType {
   ONE_TIME_ITEM,
   CUTSCENE,
   BATTLE_TEST,
-  CHATBOX,
   PROXIMITY_CHATBOX,
-};
+}
 
 @export_category("Identification")
 @export var entityId:String = UUID.uuidv4()
@@ -24,19 +23,30 @@ enum InteractType {
 var button := func():
   entityId = UUID.uuidv4()
 
-# Movement settings
+@export_category("Dialogue")
+@export var dialogueName:String = ""
+@export var displayName:String = ""
+
 @export_category("Movement")
 @export var movementType:MovementType = MovementType.NONE
 
-# Interaction settings
 @export_category("Interactions")
 @export var interactType:InteractType = InteractType.NONE
-@export var dialogueResource:DialogueResource = null
+@export var dialogueBasePath:String = ""
 @export var dialogueTitle:String = "start"
 @export var oneTimeItem:ItemResource = null
 @export var cutscene:CutsceneResource = null
-@export var chatboxMessage:String = ""
-@export var chatboxDuration:float = 3.0
 
-# TEST BATTLE
 @export_category("Test Battle")
+
+func _enter_tree() -> void:
+  if Engine.is_editor_hint():
+    return
+  if dialogueName != "":
+    OVERWORLD.registerDialogueEntity(self)
+
+func _exit_tree() -> void:
+  if Engine.is_editor_hint():
+    return
+  if dialogueName != "":
+    OVERWORLD.unregisterDialogueEntity(self)

overworld/entity/EntityInteractableArea.gd

@@ -1,6 +1,5 @@
 class_name EntityInteractableArea extends Area3D
 const ItemAction = preload("res://cutscene/item/ItemAction.gd")
-const DialogueAction = preload("res://cutscene/dialogue/DialogueAction.gd")
 
 @export var entity:Entity
 
@@ -8,44 +7,32 @@ func isInteractable() -> bool:
   if !entity:
     return false
 
-  if entity.interactType == Entity.InteractType.NONE:
-    return false
-
-  if entity.interactType == Entity.InteractType.CONVERSATION:
-    return entity.dialogueResource != null
-
-  if entity.interactType == Entity.InteractType.CUTSCENE:
-    if entity.cutscene == null:
+  match entity.interactType:
+    Entity.InteractType.NONE:
       return false
-    if !entity.cutscene.canRun():
-      return false
-    return true
-
-  if entity.interactType == Entity.InteractType.ONE_TIME_ITEM:
-    if entity.oneTimeItem == null:
-      return false
-    if entity.oneTimeItem.quantity <= 0:
-      return false
-    if entity.oneTimeItem.item == Item.Id.NULL:
-      return false
-    return true
-
-  if entity.interactType == Entity.InteractType.BATTLE_TEST:
-    return true
-
-  if entity.interactType == Entity.InteractType.CHATBOX:
-    return entity.chatboxMessage != ""
+    Entity.InteractType.CONVERSATION:
+      return entity.dialogueBasePath != ""
+    Entity.InteractType.CUTSCENE:
+      return entity.cutscene != null and entity.cutscene.canRun()
+    Entity.InteractType.ONE_TIME_ITEM:
+      return (
+        entity.oneTimeItem != null
+        and entity.oneTimeItem.quantity > 0
+        and entity.oneTimeItem.item != Item.Id.NULL
+      )
+    Entity.InteractType.BATTLE_TEST:
+      return true
 
   return false
 
-func _onConversationInteract(other:Entity) -> void:
-  assert(entity.dialogueResource != null)
+func _onConversationInteract(_other:Entity) -> void:
+  assert(entity.dialogueBasePath != "")
   var cutscene:Cutscene = Cutscene.new()
   cutscene.addCallable(DialogueAction.getDialogueCallable(
-    entity.dialogueResource,
+    entity.dialogueBasePath,
     entity.dialogueTitle,
     [entity],
-    {"npc": entity, "player": other}
+    DialogueAction.DialogueMode.CONVERSATION
   ))
   cutscene.start()
 
@@ -57,24 +44,17 @@ func _onItemInteract(_other:Entity) -> void:
   entity.queue_free()
 
 func onInteract(other:Entity) -> void:
-  if entity.interactType == Entity.InteractType.NONE:
-    return
-
   match entity.interactType:
+    Entity.InteractType.NONE:
+      return
     Entity.InteractType.CONVERSATION:
       _onConversationInteract(other)
-      return
-
     Entity.InteractType.ONE_TIME_ITEM:
       _onItemInteract(other)
-      return
-
     Entity.InteractType.CUTSCENE:
       var cutscene:Cutscene = Cutscene.new()
       entity.cutscene.queue(cutscene)
       cutscene.start()
-      return
-
     Entity.InteractType.BATTLE_TEST:
       var testEnemy = BattleFighter.new({
         'controller': BattleFighter.FighterController.AI
@@ -85,13 +65,3 @@ func onInteract(other:Entity) -> void:
         BATTLE.BattlePosition.LEFT_MIDDLE_FRONT: testEnemy
       }))
       cutscene.start()
-      return
-
-    Entity.InteractType.CHATBOX:
-      assert(entity.chatboxMessage != "")
-      var chatbox:WorldChatBox = UI.spawnWorldChatBox(entity)
-      chatbox.showAdvanceable(entity.chatboxMessage)
-      return
-
-    _:
-      pass

overworld/entity/EntityMovement.gd

@@ -20,7 +20,7 @@ func _applyGravity() -> void:
 func _applyPlayerMovement(delta:float):
   # Interactions, may move
   if Input.is_action_just_pressed("interact") && interactingArea && interactingArea.hasInteraction():
-    if !UI.hasAdvanceableChatBox() && !UI.dialogueActive:
+    if !UI.dialogueActive:
       interactingArea.interact()
     return
 
@@ -63,7 +63,7 @@ func _applyFriction(delta:float) -> void:
   entity.velocity.z *= delta * FRICTION
 
 func _canMove() -> bool:
-  if !UI.MAIN_CHATBOX.isClosed:
+  if UI.activeConversation:
     return false
   if UI.GAME_MENU && UI.GAME_MENU.isOpen():
     return false

overworld/entity/EntityProximityArea.gd

@@ -2,31 +2,12 @@ class_name EntityProximityArea extends Area3D
 
 @export var entity:Entity
 
-var _triggered:bool = false
-var _chatbox:WorldChatBox = null
-
 func _ready() -> void:
   body_entered.connect(_onBodyEntered)
   body_exited.connect(_onBodyExited)
 
-func _onBodyEntered(body:Node3D) -> void:
-  if _triggered:
-    return
-  if !(body is Entity):
-    return
-  if (body as Entity).entityId != "player":
-    return
-  _triggered = true
-  assert(entity != null && entity.chatboxMessage != "")
-  if is_instance_valid(_chatbox) and _chatbox.visible:
-    _chatbox.resetTimer(entity.chatboxDuration)
-  else:
-    _chatbox = UI.spawnWorldChatBox(entity)
-    _chatbox.showTimed(entity.chatboxMessage, entity.chatboxDuration)
+func _onBodyEntered(_body:Node3D) -> void:
+  pass
 
-func _onBodyExited(body:Node3D) -> void:
-  if !(body is Entity):
-    return
-  if (body as Entity).entityId != "player":
-    return
-  _triggered = false
+func _onBodyExited(_body:Node3D) -> void:
+  pass