handle referenced re-releases more consistently

6 files changed, 27 insertions, 14 deletions

diff --git a/album/cool-and-new-voulem1.yaml b/album/cool-and-new-voulem1.yaml
index 7d65e86..7de2c0b 100644
--- a/album/cool-and-new-voulem1.yaml
+++ b/album/cool-and-new-voulem1.yaml
@@ -1050,10 +1050,10 @@ Cover Art File Extension: jpg
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/lame-and-old-webcomic-voluem-10-mega-milx
 - https://www.youtube.com/watch?v=asM4qGQ35z4
-Referenced Tracks:
+Sampled Tracks:
 - Creata
 - Train
-- track:of-gods-and-witches-vol-10
+- track:of-gods-and-witches
 - Beatup
 - You Killed My Father (Prepare To Die)
 - Sound Judgement
diff --git a/album/hiveswap-act-2-ost.yaml b/album/hiveswap-act-2-ost.yaml
index 741306e..17bc37c 100644
--- a/album/hiveswap-act-2-ost.yaml
+++ b/album/hiveswap-act-2-ost.yaml
@@ -73,7 +73,6 @@ URLs:
 - https://youtu.be/S42nK1sihuc
 ---
 Track: Studio Space
-Originally Released As: Charun's Cave
 Artists:
 - Toby Fox
 Duration: '1:02'
@@ -93,13 +92,20 @@ Referenced Tracks:
 - Homestead
 ---
 Track: Homestead
-Originally Released As: beekeeper who? i dont know her.
 Artists:
 - James Roach
 Duration: '1:42'
 URLs:
 - https://homestuck.bandcamp.com/track/homestead
 - https://youtu.be/xDyuk7rRSVA
+Commentary: |-
+    <i>James Roach:</i>
+    <i>(Commentary was <a href="https://soundcloud.com/jamesroachmusic/beekeeper-who-i-dont-know-her">originally written</a> as part of Hiveswap Friendsim for [[beekeeper who? i dont know her.]])</i>
+    this track presented a unique problem in that i didn't want to write it at the time. I had written a really somber and melancholic track for the area outside the hive (the farm in the concept art) and changing it into something a little goofier and weird presented a unique difficulty for me. I just didn't know what to do for the first time in like actual YEARS i had no idea where to even start. I kept at it for a very long time and eventually just muscled through it with sheer force of will. People often ask me the hardest track or my least favorite to work on. it was this one. silver lining: its also become one of my favorites. i love how it came out. thats the power of determination. did you know you can't say determination anymore.
+    this was written for, yes, the fabled beekeeper troll that nobody will talk about. its become some sort of myth as to what happened to her but the truth isn't that exciting. in early hiveswap days each member of the crew got to "pick" a character that they could choose one design element of. The person who picked beekeeper just had a fantroll based off of herself. they also just... drew micro/macro porn of themselves? a power move, honestly. I met them in person and they offered me weed within literal minutes of meeting so i mean i guess they seemed nice. when they no longer worked for the company it was just simpler to redesign the character than deal with literally any of that. mystewy sowved :)
+    at the point in production where they were figuring out names/personalities/traits they kinda thrust this one on me because it "would make the most people angry." beekeeper troll was beloved by a very specific kind of horny dude. you know the kind that regularly says "lewds" or w/e. nothin wrong with that i guess. chase your bliss. but in an effort by my SO CALLED FRIENDS to antagonize me, they were like "heh h h e h he e e he h what if we make this cute girl character that hornyboys love into a dumpy little round dude and then say we based him off james who they already do not like."
+    thanks guys.
+    anyway zebede's bullet points and even his name are references to me but thats kinda where it ends. st. james son of zebedee is also known as santiago, which is my birthname. the tongva were "maybe" the indigenous people of long beach, where i live, which is "too far to visit" which is a joke about The Greater Los Angeles Area. I live 20 minutes away. cowards.
 ---
 Track: Shell Game
 Originally Released As: SERVICE CAR
@@ -240,7 +246,7 @@ URLs:
 - https://youtu.be/AJh5dQB0wvM
 Referenced Tracks:
 - Joey Claire, Extraordinaire
-- track:old-secret-act2
+- track:old-secret
 ---
 Section: B-Sides
 ---
diff --git a/album/psycholonials-ep-9.yaml b/album/psycholonials-ep-9.yaml
index 08b6bc8..698bdf3 100644
--- a/album/psycholonials-ep-9.yaml
+++ b/album/psycholonials-ep-9.yaml
@@ -77,4 +77,4 @@ Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-final-remix
 Referenced Tracks:
-- track:ephemeral-muse
+- Harrigan
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index c3f76f4..d05626a 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -346,7 +346,7 @@ URLs:
 - https://psycholonials.bandcamp.com/track/ephemeral-muse-final-remix-2
 - https://open.spotify.com/track/3oIQx0z9rNmEew41Ruxinb
 Referenced Tracks:
-- track:ephemeral-muse
+- Harrigan
 ---
 Section: Bonus tracks
 ---
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 1d57fad..0759a8e 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -648,6 +648,7 @@ URLs:
 - https://soundcloud.com/albatrosssoup/totallynotmegaman
 ---
 Track: beekeeper who? i dont know her.
