From e181cb1c8243b035ba46b1b44409c6471e000fe6 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Tue, 2 Jun 2026 16:03:30 +0100 Subject: [PATCH] Music puzzle: Replace bush-crops with carrots & barley Resolves https://github.com/endlessm/threadbare/issues/1330 --- .../1_music_puzzle/music_puzzle.tscn | 121 +++++++++--------- 1 file changed, 61 insertions(+), 60 deletions(-) diff --git a/scenes/quests/lore_quests/quest_001/1_music_puzzle/music_puzzle.tscn b/scenes/quests/lore_quests/quest_001/1_music_puzzle/music_puzzle.tscn index 5acae9fbe..f6e406b2f 100644 --- a/scenes/quests/lore_quests/quest_001/1_music_puzzle/music_puzzle.tscn +++ b/scenes/quests/lore_quests/quest_001/1_music_puzzle/music_puzzle.tscn @@ -16,14 +16,15 @@ [ext_resource type="Script" uid="uid://c68oh8dtr21ti" path="res://scenes/game_logic/sequence_puzzle.gd" id="7_nonj7"] [ext_resource type="PackedScene" uid="uid://covsdqqsd6rsy" path="res://scenes/game_elements/props/sign/sign.tscn" id="8_evicy"] [ext_resource type="PackedScene" uid="uid://be4o3ythda4cu" path="res://scenes/game_elements/props/sequence_puzzle_hint_sign/sequence_puzzle_hint_sign.tscn" id="9_evicy"] -[ext_resource type="Texture2D" uid="uid://ck738xogv1kp5" path="res://assets/third_party/tiny-swords/Deco/11.png" id="9_nonj7"] [ext_resource type="PackedScene" uid="uid://7873qa54birk" path="res://scenes/game_elements/props/tree/tree.tscn" id="13_inhg4"] [ext_resource type="PackedScene" uid="uid://fuhl3l6gxq5k" path="res://scenes/game_elements/props/collectible_item/collectible_item.tscn" id="14_src2c"] [ext_resource type="Script" uid="uid://bgmwplmj3bfls" path="res://scenes/globals/game_state/inventory/inventory_item.gd" id="15_rxyid"] [ext_resource type="SpriteFrames" uid="uid://dtoylirwywk0j" path="res://scenes/game_elements/characters/components/sprite_frames/storyweaver_blue.tres" id="15_s3slv"] [ext_resource type="SpriteFrames" uid="uid://djwymcffy83" path="res://scenes/game_elements/props/tree/components/tree_spriteframes_red.tres" id="16_8nm0x"] [ext_resource type="PackedScene" uid="uid://cfcgrfvtn04yp" path="res://scenes/ui_elements/hud/hud.tscn" id="16_ytxvq"] +[ext_resource type="PackedScene" uid="uid://ccpgw7k4rlmea" path="res://scenes/game_elements/props/decoration/crops/barley.tscn" id="17_6y4lh"] [ext_resource type="PackedScene" uid="uid://crqjcicx0vdu" path="res://scenes/game_elements/props/decoration/bush/bush.tscn" id="17_wasqo"] +[ext_resource type="PackedScene" uid="uid://c78fj5em5tpm5" path="res://scenes/game_elements/props/decoration/crops/carrot.tscn" id="18_jaqfj"] [ext_resource type="SpriteFrames" uid="uid://bgckvdkxuxrgh" path="res://scenes/game_elements/props/decoration/bush/components/bush_spriteframes_red_large.tres" id="18_l4i5r"] [ext_resource type="PackedScene" uid="uid://b3lldk3lo2mwl" path="res://scenes/game_elements/characters/npcs/sequence_puzzle_assistant/sequence_puzzle_assistant.tscn" id="20_jdge0"] [ext_resource type="Script" uid="uid://ccc78coj2b1li" path="res://scenes/game_logic/sequence_puzzle_step.gd" id="20_thpfs"] @@ -1266,97 +1267,97 @@ position = Vector2(728, 416) scale = Vector2(1.2198, 1.16248) sprite_frames = ExtResource("16_8nm0x") -[node name="Bush" parent="OnTheGround/Trees" unique_id=1872848892 instance=ExtResource("17_wasqo")] +[node name="Bushes" type="Node2D" parent="OnTheGround" unique_id=389576391] +y_sort_enabled = true + +[node name="Bush" parent="OnTheGround/Bushes" unique_id=1924859315 instance=ExtResource("17_wasqo")] position = Vector2(893, 2047) sprite_frames = ExtResource("18_l4i5r") -[node name="Bush2" parent="OnTheGround/Trees" unique_id=1622590848 instance=ExtResource("17_wasqo")] +[node name="Bush2" parent="OnTheGround/Bushes" unique_id=53645857 instance=ExtResource("17_wasqo")] position = Vector2(1111, 914) sprite_frames = ExtResource("18_l4i5r") -[node name="Bush3" parent="OnTheGround/Trees" unique_id=1963706683 instance=ExtResource("17_wasqo")] +[node name="Bush3" parent="OnTheGround/Bushes" unique_id=138912045 instance=ExtResource("17_wasqo")] position = Vector2(889, 742) sprite_frames = ExtResource("18_l4i5r") -[node name="Bush4" parent="OnTheGround/Trees" unique_id=59615686 instance=ExtResource("17_wasqo")] +[node name="Bush4" parent="OnTheGround/Bushes" unique_id=35806464 instance=ExtResource("17_wasqo")] position = Vector2(1161, 833) sprite_frames = ExtResource("18_l4i5r") -[node name="Bush5" parent="OnTheGround/Trees" unique_id=1463250054 instance=ExtResource("17_wasqo")] +[node name="Bush5" parent="OnTheGround/Bushes" unique_id=2092934701 instance=ExtResource("17_wasqo")] position = Vector2(897, 777) sprite_frames = ExtResource("23_u8pjn") -[node name="Crop7" type="Sprite2D" parent="OnTheGround/Trees" unique_id=166161977] -position = Vector2(992, 735) -texture = ExtResource("9_nonj7") +[node name="CarrotPatch" type="Node2D" parent="OnTheGround" unique_id=1314737810] +y_sort_enabled = true + +[node name="Carrot" parent="OnTheGround/CarrotPatch" unique_id=1754863128 instance=ExtResource("18_jaqfj")] +position = Vector2(998, 736) + +[node name="Carrot2" parent="OnTheGround/CarrotPatch" unique_id=1071605295 instance=ExtResource("18_jaqfj")] +position = Vector2(1017, 757) -[node name="Crop8" type="Sprite2D" parent="OnTheGround/Trees" unique_id=1711273711] -position = Vector2(1041, 790) -texture = ExtResource("9_nonj7") +[node name="Carrot3" parent="OnTheGround/CarrotPatch" unique_id=1759326546 instance=ExtResource("18_jaqfj")] +position = Vector2(981, 757) -[node name="Crop9" type="Sprite2D" parent="OnTheGround/Trees" unique_id=477255519] -position = Vector2(989, 790) -texture = ExtResource("9_nonj7") +[node name="Carrot4" parent="OnTheGround/CarrotPatch" unique_id=1797317915 instance=ExtResource("18_jaqfj")] +position = Vector2(1036, 733) -[node name="Crop11" type="Sprite2D" parent="OnTheGround/Trees" unique_id=2063272188] -position = Vector2(679, 1053) -texture = ExtResource("9_nonj7") +[node name="Carrot5" parent="OnTheGround/CarrotPatch" unique_id=1997604573 instance=ExtResource("18_jaqfj")] +position = Vector2(998, 781) + +[node name="Carrot6" parent="OnTheGround/CarrotPatch" unique_id=873878614 instance=ExtResource("18_jaqfj")] +position = Vector2(1039, 781) + +[node name="Carrot7" parent="OnTheGround/CarrotPatch" unique_id=456370935 instance=ExtResource("18_jaqfj")] +position = Vector2(980, 804) + +[node name="Crops" type="Node2D" parent="OnTheGround" unique_id=1464834906] +y_sort_enabled = true -[node name="Crop12" type="Sprite2D" parent="OnTheGround/Trees" unique_id=1826392749] -position = Vector2(739, 1053) -texture = ExtResource("9_nonj7") +[node name="Barley" parent="OnTheGround/Crops" unique_id=831247970 instance=ExtResource("17_6y4lh")] +position = Vector2(679, 1061) -[node name="Crop13" type="Sprite2D" parent="OnTheGround/Trees" unique_id=70355850] -position = Vector2(1047, 1052) -texture = ExtResource("9_nonj7") +[node name="Barley2" parent="OnTheGround/Crops" unique_id=1089134615 instance=ExtResource("17_6y4lh")] +position = Vector2(739, 1061) -[node name="Crop14" type="Sprite2D" parent="OnTheGround/Trees" unique_id=373191540] -position = Vector2(920, 1053) -texture = ExtResource("9_nonj7") +[node name="Barley3" parent="OnTheGround/Crops" unique_id=390786883 instance=ExtResource("17_6y4lh")] +position = Vector2(1047, 1060) -[node name="Crop17" type="Sprite2D" parent="OnTheGround/Trees" unique_id=691819899] -position = Vector2(987, 1052) -texture = ExtResource("9_nonj7") +[node name="Barley4" parent="OnTheGround/Crops" unique_id=1456609420 instance=ExtResource("17_6y4lh")] +position = Vector2(920, 1061) -[node name="Crop15" type="Sprite2D" parent="OnTheGround/Trees" unique_id=1237230031] -position = Vector2(860, 1054) -texture = ExtResource("9_nonj7") +[node name="Barley5" parent="OnTheGround/Crops" unique_id=1356912350 instance=ExtResource("17_6y4lh")] +position = Vector2(987, 1060) -[node name="Crop16" type="Sprite2D" parent="OnTheGround/Trees" unique_id=297842922] -position = Vector2(799, 1053) -texture = ExtResource("9_nonj7") +[node name="Barley6" parent="OnTheGround/Crops" unique_id=951887374 instance=ExtResource("17_6y4lh")] +position = Vector2(860, 1062) -[node name="Crop18" type="Sprite2D" parent="OnTheGround/Trees" unique_id=230334225] -position = Vector2(677, 1181) -texture = ExtResource("9_nonj7") +[node name="Barley7" parent="OnTheGround/Crops" unique_id=111888314 instance=ExtResource("17_6y4lh")] +position = Vector2(799, 1061) -[node name="Crop19" type="Sprite2D" parent="OnTheGround/Trees" unique_id=1846662137] -position = Vector2(737, 1181) -texture = ExtResource("9_nonj7") +[node name="Barley8" parent="OnTheGround/Crops" unique_id=1285550222 instance=ExtResource("17_6y4lh")] +position = Vector2(680, 1191) -[node name="Crop20" type="Sprite2D" parent="OnTheGround/Trees" unique_id=304831163] -position = Vector2(1045, 1180) -texture = ExtResource("9_nonj7") +[node name="Barley9" parent="OnTheGround/Crops" unique_id=581718680 instance=ExtResource("17_6y4lh")] +position = Vector2(740, 1191) -[node name="Crop21" type="Sprite2D" parent="OnTheGround/Trees" unique_id=1061715858] -position = Vector2(918, 1181) -texture = ExtResource("9_nonj7") +[node name="Barley10" parent="OnTheGround/Crops" unique_id=372905164 instance=ExtResource("17_6y4lh")] +position = Vector2(1048, 1190) -[node name="Crop22" type="Sprite2D" parent="OnTheGround/Trees" unique_id=475887121] -position = Vector2(985, 1180) -texture = ExtResource("9_nonj7") +[node name="Barley11" parent="OnTheGround/Crops" unique_id=873557679 instance=ExtResource("17_6y4lh")] +position = Vector2(921, 1191) -[node name="Crop23" type="Sprite2D" parent="OnTheGround/Trees" unique_id=1594794515] -position = Vector2(858, 1182) -texture = ExtResource("9_nonj7") +[node name="Barley12" parent="OnTheGround/Crops" unique_id=495408087 instance=ExtResource("17_6y4lh")] +position = Vector2(988, 1190) -[node name="Crop24" type="Sprite2D" parent="OnTheGround/Trees" unique_id=1189273088] -position = Vector2(797, 1181) -texture = ExtResource("9_nonj7") +[node name="Barley13" parent="OnTheGround/Crops" unique_id=1755631401 instance=ExtResource("17_6y4lh")] +position = Vector2(861, 1192) -[node name="Crop10" type="Sprite2D" parent="OnTheGround/Trees" unique_id=2003847167] -position = Vector2(1044, 737) -texture = ExtResource("9_nonj7") +[node name="Barley14" parent="OnTheGround/Crops" unique_id=169134153 instance=ExtResource("17_6y4lh")] +position = Vector2(800, 1191) [node name="Player" parent="OnTheGround" unique_id=2045681530 instance=ExtResource("2_0ayb4")] position = Vector2(539, 1972)