diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 2296e14f..75508972 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -333,7 +333,7 @@ func give_lore_feedback(): if float(fitting_card_count) / float(total_card_count) < 0.2: Prompts.instruction("You can move on, but you may not have understood Lisa.") if not unfitting: - if State.speech_language == 2: + if State.speech_locale == 2: $AnimationPlayer.play("unfitting_de") else: $AnimationPlayer.play("unfitting") @@ -341,7 +341,7 @@ func give_lore_feedback(): elif fitting_card_count < total_card_count: Prompts.instruction(TranslationServer.translate("You may leave the room, but Lisa only agrees with %d of the %d connections.") % [fitting_card_count, total_card_count]) if not incomplete: - if State.speech_language == 2: + if State.speech_locale == 2: $AnimationPlayer.play("incomplete_de") else: $AnimationPlayer.play("incomplete") @@ -349,7 +349,7 @@ func give_lore_feedback(): else: Prompts.instruction("Lisa would like you to leave her room and move on.") if not complete: - if State.speech_language == 2: + if State.speech_locale == 2: $AnimationPlayer.play("complete_de") else: $AnimationPlayer.play("complete") diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 6f74d24a..6c89df7d 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -117,7 +117,7 @@ var burn_state: burned = burned.NOT: burn_tween.tween_property(self, "burn_progress", 0.5, 2) burn_state = burning burned.TORCHED: - print("Card %s has been burned." % HardCards.get_obscure_name(name)) + print("Card %s has been burned." % CardLibrary.get_obscure_name(name)) has_burned.emit() burn_state = burning @@ -142,8 +142,8 @@ func init(card_name: String = "card", own_id:StringName = "-1") -> void: push_error("Illegal card!", card_name, own_id) card_id = own_id name = card_name - # first digit of the card id is 0-3 for youth cards. - from_youth = (card_id as String)[0] as int < 4 + + from_youth = int((card_id as String)[0]) < (Scenes.id.TRANSITION as int) func _ready(): @@ -158,7 +158,7 @@ func _ready(): func _on_text_updated(): if is_node_ready() and name != "c_void" and name != "3.c_void": if from_youth: - if State.current_room == State.rooms.YOUTH or State.onready_room == State.rooms.YOUTH: + if State.get_room_id() <= Room.ids.YOUTH: background_sprite.animation = "youth" else: background_sprite.animation = "aged" @@ -263,7 +263,7 @@ func attach_or_exchange_note(note: StickyNote, instant: bool = false) -> void: else: note.position = sticky_note_position - if name == "c_hit" and note.name == "c_effort" and Steamworks.has_initialized: + if name == "c_hit" and note.name == "c_effort" and Steamworks.is_initialized: Steam.setAchievement("FIGHT_FOR_GOOD") Steam.storeStats() diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index 06932379..1e6e9974 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -154,7 +154,7 @@ func pick(id: int) -> void: winning_id = randi() % options.size() - ( 1 if selection_state == POSTS_SELECTED else 0) else: winning_id = 1 if id == 0 else 0 - if Steamworks.has_initialized: + if Steamworks.is_initialized: Steam.setAchievement("FIGHT_BACK") Steam.storeStats() diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd index e22aed3a..278cf74e 100644 --- a/src/singletons/global_state.gd +++ b/src/singletons/global_state.gd @@ -142,7 +142,7 @@ const user_saves_path:String = "user://savegames" set(disconnect): if disconnect and not disconnect_steam: Steam.steamShutdown() - Steamworks.has_initialized = false + Steamworks.is_initialized = false elif not disconnect and disconnect_steam: Steamworks._ready() disconnect_steam = disconnect diff --git a/src/singletons/main/main.gd b/src/singletons/main/main.gd index e102e588..e6433cfd 100644 --- a/src/singletons/main/main.gd +++ b/src/singletons/main/main.gd @@ -46,7 +46,6 @@ var state: AppState = AppState.INIT: main_menu.hide() pause_menu.hide() hotswap_ready = false - menu_animation.play("hide_pause_menu") if state == AppState.PAUSE: menu_animation.play("hide_pause_menu") AppState.PAUSE: