implement texture switching and adding thank-you prompt #2

Merged
tiger merged 5 commits from laurins-lair into development 2026-03-12 13:07:54 +00:00
4 changed files with 17 additions and 17 deletions
Showing only changes of commit 0d1713f024 - Show all commits

View File

@ -28,7 +28,7 @@ func start_room_async():
%SceneAnimationPlayer.start_soundtrack()
if not State.save_game.childhood_board_complete:
P.instruction.call_deferred("Find all three Momentos to collect all thoughts.")
Prompts.instruction.call_deferred("Find all three Momentos to collect all thoughts.")
Scenes.player_enable.emit(true)

View File

@ -44,14 +44,14 @@ func _delayed_ready() ->void:
## Updates prompt label based on the interaction type and collected state
func _show_prompt() -> void:
var overrides : Array[StringName] = [&"menu_back"]
P.right_bottom(P.pick(&"ui_cancel"), overrides)
P.instruction(I18n.get_memento_prompt(mementos_collected))
P.performed.connect(_perform)
Prompts.right_bottom(Prompts.pick(&"ui_cancel"), overrides)
Prompts.instruction(I18n.get_memento_prompt(mementos_collected))
Prompts.performed.connect(_perform)
func _hide_prompt():
P.performed.disconnect(_perform)
P.clear()
Prompts.performed.disconnect(_perform)
Prompts.clear()
func play():
@ -324,7 +324,7 @@ func give_lore_feedback():
fitting_card_count += int(child.card_id == child.get_attached_note().parent_id)
if float(fitting_card_count) / float(total_card_count) < 0.2:
P.instruction("You can move on, but you may not have understood Lisa.")
Prompts.instruction("You can move on, but you may not have understood Lisa.")
if not unfitting:
if State.speech_language == 2:
$AnimationPlayer.play("unfitting_de")
@ -332,7 +332,7 @@ func give_lore_feedback():
$AnimationPlayer.play("unfitting")
unfitting = true
elif fitting_card_count < total_card_count:
P.instruction(TranslationServer.translate("You may leave the room, but Lisa only agrees with %d of the %d connections.") % [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:
$AnimationPlayer.play("incomplete_de")
@ -340,7 +340,7 @@ func give_lore_feedback():
$AnimationPlayer.play("incomplete")
incomplete = true
else:
P.instruction("Lisa would like you to leave her room and move on.")
Prompts.instruction("Lisa would like you to leave her room and move on.")
if not complete:
if State.speech_language == 2:
$AnimationPlayer.play("complete_de")

View File

@ -69,7 +69,7 @@ func expand() -> void:
func collapse() -> void:
if not shown: return
shown = false
P.clear()
Prompts.clear()
if tween: tween.kill()
tween = create_tween().set_ease(Tween.EASE_IN).set_trans(Tween.TRANS_BACK)
@ -182,14 +182,14 @@ func interact() -> void:
func _show_prompt() -> void:
var overrides : Array[StringName] = []
if playable is StoryPlayable:
P.interaction(I18n.get_story_caption(playable.scene_id))
Prompts.interaction(I18n.get_story_caption(playable.scene_id))
overrides = ["listen again" if collected else "MementoLabel_collect"]
P.center(P.pick("collect_memento_ui"), overrides)
Prompts.center(Prompts.pick("collect_memento_ui"), overrides)
elif playable is CardBoard:
P.interaction("Mind Board")
Prompts.interaction("Mind Board")
overrides = ["find connections"]
P.center(P.pick("collect_memento_ui"), overrides)
Prompts.center(Prompts.pick("collect_memento_ui"), overrides)
elif playable is CardBurner:
P.interaction("Move on")
Prompts.interaction("Move on")
overrides = ["Move on"]
P.center(P.pick("collect_memento_ui"), overrides)
Prompts.center(Prompts.pick("collect_memento_ui"), overrides)

View File

@ -38,7 +38,7 @@ PromptManager="*uid://7tdmg25cjdqd"
Steam="*res://dev-util/steam.gd"
Main="*res://singletons/main/main.tscn"
I18n="*res://dev-util/i18n.gd"
P="*res://ui/prompter/prompter.tscn"
Prompts="*res://ui/prompter/prompter.tscn"
[debug]