Compare commits

..

No commits in common. "ba4602d4b8f22b308b11ec1600dc5fc4b9a0bd9d" and "5b034a9ce7e82da512b9f8850861849e785d7956" have entirely different histories.

9 changed files with 181 additions and 174 deletions

View File

@ -1767,6 +1767,10 @@ mix_target = 2
bus = &"text"
script = ExtResource("10_ypa88")
[node name="CardBurner" parent="logic/UI" instance=ExtResource("11_5bsh1")]
visible = false
layout_mode = 1
[node name="ScenePlayer" type="AnimationPlayer" parent="logic" groups=["scene_actors"]]
unique_name_in_owner = true
libraries = {
@ -1908,7 +1912,6 @@ transform = Transform3D(0.99999976, 0, 0, 0, 1, 0, 0, 0, 0.99999976, 0.10009599,
[node name="DoorInteractable" parent="logic" instance=ExtResource("22_ks23q")]
transform = Transform3D(-0.9999984, 0, 8.7422585e-08, 0, 1, 0, -8.7422585e-08, 0, -0.9999984, 0.42437345, 0.9173807, -0.95442796)
interaction = ExtResource("11_5bsh1")
billboard = false
[node name="View" parent="logic/DoorInteractable" index="1"]

View File

@ -69,8 +69,6 @@ func _navigate_prev():
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
print_debug("CardBoard.gd: %s._ready()" % self.name)
super._ready()
# HACK: Lets us debug more easily
if get_parent() == get_tree().root:
_debug_mode()
@ -386,7 +384,7 @@ func handle_drop(draggable: Draggable) -> int:
# Takes the inputs for control inputs
func _input(event) -> void:
if event.is_action_pressed("ui_cancel"):
if event is InputEventAction and event.is_action_pressed("ui_cancel"):
closed.emit()
get_viewport().set_input_as_handled()

View File

@ -100,33 +100,31 @@ func set_highlight(value: bool) -> void:
var burn_tween: Tween
signal has_burned
var burn_state: burned = burned.NOT:
@export var burn_state: burned = burned.NOT:
set(burning):
if burning != burn_state:
if burn_tween: burn_tween.kill()
if burn_tween != null:
burn_tween.kill()
match burning:
burned.NOT:
burn_tween = get_tree().create_tween()
burn_tween.tween_property(self, "burn_progress", 0, 0.5)
burn_state = burning
burned.SINGED:
burn_tween = get_tree().create_tween()
burn_tween.set_ease(Tween.EASE_OUT)
burn_tween.set_trans(Tween.TRANS_SINE)
burn_tween.tween_property(self, "burn_progress", 0.5, 2)
burn_state = burning
burned.BURNING:
burn_tween = get_tree().create_tween()
burn_tween.tween_property(self, "burn_progress", 2.0, 2)
burn_tween.tween_callback(_torch).set_delay(1.0)
burned.TORCHED:
print_debug("Card %s has been burned." % HardCards.get_obscure_name(name))
has_burned.emit()
burn_state = burning
func torch():
if burn_tween: burn_tween.kill()
func _torch():
burn_state = burned.TORCHED
burn_tween = create_tween()
burn_tween.tween_property(self, "burn_progress", 2.0, 2)
await burn_tween.finished
var crumble_material: ShaderMaterial = preload("res://logic-scenes/card_burner/card_crumble.material")
var card_fire: Sprite2D = preload("res://logic-scenes/card_burner/card_fire.tscn").instantiate()

View File

@ -1,9 +0,0 @@
[gd_resource type="GradientTexture2D" load_steps=2 format=3 uid="uid://dwerd76p42ac"]
[sub_resource type="Gradient" id="Gradient_ckmi5"]
colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
[resource]
gradient = SubResource("Gradient_ckmi5")
width = 128
height = 128

View File

@ -1,79 +1,63 @@
class_name CardBurner
extends Playable
class_name CardBurner extends CenterContainer
var focused: bool = false:
set(focus):
if is_node_ready():
if not focus == focused:
if focus:
process_mode = Node.PROCESS_MODE_INHERIT
self.show()
Input.mouse_mode = Input.MOUSE_MODE_HIDDEN
if not PromptManager.icons == InputPrompt.Icons.KEYBOARD or true:
handle_direction_input(Vector2.UP)
else:
self.hide()
process_mode = Node.PROCESS_MODE_DISABLED
focused = focus
@onready var cursor: CandleCursor = %CandleCursor
@onready var ancors: Array[Control] = [%Ancor1, %Ancor2, %Ancor3, %Ancor4]
signal card_burned
var cards : Array[Card] = []
var _submitted := false
func _ready():
print_debug("CardBurner.gd: %s._ready()" % self.name)
super._ready()
# Note: burn_cards is now called directly by the transition system, not via register_scene_actor
%SkipButton.pressed.connect(card_burned.emit)
## Main play coroutine - simple linear flow for burning a card
func play() -> void:
print_debug("CardBurner: Starting card burning sequence")
# 1. Get all card names from the board (excluding stickies which start with "p")
func burn_cards(_id: int, _repeat: bool = false) -> void:
# Get all card names from the board (excluding stickies which start with "p")
var card_names: Array[StringName] = []
for item_name in State.save_game.board_positions.keys():
if not item_name.begins_with("p"):
card_names.append(item_name)
print_debug("CardBurner: Found %d cards to choose from" % card_names.size())
# Get card instances and shuffle them
var random_cards: Array = HardCards.get_cards_by_name_array(card_names)["cards"]
random_cards.shuffle()
# 2. Get card instances and shuffle them
var stack : Array = HardCards.get_cards_by_name_array(card_names)["cards"]
stack.shuffle()
for ancor:Control in ancors:
if random_cards.size() > 0:
ancor.get_child(0).queue_free()
var new_child: Card = random_cards.pop_front()
ancor.add_child(new_child)
new_child.owner = self
new_child.has_burned.connect(card_burned.emit)
cards = []
# 3. Populate the 4 anchor slots with random cards
for ancor: Control in ancors:
var card: Card = stack.pop_front()
cards.append(card)
ancor.add_child(card)
print_debug("CardBurner: Added card '%s' to anchor" % card.name)
print("CardBurner: ", len(cards))
# 4. Wait for player to burn a card (or skip)
print_debug("CardBurner: Waiting for player to burn a card...")
handle_direction_input(Vector2.UP)
await card_burned
# 5. Play vanish animation and wait for completion
print_debug("CardBurner: Card burned, playing vanish animation")
$AnimationPlayer.play("vanish")
await $AnimationPlayer.animation_finished
print_debug("CardBurner: Sequence complete")
signal card_burned
func handle_hover(to_handle: Area2D):
if to_handle is Card:
if to_handle.burn_state == Card.burned.NOT:
to_handle.burn_state = Card.burned.SINGED
func handle_hover(card: Draggable) -> void:
if not card is Card: return
selection = cards.find(card)
func handle_mouse_button(event: InputEventMouseButton, card: Card) -> void:
func handle_mouse_button(event: InputEventMouseButton, card: Card):
if event.button_index == MOUSE_BUTTON_MASK_LEFT and event.is_pressed() and not event.is_echo():
_submit(card)
func _submit(card : Card):
_submitted = true
%SkipButton.visible = false
await card.torch()
card_burned.emit()
card.burn_state = Card.burned.BURNING
func _input(event: InputEvent) -> void:
if _submitted: return
if focused:
if event.is_action_pressed("ui_up"):
handle_direction_input(Vector2.UP)
elif event.is_action_pressed("ui_down"):
@ -82,55 +66,52 @@ func _input(event: InputEvent) -> void:
handle_direction_input(Vector2.LEFT)
elif event.is_action_pressed("ui_right"):
handle_direction_input(Vector2.RIGHT)
elif event is InputEventMouse:
cursor.gamepad_mode = false
ancors[card_index].get_child(0)._on_mouse_exited()
elif event.is_action_pressed("ui_accept"):
_submit(cards[selection])
ancors[card_index].get_child(0).burn_state = Card.burned.BURNING
var focus_cards: bool = false:
set(focus):
if _submitted: return
focus_cards = focus
if focus_cards:
cursor.visible = true
%SkipButton.release_focus()
card_index = card_index
else:
cursor.visible = false
%SkipButton.grab_focus()
ancors[card_index].get_child(0)._on_mouse_exited()
var selection: int:
set(value):
if _submitted: return
selection = value % len(cards)
for i in range(len(cards)):
var card := cards[i]
card.highlighted = (selection == i)
card.burn_state = Card.burned.SINGED if card.highlighted else Card.burned.NOT
if card.highlighted:
cursor.gamepad_target = card.global_position + Vector2(-120, 150)
func handle_direction_input(direction: Vector2) -> void:
if _submitted: return
var card_index: int = 0:
set(index):
ancors[card_index].get_child(0)._on_mouse_exited()
card_index = index % 4
handle_hover(ancors[card_index].get_child(0))
func handle_direction_input(direction: Vector2):
if not cursor.gamepad_mode:
for ancor in ancors:
ancor.get_child(0)._on_mouse_exited()
cursor.gamepad_mode = true
focus_cards = focus_cards
match direction:
Vector2.UP:
focus_cards = true
cursor.visible = true
%SkipButton.release_focus()
selection = selection
card_index = card_index
Vector2.DOWN:
focus_cards = false
cursor.visible = false
%SkipButton.grab_focus()
ancors[card_index].get_child(0)._on_mouse_exited()
Vector2.LEFT:
focus_cards = true
selection -= 1
card_index -= 1
Vector2.RIGHT:
focus_cards = true
selection += 1
card_index += 1
cursor.gamepad_target = ancors[card_index].get_child(0).global_position + Vector2(-120, 150)
if not focus_cards: cursor.gamepad_target += Vector2(0, 50)

View File

@ -1,17 +1,17 @@
[gd_scene load_steps=13 format=3 uid="uid://g2a27jwdapai"]
[gd_scene load_steps=15 format=3 uid="uid://g2a27jwdapai"]
[ext_resource type="Script" uid="uid://bbia2hcdwctyn" path="res://logic-scenes/card_burner/card_burner.gd" id="1_copuj"]
[ext_resource type="Texture2D" uid="uid://615hvpuiacvm" path="res://addons/input_prompts/icons/xbox/X.png" id="3_ckmi5"]
[ext_resource type="PackedScene" uid="uid://uc6urpgv7n1y" path="res://logic-scenes/card_burner/cursor_candle.tscn" id="3_l4ogr"]
[ext_resource type="Texture2D" uid="uid://dwerd76p42ac" path="res://logic-scenes/card_burner/burner_gradient.tres" id="4_ckmi5"]
[ext_resource type="Script" uid="uid://bbs1u7ojno7xo" path="res://addons/input_prompts/action_prompt/action_prompt.gd" id="4_x6cxt"]
[ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="5_ckmi5"]
[sub_resource type="InputEventKey" id="InputEventKey_ckmi5"]
[sub_resource type="InputEventKey" id="InputEventKey_x6cxt"]
device = -1
physical_keycode = 88
unicode = 120
[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_x6cxt"]
[sub_resource type="InputEventJoypadButton" id="InputEventJoypadButton_23lqb"]
device = -1
button_index = 2
pressed = true
@ -22,12 +22,20 @@ action = &"skip"
[sub_resource type="Shortcut" id="Shortcut_57mhv"]
events = [SubResource("InputEventAction_23lqb")]
[sub_resource type="Gradient" id="Gradient_ckmi5"]
colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
[sub_resource type="GradientTexture2D" id="GradientTexture2D_x6cxt"]
gradient = SubResource("Gradient_ckmi5")
width = 100
height = 100
[sub_resource type="Animation" id="Animation_57mhv"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("../../Sprite2D:self_modulate")
tracks/0/path = NodePath("../Sprite2D:self_modulate")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
@ -54,7 +62,7 @@ resource_name = "vanish"
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("../../Sprite2D:self_modulate")
tracks/0/path = NodePath("../Sprite2D:self_modulate")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/keys = {
@ -90,12 +98,6 @@ grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_copuj")
[node name="ColorRect" type="ColorRect" parent="."]
visible = false
custom_minimum_size = Vector2(8192, 8192)
layout_mode = 2
color = Color(0, 0, 0, 0.3137255)
[node name="Control" type="Control" parent="."]
layout_mode = 2
@ -174,7 +176,7 @@ stretch_mode = 5
script = ExtResource("4_x6cxt")
action = "skip"
icon = 0
events = Array[InputEvent]([null, SubResource("InputEventKey_ckmi5"), SubResource("InputEventJoypadButton_x6cxt")])
events = Array[InputEvent]([null, SubResource("InputEventKey_x6cxt"), SubResource("InputEventJoypadButton_23lqb")])
metadata/_custom_type_script = "uid://bbs1u7ojno7xo"
[node name="SkipButton" type="Button" parent="Control/HSplitContainer"]
@ -183,18 +185,68 @@ layout_mode = 2
shortcut = SubResource("Shortcut_57mhv")
text = "Keep all thoughts"
[node name="Sprite2D" type="Sprite2D" parent="Control"]
self_modulate = Color(1, 1, 1, 0)
scale = Vector2(100, 100)
texture = SubResource("GradientTexture2D_x6cxt")
[node name="CandleCursor" parent="." instance=ExtResource("3_l4ogr")]
unique_name_in_owner = true
position = Vector2(989, 1068)
[node name="Sprite2D" type="Sprite2D" parent="."]
self_modulate = Color(1, 1, 1, 0)
position = Vector2(954.99994, 545)
scale = Vector2(100, 100)
texture = ExtResource("4_ckmi5")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
root_node = NodePath("../Control/HSplitContainer")
libraries = {
&"": SubResource("AnimationLibrary_kaqqi")
}
[node name="Card1" parent="." instance=ExtResource("5_ckmi5")]
picked_random = null
wiggle_strength = null
wiggle_speed = null
scale_bump = null
bounce_speed = null
highlighted = null
is_dragable = null
diameter = null
burn_progress = null
burn_state = null
direction = null
[node name="Card2" parent="." instance=ExtResource("5_ckmi5")]
picked_random = null
wiggle_strength = null
wiggle_speed = null
scale_bump = null
bounce_speed = null
highlighted = null
is_dragable = null
diameter = null
burn_progress = null
burn_state = null
direction = null
[node name="Card3" parent="." instance=ExtResource("5_ckmi5")]
picked_random = null
wiggle_strength = null
wiggle_speed = null
scale_bump = null
bounce_speed = null
highlighted = null
is_dragable = null
diameter = null
burn_progress = null
burn_state = null
direction = null
[node name="Card4" parent="." instance=ExtResource("5_ckmi5")]
picked_random = null
wiggle_strength = null
wiggle_speed = null
scale_bump = null
bounce_speed = null
highlighted = null
is_dragable = null
diameter = null
burn_progress = null
burn_state = null
direction = null

View File

@ -1,7 +1,7 @@
class_name Interactable extends Node3D
@export var interaction: PackedScene = null
var playable : Playable = null
var interaction_ui : Playable = null
@onready var view: Node3D = $View
@onready var frame: Sprite3D = $Frame
@ -30,12 +30,12 @@ func _ready() -> void:
view.scale = Vector3.ZERO
frame.modulate.a = 0
if interaction:
playable = interaction.instantiate() as Control
canvas_layer.add_child(playable)
interaction_ui = interaction.instantiate() as Control
canvas_layer.add_child(interaction_ui)
_update_caption()
# Check if this scene was already completed (for re-entering rooms)
if playable is StoryPlayable:
var story := playable as StoryPlayable
if interaction_ui is StoryPlayable:
var story := interaction_ui as StoryPlayable
collected = Scenes.is_sequence_repeating(story.scene_id)
else:
_update_prompt()
@ -106,19 +106,19 @@ func play_story() -> void:
canvas_layer.show()
# Allow room to prepare for scene (e.g., play animations)
await State.room.prepare_scene_start(playable.scene_id, repeat)
await State.room.prepare_scene_start(interaction_ui.scene_id, repeat)
Scenes.begin_sequence(playable.scene_id)
Scenes.begin_sequence(interaction_ui.scene_id)
# Play the story
await playable.play()
await interaction_ui.play()
# Pick the cards if not already picked
if not repeat:
var picker := State.room.get_node("%Picker") as CardPicker
await picker.pick_cards(playable.scene_id)
await picker.pick_cards(interaction_ui.scene_id)
Scenes.end_sequence(playable.scene_id) # todo: maybe later?
Scenes.end_sequence(interaction_ui.scene_id) # todo: maybe later?
# Hide the CanvasLayer when done
canvas_layer.hide()
@ -126,12 +126,11 @@ func play_story() -> void:
Scenes.player_enable.emit(true)
expand()
func play_board() -> void:
canvas_layer.show()
# Play the board (handles mouse visibility and waits for close)
await playable.play()
await interaction_ui.play()
# Hide the CanvasLayer when done
canvas_layer.hide()
@ -140,53 +139,42 @@ func play_board() -> void:
expand()
func play_burner() -> void:
canvas_layer.show()
# Play the board (handles mouse visibility and waits for close)
await playable.play()
# Hide the CanvasLayer when done
canvas_layer.hide()
func interact() -> void:
Scenes.player_enable.emit(false)
shown = false
await collapse()
collected = true
# collapse other interactables BEFORE showing canvas
get_tree().call_group("interactables", "collapse")
# Show the CanvasLayer so the story is visible full-screen
canvas_layer.show()
if playable is StoryPlayable:
if interaction_ui is StoryPlayable:
await play_story()
if playable is CardBoard:
if interaction_ui is CardBoard:
await play_board()
if playable is CardBurner:
await play_burner()
canvas_layer.hide()
collected = true
Scenes.player_enable.emit(true)
## Updates caption label based on the instantiated interaction_ui
func _update_caption() -> void:
if playable is StoryPlayable:
var story := playable as StoryPlayable
if interaction_ui is StoryPlayable:
var story := interaction_ui as StoryPlayable
caption.text = I18n.get_story_caption(story.scene_id)
if playable is CardBoard:
elif interaction_ui is CardBoard:
caption.text = TranslationServer.translate("Mind Board")
if playable is CardBurner:
caption.text = TranslationServer.translate("leave")
## Updates prompt label based on the interaction type and collected state
func _update_prompt() -> void:
if playable is StoryPlayable:
if interaction_ui is StoryPlayable:
if collected:
prompt.text = TranslationServer.translate("read again")
else:
prompt.text = TranslationServer.translate("MementoLabel_collect")
elif playable is CardBoard:
elif interaction_ui is CardBoard:
prompt.text = TranslationServer.translate("find connections")

View File

@ -70,7 +70,7 @@ var substring_sizes: Array[int]
func _ready() -> void:
print_debug("StoryPlayable.gd: %s._ready()" % self.name)
super._ready()
hide()
animation_player.play("RESET")
State.settings_changed.connect(func(): story_array = story_array)
skip_control = %SkipControl

View File

@ -1,14 +1,10 @@
extends Control
class_name Playable
func _ready() -> void:
pass
## Awaitable that encapsulates the core interaction with this Playable
func play() -> void:
push_warning("Playeable[base].play() not overridden")
await get_tree().process_frame # Dummy wait so this is a coroutine
func handle_hover(_area: Draggable):
#prints("Playable[base].handle_hover", _area, _area.name)
func handle_hover(area: Draggable):
prints("Playable[base].handle_hover", area, area.name)
pass