Merge branch 'staging-yaml' of notabug.org:hsmusic/hsmusic-data into staging-yaml

17 files changed, 89 insertions, 17 deletions

diff --git a/album/alterniabound.yaml b/album/alterniabound.yaml
index 21e2f9f1..4d657363 100644
--- a/album/alterniabound.yaml
+++ b/album/alterniabound.yaml
@@ -358,7 +358,6 @@ Commentary: |-
     <img src="media/misc/requiem-of-sunshine-and-rainbows.jpg" width="350" height="350">
 ---
 Track: Eridan's Theme
-Directory: eridans-theme
 Artists:
 - Toby Fox
 Contributors:
diff --git a/album/ancestral.yaml b/album/ancestral.yaml
index 52a58dc3..6023ff1f 100644
--- a/album/ancestral.yaml
+++ b/album/ancestral.yaml
@@ -1179,7 +1179,7 @@ Art Tags:
 Referenced Tracks:
 - track:fuchsia-ruler
 - Gold Pilot
-- Heir of Grief
+- track:heir-of-grief
 Commentary: |-
     <i>Circlejourney:</i>
     The Doom of the Planets is about Her Imperious Condescension's relationship with the Helmsman throughout her interplanetary conquest. Grandiose orchestral snippets are interspersed with intimate, sometimes dissonant contrapuntal segments featuring motifs from [[Gold Pilot]] and [[track:fuchsia-ruler]]. Eventually the various disparate moods of the piece unite at the climax of the piece, signifying the ship's final leap through the cosmos, which ends in theHelmsman's death, the music fading way as his life does.
diff --git a/album/cool-and-new-volume-2.yaml b/album/cool-and-new-volume-2.yaml
index 2d3bef6d..24b8e7e1 100644
--- a/album/cool-and-new-volume-2.yaml
+++ b/album/cool-and-new-volume-2.yaml
@@ -552,7 +552,7 @@ URLs:
 Art Tags:
 - John
 Referenced Tracks:
-- Heir of Grief
+- track:heir-of-grief
 - Let the Squiddles Sleep (End Theme)
 Sampled Tracks:
 - Let the Squiddles Sleep (End Theme)
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index 8530ef17..ea28b192 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -1077,7 +1077,7 @@ Referenced Tracks:
 - track:mutiny
 - The Beginning of Something Really Excellent
 - Umbral Ultimatum
-- Of Gods and Witches
+- track:of-gods-and-witches
 - track:frost-vol6
 - Sunslammer
 - Atomic Bonsai
diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index 6eae5355..f375bd13 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -899,7 +899,7 @@ URLs:
 - https://www.youtube.com/watch?v=fGvEDsNa6mg
 Referenced Tracks:
 - track:megalovania-halloween
-- Heir of Grief
+- track:heir-of-grief
 - track:sburban-countdown
 - Homestuck Anthem
 Art Tags:
@@ -1045,7 +1045,7 @@ URLs:
 Referenced Tracks:
 - Creata
 - Train
-- Of Gods and Witches
+- track:of-gods-and-witches-vol-10
 - Beatup
 - You Killed My Father (Prepare To Die)
 - Sound Judgement
diff --git a/album/diverging-delicacies.yaml b/album/diverging-delicacies.yaml
index 254cf3aa..45f1b93a 100644
--- a/album/diverging-delicacies.yaml
+++ b/album/diverging-delicacies.yaml
@@ -362,7 +362,7 @@ Art Tags:
 - Earth
 - 'cw: blood'
 Referenced Tracks:
-- Heir of Grief
+- track:heir-of-grief
 - track:theme
 - Purple Bard
 ---
diff --git a/album/homestuck-vol-10.yaml b/album/homestuck-vol-10.yaml
index 6f05af4a..34290800 100644
--- a/album/homestuck-vol-10.yaml
+++ b/album/homestuck-vol-10.yaml
@@ -128,6 +128,8 @@ Commentary: |-
     The next day I landed a job working at a Sake company. True story.
 ---
 Track: Of Gods and Witches
