diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index 68350fc..0b7ed90 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -60,29 +60,29 @@ signal cards_picked(cardnames: Array[String]) func _ready() -> void: reset() return - - #FIXME: can I make this less annoying somehow? - if State.onready_room == State.rooms.YOUTH: - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_DRAEVEN, 2) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_CHILDHOOD, 1) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_VOICE_TRAINING, 2) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_JUI_JUTSU, 1) - elif State.onready_room == State.rooms.ADULTHOOD: - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_DND, 1) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_VOLUNTARY, 1) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_CHRISTMAS, 1) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_EATING, 1) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_UNI, 1) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_THERAPY, 1) - Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_BURNOUT, 1) - else: - assert(false, "Not Implemented") - - if get_tree().root == self.get_parent(): - pick_cards(3, false) - State.take_stage(self) - - reset() +# +# #FIXME: can I make this less annoying somehow? +# if State.onready_room == State.rooms.YOUTH: +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_DRAEVEN, 2) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_CHILDHOOD, 1) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_VOICE_TRAINING, 2) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_JUI_JUTSU, 1) +# elif State.onready_room == State.rooms.ADULTHOOD: +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_DND, 1) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_VOLUNTARY, 1) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_CHRISTMAS, 1) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_EATING, 1) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_UNI, 1) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_THERAPY, 1) +# Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_BURNOUT, 1) +# else: +# assert(false, "Not Implemented") +# +# if get_tree().root == self.get_parent(): +# pick_cards(3, false) +# State.take_stage(self) +# +# reset() func reset(): card_anim_skipped = false diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd index df93f07..980811c 100644 --- a/src/singletons/global_state.gd +++ b/src/singletons/global_state.gd @@ -264,7 +264,7 @@ var stage_list:Array = [] var focus_locked: bool = false # Intented for use when an actor wants focus for itself, can reclaim focus, thus dropping the stack that focused. -func take_stage(actor: Object, reclaim: bool = false) -> bool: +func take_stage(actor: Object, _reclaim: bool = false) -> bool: print_debug("DEPRECATED: take_stage ", actor); return false #if focus_locked or Scenes.current_sequence != -1: return false