diff --git a/scenes/dev/components/music/Dev_Archipelago.strudel.js b/scenes/dev/components/music/Dev_Archipelago.strudel.js deleted file mode 100644 index 2a5fbe23b..000000000 --- a/scenes/dev/components/music/Dev_Archipelago.strudel.js +++ /dev/null @@ -1,56 +0,0 @@ -// @title Dev Archipelago -// @by wjt -// Copyright 2026 The Threadbare Authors -// SPDX-License-Identifier: CC-BY-SA-4.0 - -setcpm(136/4) - -var transition = "<[Db^7@2 Db6] Db6 [Db^7@2 Db6] >" -var ch1 = "<[Db^7@2 Db6] Db6 [Db^9@2 Db69] [Db69@2 Do7] [Ebm7@2 Ao7@2 Ab7] Ab7 [Ebm7@3 Ao7] <[Ab7 ~@7] [Ab9 Ab7b9]>>" -var ch2 = "<[Ebm9@2 Ao7] [Ab11 Ab7] [Db^9 Db^7] <[Bb9@2 Eo7] [Db@1 ~@7]>>" -var p = "<0 1@2 2@2 3@2>/8" -var ch = p.pick([transition, ch1, ch2, ch2]) - -$: n(`[1?0.2,2?0.2,3?0.2,4?0.2,5?0.2]*3/2`).struct("x(7,16,2)/2") - .chord(ch).anchor("Ab4").mode("below").voicing() - .velocity("1.0 0.8@3".slow(2)) - .clip(1.2).s("gm_acoustic_guitar_nylon") - .add(note(perlin.range(0,.1))) - .color("cyan") - .gain(0.6) -$: ch.rootNotes("<[2@3 1] [1@2 2] 2 [2|1]>").note().struct("<[x@3 x@3 x@2] [x@2 x x@2 x x@2]>") - .velocity("1.0 0.7@3") - .add(note(perlin.range(0,.1))) - .gain(0.7) - .clip(0.8).s("gm_acoustic_bass").color("magenta") - -$: s("cabasa*8").velocity("[1.0 0.5 0.7 0.5]*2").gain(1.2) -$: s("clave:5(7,16,4)/2").gain(1.4) - -S$: n(p.early(7/8).pick([ - "~", - `< - [~@3 -3 -2 0@2 2@2 0@3 -2@3 0] - [~@4 2 3 4 2@2 0@3 -2@3 2] - [1@7 3 -1@3 -3@4 2] - [1@7 -3 4@8] - >/2`, - `< - [~@2 5@2 3 1@2 -1@9] - [~@2 4@2 2 0@2 -2@4 -2 5@4] - [~@2 5@2 3 1@2 -1@4 0@3 1@2] - [2@8 <~ [~@1 -2 -1 0 1 2 3 4]>@8] - >/2 - `, - `< - [3@2 3@2 5 7@2 6@6 [6 7] 6 5] - [4@3 4@1 6 8@2 7@4 [7 8] 9 8 7 6] - [3@2 3@2 5 7@2 6@5 6 7 8 6] - <[7 ~] [4@8 ~@5 [6 7] 6 5]> - >/2`, -]) -).scale("Db4:major").s("xylophone_medium_ff") - .gain(0.6) - .pan(cosine.range(0.25, 0.75).slow(8)) - -all(x => x.room("0.7:3")) diff --git a/scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg b/scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg deleted file mode 100644 index cba3e154d..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc32e44f2f01939317214fd239ee43dd4981b9373a5489ece1d0c4893b85c154 -size 121072 diff --git a/scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg.import b/scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg.import deleted file mode 100644 index b6b8cb419..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://lqk3h6uh77g" -path="res://.godot/imported/Dev_Archipelago_A_Rhythm.ogg-19d42dfd19c35d50aa32a783a633015b.oggvorbisstr" - -[deps] - -source_file="res://scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg" -dest_files=["res://.godot/imported/Dev_Archipelago_A_Rhythm.ogg-19d42dfd19c35d50aa32a783a633015b.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0.0 -bpm=136.0 -beat_count=32 -bar_beats=4 diff --git a/scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg b/scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg deleted file mode 100644 index ce7f76b5e..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbc0bd26d79134037646a666d2e5d6a66ef02ca52b012e58d080c396facdeab8 -size 173337 diff --git a/scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg.import b/scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg.import deleted file mode 100644 index 8fb6c398a..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://cxtfshe6ajjss" -path="res://.godot/imported/Dev_Archipelago_B_Melody.ogg-844932a716a3b51740afc5e46ce91335.oggvorbisstr" - -[deps] - -source_file="res://scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg" -dest_files=["res://.godot/imported/Dev_Archipelago_B_Melody.ogg-844932a716a3b51740afc5e46ce91335.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0 -bpm=136.0 -beat_count=0 -bar_beats=4 diff --git a/scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg b/scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg deleted file mode 100644 index e0d752457..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2886518212e0d1dc690447750428c4a502cf6e10bf53d1fd718aa48557a2c3f5 -size 237730 diff --git a/scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg.import b/scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg.import deleted file mode 100644 index 2050df963..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://bydb8j0elt7tq" -path="res://.godot/imported/Dev_Archipelago_B_Rhythm.ogg-45e1161de72f36d2df579ae46071e5b5.oggvorbisstr" - -[deps] - -source_file="res://scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg" -dest_files=["res://.godot/imported/Dev_Archipelago_B_Rhythm.ogg-45e1161de72f36d2df579ae46071e5b5.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0 -bpm=136.0 -beat_count=0 -bar_beats=4 diff --git a/scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg b/scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg deleted file mode 100644 index 89c7fa796..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abd0501bd970435f0b6fec25610a50ef52db6ee20e8a8bf8e2a565c2f8591cc5 -size 164161 diff --git a/scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg.import b/scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg.import deleted file mode 100644 index 378800fa1..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://dmh2y0nv2r7gw" -path="res://.godot/imported/Dev_Archipelago_C1_Melody.ogg-c0067cd1c8b7accf9c37618065af80e9.oggvorbisstr" - -[deps] - -source_file="res://scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg" -dest_files=["res://.godot/imported/Dev_Archipelago_C1_Melody.ogg-c0067cd1c8b7accf9c37618065af80e9.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0 -bpm=136.0 -beat_count=0 -bar_beats=4 diff --git a/scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg b/scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg deleted file mode 100644 index 6d946200f..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00c3deade45e9301c0c659c7762c9bc0a1f5f23d0833f72a1910121d23b63f7e -size 169692 diff --git a/scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg.import b/scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg.import deleted file mode 100644 index 3dd49b328..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://bcltrnbs1esw7" -path="res://.godot/imported/Dev_Archipelago_C2_Melody.ogg-66ed0d8f3db50f60407ad60de11268fc.oggvorbisstr" - -[deps] - -source_file="res://scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg" -dest_files=["res://.godot/imported/Dev_Archipelago_C2_Melody.ogg-66ed0d8f3db50f60407ad60de11268fc.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0 -bpm=136.0 -beat_count=0 -bar_beats=4 diff --git a/scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg b/scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg deleted file mode 100644 index 121c97042..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de43db0013668fa7a624b200fa2988ceeafee04e0999e322ce949772dde276d4 -size 239122 diff --git a/scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg.import b/scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg.import deleted file mode 100644 index a3f3eaa21..000000000 --- a/scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="oggvorbisstr" -type="AudioStreamOggVorbis" -uid="uid://de4yund0wfo65" -path="res://.godot/imported/Dev_Archipelago_C_Rhythm.ogg-a89ba4a6045d43c245b845ada459fa05.oggvorbisstr" - -[deps] - -source_file="res://scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg" -dest_files=["res://.godot/imported/Dev_Archipelago_C_Rhythm.ogg-a89ba4a6045d43c245b845ada459fa05.oggvorbisstr"] - -[params] - -loop=true -loop_offset=0 -bpm=136.0 -beat_count=0 -bar_beats=4 diff --git a/scenes/dev/components/music/dev_archipelago_music.tres b/scenes/dev/components/music/dev_archipelago_music.tres deleted file mode 100644 index a75afb0fa..000000000 --- a/scenes/dev/components/music/dev_archipelago_music.tres +++ /dev/null @@ -1,57 +0,0 @@ -[gd_resource type="AudioStreamInteractive" format=3 uid="uid://bxck4xpi66onr"] - -[ext_resource type="AudioStream" uid="uid://lqk3h6uh77g" path="res://scenes/dev/components/music/Dev_Archipelago_A_Rhythm.ogg" id="1_vsr8l"] -[ext_resource type="AudioStream" uid="uid://bydb8j0elt7tq" path="res://scenes/dev/components/music/Dev_Archipelago_B_Rhythm.ogg" id="2_43x7t"] -[ext_resource type="AudioStream" uid="uid://cxtfshe6ajjss" path="res://scenes/dev/components/music/Dev_Archipelago_B_Melody.ogg" id="3_ltmfj"] -[ext_resource type="AudioStream" uid="uid://de4yund0wfo65" path="res://scenes/dev/components/music/Dev_Archipelago_C_Rhythm.ogg" id="4_nqwxv"] -[ext_resource type="AudioStream" uid="uid://dmh2y0nv2r7gw" path="res://scenes/dev/components/music/Dev_Archipelago_C1_Melody.ogg" id="5_rtwt7"] -[ext_resource type="AudioStream" uid="uid://bcltrnbs1esw7" path="res://scenes/dev/components/music/Dev_Archipelago_C2_Melody.ogg" id="6_46ask"] - -[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_elv3o"] -stream_count = 2 -stream_0/stream = ExtResource("2_43x7t") -stream_0/volume = 0.0 -stream_1/stream = ExtResource("3_ltmfj") -stream_1/volume = 0.0 - -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_x3lvp"] -playback_mode = 1 -streams_count = 2 -stream_0/stream = ExtResource("2_43x7t") -stream_1/stream = SubResource("AudioStreamSynchronized_elv3o") - -[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_6vtbr"] -stream_count = 2 -stream_0/stream = ExtResource("4_nqwxv") -stream_0/volume = 0.0 -stream_1/stream = ExtResource("5_rtwt7") -stream_1/volume = 0.0 - -[sub_resource type="AudioStreamSynchronized" id="AudioStreamSynchronized_b0l60"] -stream_count = 2 -stream_0/stream = ExtResource("4_nqwxv") -stream_0/volume = 0.0 -stream_1/stream = ExtResource("6_46ask") -stream_1/volume = 0.0 - -[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_ut7wt"] -playback_mode = 1 -streams_count = 3 -stream_0/stream = ExtResource("4_nqwxv") -stream_1/stream = SubResource("AudioStreamSynchronized_6vtbr") -stream_2/stream = SubResource("AudioStreamSynchronized_b0l60") - -[resource] -clip_count = 3 -clip_0/name = &"A" -clip_0/stream = ExtResource("1_vsr8l") -clip_0/auto_advance = 1 -clip_0/next_clip = 1 -clip_1/name = &"B" -clip_1/stream = SubResource("AudioStreamRandomizer_x3lvp") -clip_1/auto_advance = 1 -clip_1/next_clip = 2 -clip_2/name = &"C" -clip_2/stream = SubResource("AudioStreamRandomizer_ut7wt") -clip_2/auto_advance = 1 -clip_2/next_clip = 1 diff --git a/scenes/dev/dev_archipelago.tscn b/scenes/dev/dev_archipelago.tscn index dadef17cb..4b7593fc5 100644 --- a/scenes/dev/dev_archipelago.tscn +++ b/scenes/dev/dev_archipelago.tscn @@ -53,8 +53,6 @@ [ext_resource type="Script" uid="uid://csev4hv57utxv" path="res://scenes/game_logic/walk_behaviors/character_speeds.gd" id="48_sqpij"] [ext_resource type="AudioStream" uid="uid://c1pdyoycgyb7t" path="res://scenes/dev/components/oi.wav" id="52_rs1iu"] [ext_resource type="Script" uid="uid://djeshbrs3vwnb" path="res://scenes/game_elements/characters/npcs/components/pet_interaction.gd" id="53_a3fwm"] -[ext_resource type="Script" uid="uid://c8405c212rbn6" path="res://scenes/game_elements/props/background_music/components/background_music.gd" id="54_m30mx"] -[ext_resource type="AudioStream" uid="uid://bxck4xpi66onr" path="res://scenes/dev/components/music/dev_archipelago_music.tres" id="55_sfy7j"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_pp1gq"] size = Vector2(64, 64) @@ -483,11 +481,6 @@ script = ExtResource("53_a3fwm") interact_area = NodePath("../InteractArea") sound_effect_player = NodePath("../AudioStreamPlayer2D") -[node name="BackgroundMusic" type="Node" parent="." unique_id=541098766] -script = ExtResource("54_m30mx") -stream = ExtResource("55_sfy7j") -metadata/_custom_type_script = "uid://c8405c212rbn6" - [connection signal="timeout" from="OnTheGround/Node2D/SheepVolleyball/Sheep/PlayerRepel/RepelTimer" to="OnTheGround/Node2D/SheepVolleyball/Sheep/PlayerRepel" method="repel_once"] [connection signal="timeout" from="OnTheGround/Node2D/SheepVolleyball/Sheep2/PlayerRepel2/RepelTimer2" to="OnTheGround/Node2D/SheepVolleyball" method="_on_repel_timer_2_timeout"] [connection signal="timeout" from="OnTheGround/Node2D/SheepVolleyball/Sheep2/PlayerRepel2/RepelTimer2" to="OnTheGround/Node2D/SheepVolleyball/Sheep2/PlayerRepel2" method="repel_once"]