restore soluslunes to vol 5 and move null to vol 8

fixes #4

8 files changed, 103 insertions, 20 deletions

diff --git a/album/homestuck-vol-5.yaml b/album/homestuck-vol-5.yaml
index 063993c4..f2df0a15 100644
--- a/album/homestuck-vol-5.yaml
+++ b/album/homestuck-vol-5.yaml
@@ -469,6 +469,14 @@ Commentary: |-
     <i>Steve Everson:</i>
     This one predates my time on the music team! It started life as a midi called Battle Chorale (obviously, a pun on "battle royale"). It was pretty popular, if I recall correctly, though there wasn’t a lot of fan music around in those days to compare to. Some time after joining the team, one of the other musicians created their own hard rock Chorale remix by that same name! So I updated my old one under a new name, and Albatross and Rad created their Hardchorale remix too. Battle Chorale never made it to publication but these two survived.
 ---
+Track: Electromechanism
+Artists:
+- SolusLunes
+Duration: '2:41'
+URLs:
+- https://www.youtube.com/watch?v=tTV70M0NCLk
+Has Cover Art: false
+---
 Track: Unsheath'd
 Artists:
 - Alex Rosetti
@@ -811,6 +819,14 @@ Commentary: |-
     <i>Alex Rosetti:</i>
     Radiation gave me a MIDI of Savior of the Waking World to remix shortly before he figured out how to do it himself. It's based on a prototype of that song and goes in a completely different direction, complete with a cheesy electric guitar synth. I think the opening ended up sounding really cool, but the rest of it just sounds kind of dumb in its execution, not that the material itself isn't good.
 ---
+Track: Shatterface
+Artists:
+- SolusLunes
+Duration: '2:37'
+URLs:
+- https://www.youtube.com/watch?v=xJQJbjvZXfo
+Has Cover Art: false
+---
 Track: Clockwork Contrivance
 Artists:
 - Clark Powell
@@ -924,6 +940,14 @@ Commentary: |-
     Man, this track goes way back. I’m talking years. One of my really early midi compositions. It sounded like the coolest shit when I was 14. It’s practically unchanged besides being synthesised with non-midi voices. Same instruments and all.
     It’s got a bit more of an... ironic appeal to it now. Still sounds pretty cool though
 ---
+Track: Darkened
+Artists:
+- SolusLunes
+Duration: '2:37'
+URLs:
+- https://www.youtube.com/watch?v=qPttUUIpuNE
+Has Cover Art: false
+---
 Track: Valhalla
 Artists:
 - Kalibration
@@ -1057,6 +1081,16 @@ Art Tags:
 Referenced Tracks:
 - Lotus
 ---
+Track: Endless Heart
+Artists:
+- SolusLunes
+Duration: '6:43'
+URLs:
+- https://www.youtube.com/watch?v=4CrsS_rwjYI
+Has Cover Art: false
+Referenced Tracks:
+- Heart of the Creator
+---
 Track: Candles and Clockwork
 Artists:
 - James Dever
@@ -1151,6 +1185,14 @@ Cover Artists:
 Art Tags:
 - Jade
 ---
+Track: Switchback
+Artists:
+- SolusLunes
+Duration: '4:48'
+URLs:
+- https://www.youtube.com/watch?v=vWShvBb3Zwo
+Has Cover Art: false
+---
 Track: Song of Life
 Artists:
 - Steve Everson
@@ -1163,6 +1205,14 @@ Cover Artists:
 Art Tags:
 - Jade
 ---
+Track: Cathedral of the End
+Artists:
+- SolusLunes
+Duration: '2:02'
+URLs:
+- https://www.youtube.com/watch?v=6ipyUF_7yWA
+Has Cover Art: false
+---
 Track: Descend
 Artists:
 - Toby Fox
diff --git a/album/homestuck-vol-8.yaml b/album/homestuck-vol-8.yaml
index c32527df..b1602f31 100644
--- a/album/homestuck-vol-8.yaml
+++ b/album/homestuck-vol-8.yaml
@@ -842,3 +842,20 @@ Art Tags:
 Commentary: |-
     <i>Mark Hadley:</i>
     Back when we knew Jade as just GG, I wrote the first part of Carefree Action as a possible upbeat strife theme for her. It never ended up getting used, but other people liked it, and eventually a remix of it (Carefree Victory) made it into the comic. The original was pretty short, so I lengthened it so that I could eventually get it onto an album. Like Sburban Reversal, I recommended it as a bonus track.
