Nuking UI global scene

This commit is contained in:
2026-01-09 19:59:30 -06:00
parent 16b96de507
commit e7f55fd731
10 changed files with 21 additions and 14 deletions

View File

@@ -5,5 +5,5 @@ class_name ConversationElement
@export_multiline var label: String
func sceneItem() -> int:
await UI.TEXTBOX.setTextAndWait(label)
# await UI.TEXTBOX.setTextAndWait(label)
return CutsceneSingleton.CUTSCENE_CONTINUE

View File

@@ -1,5 +1,4 @@
class_name Entity extends CharacterBody3D
const ConversationElement = preload("res://cutscene/conversation/ConversationElement.gd")
enum MovementType {
NONE,

View File

@@ -1,5 +1,4 @@
class_name EntityInteractableArea extends Area3D
const Entity = preload("res://overworld/entity/Entity.gd")
@export var entity:Entity

View File

@@ -1,5 +1,4 @@
class_name EntityInteractingArea extends Area3D
const Entity = preload("res://overworld/entity/Entity.gd")
var interactableAreas:Array[EntityInteractableArea] = []
@export var entity:Entity

View File

@@ -19,7 +19,6 @@ config/icon="res://icon.svg"
PAUSE="*res://singleton/Pause.gd"
TRANSITION="*res://singleton/Transition.tscn"
UI="*res://ui/UI.tscn"
QUEST="*res://quest/Quest.tscn"
OVERWORLD="*res://overworld/Overworld.gd"
SCENE="*res://scene/Scene.gd"

View File

@@ -18,7 +18,7 @@ func removeAndHide(node:Node3D) -> void:
node.visible = false
func addAndShow(node:Node3D) -> void:
if node:
if node && node.get_parent() != self:
add_child(node)
node.visible = true

View File

@@ -15,9 +15,13 @@ cooking = NodePath("CookingScene")
metadata/_custom_type_script = "uid://ml70iui7qpo4"
[node name="InitialScene" parent="." instance=ExtResource("2_hkmoa")]
visible = false
[node name="BattleScene" parent="." instance=ExtResource("2_0idls")]
visible = false
[node name="OverworldScene" parent="." instance=ExtResource("2_o1wvd")]
visible = false
[node name="CookingScene" parent="." instance=ExtResource("5_aj1eq")]
visible = false

View File

@@ -12,11 +12,11 @@ func isMovementPaused() -> bool:
if cutscenePaused:
return true
if !UI.TEXTBOX.isClosed:
return true
# if !UI.TEXTBOX.isClosed:
# return true
if UI.PAUSE.isOpen():
return true
# if UI.PAUSE.isOpen():
# return true
if OVERWORLD.isMapChanging():
return true
@@ -24,7 +24,8 @@ func isMovementPaused() -> bool:
return false
func menuPause() -> void:
if UI.PAUSE.isOpen():
UI.PAUSE.close()
else:
UI.PAUSE.open()
# if UI.PAUSE.isOpen():
# UI.PAUSE.close()
# else:
# UI.PAUSE.open()
pass

View File

@@ -1,5 +1,10 @@
class_name UISingleton extends Control
# @deprecated
@export var TEXTBOX: VNTextbox
# @deprecated
@export var PAUSE: PauseMenu
# @deprecated
@export var DEBUG: DebugMenu

View File

@@ -12,6 +12,7 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
mouse_filter = 1
script = ExtResource("1_son71")
TEXTBOX = NodePath("VNTextbox")
PAUSE = NodePath("PauseMenu")