+Directory: of-gods-and-witches-vol-10
+Originally Released As: track:of-gods-and-witches
 Artists:
 - Tensei
 Duration: '4:13'
@@ -152,7 +154,7 @@ Referenced Tracks:
 Commentary: |-
     <i>Tensei:</i>
     For the longest time I considered this a song for Jade, specifically her dog tier transformation. Then I realized, far too late, that Aranea doesn't have a lot of music given her relative importance in the comic!
-    More importantly, this song has some piratey/celcitc jig vibes (partially based on the fight club theme from Assassin's Creed 3), which actually made it a decent fit for Aranea (given her Mindfang alter ego).
+    More importantly, this song has some piratey/celtic jig vibes (partially based on the fight club theme from Assassin's Creed 3), which actually made it a decent fit for Aranea (given her Mindfang alter ego).
     So by the limited powers of canonization invested in me, I hereby pronounce this song's alternative title as "Of Sylphs and Sekrets" and that it may be interpreted as a theme for either Jade or Aranea.
 ---
 Track: Beatup
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 88c672c9..d6a346b9 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -2128,7 +2128,7 @@ Referenced Tracks:
 - Gold Pilot
 - English
 - track:intro-canwave2
-- Of Gods and Witches
+- track:of-gods-and-witches
 - Science Blaster
 - Formation
 - track:sburban-jungle
diff --git a/album/lofam5.yaml b/album/lofam5.yaml
index ea3d00d2..a4924c78 100644
--- a/album/lofam5.yaml
+++ b/album/lofam5.yaml
@@ -217,7 +217,7 @@ Art Tags:
 Referenced Tracks:
 - Penumbra Phantasm
 - track:doctor
-- Heir of Grief
+- track:heir-of-grief
 - Moshi Moshi?
 Commentary: |-
     <i>FrostyMac:</i>
@@ -1261,10 +1261,10 @@ Art Tags:
 - PM
 - Green Sun
 Referenced Tracks:
-- Heir of Grief
+- track:heir-of-grief
 Commentary: |-
     <i>Monckat:</i>
-    You guys all remember that iconic moment in [S] Collide where PM finally steals the sax that Jack’s been using to play Black all this time and uses it to perform a haunting sax rendition of [[Heir of Grief]], right? Yeah me too, thought it was a perfect fit.
+    You guys all remember that iconic moment in [S] Collide where PM finally steals the sax that Jack’s been using to play Black all this time and uses it to perform a haunting sax rendition of [[track:heir-of-grief|Heir of Grief]], right? Yeah me too, thought it was a perfect fit.
 ---
 Track: Collapse Reprise
 Artists:
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 07d2b5a8..0afada89 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -659,6 +659,23 @@ Artists:
 Duration: '4:21'
 URLs:
 - https://www.youtube.com/watch?v=we8DQb_a2u4
+Commentary: |-
+    <i>Tensei:</i>
+    I’ll have to do some explaining for this one: I’ve been messing around with vertically layered music composition, and wanted to do something with problem sleuth (that OTHER mspaint adventure). Feel free to skip my blathering below and just listen to the music though!
+
+    I always felt like PS was at least partially a callback to 90s point ‘n click adventure games along the lines of Grim Fandango, Day of the Tentacle, Monkey Island, Sam & Max, etc. so this song is intended to reflect that. If you imagine PS as a video game, this is the song that would play at the very start of the adventure while our heroes are messing around in their offices and getting caught up in all kinds of shenanigans.
+
+    Now, the nice thing about PS is that the three main characters (Problem Sleuth, Pickle Inspector and Ace Dick) all have some strong themes that make it easy to come up with appropriate musical motifs. In fact, the three musical instruments that appear fairly early in the comic ( A trumpet, a clarinet and a tuba) all are pretty obviously intended as metaphorical representations of the three heroes, which means that as a composer I have my work cut out for me.
+
+    The idea with vertical layering in this song is that depending on which of the protagonists is currently ‘on screen’, the theme uses different motifs and lead instruments: when more than one protagonist is on screen their motifs are played at the same time and combined. Normal playback methods don’t support this kind of interactive music (many game engines do, however), so this particular version is more of a proof of concept that just demonstrates the different layers and highlights how they interact.
+
+    The first section after the intro belongs to Problem Sleuth. He’s the leader of the bunch, and to reflect his mario-esque all-around average strength, his motif is played on a muted trumpet in the middle register with a combination of short and sustained notes. 
+
+    After that we come to Ace Dick. His motif consists of short notes played on a tuba and backed by trombones and timpani to throw some appropriate weight around. 
+
+    Pickle Inspector goes third with sustained notes played in the higher register of a clarinet. He’s a bit of a loopy character so there’s some glockenspiel and a lot of chroma… chromatics? chromaticity? to give it a bit of whimsy
+
+    The fourth loop combines the motifs of all three characters to demonstrate the interaction between layers when all three are present. The final loop is a variation on the Problem Sleuth motif with an added theremin and a delay effect on all the instruments to give it a ‘spacy’ sound: we’re entering the realm of imagination and the music becomes appropriately screwy.
 ---
 Track: Mayorlovania
 Artists:
diff --git a/album/of-troles-and-chiptumes.yaml b/album/of-troles-and-chiptumes.yaml
index 3478de55..9d3faa78 100644
--- a/album/of-troles-and-chiptumes.yaml
+++ b/album/of-troles-and-chiptumes.yaml
@@ -29,6 +29,7 @@ Commentary:
     <img src="media/misc/Of Troles and Chiptunes - Album Art Prototype.png" width="400" height="400">
 
     <i>Ngame:</i>
+    
     (<a href="https://www.youtube.com/watch?v=OHjiWhS4Zks&t=1h29m08s">Community listening stream w/ chat</a>)
 ---
 Group: Main album
diff --git a/album/p-s.yaml b/album/p-s.yaml
index 4384ed5e..c38546f1 100644
--- a/album/p-s.yaml
+++ b/album/p-s.yaml
@@ -196,7 +196,7 @@ Duration: '3:33'
 URLs:
 - https://casualsunday.bandcamp.com/track/heir-of-grief-8-bit
 Referenced Tracks:
-- Heir of Grief
+- track:heir-of-grief
 ---
 Track: '[S]ynchronize'
 Artists:
diff --git a/album/s-collide.yaml b/album/s-collide.yaml
index d30a9522..313e6ecb 100644
--- a/album/s-collide.yaml
+++ b/album/s-collide.yaml
@@ -87,6 +87,7 @@ Referenced Tracks:
 - Typheus
 ---
 Track: Heir of Grief
+Directory: heir-of-grief-collide
 Artists:
 - Tensei
 Contributors:
@@ -102,7 +103,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/heir-of-grief-2
 - https://youtu.be/Es5mh7pBeec
 Referenced Tracks:
-- Heir Conditioning
+- track:heir-of-grief
 - Typheus
 Commentary: |-
     <i>James Roach:</i>
diff --git a/album/songs-unsung.yaml b/album/songs-unsung.yaml
new file mode 100644
index 00000000..39f5ea91
--- /dev/null
+++ b/album/songs-unsung.yaml
@@ -0,0 +1,51 @@
+Album: Songs Unsung
+Artists:
+- Tensei
+Date: August 14, 2014
+Date Added: May 23, 2022
+URLs:
+- https://tenseimusic.bandcamp.com/album/songs-unsung
+Cover Artists:
+- Tensei
+Has Track Art: false
+Cover Art File Extension: png
+Color: '#f6bd0e'
+Groups:
+- Fandom
+- Tensei
+Commentary:
+    <i>Tensei:</i>
+
+    I’m releasing an EP containing some of the stuff that I’ve posted before, including among others the 5 minute ‘epic’ metal rearrangement of [[track:heir-conditioning|Heir Conditioning]].
+---
+Track: Before the Rains Come
+Duration: '01:44'
+URLs:
+- https://tenseimusic.bandcamp.com/track/before-the-rains-come
+---
+Track: Heir of Grief
+Directory: heir-of-grief
+Duration: '05:22'
+URLs:
+- https://tenseimusic.bandcamp.com/track/heir-of-grief
+- https://www.youtube.com/watch?v=U_icK3AHDgc
+Referenced Tracks:
+- Heir Conditioning
+---
+Track: Of Gods and Witches
+Duration: '04:13'
+URLs:
+- https://tenseimusic.bandcamp.com/track/of-gods-and-witches
+- https://www.youtube.com/watch?v=FpBfNFGA8qY
+Referenced Tracks:
+- track:doctor
+---
+Track: Peaches and Curry
+Duration: '02:01'
+URLs:
+- https://tenseimusic.bandcamp.com/track/peaches-and-curry
+---
+Track: Lighten Up
+Duration: '02:12'
+URLs:
+- https://tenseimusic.bandcamp.com/track/lighten-up
\ No newline at end of file
diff --git a/album/theres-no-place-like-home.yaml b/album/theres-no-place-like-home.yaml
index 3fc0b4f4..9b60e822 100644
--- a/album/theres-no-place-like-home.yaml
+++ b/album/theres-no-place-like-home.yaml
@@ -149,7 +149,7 @@ Referenced Tracks:
 - Moonsetter
 - Gaia Queen
 - Atomic Bonsai
-- Of Gods and Witches
+- track:of-gods-and-witches
 - Cyan Beast
 - Olive Rogue
 - track:ohgodwhat
@@ -204,7 +204,7 @@ Referenced Tracks:
 - Penumbra Phantasm
 - Thanks for Playing
 - Cascade (Beta)
-- Heir of Grief
+- track:heir-of-grief
 - track:doctor
 - Descend
 ---
diff --git a/flashes.yaml b/flashes.yaml
index aed6a406..78ff5a17 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -1546,7 +1546,7 @@ Featured Tracks:
 - Creata (Canon Edit)
 - Oppa Toby Style
 - Eternity, Served Cold (Canon Edit)
-- Heir of Grief
+- track:heir-of-grief-collide
 Flash: '[S] Collide.'
 Page: '8087'
 ---
diff --git a/static-pages.yaml b/static-pages.yaml
index 664c2f06..6f5a9d1e 100644
--- a/static-pages.yaml
+++ b/static-pages.yaml
@@ -138,6 +138,7 @@ Content: |-
         - new artists: [[artist:blue-lennox]], [[artist:cassandraooc]], [[artist:feidlimid]], [[artist:jordan-chin]], [[artist:madipup]], [[artist:mercy-rose]], [[artist:nattysashy]], [[artist:robogauntlet]], [[artist:slamalama1]], [[artist:tunesofjasmine]], [[artist:valdotpng]], [[artist:vance-duche]]
         - new [[album:references-beyond-homestuck|referenced non-homestuck tracks]]: [[track:drift-away]], [[track:havent-you-noticed-im-a-star]], [[track:lapis-lazuli]], [[track:peace-and-love-on-the-planet-earth]], [[track:tower-of-mistakes]], [[track:we-are-the-crystal-gems]], [[track:whats-the-use-of-feeling-blue]]
             - new artists for these: [[artist:aimee-mann]], [[artist:aivi-and-surasshu]], [[artist:deedee-magno-hall]], [[artist:hellen-jo]], [[artist:jeff-ball]], [[artist:jeff-liu]], [[artist:michaela-dietz]], [[artist:olivia-olson]], [[artist:patti-lupone]], [[artist:sarah-stiles]], [[artist:shelby-rabara]], [[artist:stemage]], [[artist:tom-scharpling]], [[artist:zach-callison]]
+    - added [[album:songs-unsung]] by [[group:tensei]]!
     - added [[album:exile]] by [[artist:bill-bolin]]!
         - [[track:strider-showdown-loop]] is now here instead of in [[album:unreleased-tracks]]
     - added [[album:heinoustuck-vol-1]]!