+---
+Track: 'null'
+Directory: null-vol8
+Artists:
+- Toby Fox
+Duration: 0:09
+URLs:
+- https://www.youtube.com/watch?v=szyzOrxvv10
+Cover Artists:
+- Unknown Artist
+Cover Art File Extension: png
+Referenced Tracks:
+- Penumbra Phantasm
+Commentary: |-
+    <i>Niklink:</i>
+    ([[media:misc/null-reversed-amplified.mp3|Reversed and amplified.]])
+    This track was only included with the album for a brief period of time before being removed without any acknowledgement. In all likelihood, this was just Toby Fox trying to tease people.
diff --git a/album/lofam4.yaml b/album/lofam4.yaml
index 79a6596b..3536bfb5 100644
--- a/album/lofam4.yaml
+++ b/album/lofam4.yaml
@@ -894,7 +894,7 @@ Referenced Tracks:
 - Eternity Served Cold
 - Carne Vale
 - Warhammer of Zillyhoo
-- track:null-toby-fox
+- track:null-vol8
 - Hello Zepp
 - Rabbunctious!
 - The Paradox Paradigm
@@ -960,7 +960,7 @@ Commentary: |-
     - [[Eternity Served Cold]] - 2:48-2:55, 4:27-4:42, 5:49-5:56
     - [[Carne Vale]] - 2:55-3:05
     - [[Warhammer of Zillyhoo]] - 3:55-3:59
-    - [[track:null-toby-fox|null]] - 4:00-4:08
+    - [[track:null-vol8|null]] - 4:00-4:08
     - [[Hello Zepp]] - 4:13-4:27
     - [[Rabbunctious!]] - 4:27-4:31
     - [[The Paradox Paradigm]] - 4:31-4:34, 4:46-4:49 - 5:01-5:04
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index ffd18d47..3f4a690e 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -326,16 +326,6 @@ Duration: '1:53'
 URLs:
 - https://www.youtube.com/watch?v=ANwj8Zm82bA
 ---
-Track: 'null'
-Directory: null-toby-fox
-Artists:
-- Toby Fox
-Duration: 0:08
-URLs:
-- https://www.youtube.com/watch?v=sIgtSvgERB4
-Referenced Tracks:
-- Penumbra Phantasm
----
 Track: Patient
 Artists:
 - Toby Fox
@@ -452,13 +442,6 @@ Duration: '4:25'
 URLs:
 - https://spellmynamewithabang.bandcamp.com/track/song-for-rose-lalonde
 ---
-Track: Switchback
-Artists:
-- SolusLunes
-Duration: '4:48'
-URLs:
-- https://www.youtube.com/watch?v=vWShvBb3Zwo
----
 Track: The Ballad of Jack Noir
 Directory: the-ballad-of-jack-noir-original
 Artists:
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 79dd094c..e8416c37 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -8837,6 +8837,20 @@ URLs:
 - https://www.youtube.com/watch?v=6Nvf9y7G9zU
 - https://battleofthebits.org/arena/Entry/grrrarrr/6241/
 ---
+Track: Heart of the Creator
+Artists:
+- Rob Diaz-Marino
+Duration: '6:44'
+URLs:
+- https://www.youtube.com/watch?v=K3-NZHCnyf4
+- https://soundcloud.com/robdiazmarino/heart-of-the-creator
+Commentary: |-
+    <i>Rob Diaz-Marino:</i>
+    Exploring the depths of the creator's stone body. The final dungeon.
+    Has an epic urgency to it, as if the end is near.
+
+    ([[media:misc/d_creator_cdv1.mid|MIDI file!]])
+---
 Track: Hey! Baby
 Artists:
 - Bruce Channel
diff --git a/album/song-of-skaia.yaml b/album/song-of-skaia.yaml
index d0106321..261f0d6d 100644
--- a/album/song-of-skaia.yaml
+++ b/album/song-of-skaia.yaml
@@ -20,7 +20,6 @@ Groups:
 - Official
 ---
 Track: 'Null'
