hiveswap act 2 & charun's cave / beekeeper fixups

5 files changed, 19 insertions, 28 deletions

diff --git a/album/hiveswap-act-2-ost.yaml b/album/hiveswap-act-2-ost.yaml
index 0a21b2d2..0e66478f 100644
--- a/album/hiveswap-act-2-ost.yaml
+++ b/album/hiveswap-act-2-ost.yaml
@@ -1,4 +1,5 @@
-Album: Hiveswap Act 2 OST
+Album: 'HIVESWAP: ACT 2 Original Soundtrack'
+Directory: hiveswap-act-2-ost
 Date: November 26, 2020
 Date Added: December 12, 2020
 URLs:
@@ -92,6 +93,8 @@ URLs:
 - https://youtu.be/S42nK1sihuc
 ---
 Track: Studio Space
+Additional Names:
+- Charun's Cave (as credited in [[flash:fs-vol15|Hiveswap Friendsim]])
 Artists:
 - Toby Fox
 Duration: '1:02'
@@ -111,6 +114,12 @@ Referenced Tracks:
 - Homestead
 ---
 Track: Homestead
+Additional Names:
+- Name: >-
+    beekeeper who? i dont know her.
+  Annotation: >-
+    as credited in [[flash:fs-vol10|Hiveswap Friendsim]],
+    [SoundCloud](https://soundcloud.com/jamesroachmusic/beekeeper-who-i-dont-know-her)
 Artists:
 - James Roach
 Duration: '1:42'
@@ -118,8 +127,7 @@ URLs:
 - https://homestuck.bandcamp.com/track/homestead
 - https://youtu.be/xDyuk7rRSVA
 Commentary: |-
-    <i>James Roach:</i>
-    <i>(Commentary was [originally written](https://soundcloud.com/jamesroachmusic/beekeeper-who-i-dont-know-her) as part of Hiveswap Friendsim for [[beekeeper who? i dont know her.]])</i>
+    <i>James Roach:</i> ([SoundCloud](https://soundcloud.com/jamesroachmusic/beekeeper-who-i-dont-know-her), as commentary for music from [[album:hiveswap-friendsim|Hiveswap Friendsim]])
     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."
diff --git a/album/unreleased-tracks.yaml b/album/unreleased-tracks.yaml
index 9a5780cf..c6ab479d 100644
--- a/album/unreleased-tracks.yaml
+++ b/album/unreleased-tracks.yaml
@@ -693,25 +693,6 @@ URLs:
 - https://www.youtube.com/watch?v=fY4bgz4o8QY
 - https://soundcloud.com/albatrosssoup/totallynotmegaman
 ---
-Track: beekeeper who? i dont know her.
-Originally Released As: Homestead
-Duration: '1:42'
-URLs:
-- https://soundcloud.com/jamesroachmusic/beekeeper-who-i-dont-know-her
-- https://www.youtube.com/watch?v=nYI7F5FHTmA
-Commentary: |-
-    <i>Quasar Nebula:</i> (wiki editor)
-    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
-Duration: '1:03'
-URLs:
-- https://www.youtube.com/watch?v=wc5iruoYLXM
-Commentary: |-
-    <i>Quasar Nebula:</i> (wiki editor)
-    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
 ---
 Track: 2chords
diff --git a/flashes.yaml b/flashes.yaml
index 3d4e72e1..9da1ebb2 100644
--- a/flashes.yaml
+++ b/flashes.yaml
@@ -1918,7 +1918,7 @@ Contributors:
 - 'Angela Sham (art: backgrounds)'
 Date: August 17, 2018
 Featured Tracks:
-- beekeeper who? i dont know her.
+- Homestead
 - ASSAULT
 Flash: Of Faraway Lands and Nearby Pals
 ---
@@ -1983,7 +1983,7 @@ Contributors:
 - Mint Chipleaf (programming)
 Date: October 26, 2018
 Featured Tracks:
-- Charun's Cave
+- Studio Space
 - idk man you name it im tired
 Flash: Of Creatives, Conventional or Otherwise
 ---
diff --git a/homepage.yaml b/homepage.yaml
index 21a1f4df..d9f578e0 100644
--- a/homepage.yaml
+++ b/homepage.yaml
@@ -23,7 +23,7 @@ Albums:
 - Homestuck Vol. 1-4
 - Homestuck Vol. 10
 - Beyond Canon
-- Hiveswap Act 2 OST
+- 'HIVESWAP: ACT 2 Original Soundtrack'
 - Homestuck Vol. 8
 
 - AlterniaBound
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index 07c50019..109a2361 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -437,6 +437,7 @@ Content: |-
     - fixed [[track:before-the-story]] ([[album:undertale-soundtrack]]) being listed as a rerelease of [[track:before-the-story-ch1]] ([[album:deltarune-ch1-ost]]), instead of the other way around
     - fixed [[track:ephemeral-muse-final-remix-psycholonials]] not being listed as a rerelease of [[track:ephemeral-muse-final-remix]] (thanks, Lilith!)
     - fixed [[track:flare-with-vocals]] being duplicated in [[album:more-homestuck-fandom]] (as "Flare (horizon's lyricover)"), and tidied this track's lyrics (thanks, Jebb, vriska/leo!)
+    - fixed [[album:hiveswap-act-2-ost]] being named "Hiveswap Act 2 OST" (thanks, Niklink!)
     - fixed [[track:empirical]] being named "--Emperical" (thanks, Rosetta Leijonde!)
     - fixed [[track:do-anbroids-dream-of]] being named "Do Androids Dream Of…?" (was "Androids", now "Anbroids"; thanks, Lilith, Grace!)
     - fixed [[track:squiddles-op-1-supercrush-guitar]] being named "Squiddles OP1: Supercrush Guitar!" (missing space in "OP 1"; thanks, Lilith, Grace!)
@@ -592,6 +593,7 @@ Content: |-
     - removed release date details from [[track:penumbra-phantasm-morris]] (until addressing individual-track release dates more broadly)
     - removed MIDIs by [[artist:toby-fox]] from [[track:liquid-negrocity]], [[track:atomyk-ebonpyre]], [[track:keepers]], and [[track:eridans-theme]] (for now)
     - removed SoundCloud close-matches, marked as original releases, for [[track:i-have-some-ideas]], [[track:blood-on-their-hands]], [[track:in-the-loop]], and [[track:love-song]] (now entered as additional names)
+    - removed SoundCloud original releases for [[track:studio-space]] and [[track:homestead]] (now entered as additional names)
     - changed directory of [[track:starsetter-canmt]] from <code>starsetter</code> to <code>starsetter-canmt</code>
     - changed directory of [[track:on-repeat]] from <code>on-repeat-intermission</code> to <code>on-repeat</code>
     - changed directory of [[track:revelations-vast-error]] from <code>revelations-bonus</code> to <code>revelations-vast-error</code>
@@ -1152,9 +1154,9 @@ Content: |-
     - 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]]
+        - switched the re-release directions of "Charun's Cave" and [[track:studio-space]], and of "beekeeper who? i dont know her." and [[track:homestead]]
+        - moved commentary on "beekeeper who? i dont know her." over to [[track:homestead]], and annotated where it originates from
+        - added rerelease context in commentary for "Charun's Cave" and "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-we-are-all-satellites]] instead of [[track:ephemeral-muse]]
     <h3>data fixes</h3>