diff --git a/src/dev-util/room_template.gd b/src/dev-util/room_template.gd index 5b3a148..b006a88 100644 --- a/src/dev-util/room_template.gd +++ b/src/dev-util/room_template.gd @@ -29,6 +29,8 @@ func get_ready(): pass func play() -> String: + for i in range(20): + await get_tree().process_frame await get_ready() await start_room() var next_room : StringName = await proceed diff --git a/src/internationalisation.de.translation b/src/internationalisation.de.translation index d907a3e..9b81b50 100644 Binary files a/src/internationalisation.de.translation and b/src/internationalisation.de.translation differ diff --git a/src/internationalisation.en.translation b/src/internationalisation.en.translation index 97ff273..0f7c76d 100644 Binary files a/src/internationalisation.en.translation and b/src/internationalisation.en.translation differ diff --git a/src/internationalisation.es.translation b/src/internationalisation.es.translation index 61de06a..8e10353 100644 Binary files a/src/internationalisation.es.translation and b/src/internationalisation.es.translation differ diff --git a/src/internationalisation.ja.translation b/src/internationalisation.ja.translation index b90cb06..1594e28 100644 Binary files a/src/internationalisation.ja.translation and b/src/internationalisation.ja.translation differ diff --git a/src/logic-scenes/board/board.gd b/src/logic-scenes/board/board.gd index 79f02b1..01190b0 100644 --- a/src/logic-scenes/board/board.gd +++ b/src/logic-scenes/board/board.gd @@ -16,9 +16,6 @@ func _ready(): elif item is StickyNote: spawn_sticky_note((item as StickyNote).duplicate()) -func _process(delta: float): - pass - func spawn_card(card: Card): $cards.add_child(card) diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index e1e2c93..010d774 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -70,10 +70,6 @@ func _navigate_prev(): func _ready() -> void: print("CardBoard.gd: %s._ready()" % self.name) super._ready() - # HACK: Lets us debug more easily - if get_parent() == get_tree().root: - _debug_mode() - return print("Board Ready!", self, "room", State.room) State.room.card_board = self diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index 038ed96..27842fc 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -230,4 +230,3 @@ func pick_cards(id: Scenes.id): await cards_picked hide() - diff --git a/src/logic-scenes/interactable/interactable.gd b/src/logic-scenes/interactable/interactable.gd index c82d34f..372bebe 100644 --- a/src/logic-scenes/interactable/interactable.gd +++ b/src/logic-scenes/interactable/interactable.gd @@ -30,6 +30,11 @@ var tween: Tween = null func _ready() -> void: assert(note and frame and canvas_layer, "Interactable must have views and frame attached") + + if interaction: + playable = interaction.instantiate() as Control + canvas_layer.add_child(playable) + view.scale = Vector3.ZERO frame.modulate.a = 0.0 light.visible = false @@ -39,9 +44,6 @@ func _ready() -> void: ## To be called by room func pull_save_state() -> void: - if interaction: - playable = interaction.instantiate() as Control - canvas_layer.add_child(playable) _update_caption() # Check if this scene was already completed (for re-entering rooms) if playable is StoryPlayable: diff --git a/src/logic-scenes/playable.gd b/src/logic-scenes/playable.gd index f8bd309..e50642f 100644 --- a/src/logic-scenes/playable.gd +++ b/src/logic-scenes/playable.gd @@ -1,10 +1,8 @@ -extends Control +extends Control class_name Playable func _ready() -> void: hide() - if not Main.normal_boot: - play.call_deferred() ## Awaitable that encapsulates the core interaction with this Playable