diff --git a/cutscene/conversation/ConversationElement.gd b/cutscene/conversation/ConversationElement.gd index 812ff65..6f00811 100644 --- a/cutscene/conversation/ConversationElement.gd +++ b/cutscene/conversation/ConversationElement.gd @@ -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 diff --git a/overworld/entity/Entity.gd b/overworld/entity/Entity.gd index ddab5c6..b5536e1 100644 --- a/overworld/entity/Entity.gd +++ b/overworld/entity/Entity.gd @@ -1,5 +1,4 @@ class_name Entity extends CharacterBody3D -const ConversationElement = preload("res://cutscene/conversation/ConversationElement.gd") enum MovementType { NONE, diff --git a/overworld/entity/EntityInteractableArea.gd b/overworld/entity/EntityInteractableArea.gd index 0d41c41..3073d98 100644 --- a/overworld/entity/EntityInteractableArea.gd +++ b/overworld/entity/EntityInteractableArea.gd @@ -1,5 +1,4 @@ class_name EntityInteractableArea extends Area3D -const Entity = preload("res://overworld/entity/Entity.gd") @export var entity:Entity diff --git a/overworld/entity/EntityInteractingArea.gd b/overworld/entity/EntityInteractingArea.gd index 704a257..d8d8191 100644 --- a/overworld/entity/EntityInteractingArea.gd +++ b/overworld/entity/EntityInteractingArea.gd @@ -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 diff --git a/project.godot b/project.godot index 717d802..f015cf6 100644 --- a/project.godot +++ b/project.godot @@ -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" diff --git a/scene/RootScene.gd b/scene/RootScene.gd index 9ae54d3..96ec9cf 100644 --- a/scene/RootScene.gd +++ b/scene/RootScene.gd @@ -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 diff --git a/scene/RootScene.tscn b/scene/RootScene.tscn index 4bd029e..d890ec4 100644 --- a/scene/RootScene.tscn +++ b/scene/RootScene.tscn @@ -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 diff --git a/singleton/Pause.gd b/singleton/Pause.gd index e3994ff..bf95a40 100644 --- a/singleton/Pause.gd +++ b/singleton/Pause.gd @@ -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 \ No newline at end of file diff --git a/ui/UI.gd b/ui/UI.gd index e72585a..affc7c0 100644 --- a/ui/UI.gd +++ b/ui/UI.gd @@ -1,5 +1,10 @@ class_name UISingleton extends Control +# @deprecated @export var TEXTBOX: VNTextbox + +# @deprecated @export var PAUSE: PauseMenu + +# @deprecated @export var DEBUG: DebugMenu diff --git a/ui/UI.tscn b/ui/UI.tscn index ce2be25..164767d 100644 --- a/ui/UI.tscn +++ b/ui/UI.tscn @@ -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")