From 77c8195ba94490d6a0d3c59f6a967b740e564d01 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 14 Mar 2026 23:57:31 -0400 Subject: [PATCH] refactored. very tired. --- project.godot | 4 ++ scenes/levels/level.tscn | 38 ++++++++++ scenes/levels/level_0.tscn | 19 +++++ scenes/levels/level_1.tscn | 16 +++++ scenes/levels/level_2.tscn | 13 ++++ scenes/levels/level_3.tscn | 10 +++ scenes/musicians/bassist.tscn | 13 +++- scenes/musicians/cellist.tscn | 14 +++- scenes/musicians/conductor.tscn | 2 - scenes/musicians/musician.tscn | 14 +++- scenes/musicians/violinist.tscn | 13 +++- scenes/{main.tscn => tilemaps.tscn} | 99 +++++---------------------- scripts/level.gd | 51 ++++++++++++++ scripts/{main.gd.uid => level.gd.uid} | 0 scripts/main.gd | 53 -------------- scripts/musician.gd | 4 +- scripts/scene_manager.gd | 31 +++++++++ scripts/scene_manager.gd.uid | 1 + scripts/tilemaps.gd | 32 +++++++++ scripts/tilemaps.gd.uid | 1 + 20 files changed, 285 insertions(+), 143 deletions(-) create mode 100644 scenes/levels/level.tscn create mode 100644 scenes/levels/level_0.tscn create mode 100644 scenes/levels/level_1.tscn create mode 100644 scenes/levels/level_2.tscn create mode 100644 scenes/levels/level_3.tscn rename scenes/{main.tscn => tilemaps.tscn} (57%) create mode 100644 scripts/level.gd rename scripts/{main.gd.uid => level.gd.uid} (100%) delete mode 100644 scripts/main.gd create mode 100644 scripts/scene_manager.gd create mode 100644 scripts/scene_manager.gd.uid create mode 100644 scripts/tilemaps.gd create mode 100644 scripts/tilemaps.gd.uid diff --git a/project.godot b/project.godot index 34b7d6d..bcbfe5a 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,10 @@ run/main_scene="uid://irgt7rn5kfap" config/features=PackedStringArray("4.6", "Forward Plus") config/icon="res://icon.svg" +[autoload] + +SceneManager="*uid://cu715fqwadsd" + [display] window/size/viewport_width=1280 diff --git a/scenes/levels/level.tscn b/scenes/levels/level.tscn new file mode 100644 index 0000000..caad158 --- /dev/null +++ b/scenes/levels/level.tscn @@ -0,0 +1,38 @@ +[gd_scene format=3 uid="uid://irgt7rn5kfap"] + +[ext_resource type="Script" uid="uid://bjv7i1kmivfai" path="res://scripts/level.gd" id="1_5vw27"] +[ext_resource type="PackedScene" uid="uid://r5ec5td6b2b2" path="res://scenes/tilemaps.tscn" id="3_mbbpy"] +[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"] + +[node name="Level" type="Node2D" unique_id=1319338792] +y_sort_enabled = true +script = ExtResource("1_5vw27") + +[node name="Tilemaps" parent="." unique_id=875292520 instance=ExtResource("3_mbbpy")] + +[node name="Camera2D" type="Camera2D" parent="." unique_id=1314238347] +position = Vector2(-6, 15) +zoom = Vector2(8, 8) + +[node name="Musicians" type="Node2D" parent="." unique_id=237973745] +y_sort_enabled = true +position = Vector2(7, -6) + +[node name="Conductor" parent="Musicians" unique_id=338073346 instance=ExtResource("8_tipki")] +unique_name_in_owner = true +position = Vector2(9, 32) + +[node name="Cellist" parent="Musicians" unique_id=233159387 instance=ExtResource("6_85g3d")] +unique_name_in_owner = true +position = Vector2(18, 9) + +[node name="Violinist" parent="Musicians" unique_id=557143802 instance=ExtResource("7_choun")] +unique_name_in_owner = true +position = Vector2(-48, 26) + +[node name="Bassist" parent="Musicians" unique_id=884981738 instance=ExtResource("8_ya4ey")] +unique_name_in_owner = true +position = Vector2(-32, -1) diff --git a/scenes/levels/level_0.tscn b/scenes/levels/level_0.tscn new file mode 100644 index 0000000..276026c --- /dev/null +++ b/scenes/levels/level_0.tscn @@ -0,0 +1,19 @@ +[gd_scene format=3 uid="uid://1mhb537c1qxd"] + +[ext_resource type="PackedScene" uid="uid://irgt7rn5kfap" path="res://scenes/levels/level.tscn" id="1_sxr8l"] + +[node name="Level0" unique_id=1319338792 instance=ExtResource("1_sxr8l")] + +[node name="Cellist" parent="Musicians" parent_id_path=PackedInt32Array(237973745) index="1" unique_id=233159387] +visible = false + +[node name="Violinist" parent="Musicians" parent_id_path=PackedInt32Array(237973745) index="2" unique_id=557143802] +visible = false + +[node name="Bassist" parent="Musicians" parent_id_path=PackedInt32Array(237973745) index="3" unique_id=884981738] +visible = false + +[editable path="Musicians/Conductor"] +[editable path="Musicians/Cellist"] +[editable path="Musicians/Violinist"] +[editable path="Musicians/Bassist"] diff --git a/scenes/levels/level_1.tscn b/scenes/levels/level_1.tscn new file mode 100644 index 0000000..8d88fad --- /dev/null +++ b/scenes/levels/level_1.tscn @@ -0,0 +1,16 @@ +[gd_scene format=3 uid="uid://dwqw0ieu8smw7"] + +[ext_resource type="PackedScene" uid="uid://irgt7rn5kfap" path="res://scenes/levels/level.tscn" id="1_x6ivy"] + +[node name="Level1" unique_id=1319338792 instance=ExtResource("1_x6ivy")] + +[node name="Cellist" parent="Musicians" parent_id_path=PackedInt32Array(237973745) index="1" unique_id=233159387] +visible = false + +[node name="Violinist" parent="Musicians" parent_id_path=PackedInt32Array(237973745) index="2" unique_id=557143802] +visible = false + +[editable path="Musicians/Conductor"] +[editable path="Musicians/Cellist"] +[editable path="Musicians/Violinist"] +[editable path="Musicians/Bassist"] diff --git a/scenes/levels/level_2.tscn b/scenes/levels/level_2.tscn new file mode 100644 index 0000000..f268445 --- /dev/null +++ b/scenes/levels/level_2.tscn @@ -0,0 +1,13 @@ +[gd_scene format=3 uid="uid://cdbfis58lkruf"] + +[ext_resource type="PackedScene" uid="uid://irgt7rn5kfap" path="res://scenes/levels/level.tscn" id="1_j2425"] + +[node name="Level2" unique_id=1319338792 instance=ExtResource("1_j2425")] + +[node name="Violinist" parent="Musicians" parent_id_path=PackedInt32Array(237973745) index="2" unique_id=557143802] +visible = false + +[editable path="Musicians/Conductor"] +[editable path="Musicians/Cellist"] +[editable path="Musicians/Violinist"] +[editable path="Musicians/Bassist"] diff --git a/scenes/levels/level_3.tscn b/scenes/levels/level_3.tscn new file mode 100644 index 0000000..92af282 --- /dev/null +++ b/scenes/levels/level_3.tscn @@ -0,0 +1,10 @@ +[gd_scene format=3 uid="uid://ccoc6j4r7yixt"] + +[ext_resource type="PackedScene" uid="uid://irgt7rn5kfap" path="res://scenes/levels/level.tscn" id="1_o8c3j"] + +[node name="Level3" unique_id=1319338792 instance=ExtResource("1_o8c3j")] + +[editable path="Musicians/Conductor"] +[editable path="Musicians/Cellist"] +[editable path="Musicians/Violinist"] +[editable path="Musicians/Bassist"] diff --git a/scenes/musicians/bassist.tscn b/scenes/musicians/bassist.tscn index e014386..99d04b6 100644 --- a/scenes/musicians/bassist.tscn +++ b/scenes/musicians/bassist.tscn @@ -5,9 +5,10 @@ [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"] +[ext_resource type="PackedScene" uid="uid://r5ec5td6b2b2" path="res://scenes/tilemaps.tscn" id="6_qpy72"] [sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_58d2m"] -polygon = PackedVector2Array(-2, 14, 2, 14, 3, 15) +polygon = PackedVector2Array(-2, 13, 3, 14, 6, 13) [node name="Bassist" unique_id=233159387 instance=ExtResource("1_ec361")] sprite_frames = ExtResource("2_58d2m") @@ -17,5 +18,15 @@ outline_texture = ExtResource("4_5nfdv") [node name="Audio" parent="." index="0" unique_id=1183742914] stream = ExtResource("5_58d2m") +[node name="Light" parent="." index="1" unique_id=428469575] +position = Vector2(7, 7) + [node name="Occluder" parent="." index="2" unique_id=807216766] occluder = SubResource("OccluderPolygon2D_58d2m") + +[node name="InputPrompt" parent="." index="3" unique_id=590379112] +position = Vector2(18, 4) +texture = ExtResource("4_5nfdv") + +[node name="Tilemaps" parent="." index="4" unique_id=875292520 instance=ExtResource("6_qpy72")] +visible = false diff --git a/scenes/musicians/cellist.tscn b/scenes/musicians/cellist.tscn index 95e21aa..810c283 100644 --- a/scenes/musicians/cellist.tscn +++ b/scenes/musicians/cellist.tscn @@ -5,17 +5,29 @@ [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"] +[ext_resource type="PackedScene" uid="uid://r5ec5td6b2b2" path="res://scenes/tilemaps.tscn" id="6_vmq6l"] [sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_vjovb"] -polygon = PackedVector2Array(-4, 13, -1, 13, 0, 14) +polygon = PackedVector2Array(-4, 16, -7, 14, 0, 13) [node name="Cellist" unique_id=233159387 instance=ExtResource("1_gkxwc")] sprite_frames = ExtResource("2_3cfa0") +flip_h = true 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="Light" parent="." index="1" unique_id=428469575] +position = Vector2(8, 5) + [node name="Occluder" parent="." index="2" unique_id=807216766] occluder = SubResource("OccluderPolygon2D_vjovb") + +[node name="InputPrompt" parent="." index="3" unique_id=590379112] +position = Vector2(17, 3) +texture = ExtResource("4_vmq6l") + +[node name="Tilemaps" parent="." index="4" unique_id=875292520 instance=ExtResource("6_vmq6l")] +visible = false diff --git a/scenes/musicians/conductor.tscn b/scenes/musicians/conductor.tscn index 62771f2..1c64bd7 100644 --- a/scenes/musicians/conductor.tscn +++ b/scenes/musicians/conductor.tscn @@ -1,7 +1,6 @@ [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"] @@ -10,7 +9,6 @@ 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") diff --git a/scenes/musicians/musician.tscn b/scenes/musicians/musician.tscn index c0af220..3c0cd2e 100644 --- a/scenes/musicians/musician.tscn +++ b/scenes/musicians/musician.tscn @@ -1,11 +1,20 @@ [gd_scene format=3 uid="uid://c1tceq1kcqngi"] +[ext_resource type="SpriteFrames" uid="uid://brmhup007maeh" path="res://resources/sprite_frames/conductor_sprite_frames.tres" id="1_7bqbn"] [ext_resource type="Script" uid="uid://djmn4qgj45j2p" path="res://scripts/musician.gd" id="1_ksqn6"] +[ext_resource type="Texture2D" uid="uid://do6jqp2l6nmwm" path="res://assets/input/keyboard_r_outline.png" id="2_6yfn3"] [ext_resource type="PackedScene" uid="uid://cwdkw1p371bks" path="res://scenes/input_prompt.tscn" id="3_6yfn3"] +[ext_resource type="Texture2D" uid="uid://bcw48038qg8od" path="res://assets/input/keyboard_r.png" id="3_pbwia"] [ext_resource type="PackedScene" uid="uid://ckx47081eegis" path="res://scenes/light.tscn" id="3_svwww"] +[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_1d8vp"] +polygon = PackedVector2Array(-4, 14, -1, 13, 0, 14) + [node name="Musician" type="AnimatedSprite2D" unique_id=233159387] +sprite_frames = ExtResource("1_7bqbn") script = ExtResource("1_ksqn6") +solid_texture = ExtResource("2_6yfn3") +outline_texture = ExtResource("3_pbwia") [node name="Audio" type="AudioStreamPlayer2D" parent="." unique_id=1183742914] unique_name_in_owner = true @@ -13,10 +22,13 @@ autoplay = true [node name="Light" parent="." unique_id=428469575 instance=ExtResource("3_svwww")] unique_name_in_owner = true +position = Vector2(4, 9) [node name="Occluder" type="LightOccluder2D" parent="." unique_id=807216766] unique_name_in_owner = true +occluder = SubResource("OccluderPolygon2D_1d8vp") [node name="InputPrompt" parent="." unique_id=590379112 instance=ExtResource("3_6yfn3")] unique_name_in_owner = true -light_mask = 0 +position = Vector2(11, 8) +texture = ExtResource("2_6yfn3") diff --git a/scenes/musicians/violinist.tscn b/scenes/musicians/violinist.tscn index c5b9a2c..80f6c46 100644 --- a/scenes/musicians/violinist.tscn +++ b/scenes/musicians/violinist.tscn @@ -5,9 +5,10 @@ [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"] +[ext_resource type="PackedScene" uid="uid://r5ec5td6b2b2" path="res://scenes/tilemaps.tscn" id="6_4d75b"] [sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_pec4u"] -polygon = PackedVector2Array(0, 14, 2, 13, 4, 13) +polygon = PackedVector2Array(-1, 14, 2, 13, 4, 13) [node name="Violinist" unique_id=233159387 instance=ExtResource("1_bgcse")] sprite_frames = ExtResource("2_pec4u") @@ -17,5 +18,15 @@ outline_texture = ExtResource("4_noys6") [node name="Audio" parent="." index="0" unique_id=1183742914] stream = ExtResource("5_pec4u") +[node name="Light" parent="." index="1" unique_id=428469575] +position = Vector2(7, 7) + [node name="Occluder" parent="." index="2" unique_id=807216766] occluder = SubResource("OccluderPolygon2D_pec4u") + +[node name="InputPrompt" parent="." index="3" unique_id=590379112] +position = Vector2(18, 4) +texture = ExtResource("4_noys6") + +[node name="Tilemaps" parent="." index="4" unique_id=875292520 instance=ExtResource("6_4d75b")] +visible = false diff --git a/scenes/main.tscn b/scenes/tilemaps.tscn similarity index 57% rename from scenes/main.tscn rename to scenes/tilemaps.tscn index 511f411..b0bccbc 100644 --- a/scenes/main.tscn +++ b/scenes/tilemaps.tscn @@ -1,16 +1,12 @@ -[gd_scene format=4 uid="uid://irgt7rn5kfap"] +[gd_scene format=4 uid="uid://r5ec5td6b2b2"] -[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://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"] +[ext_resource type="Script" uid="uid://dfyxb4u0rfayk" path="res://scripts/tilemaps.gd" id="1_arm6k"] +[ext_resource type="Texture2D" uid="uid://cs47f2rurekyx" path="res://assets/tiles/floor_wood_01-32x16.png" id="1_bpdrm"] +[ext_resource type="Texture2D" uid="uid://du5d58gs5hbv1" path="res://assets/tiles/Flat_Wood_01-SE-64x96-scaled-down.png" id="2_arm6k"] +[ext_resource type="Texture2D" uid="uid://bt1tsd8ahetqy" path="res://assets/tiles/Flat_Wood_01_WindowA-SE-64x96-scaled-down.png" id="3_67w8y"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_h2yge"] -texture = ExtResource("2_0xm2m") +texture = ExtResource("1_bpdrm") texture_region_size = Vector2i(32, 16) 0:0/0 = 0 1:0/0 = 0 @@ -37,7 +33,7 @@ tile_size = Vector2i(32, 16) sources/5 = SubResource("TileSetAtlasSource_h2yge") [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_dg77c"] -texture = ExtResource("10_dg77c") +texture = ExtResource("2_arm6k") texture_region_size = Vector2i(16, 24) 0:0/0 = 0 1:0/0 = 0 @@ -65,7 +61,7 @@ texture_region_size = Vector2i(16, 24) 5:3/0 = 0 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_w48qg"] -texture = ExtResource("10_ycdy4") +texture = ExtResource("3_67w8y") texture_region_size = Vector2i(16, 24) 0:0/0 = 0 1:0/0 = 0 @@ -99,7 +95,7 @@ sources/0 = SubResource("TileSetAtlasSource_dg77c") sources/1 = SubResource("TileSetAtlasSource_w48qg") [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ycdy4"] -texture = ExtResource("10_dg77c") +texture = ExtResource("2_arm6k") texture_region_size = Vector2i(16, 24) 0:0/0 = 0 1:0/0 = 0 @@ -127,7 +123,7 @@ texture_region_size = Vector2i(16, 24) 5:3/0 = 0 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_vivmo"] -texture = ExtResource("10_ycdy4") +texture = ExtResource("3_67w8y") texture_region_size = Vector2i(16, 24) 0:0/0 = 0 1:0/0 = 0 @@ -160,84 +156,23 @@ tile_size = Vector2i(32, 16) sources/0 = SubResource("TileSetAtlasSource_ycdy4") sources/1 = SubResource("TileSetAtlasSource_vivmo") -[node name="Main" type="Node2D" unique_id=1319338792] -y_sort_enabled = true -script = ExtResource("1_5vw27") +[node name="Tilemaps" type="Node2D" unique_id=875292520] +script = ExtResource("1_arm6k") -[node name="Camera2D" type="Camera2D" parent="." unique_id=1314238347] -position = Vector2(-6, 15) -zoom = Vector2(8, 8) - -[node name="Musicians" type="Node2D" parent="." unique_id=237973745] -y_sort_enabled = true -position = Vector2(7, -6) - -[node name="Conductor" parent="Musicians" unique_id=338073346 instance=ExtResource("8_tipki")] -unique_name_in_owner = true -position = Vector2(9, 32) - -[node name="Light" parent="Musicians/Conductor" index="1" unique_id=428469575] -position = Vector2(4, 9) - -[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 -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] +[node name="Stage" type="TileMapLayer" parent="." unique_id=1731864373] z_index = -10 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] +[node name="BackLeftWalls" type="TileMapLayer" parent="." unique_id=350809361] z_index = 1 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] +[node name="BackRightWalls" type="TileMapLayer" parent="." unique_id=588485930] position = Vector2(0, -8) 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"] +[node name="CanvasModulate" type="CanvasModulate" parent="." unique_id=488909628] +color = Color(0.34901962, 0.34901962, 0.34901962, 1) diff --git a/scripts/level.gd b/scripts/level.gd new file mode 100644 index 0000000..8d16a4d --- /dev/null +++ b/scripts/level.gd @@ -0,0 +1,51 @@ +#@tool +#@icon(icon_path: String) +class_name Level +extends Node2D +## Documentation comments + +#signal +#enum +#const + +@export var level_number: int = 0 + +# Musicians +@onready var conductor: Musician = %Conductor +@onready var violinist: Musician = %Violinist +@onready var cellist: Musician = %Cellist +@onready var bassist: Musician = %Bassist +@onready var tilemaps: Tilemaps = $Tilemaps + + + + +## OVERRIDES + +func _ready() -> void: + tilemaps.canvas_modulate.visible = true + SceneManager.build_level(level_number) + +#func _process(_delta: float) -> void: + #pass +# +#func _physics_process(_delta: float) -> void: + #pass + +func _unhandled_input(event: InputEvent) -> void: + if event.is_action_pressed("ready"): + conductor.enter_exit() + if event.is_action_pressed("viol"): + violinist.enter_exit() + if event.is_action_pressed("cello"): + cellist.enter_exit() + if event.is_action_pressed("bass"): + bassist.enter_exit() + +## CORE + +## PRIVATE/HELPER + +## RECEIVERS + +## SETTERS/GETTERS diff --git a/scripts/main.gd.uid b/scripts/level.gd.uid similarity index 100% rename from scripts/main.gd.uid rename to scripts/level.gd.uid diff --git a/scripts/main.gd b/scripts/main.gd deleted file mode 100644 index 6c73f53..0000000 --- a/scripts/main.gd +++ /dev/null @@ -1,53 +0,0 @@ -#@tool -#@icon(icon_path: String) -#class_name MyNode -extends Node2D -## Documentation comments - -## signal -## enum -## const - -@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 - -## OVERRIDES - -func _ready() -> void: - canvas_modulate.visible = true - -func _process(_delta: float) -> void: - pass - -func _physics_process(_delta: float) -> void: - pass - -func _unhandled_input(event: InputEvent) -> void: - if event.is_action_pressed("ready"): - conductor.enter_exit() - if event.is_action_pressed("viol"): - violinist.enter_exit() - if event.is_action_pressed("cello"): - cellist.enter_exit() - if event.is_action_pressed("bass"): - bassist.enter_exit() -## CORE -# -#func enter_instrument(instrument: Node) -> void: - #print("Now playing " + instrument.name) - #var instrument_audio: AudioStreamPlayer2D = instrument.get_child(0) - #var instrument_light: PointLight2D = instrument.get_child(1) - #instrument.play("default") - #instrument_audio.play() - #instrument_light.visible = true - -## PRIVATE/HELPER - -## RECEIVERS - -## SETTERS/GETTERS diff --git a/scripts/musician.gd b/scripts/musician.gd index f508ee9..459d723 100644 --- a/scripts/musician.gd +++ b/scripts/musician.gd @@ -4,8 +4,8 @@ class_name Musician extends AnimatedSprite2D ## Documentation comments -# signal -# enum +#signal +#enum #const @export_group("Input Textures") diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd new file mode 100644 index 0000000..f022130 --- /dev/null +++ b/scripts/scene_manager.gd @@ -0,0 +1,31 @@ +#@tool +#@icon(icon_path: String) +extends Node +## Documentation comments + +#signal +#enum +#const +#@export var +var levels: Array[Level] +var current_level: Level +#@onready var + +## OVERRIDES + +func _ready() -> void: + pass + +#func _process(_delta: float) -> void: + #pass + + +## CORE +func build_level(level_number: int) -> void: + print_debug("Building level #%s" % level_number) + +## PRIVATE/HELPER + +## RECEIVERS + +## SETTERS/GETTERS diff --git a/scripts/scene_manager.gd.uid b/scripts/scene_manager.gd.uid new file mode 100644 index 0000000..24e3689 --- /dev/null +++ b/scripts/scene_manager.gd.uid @@ -0,0 +1 @@ +uid://cu715fqwadsd diff --git a/scripts/tilemaps.gd b/scripts/tilemaps.gd new file mode 100644 index 0000000..fca2c73 --- /dev/null +++ b/scripts/tilemaps.gd @@ -0,0 +1,32 @@ +#@tool +#@icon(icon_path: String) +class_name Tilemaps +extends Node2D +## Documentation comments + +#signal +#enum +#const +#@export var +#var + +@onready var canvas_modulate: CanvasModulate = $CanvasModulate + +## OVERRIDES + +func _ready() -> void: + pass + +func _process(_delta: float) -> void: + pass + +func _physics_process(_delta: float) -> void: + pass + +## CORE + +## PRIVATE/HELPER + +## RECEIVERS + +## SETTERS/GETTERS diff --git a/scripts/tilemaps.gd.uid b/scripts/tilemaps.gd.uid new file mode 100644 index 0000000..7438d26 --- /dev/null +++ b/scripts/tilemaps.gd.uid @@ -0,0 +1 @@ +uid://dfyxb4u0rfayk