From a84ecd87b4c6f7d304431e7d941910071fe312a6 Mon Sep 17 00:00:00 2001 From: Tiger Date: Sun, 11 Jan 2026 22:09:19 +0100 Subject: [PATCH] fix: draeven / draven chaos, working on sticky notes --- src/base-environments/transition/station.gd | 2 +- .../youth_room/audio/draeven.ogg.import | 19 ------- .../audio/{draeven.ogg => draven.ogg} | 0 .../youth_room/audio/draven.ogg.import | 19 +++++++ .../youth_room/scnees/draven.tscn | 16 +++--- .../youth_room/youth_room.gd | 4 +- .../youth_room/youth_room.tscn | 4 +- .../youth_room/youth_room_scene_player.gd | 4 +- src/dev-util/board of devs.tscn | 20 +++---- src/internationalisation.csv | 4 +- src/logic-scenes/board/card.gd | 6 +- src/logic-scenes/board/card.tscn | 11 ++++ src/logic-scenes/board/sticky-note.gd | 44 +++------------ src/logic-scenes/board/sticky-note.tscn | 3 +- src/logic-scenes/card_burner/card_burner.tscn | 44 +++++++++++++++ src/logic-scenes/card_picker/card_picker.gd | 2 +- src/logic-scenes/card_picker/card_picker.tscn | 55 +++++++++++++------ .../collectable/collectable_ui.gd | 6 +- .../player_controller/player_controller.gd | 2 +- src/singletons/global_state.gd | 2 +- src/singletons/main/main.gd | 2 +- src/singletons/scene_reference.gd | 2 +- 22 files changed, 160 insertions(+), 111 deletions(-) delete mode 100644 src/base-environments/youth_room/audio/draeven.ogg.import rename src/base-environments/youth_room/audio/{draeven.ogg => draven.ogg} (100%) create mode 100644 src/base-environments/youth_room/audio/draven.ogg.import diff --git a/src/base-environments/transition/station.gd b/src/base-environments/transition/station.gd index 8c72a98..6c63edf 100644 --- a/src/base-environments/transition/station.gd +++ b/src/base-environments/transition/station.gd @@ -11,7 +11,7 @@ enum id { } @export var station_name: StringName = "" -@export var memory: Scenes.id = Scenes.id.YOUTH_DRAEVEN +@export var memory: Scenes.id = Scenes.id.YOUTH_DRAVEN @export_file("*.tscn") var station_path: String = "" @export var arriving_lines: Dictionary[TrainLine.id, float] @export var departing_lines: Dictionary[TrainLine.id, float] diff --git a/src/base-environments/youth_room/audio/draeven.ogg.import b/src/base-environments/youth_room/audio/draeven.ogg.import deleted file mode 100644 index 9320343..0000000 --- a/src/base-environments/youth_room/audio/draeven.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://d1r1tvb1paup4" -path="res://.godot/imported/draeven.ogg-f2cd990bd1c11bdd8b59fe3f4d2ec30b.oggvorbisstr" - -[deps] - -source_file="res://base-environments/youth_room/audio/draeven.ogg" -dest_files=["res://.godot/imported/draeven.ogg-f2cd990bd1c11bdd8b59fe3f4d2ec30b.oggvorbisstr"] - -[params] - -loop=false -loop_offset=0 -bpm=0 -beat_count=0 -bar_beats=4 diff --git a/src/base-environments/youth_room/audio/draeven.ogg b/src/base-environments/youth_room/audio/draven.ogg similarity index 100% rename from src/base-environments/youth_room/audio/draeven.ogg rename to src/base-environments/youth_room/audio/draven.ogg diff --git a/src/base-environments/youth_room/audio/draven.ogg.import b/src/base-environments/youth_room/audio/draven.ogg.import new file mode 100644 index 0000000..8ec1b4e --- /dev/null +++ b/src/base-environments/youth_room/audio/draven.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://d1r1tvb1paup4" +path="res://.godot/imported/draven.ogg-0b0fce547c634a7f56f440b73b703e77.oggvorbisstr" + +[deps] + +source_file="res://base-environments/youth_room/audio/draven.ogg" +dest_files=["res://.godot/imported/draven.ogg-0b0fce547c634a7f56f440b73b703e77.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/src/base-environments/youth_room/scnees/draven.tscn b/src/base-environments/youth_room/scnees/draven.tscn index 1976dd8..f187cba 100644 --- a/src/base-environments/youth_room/scnees/draven.tscn +++ b/src/base-environments/youth_room/scnees/draven.tscn @@ -6,7 +6,7 @@ [ext_resource type="PackedScene" uid="uid://dvwuhobhka78d" path="res://ui/skip_control/skip_control.tscn" id="5_ddnfo"] [ext_resource type="AudioStream" uid="uid://cvlqvlrc6lqru" path="res://base-environments/youth_room/audio/draven-de.wav" id="5_f6vs7"] [ext_resource type="AudioStream" uid="uid://c4clagpd3ril0" path="res://base-environments/youth_room/audio/Ambient 5.ogg" id="6_7f2et"] -[ext_resource type="AudioStream" uid="uid://d1r1tvb1paup4" path="res://base-environments/youth_room/audio/draeven.ogg" id="7_nbb1o"] +[ext_resource type="AudioStream" uid="uid://d1r1tvb1paup4" path="res://base-environments/youth_room/audio/draven.ogg" id="7_nbb1o"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="8_hxlqo"] [sub_resource type="Animation" id="Animation_ytihj"] @@ -86,7 +86,7 @@ tracks/5/keys = { tracks/6/type = "value" tracks/6/imported = false tracks/6/enabled = true -tracks/6/path = NodePath("%AnimationPlayer/Music:stream") +tracks/6/path = NodePath("../../../AnimationPlayer/Music:stream") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/keys = { @@ -98,7 +98,7 @@ tracks/6/keys = { tracks/7/type = "value" tracks/7/imported = false tracks/7/enabled = true -tracks/7/path = NodePath("%AnimationPlayer/Music:playing") +tracks/7/path = NodePath("../../../AnimationPlayer/Music:playing") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { @@ -114,7 +114,7 @@ length = 151.0 tracks/0/type = "audio" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("%AnimationPlayer/Text") +tracks/0/path = NodePath("../../../AnimationPlayer/Text") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -230,7 +230,7 @@ tracks/6/keys = { tracks/7/type = "value" tracks/7/imported = false tracks/7/enabled = true -tracks/7/path = NodePath("%AnimationPlayer/Music:stream") +tracks/7/path = NodePath("../../../AnimationPlayer/Music:stream") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { @@ -260,7 +260,7 @@ tracks/0/keys = { tracks/1/type = "value" tracks/1/imported = false tracks/1/enabled = true -tracks/1/path = NodePath("%AnimationPlayer/Music:playing") +tracks/1/path = NodePath("../../../AnimationPlayer/Music:playing") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { @@ -276,7 +276,7 @@ length = 150.0 tracks/0/type = "audio" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("%AnimationPlayer/Text") +tracks/0/path = NodePath("../../../AnimationPlayer/Text") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { @@ -380,7 +380,7 @@ tracks/6/keys = { tracks/7/type = "value" tracks/7/imported = false tracks/7/enabled = true -tracks/7/path = NodePath("%AnimationPlayer/Music:stream") +tracks/7/path = NodePath("../../../AnimationPlayer/Music:stream") tracks/7/interp = 1 tracks/7/loop_wrap = true tracks/7/keys = { diff --git a/src/base-environments/youth_room/youth_room.gd b/src/base-environments/youth_room/youth_room.gd index 8702fa7..a7f6f4f 100644 --- a/src/base-environments/youth_room/youth_room.gd +++ b/src/base-environments/youth_room/youth_room.gd @@ -14,7 +14,7 @@ func start_room(): %UI.show() $logic/PlayerController.process_mode = Node.PROCESS_MODE_INHERIT - if not Scenes.is_sequence_repeating(Scenes.id.YOUTH_DRAEVEN): + if not Scenes.is_sequence_repeating(Scenes.id.YOUTH_DRAVEN): # Play intro scene directly (not triggered by CollectableUi) await _play_intro_scene() else: @@ -37,7 +37,7 @@ func _play_intro_scene() -> void: # Play the story (StoryPlayable handles its own visibility via animations) await intro.play_story() - Scenes.end_sequence(Scenes.id.YOUTH_DRAEVEN) + Scenes.end_sequence(Scenes.id.YOUTH_DRAVEN) diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 0eda798..a4abdd8 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -426,7 +426,7 @@ tracks/1/keys = { } [sub_resource type="Animation" id="Animation_1kp3w"] -resource_name = "draeven" +resource_name = "draven" length = 160.0 tracks/0/type = "value" tracks/0/imported = false @@ -826,7 +826,7 @@ tracks/1/keys = { _data = { &"RESET": SubResource("Animation_nwry8"), &"childhood_music": SubResource("Animation_ea6x8"), -&"draeven": SubResource("Animation_1kp3w"), +&"draven": SubResource("Animation_1kp3w"), &"intro": SubResource("Animation_1pmhi"), &"jui_jutsu": SubResource("Animation_dot4p"), &"jui_jutsu_music": SubResource("Animation_corra"), diff --git a/src/base-environments/youth_room/youth_room_scene_player.gd b/src/base-environments/youth_room/youth_room_scene_player.gd index 78c10d4..d663082 100644 --- a/src/base-environments/youth_room/youth_room_scene_player.gd +++ b/src/base-environments/youth_room/youth_room_scene_player.gd @@ -24,8 +24,8 @@ func _on_scene_starting(scene_id: Scenes.id, _repeat: bool) -> void: _play_chest_animation() Scenes.id.YOUTH_JUI_JUTSU: play("jui_jutsu_music") - Scenes.id.YOUTH_DRAEVEN: - play("draeven") + Scenes.id.YOUTH_DRAVEN: + play("draven") func _on_scene_finished(scene_id: Scenes.id, _repeat: bool) -> void: print_debug("YouthRoomScenePlayer._on_scene_finished(%s)" % Scenes.id.keys()[scene_id]) diff --git a/src/dev-util/board of devs.tscn b/src/dev-util/board of devs.tscn index 24f8d2a..7ed1afc 100644 --- a/src/dev-util/board of devs.tscn +++ b/src/dev-util/board of devs.tscn @@ -13,46 +13,46 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_ols6o") -[node name="draeven" type="Control" parent="."] +[node name="draven" type="Control" parent="."] anchors_preset = 0 offset_left = 190.0 offset_top = 141.0 offset_right = 230.0 offset_bottom = 181.0 -[node name="c_out-of-world" parent="draeven" instance=ExtResource("1_xrckx")] +[node name="c_out-of-world" parent="draven" instance=ExtResource("1_xrckx")] position = Vector2(2, -6) text = "I feel like I am not from of this world" -[node name="p_unique" parent="draeven/c_out-of-world" groups=["c_comic_heroes", "c_confusion", "c_hit", "c_homework", "c_joy", "c_out-of-world", "c_teachers"] instance=ExtResource("2_ucudl")] +[node name="p_unique" parent="draven/c_out-of-world" groups=["c_comic_heroes", "c_confusion", "c_hit", "c_homework", "c_joy", "c_out-of-world", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "I like being unique like that" -[node name="p_few_friends" parent="draeven/c_out-of-world" groups=["c_comic_heroes", "c_fighting", "c_joy", "c_out-of-world", "c_rejection", "c_teachers", "c_teasing"] instance=ExtResource("2_ucudl")] +[node name="p_few_friends" parent="draven/c_out-of-world" groups=["c_comic_heroes", "c_fighting", "c_joy", "c_out-of-world", "c_rejection", "c_teachers", "c_teasing"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "I am thankful for the few friends that get me" -[node name="c_rejection" parent="draeven" instance=ExtResource("1_xrckx")] +[node name="c_rejection" parent="draven" instance=ExtResource("1_xrckx")] position = Vector2(9, 294) text = "I fear being rejected" -[node name="p_friends" parent="draeven/c_rejection" groups=["c_boy_stuff", "c_comic_heroes", "c_fighting", "c_homework", "c_joy", "c_out-of-world", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] +[node name="p_friends" parent="draven/c_rejection" groups=["c_boy_stuff", "c_comic_heroes", "c_fighting", "c_homework", "c_joy", "c_out-of-world", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "that makes it hard to find friends" -[node name="p_laughed" parent="draeven/c_rejection" groups=["c_boy_stuff", "c_comic_heroes", "c_confusion", "c_homework", "c_joy", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] +[node name="p_laughed" parent="draven/c_rejection" groups=["c_boy_stuff", "c_comic_heroes", "c_confusion", "c_homework", "c_joy", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "I'm afraid I will just get laughed at" -[node name="c_confusion" parent="draeven" instance=ExtResource("1_xrckx")] +[node name="c_confusion" parent="draven" instance=ExtResource("1_xrckx")] position = Vector2(11, 593) text = "I am just too many things at once" -[node name="p_inner_conflict" parent="draeven/c_confusion" groups=["c_boy_stuff", "c_confusion", "c_fighting", "c_homework", "c_rejection", "c_teasing"] instance=ExtResource("2_ucudl")] +[node name="p_inner_conflict" parent="draven/c_confusion" groups=["c_boy_stuff", "c_confusion", "c_fighting", "c_homework", "c_rejection", "c_teasing"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) text = "it is just so overwhelming for me" -[node name="p_outer_conflict" parent="draeven/c_confusion" groups=["c_boy_stuff", "c_confusion", "c_fighting", "c_hit", "c_homework", "c_joy", "c_out-of-world", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] +[node name="p_outer_conflict" parent="draven/c_confusion" groups=["c_boy_stuff", "c_confusion", "c_fighting", "c_hit", "c_homework", "c_joy", "c_out-of-world", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 140) text = "this is just too much for others" diff --git a/src/internationalisation.csv b/src/internationalisation.csv index bbc53cb..c94d475 100644 --- a/src/internationalisation.csv +++ b/src/internationalisation.csv @@ -564,8 +564,8 @@ To see its beauty. It helped a lot.,To see its beauty. It helped a lot.,Weil es More Options,More Options,Mehr Optionen,,, MementoLabel_collect,collect,einsammeln,,, MementoLabel_CN,CN,CN,,, -MementoLabel_Draeven,,,,, -MementoLabel_DraevenCN,Alienation,Einsamkeit,,, +MementoLabel_Draven,,,,, +MementoLabel_DravenCN,Alienation,Einsamkeit,,, MementoLabel_Childhood,,,,, MementoLabel_ChildhoodCN,"Eating Issues, Alienation, Swearing","Probleme mit Essen, soziale Isolation, Fluchen",,, MementoLabel_Voice,,,,, diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index cd0f712..36e03d6 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -18,8 +18,8 @@ var current_sticky_note: StickyNote = null var wiggle_pos: float = 0 var wiggle_intensity: float = 0 var noise: Noise = FastNoiseLite.new() -var wiggle_tween -var scale_tween +var wiggle_tween : Tween +var scale_tween : Tween var transfor_arr: Array[Transform2D] = [ Transform2D(0.9, Vector2(-125, -83)), @@ -37,8 +37,6 @@ var transfor_arr: Array[Transform2D] = [ @onready var label: Label = $Label @onready var background_sprite: AnimatedSprite2D = $AnimatedSprite2D - - @export var picked_random: bool = false @export var wiggle_strength: float = 0.2 diff --git a/src/logic-scenes/board/card.tscn b/src/logic-scenes/board/card.tscn index d520c96..2f4a943 100644 --- a/src/logic-scenes/board/card.tscn +++ b/src/logic-scenes/board/card.tscn @@ -10,6 +10,17 @@ size = Vector2(511, 410) [node name="Card" type="Area2D"] script = ExtResource("1_emip0") text = "asdf" +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 metadata/_custom_type_script = "uid://ddy8kb2hjvgss" metadata/type = "card" diff --git a/src/logic-scenes/board/sticky-note.gd b/src/logic-scenes/board/sticky-note.gd index 61dd4d9..5ba4b83 100644 --- a/src/logic-scenes/board/sticky-note.gd +++ b/src/logic-scenes/board/sticky-note.gd @@ -20,6 +20,8 @@ var position_locked: bool = false signal transform_tween_finished +@onready var background_sprite: AnimatedSprite2D = %BackgroundSprite + @export var text: String = "" : set (value): if is_node_ready(): @@ -27,7 +29,6 @@ signal transform_tween_finished text = value var content: Node2D var label: Label -var background_sprite: AnimatedSprite2D @export var picked_random: bool = false @@ -59,8 +60,8 @@ var background_sprite: AnimatedSprite2D @export var voice_line: AudioStream = null @export var is_dragable: bool = false -@onready var base_rotation = rotation -@onready var base_scale = scale +@onready var base_rotation := rotation +@onready var base_scale := scale var is_dragged: bool = false: set(dragged): is_dragged = dragged @@ -70,7 +71,7 @@ var is_dragged: bool = false: var initial_drag_position: Vector2 var mouse_diff: Vector2 -@onready var diameter = 312.0 +@onready var diameter := 312.0 @export_range(1.0, 10.0) var bounce_speed: float = 8 var on_board: bool = false @@ -81,37 +82,10 @@ func _init(sticky_name: String = "sticky_note", card_id: StringName = "-1") -> v sticky_id = card_id func _ready() -> void: - if get_child_count() == 0: - content = Node2D.new() - add_child(content, false, Node.INTERNAL_MODE_BACK) - label = Label.new() - label.autowrap_mode = TextServer.AUTOWRAP_WORD - label.size = Vector2( 295.0, 97.0 ) - label.position = Vector2( -52.0, -50.0 ) - label.vertical_alignment = VERTICAL_ALIGNMENT_CENTER - #FIXME eventually replace with better theme handling - label.theme = State.current_main_theme - State.theme_changed.connect(func change_theme(new_theme): label.theme = new_theme) - content.add_child(label, false, Node.INTERNAL_MODE_BACK) - background_sprite = AnimatedSprite2D.new() - background_sprite.sprite_frames = preload("res://logic-scenes/board/card-textures/sticky-note_sprites.tres") - background_sprite.scale = Vector2(0.65, 0.65) - background_sprite.position = Vector2(99.5, 0) - content.add_child(background_sprite, false, Node.INTERNAL_MODE_FRONT) - var collision_shape := CollisionShape2D.new() - var capsule := CapsuleShape2D.new() - capsule.radius = 48.0 - capsule.height = diameter - collision_shape.shape = capsule - add_child(collision_shape, false, Node.INTERNAL_MODE_FRONT) - collision_shape.position.x = 99.5 - collision_shape.rotation = PI/2 - - label.theme_type_variation = "card_text" - else: - label = $Content/Label - background_sprite = $Content/BackgroundSprite - content = $Content + label = $Content/Label + background_sprite = $Content/BackgroundSprite + content = $Content + _on_text_updated.call_deferred() input_event.connect(_on_input_event) diff --git a/src/logic-scenes/board/sticky-note.tscn b/src/logic-scenes/board/sticky-note.tscn index 144fd89..e910626 100644 --- a/src/logic-scenes/board/sticky-note.tscn +++ b/src/logic-scenes/board/sticky-note.tscn @@ -22,6 +22,7 @@ shape = SubResource("CapsuleShape2D_ml4q7") [node name="Content" type="Node2D" parent="."] [node name="BackgroundSprite" type="AnimatedSprite2D" parent="Content"] +unique_name_in_owner = true position = Vector2(99.5, 0) scale = Vector2(0.65, 0.65) sprite_frames = ExtResource("2_260t4") @@ -41,6 +42,6 @@ grow_horizontal = 2 grow_vertical = 2 theme = ExtResource("3_qmm0h") theme_type_variation = &"card_text" -text = "card" +text = "sticksum ipsum dolor sit amet met post-it sulcum dulce est 3M, et tesa est." vertical_alignment = 1 autowrap_mode = 3 diff --git a/src/logic-scenes/card_burner/card_burner.tscn b/src/logic-scenes/card_burner/card_burner.tscn index fba621d..981823d 100644 --- a/src/logic-scenes/card_burner/card_burner.tscn +++ b/src/logic-scenes/card_burner/card_burner.tscn @@ -200,9 +200,53 @@ libraries = { } [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 diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index 3d71fb0..4085ed9 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -240,6 +240,6 @@ func pick_cards(id: int, repeat: bool): reset() show() selection_state = CARDS - if id == Scenes.id.YOUTH_DRAEVEN and not repeat: + if id == Scenes.id.YOUTH_DRAVEN and not repeat: $Meaning.play() await cards_picked diff --git a/src/logic-scenes/card_picker/card_picker.tscn b/src/logic-scenes/card_picker/card_picker.tscn index eacf13a..789bae6 100644 --- a/src/logic-scenes/card_picker/card_picker.tscn +++ b/src/logic-scenes/card_picker/card_picker.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://bdb6n10apk1en" path="res://logic-scenes/card_picker/card_picker.gd" id="1_pjntm"] [ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="2_t7byf"] -[ext_resource type="Script" uid="uid://r12efqgk6t4n" path="res://logic-scenes/board/sticky-note.gd" id="3_f4sp4"] +[ext_resource type="PackedScene" uid="uid://vkcdj8c3ytbq" path="res://logic-scenes/board/sticky-note.tscn" id="3_et74x"] [ext_resource type="AudioStream" uid="uid://bakwypwhs7a5n" path="res://base-environments/youth_room/audio/why-does-it-mean.wav" id="4_ujc5a"] [ext_resource type="Script" uid="uid://c1oub0cs7cph6" path="res://dev-util/stereo-switch.gd" id="5_et74x"] [ext_resource type="AudioStream" uid="uid://tbx31bdlhbtr" path="res://base-environments/youth_room/audio/why-does-it-mean_de.wav" id="6_et74x"] @@ -1774,6 +1774,17 @@ libraries = { } [node name="Card" parent="cards/card_1" instance=ExtResource("2_t7byf")] +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="card_2" type="Control" parent="cards"] anchors_preset = 0 @@ -1784,6 +1795,17 @@ libraries = { } [node name="Card" parent="cards/card_2" instance=ExtResource("2_t7byf")] +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="card_3" type="Control" parent="cards"] anchors_preset = 0 @@ -1799,6 +1821,17 @@ libraries = { } [node name="Card" parent="cards/card_3" instance=ExtResource("2_t7byf")] +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="sticky_notes" type="Panel" parent="."] layout_mode = 2 @@ -1815,10 +1848,7 @@ libraries = { } autoplay = "ini" -[node name="StickyNote" type="Area2D" parent="sticky_notes/sticky_note_1"] -script = ExtResource("3_f4sp4") -text = "Slot 1" -metadata/_custom_type_script = "uid://r12efqgk6t4n" +[node name="sticky-note" parent="sticky_notes/sticky_note_1" instance=ExtResource("3_et74x")] [node name="sticky_note_2" type="Control" parent="sticky_notes"] anchors_preset = 0 @@ -1832,10 +1862,7 @@ libraries = { } autoplay = "ini" -[node name="StickyNote" type="Area2D" parent="sticky_notes/sticky_note_2"] -script = ExtResource("3_f4sp4") -text = "Slot 2" -metadata/_custom_type_script = "uid://r12efqgk6t4n" +[node name="sticky-note" parent="sticky_notes/sticky_note_2" instance=ExtResource("3_et74x")] [node name="sticky_note_3" type="Control" parent="sticky_notes"] anchors_preset = 0 @@ -1849,10 +1876,7 @@ libraries = { } autoplay = "ini" -[node name="StickyNote" type="Area2D" parent="sticky_notes/sticky_note_3"] -script = ExtResource("3_f4sp4") -text = "Slot 3" -metadata/_custom_type_script = "uid://r12efqgk6t4n" +[node name="sticky-note" parent="sticky_notes/sticky_note_3" instance=ExtResource("3_et74x")] [node name="sticky_note_4" type="Control" parent="sticky_notes"] anchors_preset = 0 @@ -1866,10 +1890,7 @@ libraries = { } autoplay = "ini" -[node name="StickyNote" type="Area2D" parent="sticky_notes/sticky_note_4"] -script = ExtResource("3_f4sp4") -text = "Slot 4" -metadata/_custom_type_script = "uid://r12efqgk6t4n" +[node name="sticky-note" parent="sticky_notes/sticky_note_4" instance=ExtResource("3_et74x")] [node name="thought_prompt" type="Control" parent="."] layout_mode = 2 diff --git a/src/logic-scenes/collectable/collectable_ui.gd b/src/logic-scenes/collectable/collectable_ui.gd index 5c8a40d..e48d3de 100644 --- a/src/logic-scenes/collectable/collectable_ui.gd +++ b/src/logic-scenes/collectable/collectable_ui.gd @@ -19,15 +19,15 @@ var story_playable: StoryPlayable -@export var scene: Scenes.id = Scenes.id.YOUTH_DRAEVEN: +@export var scene: Scenes.id = Scenes.id.YOUTH_DRAVEN: set(id): scene = id if is_inside_tree() and not is_board: match id: - Scenes.id.YOUTH_DRAEVEN: + Scenes.id.YOUTH_DRAVEN: # FIXME: this explicit translation should not be nessecary if title_override == "": title_label.text = TranslationServer.translate("Starlight") - if subtitle_override == "": cn_label.text = "[b]%s[/b]: %s" % [TranslationServer.translate("MementoLabel_CN"), TranslationServer.translate("MementoLabel_DraevenCN")] + if subtitle_override == "": cn_label.text = "[b]%s[/b]: %s" % [TranslationServer.translate("MementoLabel_CN"), TranslationServer.translate("MementoLabel_DravenCN")] Scenes.id.YOUTH_CHILDHOOD: if title_override == "": title_label.text = TranslationServer.translate("crafted Mask") if subtitle_override == "": cn_label.text = "[b]%s[/b]: %s" % [TranslationServer.translate("MementoLabel_CN"), TranslationServer.translate("MementoLabel_ChildhoodCN")] diff --git a/src/logic-scenes/player_controller/player_controller.gd b/src/logic-scenes/player_controller/player_controller.gd index f72e26c..24162bd 100644 --- a/src/logic-scenes/player_controller/player_controller.gd +++ b/src/logic-scenes/player_controller/player_controller.gd @@ -273,7 +273,7 @@ func _input(event:InputEvent) -> void: func play_scene(_id: int, _repeat: bool): pass - #if id == Scenes.id.YOUTH_DRAEVEN: + #if id == Scenes.id.YOUTH_DRAVEN: # var rotation_tween := create_tween() func scene_finished(_id, repeat: bool): diff --git a/src/singletons/global_state.gd b/src/singletons/global_state.gd index 709cca4..9d8d052 100644 --- a/src/singletons/global_state.gd +++ b/src/singletons/global_state.gd @@ -299,7 +299,7 @@ enum rooms { } enum sequences { - DRAEVEN, + DRAVEN, CHILDHOOD, VOICE, JUI_JUTSU, diff --git a/src/singletons/main/main.gd b/src/singletons/main/main.gd index 31abb4c..c234acb 100644 --- a/src/singletons/main/main.gd +++ b/src/singletons/main/main.gd @@ -13,7 +13,7 @@ var normal_boot : bool = false @onready var pause_menu: PauseManu = %PauseMenu @onready var room_paths := { - State.rooms.NULL: youth_room_path, # Maybe Draeven story? + State.rooms.NULL: youth_room_path, # Maybe Draven story? State.rooms.YOUTH: youth_room_path, State.rooms.TRANSITION: transition_room_path, State.rooms.ADULTHOOD: adulthood_room_path, diff --git a/src/singletons/scene_reference.gd b/src/singletons/scene_reference.gd index c91cee6..369cd0c 100644 --- a/src/singletons/scene_reference.gd +++ b/src/singletons/scene_reference.gd @@ -13,7 +13,7 @@ var is_playing: bool: get: return current_sequence != -1 enum id { - YOUTH_DRAEVEN, + YOUTH_DRAVEN, YOUTH_CHILDHOOD, YOUTH_VOICE_TRAINING, YOUTH_JUI_JUTSU,