infection 2 tweaks (fold into chronic infection) + changelog

also similarly folds flare (green sun remix) into
flare: insurrection remix

8 files changed, 31 insertions, 36 deletions

diff --git a/album/9.yaml b/album/9.yaml
index 8db914d5..98e10637 100644
--- a/album/9.yaml
+++ b/album/9.yaml
@@ -875,7 +875,7 @@ Referenced Tracks:
 - RollerCoaster Tycoon Theme
 - Battle Theme for the Lost at Heart
 - Good Grievous Bodily Harm
-- Flare (Green Sun Remix)
+- 'Flare: Insurrection Remix'
 - Apexhalation
 - licord nacrasty
 - track:midnight-suffer
diff --git a/album/_.yaml b/album/_.yaml
index 31bdb904..bbb71b55 100644
--- a/album/_.yaml
+++ b/album/_.yaml
@@ -650,7 +650,10 @@ Sampled Tracks:
 - Windows SFX
 ---
 Track: Chronic Infection
-Originally Released As: Infection 2
+Additional Names:
+- Infection 2 ([SoundCloud](https://soundcloud.com/difarem/infection-2))
+Artists:
+- Difarem
 Cover Artists:
 - Makin
 Art Tags:
@@ -666,6 +669,14 @@ Duration: '03:08'
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/chronic-infection
 - https://youtu.be/tvwQwsK7_1o
+- https://soundcloud.com/difarem/infection-2
+Referenced Tracks:
+- track:infection-canmt
+- Chronic Jungle (Redone)
+Commentary: |-
+    <i>Difarem:</i> ([SoundCloud description](https://soundcloud.com/difarem/infection-2), excerpt, 8/15/2017)
+
+    In the same vein as cookie's [[track:chronic-jungle-redone|chronic jungle remake]], here is [[track:infection-canmt]] (one of my three call and new 2 tracks) as I would have done it today (also incorporating elements from cookie's new track). I've been actually working on this for a couple months! Well, except the part from 1:57, that's last week's work.
 ---
 Track: Obana Never Gives Up
 Artists:
diff --git a/album/canwc-for-the-spookdays.yaml b/album/canwc-for-the-spookdays.yaml
index f969de9c..453d5b9e 100644
--- a/album/canwc-for-the-spookdays.yaml
+++ b/album/canwc-for-the-spookdays.yaml
@@ -51,7 +51,7 @@ URLs:
 - https://youtu.be/gfFqM_h4gJg
 Referenced Tracks:
 - spooksong
-- Infection 2
+- Chronic Infection
 - Liquid Negrocity
 - track:penumbra-phantasm
 Sampled Tracks:
diff --git a/album/intermishin.yaml b/album/intermishin.yaml
index c9e4a9ec..ca172463 100644
--- a/album/intermishin.yaml
+++ b/album/intermishin.yaml
@@ -488,7 +488,7 @@ Referenced Tracks:
 - Three in the Medley
 - track:flare
 - Flare (Cascade)
-- Flare (Green Sun Remix)
+- 'Flare: Insurrection Remix'
 - Ye Flarey Gentlemen
 - My Grand Dad is the Green Sun
 - Solar Voyage
@@ -517,7 +517,7 @@ Sampled Tracks:
 - Three in the Medley
 - track:flare
 - Flare (Cascade)
-- Flare (Green Sun Remix)
+- 'Flare: Insurrection Remix'
 - Ye Flarey Gentlemen
 - My Grand Dad is the Green Sun
 - Solar Voyage
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 07bef0b0..9ebe6480 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -426,13 +426,6 @@ Commentary: |-
 
     Flare was a pretty big hit in its own right, so there's always the pressure coming from the responsibility to handle this properly. I hope you enjoy it!
 ---
-Track: Flare (Green Sun Remix)
-Artists:
-- Clark Powell
-Duration: '4:08'
-URLs:
-- https://soundcloud.com/plazmataz/flare-green-sun-remix
----
 Track: Flight of the White Wolf
 Artists:
 - Malcolm Brown
@@ -2203,11 +2196,11 @@ URLs:
 Referenced Tracks:
 - Chronic Jungle
 Commentary: |-
-    <i>cookiefonster:</i> ([SoundCloud](https://soundcloud.com/cookie-fonster/call-and-new-2-chronic-jungle-redone), 5/29/2017)
+    <i>cookiefonster:</i> ([SoundCloud description](https://soundcloud.com/cookie-fonster/call-and-new-2-chronic-jungle-redone), 5/29/2017)
 
-    [[artist:discfortune|crypt]] said chronic jungle from [[album:call-and-new-2-locomotif|call and new 2]] sounded exactly like all my other music from that time (i made that thing in fucking november) so i redid it by remixing the same songs but with actual thought into it so its really a completely different song. i still made it in about an hour total but i like to think im good at music now.
+    [[artist:discfortune|crypt]] said [[track:chronic-jungle|chronic jungle]] from call and new 2 sounded exactly like all my other music from that time (i made that thing in fucking november) so i redid it by remixing the same songs but with actual thought into it so its really a completely different song. i still made it in about an hour total but i like to think im good at music now.
 
-    im not redoing my other song [[track:bolins-cereal-journey|(bolin's cereal journey)]] because even though i dont like that song either i dont see much "couldve been better/more interesting" in it either. i mean its already hard enough to make [[artist:splitsuns|splitsuns]] better and i failed in that but at least made a maybe more interesting rack. its still a minute long track i made in an hour but my mind tells me this time the track isnt complete shit.
+    im not redoing my other song ([[track:bolins-cereal-journey|bolin's cereal journey]]) because even though i dont like that song either i dont see much "couldve been better/more interesting" in it either. i mean its already hard enough to make [[artist:splitsuns|splitsuns]] better and i failed in that but at least made a maybe more interesting rack. its still a minute long track i made in an hour but my mind tells me this time the track isnt complete shit.
     
     in any case this is the first actual song i made and finished in just over two months so yay for that. it was a good musical exercise
 ---
@@ -2286,24 +2279,6 @@ Referenced Tracks:
 - Endless Climb
 - Land of Quartz and Melody
 ---
-Track: Infection 2
-Artists:
-- Difarem
-Duration: '3:09'
-URLs:
-- https://soundcloud.com/difarem/infection-2
-Referenced Tracks:
-- track:infection-canmt
-- Chronic Jungle (Redone)
-Commentary: |-
-    <i>Difarem:</i> ([SoundCloud](https://soundcloud.com/difarem/infection-2), 8/15/2017)
-
-    In the same vein as cookie's chronic jungle remake ([Cookie-fonster - Call-and-new-2-chronic-jungle-redone](https://soundcloud.com/cookie-fonster/call-and-new-2-chronic-jungle-redone)), here is [[track:infection-canmt]] (one of my three call and new 2 tracks) as I would have done it today (also incorporating elements from cookie's new track). I've been actually working on this for a couple months! Well, except the part from 1:57, that's last week's work.
-
-    For comparison, here's the original: [Difarem - Infection](https://soundcloud.com/difarem/infection)
-
-    Art by [[artist:hadron|HadronKalido]]
----
 Track: Monody
 Artists:
 - ostrichlittledungeon
diff --git a/album/psycholonials-ep-8.yaml b/album/psycholonials-ep-8.yaml
index 0df04825..8c2ad814 100644
--- a/album/psycholonials-ep-8.yaml
+++ b/album/psycholonials-ep-8.yaml
@@ -42,7 +42,11 @@ URLs:
 - https://open.spotify.com/track/3ILu9zH2LuB9e3CP6SfxTZ
 ---
 Track: 'Flare: Insurrection Remix'
-Originally Released As: Flare (Green Sun Remix)
+Additional Names:
+- Name: >-
+    Flare (Green Sun Remix)
+  Annotation: >-
+    [SoundCloud](https://soundcloud.com/plazmataz/flare-green-sun-remix)
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix-2
diff --git a/album/psycholonials.yaml b/album/psycholonials.yaml
index 004a8989..74eaa69d 100644
--- a/album/psycholonials.yaml
+++ b/album/psycholonials.yaml
@@ -320,7 +320,7 @@ URLs:
 ---
 Track: 'Flare: Insurrection Remix'
 Directory: flare-insurrection-remix-psycholonials
-Originally Released As: Flare (Green Sun Remix)
+Originally Released As: track:flare-insurrection-remix
 Duration: '4:08'
 URLs:
 - https://psycholonials.bandcamp.com/track/flare-insurrection-remix-2
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index bd490006..47ae36f5 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -49,13 +49,18 @@ Content: |-
     - added commentary blurbs from Bandcamp and YouTube, as well as additional names mostly from YouTube, across [[album:the-funk-mclovin-homestuck-experience]], [[album:class-act]], and [[album:class-act-b-side]]
     - added album release commentary to [[album:gravity-makes-the-flame-rise]] and [[album:ulterior-motives]]
     - added album release photoset to [[album:ulterior-motives]]
-    - added Tumblr commentary and listening link from [[artist:toby-fox]] to [[track:valor-toby-fox]] (thanks, Lilith!)
+    - added SoundCloud commentary from [[artist:difarem]], additional name, and listening link to [[track:chronic-infection]] (thanks, Lilith!)
+    - added Tumblr commentary from [[artist:toby-fox]] and listening link to [[track:valor-toby-fox]] (thanks, Lilith!)
     - added Tumblr commentary from [[artist:malcolm-brown]] to [[track:cheer-up-crabface-its-halloween]] and [[track:flight-of-the-white-wolf]] (thanks, Lilith!)
     - added names on original releases as additional names for [[track:lies-with-the-sea]] and [[track:chain-of-prospit]], and for newly renamed [[track:the-prelude]], [[track:revelations-i]], [[track:revelations-ii]], and [[track:revelations-iii]] (thanks, Lilith!)
+    <h3>data changes</h3>
+    - removed "Infection 2" and made this into an additional name on [[track:chronic-infection]] (and added commentary here; thanks, Lilith!)
+    - removed "Flare (Green Sun Remix)" and made this into an additional name on [[track:flare-insurrection-remix]] (which was previously listed as a rerelease)
     - moved [[track:thunderhead-loftlocked]] from [[album:more-homestuck-fandom]] to [[album:loftlocked-vol-1]] (thanks, Lilith!)
     <h3>data fixes</h3>
     - fixed [[track:fiduspawn-go]] not referencing [[track:title-screen-pokemon-red-blue]] (thanks, Morris!)
     - fixed [[track:arise-canmt]] referencing [[track:un-owen-was-her]] instead of [[track:final-savage-sister-flandre-s]] (thanks, Lilith!)
+    - fixed [[track:chronic-infection]] referencing [[track:chronic-jungle]] instead of [[track:chronic-jungle-redone]] (thanks, Lilith!)
     - fixed [[track:anarchy-gravity-makes-the-flame-rise]] not sampling [[track:nothing-but-the-best]] (thanks, Morris!)
     - fixed [[track:cheer-up-crabface-its-halloween]] not referencing [[track:crustacean]] and [[track:rex-duodecim-angelus]] (thanks, Lilith!)
     - fixed [[track:valor-toby-fox]] not referencing [[track:showtime-original-mix]] (thanks, Lilith!)