YourWishes/Dawn-Godot
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Nuking UI global scene

Browse Source
This commit is contained in:
Dominic Masters
2026-01-09 19:59:30 -06:00
parent 16b96de507
commit e7f55fd731
10 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cutscene/conversation/ConversationElement.gd
View File

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

1
overworld/entity/Entity.gd
View File

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

1
overworld/entity/EntityInteractableArea.gd
View File

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

1
overworld/entity/EntityInteractingArea.gd
View File

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

1
project.godot
View File

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

2
scene/RootScene.gd
View File

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

4
scene/RootScene.tscn
View File

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

17
singleton/Pause.gd
View File

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

5
ui/UI.gd
View File

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

1
ui/UI.tscn
View File

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