betalars
/
frame-of-mind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: loading in both board rooms unified

This commit is contained in:
tiger tiger tiger 2026-01-22 01:36:54 +01:00
parent 071c0de5a7
commit efc2488dff
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/base-environments/volunteer_room/volunteer_room.gd
View File

@ -19,17 +19,19 @@ func get_ready() -> void:
%TherapyUniInteractable.visible = save_game.subway_burnout %TherapyUniInteractable.visible = save_game.subway_burnout
pull_save_state(State.save_game) pull_save_state(State.save_game)
card_board.board_completed.connect(func():
#TODO: hook in ending
#%DoorInteractable.show()
pass
)
card_board.closed.connect(save_room)
Scenes.scene_finished.connect(_on_scene_finished) Scenes.scene_finished.connect(_on_scene_finished)
card_picker.cards_picked.connect(card_board.populate_board) card_picker.cards_picked.connect(card_board.populate_board)
card_board.closed.connect(save_room)
card_board.board_completed.connect(func():
save_game.childhood_board_complete = true
%DoorInteractable.show()
)
# This MUST happen after the signal connection, or the door will remain locked
card_board.initialise_from_save(save_game)
func start_room(): func start_room():
await super.start_room() await super.start_room()

14
src/base-environments/youth_room/youth_room.gd
View File

@ -42,21 +42,22 @@ func _play_intro_scene() -> void:
func get_ready() -> void: func get_ready() -> void:
await super.get_ready() await super.get_ready()
pull_save_state(State.save_game) pull_save_state(State.save_game)
card_board.closed.connect(save_room) card_board.closed.connect(save_room)
card_board.board_completed.connect(func(): card_board.board_completed.connect(func():
%DoorInteractable.show()
save_game.childhood_board_complete = true save_game.childhood_board_complete = true
%DoorInteractable.show()
) )
Scenes.scene_finished.connect(_on_scene_finished) Scenes.scene_finished.connect(_on_scene_finished)
card_picker.cards_picked.connect(card_board.populate_board) card_picker.cards_picked.connect(card_board.populate_board)
# This MUST happen after the signal connection, or the door will remain locked
card_board.initialise_from_save(save_game)
ui.hide() ui.hide()# Not sure?
$sfx/distant_rain.play()
$"sfx/rain on window".play()
func pull_save_state(save: SaveGame) -> void: func pull_save_state(save: SaveGame) -> void:
@ -66,9 +67,6 @@ func pull_save_state(save: SaveGame) -> void:
# Interactions can this way load their correct prompts # Interactions can this way load their correct prompts
get_tree().call_group("interactables", "pull_save_state") get_tree().call_group("interactables", "pull_save_state")
# Load board state from save first, before overwriting it
card_board.initialise_from_save(save_game)
# TODO: These should be deprecated, SaveGame is our source of truth # TODO: These should be deprecated, SaveGame is our source of truth
Scenes.started_sequences = save_game.mementos_complete Scenes.started_sequences = save_game.mementos_complete
Scenes.completed_sequences = save_game.mementos_complete Scenes.completed_sequences = save_game.mementos_complete