+Originally Released As: Homestead
 Artists:
 - James Roach
 Duration: '1:42'
@@ -655,19 +656,19 @@ URLs:
 - https://soundcloud.com/jamesroachmusic/beekeeper-who-i-dont-know-her
 - https://www.youtube.com/watch?v=nYI7F5FHTmA
 Commentary: |-
-    <i>James Roach:</i>
-    this track presented a unique problem in that i didn't want to write it at the time. I had written a really somber and melancholic track for the area outside the hive (the farm in the concept art) and changing it into something a little goofier and weird presented a unique difficulty for me. I just didn't know what to do for the first time in like actual YEARS i had no idea where to even start. I kept at it for a very long time and eventually just muscled through it with sheer force of will. People often ask me the hardest track or my least favorite to work on. it was this one. silver lining: its also become one of my favorites. i love how it came out. thats the power of determination. did you know you can't say determination anymore.
-    this was written for, yes, the fabled beekeeper troll that nobody will talk about. its become some sort of myth as to what happened to her but the truth isn't that exciting. in early hiveswap days each member of the crew got to "pick" a character that they could choose one design element of. The person who picked beekeeper just had a fantroll based off of herself. they also just... drew micro/macro porn of themselves? a power move, honestly. I met them in person and they offered me weed within literal minutes of meeting so i mean i guess they seemed nice. when they no longer worked for the company it was just simpler to redesign the character than deal with literally any of that. mystewy sowved :)
-    at the point in production where they were figuring out names/personalities/traits they kinda thrust this one on me because it "would make the most people angry." beekeeper troll was beloved by a very specific kind of horny dude. you know the kind that regularly says "lewds" or w/e. nothin wrong with that i guess. chase your bliss. but in an effort by my SO CALLED FRIENDS to antagonize me, they were like "heh h h e h he e e he h what if we make this cute girl character that hornyboys love into a dumpy little round dude and then say we based him off james who they already do not like."
-    thanks guys.
-    anyway zebede's bullet points and even his name are references to me but thats kinda where it ends. st. james son of zebedee is also known as santiago, which is my birthname. the tongva were "maybe" the indigenous people of long beach, where i live, which is "too far to visit" which is a joke about The Greater Los Angeles Area. I live 20 minutes away. cowards.
+    <i>Quasar Nebula:</i>
+    This track was part of Hiveswap Friendsim for over a year before being released as [[track:homestead]] on [[album:hiveswap-act-2-ost]].
 ---
 Track: Charun's Cave
+Originally Released As: Studio Space
 Artists:
 - Toby Fox
 Duration: '1:03'
 URLs:
 - https://www.youtube.com/watch?v=wc5iruoYLXM
+Commentary: |-
+    <i>Quasar Nebula:</i>
+    This track was part of Hiveswap Friendsim for over a year before being released as [[track:studio-space]] on [[album:hiveswap-act-2-ost]].
 ---
 Section: Tracks featured in Pesterquest
 ---
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 3ba7b7c..ccd769c 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -102,6 +102,12 @@ Content: |-
     - fixed [[artist:aris-martinian]] having some artist credits under a different name
     - removed full album listening link for [[album:alternia]] due to missing bonus tracks
     - replaced "smart" quotation marks and apostraphes (&#147;like these&#148; &#145;and these&#146;) as well as ellipses with portable ASCII characters, mostly throughout commentary
+    - changed a few track fields to handle re-releases more consistently
+        - switched the re-release directions of [[track:charuns-cave]] and [[track:studio-space]], and of [[track:beekeeper-who-i-dont-know-her]] and [[track:homestead]]
+        - moved commentary on [[track:beekeeper-who-i-dont-know-her]] over to [[track:homestead]], and annotated where it originates from
+        - added rerelease context in commentary for [[track:charuns-cave]] and [[track:beekeeper-who-i-dont-know-her]]
+        - changed [[lame and old webcomic voluem 10 (MEGA MILX)]] to sample [[track:of-gods-and-witches]] (from [[album:songs-unsung]]) instead of [[track:of-gods-and-witches-vol-10]] (from [[album:homestuck-vol-10]])
+        - changed [[track:ephemeral-muse-final-remix]] to reference [[track:harrigan]] instead of [[track:ephemeral-muse]]
     <h3>data fixes</h3>
     - fixed [[track:black-rose-green-sun]] not referencing [[track:macabre]] (thanks, Makin!)
     - fixed [[track:terezi-owns]] not referencing [[track:crystalanthemums]] (thanks, JG!)
@@ -138,7 +144,7 @@ Content: |-
     - fixed missing cover artist info for a few tracks:
         - fixed [[track:troleplanet]] missing credits for [[artist:bambosh]]
         - fixed [[album:strife]] missing credits for [[artist:homestuck]]
-        - fixed [[album:land-of-hues-and-duels-trollside]] missing credits for [[artist:priestlybeast]]
+        - fixed [[album:land-of-hue-and-duels-trollside]] missing credits for [[artist:priestlybeast]]
 
     <h2 id="14-jul-2023"><a href="#14-jul-2023">[[date:14 July 2023]]</a> - moderately belated maintenance</h2>
     <h3>bug fixes</h3>