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

tiger-cleanup #1

Merged
tiger merged 97 commits from tiger-cleanup into development 2026-01-15 14:54:23 +00:00
Conversation 0 Commits 97 Files Changed 708 +24 -24
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1114f7f3c9 - Show all commits

46
src/logic-scenes/card_picker/card_picker.gd
View File

@ -60,29 +60,29 @@ signal cards_picked(cardnames: Array[String])
func _ready() -> void: func _ready() -> void:
reset() reset()
return return
#
#FIXME: can I make this less annoying somehow? # #FIXME: can I make this less annoying somehow?
if State.onready_room == State.rooms.YOUTH: # 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_DRAEVEN, 2)
Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_CHILDHOOD, 1) # 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_VOICE_TRAINING, 2)
Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_JUI_JUTSU, 1) # Scenes.sign_up_for_sequence(pick_cards, Scenes.id.YOUTH_JUI_JUTSU, 1)
elif State.onready_room == State.rooms.ADULTHOOD: # 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_DND, 1)
Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_VOLUNTARY, 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_CHRISTMAS, 1)
Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_EATING, 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_UNI, 1)
Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_THERAPY, 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) # Scenes.sign_up_for_sequence(pick_cards, Scenes.id.ADULT_BURNOUT, 1)
else: # else:
assert(false, "Not Implemented") # assert(false, "Not Implemented")
#
if get_tree().root == self.get_parent(): # if get_tree().root == self.get_parent():
pick_cards(3, false) # pick_cards(3, false)
State.take_stage(self) # State.take_stage(self)
#
reset() # reset()
func reset(): func reset():
card_anim_skipped = false card_anim_skipped = false

2
src/singletons/global_state.gd
View File

@ -264,7 +264,7 @@ var stage_list:Array = []
var focus_locked: bool = false var focus_locked: bool = false
# Intented for use when an actor wants focus for itself, can reclaim focus, thus dropping the stack that focused. # 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); print_debug("DEPRECATED: take_stage ", actor);
return false return false
#if focus_locked or Scenes.current_sequence != -1: return false #if focus_locked or Scenes.current_sequence != -1: return false