small changes
This commit is contained in:
+19
-11
@@ -6,6 +6,9 @@ extends Control
|
||||
@export var TextScreens: PackedScene
|
||||
@export var DialogueScreens: PackedScene
|
||||
|
||||
var balloon: Node
|
||||
|
||||
|
||||
|
||||
# Called when the node enters the scene tree for the first time.
|
||||
func _ready() -> void:
|
||||
@@ -45,12 +48,6 @@ func _ready() -> void:
|
||||
|
||||
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta: float) -> void:
|
||||
pass
|
||||
|
||||
|
||||
|
||||
# Starts a new game
|
||||
func _on_new_game_pressed():
|
||||
Globals.day_count = 1
|
||||
@@ -76,7 +73,7 @@ func play_intro():
|
||||
TransitionScreen.transition("big", [$TextScreens, $TextScreens/MarginContainer, text_container.get_child(4), UI, UI.get_node("UI/SkipContainer")], [$DialogueScreens])
|
||||
await TransitionScreen.transition_finished
|
||||
|
||||
DialogueManager.show_dialogue_balloon(Globals.dialogue_intro, "start")
|
||||
$DialogueScreens.start_balloon(Globals.dialogue_intro, "start")
|
||||
await DialogueManager.dialogue_ended
|
||||
|
||||
#Starting the day
|
||||
@@ -115,7 +112,7 @@ func _on_recovery_pressed():
|
||||
await TransitionScreen.transition_finished
|
||||
|
||||
#End of day dialogue
|
||||
DialogueManager.show_dialogue_balloon(Globals.dialogue_recovery, "end_of_day_" + str(Globals.day_count))
|
||||
$DialogueScreens.start_balloon(Globals.dialogue_recovery, "end_of_day_" + str(Globals.day_count))
|
||||
await DialogueManager.dialogue_ended
|
||||
|
||||
#Start of the next day
|
||||
@@ -160,11 +157,16 @@ func save_game(save_slot_number:int):
|
||||
#Loads save file from the selected load slot
|
||||
func load_game(load_slot_number:int):
|
||||
|
||||
#CLeaning balloons
|
||||
$DialogueScreens.clean_balloon()
|
||||
$ScreeningDesk.clean_balloon()
|
||||
|
||||
#Hiding loading menus and masks
|
||||
TransitionScreen.mask.visible = false
|
||||
UI.get_node("UI/Menu").hide()
|
||||
UI.get_node("UI/UpperContainer").hide()
|
||||
UI.get_node("UI/Load").hide()
|
||||
UI.get_node("UI/LoadTitle").hide()
|
||||
UI.get_node("UI/Menu").hide()
|
||||
|
||||
#Opening save file
|
||||
var file = FileAccess.open("res://Saves/save_" + str(load_slot_number) + ".json", FileAccess.READ)
|
||||
@@ -202,10 +204,16 @@ func _on_load_slot_pressed(load_slot):
|
||||
|
||||
func _on_main_menu_pressed():
|
||||
|
||||
#Hiding menu
|
||||
#Removing mask
|
||||
TransitionScreen.mask.visible = false
|
||||
|
||||
#Cleaning balloons
|
||||
$DialogueScreens.clean_balloon()
|
||||
$ScreeningDesk.clean_balloon()
|
||||
|
||||
#Hiding menus
|
||||
UI.get_node("UI/Menu").hide()
|
||||
UI.get_node("UI/UpperContainer").hide()
|
||||
TransitionScreen.mask.visible = false
|
||||
|
||||
#Going back to main menu
|
||||
var scenes_to_hide = [$ScreeningDesk, $Bedroom, $TextScreens, $TextScreens/Day, $ScreeningDesk.patient_controls, $ScreeningDesk.end_of_day_controls, $ScreeningDesk.patient_texture, $ScreeningDesk.panel_container, $ScreeningDesk.face_zoom] + $ScreeningDesk.margin_container.get_children()
|
||||
|
||||
Reference in New Issue
Block a user