diff --git a/src/dev-util/savegame.gd b/src/dev-util/savegame.gd index d8ef1df..baa4699 100644 --- a/src/dev-util/savegame.gd +++ b/src/dev-util/savegame.gd @@ -213,7 +213,7 @@ func validate_board_state() -> bool: push_error("Save %s could not be parsed: Corrupted Cards." % unique_save_name) return false for sticky in board_state.stickies.values(): - if not (sticky == -1 or sticky is Vector2 or board_state.cards.keys.has(sticky)): + if not (sticky is int or sticky is Vector2 or board_state.cards.keys().has(sticky)): push_error("Save %s could not be parsed: Corrupted Sticky Notes.") return false diff --git a/src/logic-scenes/main menu/save_game_display.gd b/src/logic-scenes/main menu/save_game_display.gd index 97185ba..cae9d86 100644 --- a/src/logic-scenes/main menu/save_game_display.gd +++ b/src/logic-scenes/main menu/save_game_display.gd @@ -88,7 +88,7 @@ func rebuild(): State.rooms.NULL: room.text = "Empty Slot" State.rooms.YOUTH: - if save.mementos_complete == 0: + if save.mementos_complete > 0: room.text = "Youth Room" else: room.text = "Intro Sequence" diff --git a/src/singletons/scene_reference.gd b/src/singletons/scene_reference.gd index a542680..87639c8 100644 --- a/src/singletons/scene_reference.gd +++ b/src/singletons/scene_reference.gd @@ -3,7 +3,8 @@ extends Node var sequence_actors:Array[Array] = [] var started_sequences: int = 0 var completed_sequences: int = 0 -var enabled_sequences: int = 63 +var enabled_sequences: int = 255: + set(stuff): pass var current_sequence: int = -1 var current_sequence_index: int = 0 @@ -14,8 +15,8 @@ enum id { YOUTH_JUI_JUTSU, TRANSITION, ADULT_DND, - ADULD_VOLUNTARY, - ADULD_CHRISTMAS, + ADULT_VOLUNTARY, + ADULT_CHRISTMAS, ADULT_EATING, ADULT_UNI, ADULT_THERAPY, @@ -74,6 +75,8 @@ func end_current_sequence(): func is_sequence_repeating(index: int) -> bool: return completed_sequences & (1 << index) > 0 +func is_sequence_unlocked(index: id) -> bool: return (1 << int(index)) & enabled_sequences > 0 + func get_completed_total() -> int: var i: int = completed_sequences - ((completed_sequences >> 1) & 0x55555555); i = (i & 0x33333333) + ((i >> 2) & 0x33333333);