-Directory: null-mark-hadley
 Duration: '2:32'
 URLs:
 - https://parsecproductions.bandcamp.com/track/null
diff --git a/artists.yaml b/artists.yaml
index 313b87c6..8fe0981f 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -3682,6 +3682,16 @@ Artist: Riri
 ---
 Artist: Rob Cavallo
 ---
+Artist: Rob Diaz-Marino
+Aliases:
+- Draggor
+- Rob DM
+- RDM
+URLs:
+- https://twitter.com/robdiazmarino
+- https://soundcloud.com/robdiazmarino
+- https://draggor.tripod.com/
+---
 Artist: Rob Little
 ---
 Artist: Rob Pereyda
@@ -4119,6 +4129,12 @@ URLs:
 - https://sollay-b.tumblr.com/
 ---
 Artist: SolusLunes
+Aliases:
+- Jared Micks
+Context Notes: |-
+    Around a month after the release of [[album:homestuck-vol-5]], it was noticed that one of SolusLunes' [[track:endless-heart|tracks]] was wholly based on an [[track:heart-of-the-creator|unrelated track]] by someone else. Said track was available as a MIDI file, which makes it quite easy to repurpose and alter existing music.
+
+    In response, SolusLunes claimed that it had been an honest mistake, forgetting that this old track was derivative of someone's else work when asked to submit all the music they could for Volume 5 (this is why the album is so huge). Nevertheless they readily agreed to have all their music removed from the album and to leave the music team.
 ---
 Artist: Somnivus
 ---
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 191fe58e..d114b43a 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -120,6 +120,9 @@ Content: |-
     - added [[album:rust-apocalypse-anniversary-remaster]] by [[artist:willow-ascenzo]]!
     - added [[album:ophiuchus-full-suite]] by [[artist:warxtron]]
     <h3>other additions</h3>
+    - added [[artist:soluslunes|SolusLunes']] six removed tracks back to [[album:homestuck-vol-5]]!
+        - [[track:electromechanism]], [[track:shatterface]], [[track:darkened]], [[track:endless-heart]], [[track:switchback]], [[track:cathedral-of-the-end]]
+            - added [[track:heart-of-the-creator]] and [[artist:rob-diaz-marino]] for references
     - added eight missing bonus tracks to [[album:strife-2]] (thanks, Cello!)
         - [[track:the-king-in-red-beta]], [[track:unite-division-beta]], [[track:arachnofunkia-beta]], [[track:heel-girl-beta]], [[track:daet-with-roze-strife-2]], [[track:dance-of-thorns-karaoke]], [[track:bound-in-blood-beta]], [[track:duet]]
             - added [[track:thin-red-line]] and [[artist:blazblue]] + [[artist:daisuke-ishiwatari]] for references
@@ -191,6 +194,7 @@ Content: |-
     - renamed tracks from [[artist:silvagunner]] to their Bandcamp release names, for ease of reference reading and disambiguation (thanks, vriska/leo!)
         - added specific artists for these tracks too!
         - new artists: [[artist:mth]], [[artist:the-voice-inside-your-head]], [[artist:the-yabba-dabba-mus]], [[artist:zvaari]]
+    - moved [[track:null-vol8]] from [[album:references-beyond-homestuck]] to [[album:homestuck-vol-8]]
     - lyrics fixes for [[track:black]], [[track:friendship-aneurysm]], [[track:indigo-heir]], [[track: temporal-shenanigans]], [[track:austin-atlantis]] also [[track:the-sock-ruse]] (thanks, Celeste!) and [[track:kalesa-in-binondo]] (thanks, Comfy!) AND [[track:looking-for-a-rock]] (thanks, Cello!) AND [[track:today-i-put-jelly-on-this-hot-god]] (thanks, HermitCyclop!) AND [[track:dawn-of-man]] (thanks, Kidpen!) AND [[track:an-apple-disaster]] (thanks, MrCheeze!)
     - removed Bandcamp links for [[track:indigo-archer]] and [[track:temporal-shenanigans]]
     - removed "Cooldown (Beta)" from [[album:unreleased-tracks]] and redirected reference in [[track:alpha-admission]] to [[track:cooldown]]