From 158339d04265567f97a36b54b213cc0bc78016d4 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 13 Mar 2026 22:52:18 -0400 Subject: [PATCH] changed structure to make musician scenes inherit a common parent --- .../sprite_frames/bass_sprite_frames.tres | 54 ++++++++++++ .../sprite_frames/cello_sprite_frames.tres | 47 ++++++++++ .../conductor_sprite_frames.tres | 47 ++++++++++ .../sprite_frames/viol_sprite_frames.tres | 54 ++++++++++++ scenes/conductor.tscn | 84 ------------------ scenes/{musicians => }/input_prompt.tscn | 0 scenes/light.tscn | 11 +++ scenes/main.tscn | 78 +++++++++++------ scenes/musicians/bass.tscn | 85 ------------------- scenes/musicians/bassist.tscn | 21 +++++ scenes/musicians/cellist.tscn | 21 +++++ scenes/musicians/cello.tscn | 79 ----------------- scenes/musicians/conductor.tscn | 21 +++++ scenes/musicians/musician.tscn | 22 +++++ scenes/musicians/viol.tscn | 84 ------------------ scenes/musicians/violinist.tscn | 21 +++++ scripts/conductor.gd | 23 ----- scripts/conductor.gd.uid | 1 - scripts/main.gd | 8 +- {scenes/musicians => scripts}/musician.gd | 27 ++++-- {scenes/musicians => scripts}/musician.gd.uid | 0 21 files changed, 397 insertions(+), 391 deletions(-) create mode 100644 resources/sprite_frames/bass_sprite_frames.tres create mode 100644 resources/sprite_frames/cello_sprite_frames.tres create mode 100644 resources/sprite_frames/conductor_sprite_frames.tres create mode 100644 resources/sprite_frames/viol_sprite_frames.tres delete mode 100644 scenes/conductor.tscn rename scenes/{musicians => }/input_prompt.tscn (100%) create mode 100644 scenes/light.tscn delete mode 100644 scenes/musicians/bass.tscn create mode 100644 scenes/musicians/bassist.tscn create mode 100644 scenes/musicians/cellist.tscn delete mode 100644 scenes/musicians/cello.tscn create mode 100644 scenes/musicians/conductor.tscn create mode 100644 scenes/musicians/musician.tscn delete mode 100644 scenes/musicians/viol.tscn create mode 100644 scenes/musicians/violinist.tscn delete mode 100644 scripts/conductor.gd delete mode 100644 scripts/conductor.gd.uid rename {scenes/musicians => scripts}/musician.gd (50%) rename {scenes/musicians => scripts}/musician.gd.uid (100%) diff --git a/resources/sprite_frames/bass_sprite_frames.tres b/resources/sprite_frames/bass_sprite_frames.tres new file mode 100644 index 0000000..a1d1313 --- /dev/null +++ b/resources/sprite_frames/bass_sprite_frames.tres @@ -0,0 +1,54 @@ +[gd_resource type="SpriteFrames" format=3 uid="uid://c34ha4ekm1xor"] + +[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_0qj0m"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_lswn8"] +atlas = ExtResource("1_0qj0m") +region = Rect2(32, 32, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_a6jrf"] +atlas = ExtResource("1_0qj0m") +region = Rect2(64, 32, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xuqvo"] +atlas = ExtResource("1_0qj0m") +region = Rect2(96, 32, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qsp4k"] +atlas = ExtResource("1_0qj0m") +region = Rect2(128, 32, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0odxb"] +atlas = ExtResource("1_0qj0m") +region = Rect2(0, 32, 32, 32) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_lswn8") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_a6jrf") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_xuqvo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qsp4k") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_lswn8") +}], +"loop": true, +"name": &"default", +"speed": 10.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_0odxb") +}], +"loop": true, +"name": &"idle", +"speed": 12.0 +}] diff --git a/resources/sprite_frames/cello_sprite_frames.tres b/resources/sprite_frames/cello_sprite_frames.tres new file mode 100644 index 0000000..731892d --- /dev/null +++ b/resources/sprite_frames/cello_sprite_frames.tres @@ -0,0 +1,47 @@ +[gd_resource type="SpriteFrames" format=3 uid="uid://bpfq0ubeyinny"] + +[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_6cuj6"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_kek77"] +atlas = ExtResource("1_6cuj6") +region = Rect2(224, 32, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4c57u"] +atlas = ExtResource("1_6cuj6") +region = Rect2(256, 32, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_efxa6"] +atlas = ExtResource("1_6cuj6") +region = Rect2(288, 32, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_5vw27"] +atlas = ExtResource("1_6cuj6") +region = Rect2(192, 32, 32, 32) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_kek77") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4c57u") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_efxa6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_kek77") +}], +"loop": true, +"name": &"default", +"speed": 8.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_5vw27") +}], +"loop": true, +"name": &"idle", +"speed": 10.0 +}] diff --git a/resources/sprite_frames/conductor_sprite_frames.tres b/resources/sprite_frames/conductor_sprite_frames.tres new file mode 100644 index 0000000..74baaf0 --- /dev/null +++ b/resources/sprite_frames/conductor_sprite_frames.tres @@ -0,0 +1,47 @@ +[gd_resource type="SpriteFrames" format=3 uid="uid://brmhup007maeh"] + +[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_t5mbj"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_lquwl"] +atlas = ExtResource("1_t5mbj") +region = Rect2(96, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_0xm2m"] +atlas = ExtResource("1_t5mbj") +region = Rect2(0, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_h2yge"] +atlas = ExtResource("1_t5mbj") +region = Rect2(32, 0, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_1bvp3"] +atlas = ExtResource("1_t5mbj") +region = Rect2(64, 0, 32, 32) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_lquwl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_0xm2m") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_h2yge") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_1bvp3") +}], +"loop": true, +"name": &"default", +"speed": 4.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_lquwl") +}], +"loop": true, +"name": &"idle", +"speed": 4.0 +}] diff --git a/resources/sprite_frames/viol_sprite_frames.tres b/resources/sprite_frames/viol_sprite_frames.tres new file mode 100644 index 0000000..00184e6 --- /dev/null +++ b/resources/sprite_frames/viol_sprite_frames.tres @@ -0,0 +1,54 @@ +[gd_resource type="SpriteFrames" format=3 uid="uid://bkq7b1w5jh1ec"] + +[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_yt1t7"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_w48qg"] +atlas = ExtResource("1_yt1t7") +region = Rect2(32, 160, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_vivmo"] +atlas = ExtResource("1_yt1t7") +region = Rect2(64, 160, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2cqfq"] +atlas = ExtResource("1_yt1t7") +region = Rect2(96, 160, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yaehf"] +atlas = ExtResource("1_yt1t7") +region = Rect2(128, 160, 32, 32) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ycdy4"] +atlas = ExtResource("1_yt1t7") +region = Rect2(0, 160, 32, 32) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_w48qg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_vivmo") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_2cqfq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_yaehf") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_w48qg") +}], +"loop": true, +"name": &"default", +"speed": 15.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_ycdy4") +}], +"loop": true, +"name": &"idle", +"speed": 12.0 +}] diff --git a/scenes/conductor.tscn b/scenes/conductor.tscn deleted file mode 100644 index f1720a3..0000000 --- a/scenes/conductor.tscn +++ /dev/null @@ -1,84 +0,0 @@ -[gd_scene format=3 uid="uid://cj48n8wtq70ea"] - -[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_lxg7y"] -[ext_resource type="Script" uid="uid://dppf0pasfnksi" path="res://scripts/conductor.gd" id="2_x67ht"] -[ext_resource type="AudioStream" uid="uid://b8n6p428csquv" path="res://assets/audio/eine-kleine-click.wav" id="3_q7w51"] -[ext_resource type="PackedScene" uid="uid://cwdkw1p371bks" path="res://scenes/musicians/input_prompt.tscn" id="4_0iywx"] -[ext_resource type="Texture2D" uid="uid://do6jqp2l6nmwm" path="res://assets/input/keyboard_r_outline.png" id="5_r54h3"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_lquwl"] -atlas = ExtResource("1_lxg7y") -region = Rect2(96, 0, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_0xm2m"] -atlas = ExtResource("1_lxg7y") -region = Rect2(0, 0, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_h2yge"] -atlas = ExtResource("1_lxg7y") -region = Rect2(32, 0, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_1bvp3"] -atlas = ExtResource("1_lxg7y") -region = Rect2(64, 0, 32, 32) - -[sub_resource type="SpriteFrames" id="SpriteFrames_7mycd"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_lquwl") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_0xm2m") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_h2yge") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_1bvp3") -}], -"loop": true, -"name": &"default", -"speed": 4.0 -}] - -[sub_resource type="Gradient" id="Gradient_lquwl"] -interpolation_mode = 2 -offsets = PackedFloat32Array(0.5, 0.8) -colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 0) - -[sub_resource type="GradientTexture2D" id="GradientTexture2D_4c57u"] -gradient = SubResource("Gradient_lquwl") -width = 96 -height = 48 -fill = 1 -fill_from = Vector2(0.5, 0.5) -fill_to = Vector2(0.85, 0.85) - -[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_4c57u"] -polygon = PackedVector2Array(0, 14, -2, 15, -4, 14) - -[node name="Conductor" type="AnimatedSprite2D" unique_id=607493736] -position = Vector2(2, 0) -sprite_frames = SubResource("SpriteFrames_7mycd") -frame_progress = 0.51704574 -script = ExtResource("2_x67ht") - -[node name="Audio" type="AudioStreamPlayer2D" parent="." unique_id=1922730130] -stream = ExtResource("3_q7w51") - -[node name="Light" type="PointLight2D" parent="." unique_id=1770033681] -unique_name_in_owner = true -position = Vector2(5, 9) -energy = 0.8 -shadow_enabled = true -shadow_filter = 2 -shadow_filter_smooth = 7.6 -texture = SubResource("GradientTexture2D_4c57u") - -[node name="Occluder" type="LightOccluder2D" parent="." unique_id=978661388] -occluder = SubResource("OccluderPolygon2D_4c57u") - -[node name="InputPrompt" parent="." unique_id=590379112 instance=ExtResource("4_0iywx")] -position = Vector2(-2, 24) -texture = ExtResource("5_r54h3") diff --git a/scenes/musicians/input_prompt.tscn b/scenes/input_prompt.tscn similarity index 100% rename from scenes/musicians/input_prompt.tscn rename to scenes/input_prompt.tscn diff --git a/scenes/light.tscn b/scenes/light.tscn new file mode 100644 index 0000000..745a9cb --- /dev/null +++ b/scenes/light.tscn @@ -0,0 +1,11 @@ +[gd_scene format=3 uid="uid://ckx47081eegis"] + +[ext_resource type="Texture2D" uid="uid://d1li1mlxutaym" path="res://resources/point_light_texture.tres" id="1_24oxn"] + +[node name="Light" type="PointLight2D" unique_id=428469575] +z_index = 100 +energy = 0.8 +shadow_enabled = true +shadow_filter = 2 +shadow_filter_smooth = 7.6 +texture = ExtResource("1_24oxn") diff --git a/scenes/main.tscn b/scenes/main.tscn index ce93134..511f411 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -2,10 +2,10 @@ [ext_resource type="Script" uid="uid://bjv7i1kmivfai" path="res://scripts/main.gd" id="1_5vw27"] [ext_resource type="Texture2D" uid="uid://cs47f2rurekyx" path="res://assets/tiles/floor_wood_01-32x16.png" id="2_0xm2m"] -[ext_resource type="PackedScene" uid="uid://cj48n8wtq70ea" path="res://scenes/conductor.tscn" id="2_4c57u"] -[ext_resource type="PackedScene" uid="uid://c5mms8bhjkplb" path="res://scenes/musicians/viol.tscn" id="3_efxa6"] -[ext_resource type="PackedScene" uid="uid://ekd4tkk01nug" path="res://scenes/musicians/cello.tscn" id="4_dg77c"] -[ext_resource type="PackedScene" uid="uid://b3ytvnucd8hod" path="res://scenes/musicians/bass.tscn" id="5_ycdy4"] +[ext_resource type="PackedScene" uid="uid://cnf35r3d7v1ij" path="res://scenes/musicians/cellist.tscn" id="6_85g3d"] +[ext_resource type="PackedScene" uid="uid://d2f7skasc4as7" path="res://scenes/musicians/violinist.tscn" id="7_choun"] +[ext_resource type="PackedScene" uid="uid://drwm126itwavd" path="res://scenes/musicians/conductor.tscn" id="8_tipki"] +[ext_resource type="PackedScene" uid="uid://dshpa8es6dcv5" path="res://scenes/musicians/bassist.tscn" id="8_ya4ey"] [ext_resource type="Texture2D" uid="uid://du5d58gs5hbv1" path="res://assets/tiles/Flat_Wood_01-SE-64x96-scaled-down.png" id="10_dg77c"] [ext_resource type="Texture2D" uid="uid://bt1tsd8ahetqy" path="res://assets/tiles/Flat_Wood_01_WindowA-SE-64x96-scaled-down.png" id="10_ycdy4"] @@ -165,49 +165,79 @@ y_sort_enabled = true script = ExtResource("1_5vw27") [node name="Camera2D" type="Camera2D" parent="." unique_id=1314238347] -position = Vector2(-4, 13) +position = Vector2(-6, 15) zoom = Vector2(8, 8) -[node name="Conductor" parent="." unique_id=607493736 instance=ExtResource("2_4c57u")] -unique_name_in_owner = true -y_sort_enabled = true -position = Vector2(8, 25) - [node name="Musicians" type="Node2D" parent="." unique_id=237973745] y_sort_enabled = true +position = Vector2(7, -6) -[node name="Viol" parent="Musicians" unique_id=173609985 instance=ExtResource("3_efxa6")] +[node name="Conductor" parent="Musicians" unique_id=338073346 instance=ExtResource("8_tipki")] unique_name_in_owner = true -y_sort_enabled = true -position = Vector2(-47, 19) +position = Vector2(9, 32) -[node name="Cello" parent="Musicians" unique_id=1539517068 instance=ExtResource("4_dg77c")] -unique_name_in_owner = true -y_sort_enabled = true -position = Vector2(28, 1) -frame_progress = 0.0 +[node name="Light" parent="Musicians/Conductor" index="1" unique_id=428469575] +position = Vector2(4, 9) -[node name="Bass" parent="Musicians" unique_id=1326988360 instance=ExtResource("5_ycdy4")] +[node name="InputPrompt" parent="Musicians/Conductor" index="3" unique_id=590379112] +visible = false +light_mask = 1 + +[node name="Cellist" parent="Musicians" unique_id=233159387 instance=ExtResource("6_85g3d")] unique_name_in_owner = true -y_sort_enabled = true -position = Vector2(-25, -6) +position = Vector2(21, 6) +flip_h = true + +[node name="Light" parent="Musicians/Cellist" index="1" unique_id=428469575] +position = Vector2(5, 9) + +[node name="InputPrompt" parent="Musicians/Cellist" index="3" unique_id=590379112] +light_mask = 1 +position = Vector2(15, 9) + +[node name="Violinist" parent="Musicians" unique_id=557143802 instance=ExtResource("7_choun")] +unique_name_in_owner = true +position = Vector2(-48, 26) + +[node name="Light" parent="Musicians/Violinist" index="1" unique_id=428469575] +position = Vector2(9, 9) + +[node name="InputPrompt" parent="Musicians/Violinist" index="3" unique_id=590379112] +light_mask = 1 +position = Vector2(16, 10) + +[node name="Bassist" parent="Musicians" unique_id=884981738 instance=ExtResource("8_ya4ey")] +unique_name_in_owner = true +position = Vector2(-32, -1) + +[node name="Light" parent="Musicians/Bassist" index="1" unique_id=428469575] +position = Vector2(8, 9) + +[node name="InputPrompt" parent="Musicians/Bassist" index="3" unique_id=590379112] +light_mask = 1 +position = Vector2(19, 9) [node name="Tilemaps" type="Node2D" parent="." unique_id=1115514972] [node name="Stage" type="TileMapLayer" parent="Tilemaps" unique_id=15466516] z_index = -10 -tile_map_data = PackedByteArray("AAD8//L/BQABAAQAAAD8//P/BQABAAQAAAD8//T/BQABAAQAAAD8//X/BQABAAQAAAD8//b/BQABAAQAAAD8//f/BQABAAQAAAD8//j/BQABAAQAAAD8//n/BQABAAQAAAD8//r/BQABAAQAAAD8//v/BQABAAQAAAD8//z/BQABAAQAAAD8//3/BQABAAQAAAD8//7/BQABAAQAAAD8////BQABAAQAAAD8/wAABQABAAQAAAD8/wEABQABAAQAAAD8/wIABQABAAQAAAD8/wMABQABAAQAAAD8/wQABQABAAQAAAD8/wUABQABAAQAAAD8/wYABQABAAQAAAD8/wcABQABAAQAAAD8/wgABQABAAQAAAD9//L/BQABAAQAAAD9//P/BQABAAQAAAD9//T/BQABAAQAAAD9//X/BQABAAQAAAD9//b/BQABAAQAAAD9//f/BQABAAQAAAD9//j/BQABAAQAAAD9//n/BQABAAQAAAD9//r/BQABAAQAAAD9//v/BQABAAQAAAD9//z/BQABAAQAAAD9//3/BQABAAQAAAD9//7/BQABAAQAAAD9////BQABAAQAAAD9/wAABQABAAQAAAD9/wEABQABAAQAAAD9/wIABQABAAQAAAD9/wMABQABAAQAAAD9/wQABQABAAQAAAD9/wUABQABAAQAAAD9/wYABQABAAQAAAD9/wcABQABAAQAAAD9/wgABQABAAQAAAD+//L/BQABAAQAAAD+//P/BQABAAQAAAD+//T/BQABAAQAAAD+//X/BQABAAQAAAD+//b/BQABAAQAAAD+//f/BQABAAQAAAD+//j/BQABAAQAAAD+//n/BQABAAQAAAD+//r/BQABAAQAAAD+//v/BQABAAQAAAD+//z/BQABAAQAAAD+//3/BQABAAQAAAD+//7/BQABAAQAAAD+////BQABAAQAAAD+/wAABQABAAQAAAD+/wEABQABAAQAAAD+/wIABQABAAQAAAD+/wMABQABAAQAAAD+/wQABQABAAQAAAD+/wUABQABAAQAAAD+/wYABQABAAQAAAD+/wcABQABAAQAAAD+/wgABQABAAQAAAD///L/BQABAAQAAAD///P/BQABAAQAAAD///T/BQABAAQAAAD///X/BQABAAQAAAD///b/BQABAAQAAAD///f/BQABAAQAAAD///j/BQABAAQAAAD///n/BQABAAQAAAD///r/BQABAAQAAAD///v/BQABAAQAAAD///z/BQABAAQAAAD///3/BQABAAQAAAD///7/BQABAAQAAAD/////BQABAAQAAAD//wAABQABAAQAAAD//wEABQABAAQAAAD//wIABQABAAQAAAD//wMABQABAAQAAAD//wQABQABAAQAAAD//wUABQABAAQAAAD//wYABQABAAQAAAD//wcABQABAAQAAAD//wgABQABAAQAAAAAAPL/BQABAAQAAAAAAPP/BQABAAQAAAAAAPT/BQABAAQAAAAAAPX/BQABAAQAAAAAAPb/BQABAAQAAAAAAPf/BQABAAQAAAAAAPj/BQABAAQAAAAAAPn/BQABAAQAAAAAAPr/BQABAAQAAAAAAPv/BQABAAQAAAAAAPz/BQABAAQAAAAAAP3/BQABAAQAAAAAAP7/BQABAAQAAAAAAP//BQABAAQAAAAAAAAABQABAAQAAAAAAAEABQABAAQAAAAAAAIABQABAAQAAAAAAAMABQABAAQAAAAAAAQABQABAAQAAAAAAAUABQABAAQAAAAAAAYABQABAAQAAAAAAAcABQABAAQAAAAAAAgABQABAAQAAAABAPL/BQABAAQAAAABAPP/BQABAAQAAAABAPT/BQABAAQAAAABAPX/BQABAAQAAAABAPb/BQABAAQAAAABAPf/BQABAAQAAAABAPj/BQABAAQAAAABAPn/BQABAAQAAAABAPr/BQABAAQAAAABAPv/BQABAAQAAAABAPz/BQABAAQAAAABAP3/BQABAAQAAAABAP7/BQABAAQAAAABAP//BQABAAQAAAABAAAABQABAAQAAAABAAEABQABAAQAAAABAAIABQABAAQAAAABAAMABQABAAQAAAABAAQABQABAAQAAAABAAUABQABAAQAAAABAAYABQABAAQAAAABAAcABQABAAQAAAABAAgABQABAAQAAAACAPL/BQABAAQAAAACAPP/BQABAAQAAAACAPT/BQABAAQAAAACAPX/BQABAAQAAAACAPb/BQABAAQAAAACAPf/BQABAAQAAAACAPj/BQABAAQAAAACAPn/BQABAAQAAAACAPr/BQABAAQAAAACAPv/BQABAAQAAAACAPz/BQABAAQAAAACAP3/BQABAAQAAAACAP7/BQABAAQAAAACAP//BQABAAQAAAACAAAABQABAAQAAAACAAEABQABAAQAAAACAAIABQABAAQAAAACAAMABQABAAQAAAACAAQABQABAAQAAAACAAUABQABAAQAAAACAAYABQABAAQAAAACAAcABQABAAQAAAACAAgABQABAAQAAAADAPL/BQABAAQAAAADAPP/BQABAAQAAAADAPT/BQABAAQAAAADAPX/BQABAAQAAAADAPb/BQABAAQAAAADAPf/BQABAAQAAAADAPj/BQABAAQAAAADAPn/BQABAAQAAAADAPr/BQABAAQAAAADAPv/BQABAAQAAAADAPz/BQABAAQAAAADAP3/BQABAAQAAAADAP7/BQABAAQAAAADAP//BQABAAQAAAADAAAABQABAAQAAAADAAEABQABAAQAAAADAAIABQABAAQAAAADAAMABQABAAQAAAADAAQABQABAAQAAAADAAUABQABAAQAAAADAAYABQABAAQAAAADAAcABQABAAQAAAADAAgABQABAAQAAAA=") +tile_map_data = PackedByteArray("AAD8//v/BQABAAQAAAD8//3/BQABAAQAAAD8////BQABAAQAAAD8/wEABQABAAQAAAD8/wUABQABAAQAAAD9//v/BQABAAQAAAD9//z/BQABAAQAAAD9//3/BQABAAQAAAD9//7/BQABAAQAAAD9////BQABAAQAAAD9/wAABQABAAQAAAD9/wEABQABAAQAAAD9/wIABQABAAQAAAD9/wMABQABAAQAAAD9/wQABQABAAQAAAD9/wUABQABAAQAAAD9/wYABQABAAQAAAD9/wcABQABAAQAAAD+//v/BQABAAQAAAD+//z/BQABAAQAAAD+//3/BQABAAQAAAD+//7/BQABAAQAAAD+////BQABAAQAAAD+/wAABQABAAQAAAD+/wEABQABAAQAAAD+/wIABQABAAQAAAD+/wMABQABAAQAAAD+/wQABQABAAQAAAD+/wUABQABAAQAAAD+/wYABQABAAQAAAD+/wcABQABAAQAAAD///v/BQABAAQAAAD///z/BQABAAQAAAD///3/BQABAAQAAAD///7/BQABAAQAAAD/////BQABAAQAAAD//wAABQABAAQAAAD//wEABQABAAQAAAD//wIABQABAAQAAAD//wMABQABAAQAAAD//wQABQABAAQAAAD//wUABQABAAQAAAD//wYABQABAAQAAAD//wcABQABAAQAAAAAAPv/BQABAAQAAAAAAPz/BQABAAQAAAAAAP3/BQABAAQAAAAAAP7/BQABAAQAAAAAAP//BQABAAQAAAAAAAAABQABAAQAAAAAAAEABQABAAQAAAAAAAIABQABAAQAAAAAAAMABQABAAQAAAAAAAQABQABAAQAAAAAAAUABQABAAQAAAAAAAYABQABAAQAAAAAAAcABQABAAQAAAABAPv/BQABAAQAAAABAPz/BQABAAQAAAABAP3/BQABAAQAAAABAP7/BQABAAQAAAABAP//BQABAAQAAAABAAAABQABAAQAAAABAAEABQABAAQAAAABAAIABQABAAQAAAABAAMABQABAAQAAAABAAQABQABAAQAAAABAAUABQABAAQAAAABAAYABQABAAQAAAABAAcABQABAAQAAAACAPz/BQABAAQAAAACAP7/BQABAAQAAAACAAAABQABAAQAAAACAAIABQABAAQAAAACAAQABQABAAQAAAACAAYABQABAAQAAAD8/wMABQABAAQAAAA=") tile_set = SubResource("TileSet_272bh") [node name="BackLeftWalls" type="TileMapLayer" parent="Tilemaps" unique_id=1380589034] z_index = 1 -tile_map_data = PackedByteArray("AAD9//n/AQAEAAIAAAD9//r/AAAEAAIAAAD8//v/AQAEAAIAAAD8//z/AAAEAAIAAAD7//3/AAAEAAEAAAD7/wAAAAAEAAEAAAD7////AAAEAAEAAAD8//7/AQAEAAIAAAD8//3/AAAEAAIAAAD9//z/AQAEAAIAAAD9//v/AAAEAAIAAAD+//r/AQAEAAIAAAD+//n/AAAEAAIAAAD///j/AQAEAAIAAAD+//j/AAAEAAIAAAD7//7/AAAEAAEAAAD///r/AAAEAAIAAAD+//v/AQAEAAIAAAD+//z/AAAEAAIAAAD9//3/AQAEAAIAAAD9//7/AAAEAAIAAAD8////AQAEAAIAAAD+//f/AQAEAAIAAAD8//n/AAAEAAIAAAD9//j/AQAEAAIAAAD9//f/AAAEAAIAAAD+//b/AQAEAAIAAAD+//X/AAAEAAIAAAD///T/AQAEAAIAAAD///b/AAAEAAIAAAD8//r/AQAEAAIAAAD8/wAAAAAEAAIAAAD///L/AAAEAAIAAAD+//P/AQAEAAIAAAD+//T/AAAEAAIAAAD9//X/AQAEAAIAAAD9//b/AAAEAAIAAAD8//f/AQAEAAIAAAD8//j/AAAEAAIAAAA=") +tile_map_data = PackedByteArray("AAD8//3/AAAEAAIAAAD9//z/AQAEAAIAAAD9//v/AAAEAAIAAAD+//r/AQAEAAIAAAD+//n/AAAEAAIAAAD///j/AQAEAAIAAAD///r/AAAEAAIAAAD+//v/AQAEAAIAAAD+//z/AAAEAAIAAAD9//3/AQAEAAIAAAD9//7/AAAEAAIAAAD8////AQAEAAIAAAD8//v/AQAEAAIAAAD9//r/AAAEAAIAAAA=") tile_set = SubResource("TileSet_ycdy4") [node name="BackRightWalls" type="TileMapLayer" parent="Tilemaps" unique_id=1757009184] position = Vector2(0, -8) -tile_map_data = PackedByteArray("AAABAPn/AQAFAAIAAAACAPr/AAAFAAIAAAAAAPn/AAAFAAIAAAABAPr/AQAFAAIAAAABAPv/AAAFAAIAAAACAPz/AQAFAAIAAAACAP3/AAAFAAIAAAAAAPr/AAAFAAIAAAAAAPv/AQAFAAIAAAABAPz/AAAFAAIAAAABAP3/AQAFAAIAAAACAP7/AAAFAAIAAAAAAPj/AQAFAAIAAAABAPj/AAAFAAIAAAACAPv/AQAFAAIAAAADAPz/AAAFAAIAAAAAAPf/AQAFAAIAAAAAAPb/AAAFAAIAAAD///v/AAAFAAIAAAAAAPz/AQAFAAIAAAAAAP3/AAAFAAIAAAABAP7/AQAFAAIAAAABAP//AAAFAAIAAAACAAAAAQAFAAIAAAACAAEAAAAFAAIAAAD///f/AAAFAAIAAAD///X/AQAFAAIAAAD///n/AQAFAAIAAAADAPr/AAAFAAIAAAADAP7/AQAFAAIAAAACAP//AQAFAAIAAAADAAAAAAAFAAIAAAADAAIAAQAFAAIAAAACAPn/AAAFAAIAAAACAPj/AAAFAAIAAAABAPf/AAAFAAIAAAABAPb/AAAFAAIAAAAAAPX/AAAFAAIAAAAAAPT/AAAFAAIAAAD///P/AAAFAAIAAAADAPj/AAAFAAIAAAACAPf/AAAFAAIAAAACAPb/AAAFAAIAAAABAPX/AAAFAAIAAAABAPT/AAAFAAIAAAAAAPP/AAAFAAIAAAAAAPL/AAAFAAIAAAD///H/AAAFAAIAAAA=") +tile_map_data = PackedByteArray("AAACAPz/AQAFAAIAAAAAAPr/AAAFAAIAAAAAAPv/AQAFAAIAAAABAPz/AAAFAAIAAAABAP3/AQAFAAIAAAACAP7/AAAFAAIAAAD///v/AAAFAAIAAAAAAPz/AQAFAAIAAAAAAP3/AAAFAAIAAAABAP7/AQAFAAIAAAABAP//AAAFAAIAAAACAAAAAQAFAAIAAAD///n/AQAFAAIAAAABAPv/AAAFAAIAAAA=") tile_set = SubResource("TileSet_w48qg") [node name="CanvasModulate" type="CanvasModulate" parent="." unique_id=1681660400] color = Color(0.3478174, 0.34781674, 0.3478171, 1) + +[editable path="Musicians/Conductor"] +[editable path="Musicians/Cellist"] +[editable path="Musicians/Violinist"] +[editable path="Musicians/Bassist"] diff --git a/scenes/musicians/bass.tscn b/scenes/musicians/bass.tscn deleted file mode 100644 index 3097da6..0000000 --- a/scenes/musicians/bass.tscn +++ /dev/null @@ -1,85 +0,0 @@ -[gd_scene format=3 uid="uid://b3ytvnucd8hod"] - -[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_vbktj"] -[ext_resource type="Script" uid="uid://djmn4qgj45j2p" path="res://scenes/musicians/musician.gd" id="2_fcial"] -[ext_resource type="AudioStream" uid="uid://cc6smyxkrrvfr" path="res://assets/audio/eine-kleine-bass.wav" id="3_7duo6"] -[ext_resource type="Texture2D" uid="uid://d1li1mlxutaym" path="res://resources/point_light_texture.tres" id="3_fcial"] -[ext_resource type="PackedScene" uid="uid://cwdkw1p371bks" path="res://scenes/musicians/input_prompt.tscn" id="5_k304j"] -[ext_resource type="Texture2D" uid="uid://bmc2ijkmfndv7" path="res://assets/input/keyboard_b_outline.png" id="6_5834n"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_lswn8"] -atlas = ExtResource("1_vbktj") -region = Rect2(32, 32, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_a6jrf"] -atlas = ExtResource("1_vbktj") -region = Rect2(64, 32, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_xuqvo"] -atlas = ExtResource("1_vbktj") -region = Rect2(96, 32, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_qsp4k"] -atlas = ExtResource("1_vbktj") -region = Rect2(128, 32, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_0odxb"] -atlas = ExtResource("1_vbktj") -region = Rect2(0, 32, 32, 32) - -[sub_resource type="SpriteFrames" id="SpriteFrames_kq58d"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_lswn8") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_a6jrf") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_xuqvo") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_qsp4k") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_lswn8") -}], -"loop": true, -"name": &"default", -"speed": 10.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_0odxb") -}], -"loop": true, -"name": &"idle", -"speed": 12.0 -}] - -[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_efxa6"] -polygon = PackedVector2Array(-2, 14, 4, 15, -4, 14) - -[node name="Bass" type="AnimatedSprite2D" unique_id=1326988360] -z_index = 10 -sprite_frames = SubResource("SpriteFrames_kq58d") -script = ExtResource("2_fcial") - -[node name="Audio" type="AudioStreamPlayer2D" parent="." unique_id=1607169101] -stream = ExtResource("3_7duo6") - -[node name="Light" type="PointLight2D" parent="." unique_id=1266087927] -position = Vector2(9, 9) -energy = 0.8 -shadow_enabled = true -shadow_filter = 2 -shadow_filter_smooth = 7.6 -texture = ExtResource("3_fcial") - -[node name="Occluder" type="LightOccluder2D" parent="." unique_id=968506542] -position = Vector2(1, 0) -occluder = SubResource("OccluderPolygon2D_efxa6") - -[node name="InputPrompt" parent="." unique_id=590379112 instance=ExtResource("5_k304j")] -texture = ExtResource("6_5834n") diff --git a/scenes/musicians/bassist.tscn b/scenes/musicians/bassist.tscn new file mode 100644 index 0000000..e014386 --- /dev/null +++ b/scenes/musicians/bassist.tscn @@ -0,0 +1,21 @@ +[gd_scene format=3 uid="uid://dshpa8es6dcv5"] + +[ext_resource type="PackedScene" uid="uid://c1tceq1kcqngi" path="res://scenes/musicians/musician.tscn" id="1_ec361"] +[ext_resource type="SpriteFrames" uid="uid://c34ha4ekm1xor" path="res://resources/sprite_frames/bass_sprite_frames.tres" id="2_58d2m"] +[ext_resource type="Texture2D" uid="uid://bw3nb0oru0pam" path="res://assets/input/keyboard_b.png" id="3_qpy72"] +[ext_resource type="Texture2D" uid="uid://bmc2ijkmfndv7" path="res://assets/input/keyboard_b_outline.png" id="4_5nfdv"] +[ext_resource type="AudioStream" uid="uid://cc6smyxkrrvfr" path="res://assets/audio/eine-kleine-bass.wav" id="5_58d2m"] + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_58d2m"] +polygon = PackedVector2Array(-2, 14, 2, 14, 3, 15) + +[node name="Bassist" unique_id=233159387 instance=ExtResource("1_ec361")] +sprite_frames = ExtResource("2_58d2m") +solid_texture = ExtResource("3_qpy72") +outline_texture = ExtResource("4_5nfdv") + +[node name="Audio" parent="." index="0" unique_id=1183742914] +stream = ExtResource("5_58d2m") + +[node name="Occluder" parent="." index="2" unique_id=807216766] +occluder = SubResource("OccluderPolygon2D_58d2m") diff --git a/scenes/musicians/cellist.tscn b/scenes/musicians/cellist.tscn new file mode 100644 index 0000000..95e21aa --- /dev/null +++ b/scenes/musicians/cellist.tscn @@ -0,0 +1,21 @@ +[gd_scene format=3 uid="uid://cnf35r3d7v1ij"] + +[ext_resource type="PackedScene" uid="uid://c1tceq1kcqngi" path="res://scenes/musicians/musician.tscn" id="1_gkxwc"] +[ext_resource type="SpriteFrames" uid="uid://bpfq0ubeyinny" path="res://resources/sprite_frames/cello_sprite_frames.tres" id="2_3cfa0"] +[ext_resource type="Texture2D" uid="uid://dahurq3y0kh20" path="res://assets/input/keyboard_c.png" id="3_vjovb"] +[ext_resource type="Texture2D" uid="uid://d1onhhk6xorit" path="res://assets/input/keyboard_c_outline.png" id="4_vmq6l"] +[ext_resource type="AudioStream" uid="uid://duovjdbif7wkw" path="res://assets/audio/eine-kleine-cello.wav" id="5_vjovb"] + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_vjovb"] +polygon = PackedVector2Array(-4, 13, -1, 13, 0, 14) + +[node name="Cellist" unique_id=233159387 instance=ExtResource("1_gkxwc")] +sprite_frames = ExtResource("2_3cfa0") +solid_texture = ExtResource("3_vjovb") +outline_texture = ExtResource("4_vmq6l") + +[node name="Audio" parent="." index="0" unique_id=1183742914] +stream = ExtResource("5_vjovb") + +[node name="Occluder" parent="." index="2" unique_id=807216766] +occluder = SubResource("OccluderPolygon2D_vjovb") diff --git a/scenes/musicians/cello.tscn b/scenes/musicians/cello.tscn deleted file mode 100644 index 54469d4..0000000 --- a/scenes/musicians/cello.tscn +++ /dev/null @@ -1,79 +0,0 @@ -[gd_scene format=3 uid="uid://ekd4tkk01nug"] - -[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_cwrgh"] -[ext_resource type="Script" uid="uid://djmn4qgj45j2p" path="res://scenes/musicians/musician.gd" id="2_dthcw"] -[ext_resource type="Texture2D" uid="uid://d1li1mlxutaym" path="res://resources/point_light_texture.tres" id="3_dthcw"] -[ext_resource type="AudioStream" uid="uid://duovjdbif7wkw" path="res://assets/audio/eine-kleine-cello.wav" id="3_pmcee"] -[ext_resource type="PackedScene" uid="uid://cwdkw1p371bks" path="res://scenes/musicians/input_prompt.tscn" id="5_ef0rn"] -[ext_resource type="Texture2D" uid="uid://d1onhhk6xorit" path="res://assets/input/keyboard_c_outline.png" id="6_4j1rk"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_kek77"] -atlas = ExtResource("1_cwrgh") -region = Rect2(224, 32, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_4c57u"] -atlas = ExtResource("1_cwrgh") -region = Rect2(256, 32, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_efxa6"] -atlas = ExtResource("1_cwrgh") -region = Rect2(288, 32, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_5vw27"] -atlas = ExtResource("1_cwrgh") -region = Rect2(192, 32, 32, 32) - -[sub_resource type="SpriteFrames" id="SpriteFrames_dg77c"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_kek77") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_4c57u") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_efxa6") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_kek77") -}], -"loop": true, -"name": &"default", -"speed": 8.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_5vw27") -}], -"loop": true, -"name": &"idle", -"speed": 10.0 -}] - -[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_dg77c"] -polygon = PackedVector2Array(-1, 13, 2, 14, -2, 15) - -[node name="Cello" type="AnimatedSprite2D" unique_id=1539517068] -sprite_frames = SubResource("SpriteFrames_dg77c") -autoplay = "idle" -flip_h = true -script = ExtResource("2_dthcw") - -[node name="Audio" type="AudioStreamPlayer2D" parent="." unique_id=1212448009] -stream = ExtResource("3_pmcee") - -[node name="Light" type="PointLight2D" parent="." unique_id=822750253] -position = Vector2(6, 9) -energy = 0.8 -shadow_enabled = true -shadow_filter = 2 -shadow_filter_smooth = 7.6 -texture = ExtResource("3_dthcw") - -[node name="Occluder" type="LightOccluder2D" parent="." unique_id=1218678921] -position = Vector2(1, 0) -occluder = SubResource("OccluderPolygon2D_dg77c") - -[node name="InputPrompt" parent="." unique_id=590379112 instance=ExtResource("5_ef0rn")] -texture = ExtResource("6_4j1rk") diff --git a/scenes/musicians/conductor.tscn b/scenes/musicians/conductor.tscn new file mode 100644 index 0000000..62771f2 --- /dev/null +++ b/scenes/musicians/conductor.tscn @@ -0,0 +1,21 @@ +[gd_scene format=3 uid="uid://drwm126itwavd"] + +[ext_resource type="PackedScene" uid="uid://c1tceq1kcqngi" path="res://scenes/musicians/musician.tscn" id="1_td0jb"] +[ext_resource type="SpriteFrames" uid="uid://brmhup007maeh" path="res://resources/sprite_frames/conductor_sprite_frames.tres" id="2_lajfc"] +[ext_resource type="Texture2D" uid="uid://bcw48038qg8od" path="res://assets/input/keyboard_r.png" id="3_lajfc"] +[ext_resource type="Texture2D" uid="uid://do6jqp2l6nmwm" path="res://assets/input/keyboard_r_outline.png" id="4_grljo"] +[ext_resource type="AudioStream" uid="uid://b8n6p428csquv" path="res://assets/audio/eine-kleine-click.wav" id="5_grljo"] + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_lajfc"] +polygon = PackedVector2Array(-4, 15, -2, 14, 0, 14) + +[node name="Conductor" unique_id=233159387 instance=ExtResource("1_td0jb")] +sprite_frames = ExtResource("2_lajfc") +solid_texture = ExtResource("3_lajfc") +outline_texture = ExtResource("4_grljo") + +[node name="Audio" parent="." index="0" unique_id=1183742914] +stream = ExtResource("5_grljo") + +[node name="Occluder" parent="." index="2" unique_id=807216766] +occluder = SubResource("OccluderPolygon2D_lajfc") diff --git a/scenes/musicians/musician.tscn b/scenes/musicians/musician.tscn new file mode 100644 index 0000000..c0af220 --- /dev/null +++ b/scenes/musicians/musician.tscn @@ -0,0 +1,22 @@ +[gd_scene format=3 uid="uid://c1tceq1kcqngi"] + +[ext_resource type="Script" uid="uid://djmn4qgj45j2p" path="res://scripts/musician.gd" id="1_ksqn6"] +[ext_resource type="PackedScene" uid="uid://cwdkw1p371bks" path="res://scenes/input_prompt.tscn" id="3_6yfn3"] +[ext_resource type="PackedScene" uid="uid://ckx47081eegis" path="res://scenes/light.tscn" id="3_svwww"] + +[node name="Musician" type="AnimatedSprite2D" unique_id=233159387] +script = ExtResource("1_ksqn6") + +[node name="Audio" type="AudioStreamPlayer2D" parent="." unique_id=1183742914] +unique_name_in_owner = true +autoplay = true + +[node name="Light" parent="." unique_id=428469575 instance=ExtResource("3_svwww")] +unique_name_in_owner = true + +[node name="Occluder" type="LightOccluder2D" parent="." unique_id=807216766] +unique_name_in_owner = true + +[node name="InputPrompt" parent="." unique_id=590379112 instance=ExtResource("3_6yfn3")] +unique_name_in_owner = true +light_mask = 0 diff --git a/scenes/musicians/viol.tscn b/scenes/musicians/viol.tscn deleted file mode 100644 index 8bc85a5..0000000 --- a/scenes/musicians/viol.tscn +++ /dev/null @@ -1,84 +0,0 @@ -[gd_scene format=3 uid="uid://c5mms8bhjkplb"] - -[ext_resource type="Texture2D" uid="uid://42h7vrqekyma" path="res://assets/symphonyguys.png" id="1_j3j2n"] -[ext_resource type="Script" uid="uid://djmn4qgj45j2p" path="res://scenes/musicians/musician.gd" id="2_ijwrm"] -[ext_resource type="AudioStream" uid="uid://bd01iv6fpqbdh" path="res://assets/audio/eine-kleine-viol.wav" id="3_atj5b"] -[ext_resource type="Texture2D" uid="uid://d1li1mlxutaym" path="res://resources/point_light_texture.tres" id="3_ijwrm"] -[ext_resource type="PackedScene" uid="uid://cwdkw1p371bks" path="res://scenes/musicians/input_prompt.tscn" id="5_u4mvl"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_w48qg"] -atlas = ExtResource("1_j3j2n") -region = Rect2(32, 160, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_vivmo"] -atlas = ExtResource("1_j3j2n") -region = Rect2(64, 160, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_2cqfq"] -atlas = ExtResource("1_j3j2n") -region = Rect2(96, 160, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_yaehf"] -atlas = ExtResource("1_j3j2n") -region = Rect2(128, 160, 32, 32) - -[sub_resource type="AtlasTexture" id="AtlasTexture_ycdy4"] -atlas = ExtResource("1_j3j2n") -region = Rect2(0, 160, 32, 32) - -[sub_resource type="SpriteFrames" id="SpriteFrames_074og"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_w48qg") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_vivmo") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_2cqfq") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_yaehf") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_w48qg") -}], -"loop": true, -"name": &"default", -"speed": 15.0 -}, { -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_ycdy4") -}], -"loop": true, -"name": &"idle", -"speed": 12.0 -}] - -[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_ycdy4"] -polygon = PackedVector2Array(0, 13, 3, 13, -1, 14) - -[node name="Viol" type="AnimatedSprite2D" unique_id=173609985] -sprite_frames = SubResource("SpriteFrames_074og") -autoplay = "idle" -script = ExtResource("2_ijwrm") - -[node name="Audio" type="AudioStreamPlayer2D" parent="." unique_id=734284253] -stream = ExtResource("3_atj5b") - -[node name="Light" type="PointLight2D" parent="." unique_id=2065896281] -z_index = 100 -position = Vector2(7, 8) -energy = 0.8 -shadow_enabled = true -shadow_filter = 2 -shadow_filter_smooth = 7.6 -texture = ExtResource("3_ijwrm") - -[node name="Occluder" type="LightOccluder2D" parent="." unique_id=1033753770] -position = Vector2(1, 0) -occluder = SubResource("OccluderPolygon2D_ycdy4") - -[node name="InputPrompt" parent="." unique_id=590379112 instance=ExtResource("5_u4mvl")] diff --git a/scenes/musicians/violinist.tscn b/scenes/musicians/violinist.tscn new file mode 100644 index 0000000..c5b9a2c --- /dev/null +++ b/scenes/musicians/violinist.tscn @@ -0,0 +1,21 @@ +[gd_scene format=3 uid="uid://d2f7skasc4as7"] + +[ext_resource type="PackedScene" uid="uid://c1tceq1kcqngi" path="res://scenes/musicians/musician.tscn" id="1_bgcse"] +[ext_resource type="SpriteFrames" uid="uid://bkq7b1w5jh1ec" path="res://resources/sprite_frames/viol_sprite_frames.tres" id="2_pec4u"] +[ext_resource type="Texture2D" uid="uid://bm53tpx7cbocx" path="res://assets/input/keyboard_v.png" id="3_4d75b"] +[ext_resource type="Texture2D" uid="uid://cctoyonq28i8q" path="res://assets/input/keyboard_v_outline.png" id="4_noys6"] +[ext_resource type="AudioStream" uid="uid://bd01iv6fpqbdh" path="res://assets/audio/eine-kleine-viol.wav" id="5_pec4u"] + +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_pec4u"] +polygon = PackedVector2Array(0, 14, 2, 13, 4, 13) + +[node name="Violinist" unique_id=233159387 instance=ExtResource("1_bgcse")] +sprite_frames = ExtResource("2_pec4u") +solid_texture = ExtResource("3_4d75b") +outline_texture = ExtResource("4_noys6") + +[node name="Audio" parent="." index="0" unique_id=1183742914] +stream = ExtResource("5_pec4u") + +[node name="Occluder" parent="." index="2" unique_id=807216766] +occluder = SubResource("OccluderPolygon2D_pec4u") diff --git a/scripts/conductor.gd b/scripts/conductor.gd deleted file mode 100644 index 281c725..0000000 --- a/scripts/conductor.gd +++ /dev/null @@ -1,23 +0,0 @@ -#@tool -#@icon(icon_path: String) -class_name Conductor -extends Musician -## Documentation comments - -## signal -## enum -## const -## @export var -## var -## @onready var - -## OVERRIDES - - -## CORE - -## PRIVATE/HELPER - -## RECEIVERS - -## SETTERS/GETTERS diff --git a/scripts/conductor.gd.uid b/scripts/conductor.gd.uid deleted file mode 100644 index 440832b..0000000 --- a/scripts/conductor.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://dppf0pasfnksi diff --git a/scripts/main.gd b/scripts/main.gd index e3c2f7f..6c73f53 100644 --- a/scripts/main.gd +++ b/scripts/main.gd @@ -8,10 +8,10 @@ extends Node2D ## enum ## const -@onready var conductor: Conductor = %Conductor -@onready var violinist: Musician = %Viol -@onready var cellist: Musician = %Cello -@onready var bassist: Musician = %Bass +@onready var conductor: Musician = %Conductor +@onready var violinist: Musician = %Violinist +@onready var cellist: Musician = %Cellist +@onready var bassist: Musician = %Bassist #@onready var rhythm_manager: RhythmManager = %RhythmManager #@onready var click_track: AudioStreamPlayer2D = %ClickTrack @onready var canvas_modulate: CanvasModulate = $CanvasModulate diff --git a/scenes/musicians/musician.gd b/scripts/musician.gd similarity index 50% rename from scenes/musicians/musician.gd rename to scripts/musician.gd index abcc0d1..f508ee9 100644 --- a/scenes/musicians/musician.gd +++ b/scripts/musician.gd @@ -6,19 +6,28 @@ extends AnimatedSprite2D # signal # enum -# const -# @export var +#const + +@export_group("Input Textures") +@export var solid_texture: Texture2D +@export var outline_texture: Texture2D + var is_active: bool = false -@onready var audio: AudioStreamPlayer2D = $Audio -@onready var light: PointLight2D = $Light -@onready var occluder: LightOccluder2D = $Occluder +@onready var audio: AudioStreamPlayer2D = %Audio +@onready var light: PointLight2D = %Light +@onready var occluder: LightOccluder2D = %Occluder +@onready var input_prompt: Sprite2D = %InputPrompt ## OVERRIDES func _ready() -> void: light.visible = false audio.connect("finished", enter_exit) + input_prompt.texture = outline_texture + audio.volume_db = -100.0 + is_active = true + func _process(_delta: float) -> void: pass @@ -30,14 +39,18 @@ func _physics_process(_delta: float) -> void: func enter_exit() -> void: if is_active: play("idle") - audio.stop() + #audio.stop() + audio.volume_db = -100.0 light.visible = false is_active = false + input_prompt.texture = outline_texture else: play("default") - audio.play() + #audio.play() + audio.volume_db = 0.0 light.visible = true is_active = true + input_prompt.texture = solid_texture ## PRIVATE/HELPER diff --git a/scenes/musicians/musician.gd.uid b/scripts/musician.gd.uid similarity index 100% rename from scenes/musicians/musician.gd.uid rename to scripts/musician.gd.uid