diff --git a/src/base-environments/transition/subway_sequence.gd b/src/base-environments/transition/subway_sequence.gd index 7026617..206afd7 100644 --- a/src/base-environments/transition/subway_sequence.gd +++ b/src/base-environments/transition/subway_sequence.gd @@ -54,12 +54,12 @@ func on_left_train_enter(_body): %Train2.get_child(0).door_open = false on_first_transition(true) await get_tree().create_timer(5.0).timeout - Scenes.enabled_sequences += 1 << Scenes.id.ADULD_VOLUNTARY - %SubwayMap.current_station = Scenes.id.ADULD_VOLUNTARY + Scenes.enabled_sequences += 1 << Scenes.id.ADULT_VOLUNTARY + %SubwayMap.current_station = Scenes.id.ADULT_VOLUNTARY %RightLabel.text = "U3 Gesundquell \n via Rosenthal Hospital" await get_tree().create_timer(5.0).timeout - Scenes.enabled_sequences += 1 << Scenes.id.ADULD_CHRISTMAS - %SubwayMap.current_station = Scenes.id.ADULD_CHRISTMAS + Scenes.enabled_sequences += 1 << Scenes.id.ADULT_CHRISTMAS + %SubwayMap.current_station = Scenes.id.ADULT_CHRISTMAS await get_tree().create_timer(5.0).timeout %Train2.get_child(0).door_open = true @@ -133,8 +133,8 @@ func on_right_train_enter(_body): on_second_transition() if on_direct_path: %ShedulePlayer_L.play("train_leaving") await get_tree().create_timer(5.0).timeout - Scenes.enabled_sequences += 1 << Scenes.id.ADULD_CHRISTMAS - %SubwayMap.current_station = Scenes.id.ADULD_CHRISTMAS + Scenes.enabled_sequences += 1 << Scenes.id.ADULT_CHRISTMAS + %SubwayMap.current_station = Scenes.id.ADULT_CHRISTMAS await get_tree().create_timer(2.0).timeout %Train2.get_child(0).door_open = false %RightLabel.text = "do not board" diff --git a/src/dev-util/music_mix_helper.gd b/src/dev-util/music_mix_helper.gd index 0d5d328..893ed92 100644 --- a/src/dev-util/music_mix_helper.gd +++ b/src/dev-util/music_mix_helper.gd @@ -20,8 +20,8 @@ enum TriggerPoint { func get_playback_id_from_scene(scene: int) -> int: match scene: Scenes.id.ADULT_DND: return 1 - Scenes.id.ADULD_VOLUNTARY: return 2 - Scenes.id.ADULD_CHRISTMAS: return 3 + Scenes.id.ADULT_VOLUNTARY: return 2 + Scenes.id.ADULT_CHRISTMAS: return 3 Scenes.id.ADULT_EATING: return 4 Scenes.id.ADULT_UNI: return 5 Scenes.id.ADULT_THERAPY: return 6 diff --git a/src/logic-scenes/collectable/new_collectable_ui.gd b/src/logic-scenes/collectable/new_collectable_ui.gd index ca67787..d34af3f 100644 --- a/src/logic-scenes/collectable/new_collectable_ui.gd +++ b/src/logic-scenes/collectable/new_collectable_ui.gd @@ -55,10 +55,10 @@ class_name CollectableUi extends CenterContainer Scenes.id.ADULT_DND: if title_override == "": title_label.text = TranslationServer.translate("colorful Dice") if subtitle_override == "": cn_label.text = "" - Scenes.id.ADULD_VOLUNTARY: + Scenes.id.ADULT_VOLUNTARY: if title_override == "": title_label.text = TranslationServer.translate("Gemstone Art") if subtitle_override == "": cn_label.text = "" - Scenes.id.ADULD_CHRISTMAS: + Scenes.id.ADULT_CHRISTMAS: if title_override == "": title_label.text = TranslationServer.translate("Chat Messages") if subtitle_override == "": cn_label.text = "" Scenes.id.ADULT_EATING: @@ -180,6 +180,9 @@ func update_state(): func try_reveal() -> bool: if is_exit and not State.active_save_game.is_childhood_board_complete: return false + elif not is_board: + if not Scenes.is_sequence_unlocked( self.scene ): + return false if not visible or animation_player.get_animation("vanish") or animation_player.get_animation("vanish_all"): update_state() visible = true @@ -229,7 +232,6 @@ func collect_memento(): if was_skipped: scene_skipped.emit(-1) is_collected = true - func _on_skip_pressed(): print("Scene skipped!") if scene != null: