Merge branch 'makin/canwc' into preview

1 files changed, 220 insertions, 87 deletions

diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index 20c1514f..0528cc65 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -50,6 +50,13 @@ Commentary: |-
 
     I kind of regret not slipping this theme into Homestuck somewhere; I feel like this could have easily been a recurring signature theme for projects I work on (like [[group:toby-fox|Toby Fox]] does with '[[track:megalovania-halloween|Megalovania]]').
 ---
+Track: Battle Theme for the Lost at Heart 
+Artists:
+- Robert J! Lake
+Duration: '2:42'
+URLs:
+- https://spellmynamewithabang.bandcamp.com/track/battle-theme-for-the-lost-at-heart
+---
 Track: Before Before the Beginning
 Artists:
 - Robert J! Lake
@@ -57,6 +64,51 @@ Duration: '5:23'
 URLs:
 - https://www.youtube.com/watch?v=ZUu2xzFJX3U
 ---
+Track: Brodylovania
+Artists:
+- Toby Fox
+Duration: '2:35'
+URLs:
+- https://www.youtube.com/watch?v=JoQsVkjYt6w
+Referenced Tracks:
+- Brodyquest
+- track:MeGaLoVania
+Sampled Tracks:
+- Brodyquest
+- track:MeGaLoVania
+Lyrics: |-
+    I'm so fresh you can... genitals... ahhhh
+
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody (Brody...)
+
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody (Brody...)
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody
+    Adrien Brody Adrien Brody A-Adrien Bro-bro-brobrody (Brody...)
+
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody (Brody...)
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+    Adrien Brody Adrien Brody Adrien Brody Adrien Brody
+---
 Track: Calliope
 Artists:
 - Malcolm Brown
@@ -67,6 +119,15 @@ Referenced Tracks:
 - Lupus Mortis Aeternae
 - English
 ---
+Track: Cascading Events
+# No official name, this one is possibly fan-sourced?
+# Also known as "Descend2 Demo", "Freefall Beta" or "cascade2"
+Artists:
+- Robert J! Lake
+Duration: '4:20'
+URLs: 
+- https://spellmynamewithabang.tumblr.com/day/2012/05/14
+---
 Track: Catscratch
 Artists:
 - Toby Fox
@@ -90,6 +151,16 @@ URLs:
 Referenced Tracks:
 - Clockwork Melody
 ---
+Track: Davesprite2
+Artists:
+- Erik Scheele
+Duration: '2:12'
+URLs:
+- https://www.youtube.com/watch?v=qaMjpWYqvME
+Referenced Tracks:
+- track:beatdown-strider-style
+- track:sburban-jungle
+---
 Track: Daywalker ~Rise~
 Directory: daywalker-rise-contest
 Artists:
@@ -105,6 +176,15 @@ Commentary: |-
     A song for Kanaya, this song is - in my opinion - the weakest contender of the lot. Daywalker nonetheless marks my first attempt at using real audio in a song - I recorded the flute performance myself. Unfortunately, my playing, recording, and production are definitely not up to snuff, honestly. Given that it was recorded with a terrible laptop mic, with a player who hadn't played in a long while (me), I suppose that was honestly no surprise.
     However, I love both the harp and flute melodies in this song. It was a blast to play, and I'd definitely think about using them again at some point in the future.
 ---
+Track: Dirkhestra
+Artists:
+- Alex Rosetti
+Duration: '2:13'
+URLs:
+- https://www.youtube.com/watch?v=63dLbjD3L0g
+Referenced Tracks:
+- Horschestra
+---
 Track: Do the Homestuck
 Artists:
 - Toby Fox
@@ -345,6 +425,26 @@ Referenced Tracks:
 - track:aggrieve
 - track:harlequin
 ---
+Track: Mutiny (crapapella)
+Artists:
+- Toby Fox
+Duration: '0:43'
+URLs:
+- https://www.youtube.com/watch?v=N3BJsvKM6DY
+Referenced Tracks:
+- track:mutiny
+Lyrics: |-
+    I LOVE YOU DOGGY
+---
+Track: My Grand Dad is the Green Sun
+Artists:
+- Clark Powell
+Duration: '3:04'
+URLs:
+- https://hsmusic.wiki/media/misc/archive/My%20Grand%20Dad%20is%20the%20Green%20Sun.mp3
+Referenced Tracks:
+- Flare
+---
 Track: Non Compos Mentis
 Artists:
 - Bill Bolin
@@ -555,6 +655,15 @@ URLs:
 Referenced Tracks:
 - The Undying
 ---
+Track: Three In The Morning (Davekind)
+Artists:
+- Clark Powell
+Duration: '2:50'
+URLs:
+- https://soundcloud.com/eliwood-lord-of-pherae/three-in-the-morning-davekind
+Referenced Tracks:
+- track:three-in-the-morning
+---
 Track: Where making this hapen
 Artists:
 - David Ko
@@ -585,6 +694,17 @@ Commentary: |-
     <i>PoisonedElite:</i>
     The first Version of Calming Quartz, my song for the album Xenoplanetarium, a Homestuck Fan Album. I wasn't happy with this version so I redid the entire song. This song references Land of Quartz and Melody by Thomas Ferkol.
 ---
+Track: Cascadium Dioxide
+Artists:
+- Cerulean
+Duration: '8:35'
+URLs:
+- https://soundcloud.com/ctza/cascadium-dioxide
+Referenced Tracks:
+- Cascade (Beta)
+- Flare (Cascade)
+- Black Rose / Green Sun
+---
 Track: Character Theme for Dirk Strider
 Artists:
 - WindlessZephyr
@@ -774,10 +894,10 @@ Lyrics: |-
     I wanted something better than this
     Than a postmortem kiss
     Three years to miss you
-    But it seems that's all I'm gonna get;
+    But it seems that's all I'm gonna get
     It's best to forget
 
-    Last night I dreamt of you —
+    Last night I dreamt of you
     You were beautiful, amidst a sky of blue
 
     It was only the two of us
@@ -793,7 +913,7 @@ Lyrics: |-
     So many things I wanted to do
     So many dreams
     Left for dead in the water
-    Drowned and gone; just smile and let them go
+    Drowned and gone, just smile and let them go
 
     I wanted so much more
     Than a game we were born to lose
@@ -1075,6 +1195,15 @@ Commentary: |-
     🎛️ DAW: Reaper<br>
     🎞️ Video Editing Software: Adobe Premiere Pro CC
 ---
+Track: luminantFlare
+# Fully gone from the internet, sorry
+Artists:
+- luminantAegis
+Referenced Tracks:
+- Flare
+- Homestuck Anthem
+- track:explore
+---
 Track: Malediction
 Artists:
 - JJ Pollution
@@ -1201,6 +1330,13 @@ Lyrics: |-
     When you tear him apart
     Hurt my friends and break my heart
 ---
+Track: Taureg
+Artists:
+- Cerulean
+Duration: '3:01'
+URLs:
+- https://altgenstuck.bandcamp.com/track/taureg
+---
 Track: The Engineer
 Artists:
 - Aradia Jones
@@ -1266,6 +1402,17 @@ Duration: '3:14'
 URLs:
 - https://hsmusic.wiki/media/misc/archive/The%20Paradox%20Paradigm.mp3
 ---
+Track: The Well
+Artists: 
+- Mathias Ramalho
+Duration: '3:48'
+URLs:
+- https://friendlycoy.bandcamp.com/track/the-well
+- https://www.youtube.com/watch?v=FjyIoAYbSN4
+Commentary: |-
+    <i>Mathias Ramalho:</i> (Composer)
+    Made for a MSPA-styled, DnD Session, named "Colored Castles"
+---
 Track: Wind Waker
 Artists:
 - Levc
@@ -1296,37 +1443,6 @@ Commentary: |-
     This is one of my tracks for the CaNMT's almost-vaporware all-vaporwave album, CANWAVE 3. In its current iteration it's a take on 2814's sample-free approach to the vapor aesthetic through ambient and techno albums such as 新しい日の誕生 and Rain Temple. It's one of my most complex songs yet and it took a lot of work to make, but the end result is something very awe-inspiring, even to me.
     (Originally this song was a straight-up cover of Voidlight that was much more laid-back and repetitive, but I scrapped it in favor of this version. Maybe I'll upload that old version somewhere along the line.)
 ---
-Track: All We're Gonna Get
-Artists:
-- Pipko Fanfare
-Duration: '1:34'
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/all-were-gonna-get
-Referenced Tracks:
-- Flare (horizon's lyricover)
-Sampled Tracks:
-- Flare (horizon's lyricover)
----
-Track: Cool and New Music Team
-Artists:
-- MrMush
-Duration: '0:49'
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/cool-and-new-music-team
-Referenced Tracks:
-- Mush X Makin
-Sampled Tracks:
-- Mush X Makin
-Lyrics: |-
-    (Great, uhh there's good parts of the fandom and then there's this. I'm sitting here like, dude, let's do some comics, let's do some music, let's do some fucking voice act— that's fun. Then it's like hey, uhh, what about we just be super cancerous and uhh, make like a buncha shit. Um, but you have so much other stuff you can do. You have good, like, music people who are willing to do music. But, like w-wh-w-w-wha-what if we made, what if we made memes! I mean, yeah that's fun, but how about some... real stuff? Naaaaaah.... naaah... nah, I like memes. Alright, fine.)
----
-Track: Die.
-Artists:
-- Mathias Ramalho
-Duration: '2:56'
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/die
----
 Track: Doctor's Ringtone (No SFX)
 Artists:
 - VulkanShawl
@@ -1361,45 +1477,6 @@ Referenced Tracks:
 - First Contact
 - track:harlequin
 ---
-Track: feeling cool and new
-Artists:
-- artist:kobacat
-Duration: '2:18'
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/feeling-cool-and-new
-Referenced Tracks:
-- saoidfisd
-- Cool and New Music Team
-Sampled Tracks:
-- saoidfisd
-- Cool and New Music Team
-- feeling right
-- Love Taste
-Lyrics: |-
-    (I'm sitting here like, dude, let's do some comics, let's do some music, let's do some fucking voice act— that's fun.)
-
-    [Sampled vocals from "feeling right" by Moe Shop]
-
-    (I want your everything, every single part of you)
-    (If you think you can fuck with me, you're going to lose)
-    (I want to taste your love, anything you want to do)
-    (And I'll kill you if you try to run, you're mine and mine alone)
-
-    [Heavily glitched]
-    (They don't love you like I do, they don't love you like I do)
-    (They don't love you like I do, they don't love you like I do)
-
-    (Then it's like hey, uhh, what about we just be super cancerous and uhh, make like a buncha shit. Um, but you have so much other stuff you can do. You have good, like, music people who are willing to do music. But, like what if we made memes! I mean, yeah that's fun, but how about some real stuff? Nah, I like memes. Alright.)
----
-Track: Gunshow 2 Theme (Instrumental)
-Artists:
-- ostrichlittledungeon
-Duration: '1:56'
-URLs:
-- https://hsmusic.wiki/media/misc/archive/Gunshow%202%20Theme%20%28Instrumental%29.mp3
-Referenced Tracks:
-- track:explore
----
 Track: Higher
 Artists:
 - ostrichlittledungeon
@@ -1411,20 +1488,6 @@ Referenced Tracks:
 - track:endless-climb
 - Land of Quartz and Melody
 ---
-Track: Intro
-Artists:
-- ostrichlittledungeon
-Contributors:
-- Bambosh (narration)
-Duration: '3:07'
-URLs:
-- https://coolandnewwebcomic.bandcamp.com/track/intro
-Referenced Tracks:
-- The Star-Spangled Banner
-- Gunshow 2 Theme (Instrumental)
-Lyrics: |-
-    (The year is 2020. President Trump has led our nation into one of the worst econonic recessions in the history of the Earth. Imigrants are pouring through the southern border. Just look at that chaos! If you thought the econony was bad with Obana in charge, think again! And not only has Trump destroyed the country, but he's running for re-election! His challenger? Representative Cory Booker from New Jersey. It's up to the intrepid Jhon Ebgret to make his way to the White House and assassinate the president, evil Trump, so that he can finally have Cory in the House! Is he a bad enough dude to off the President of the United States himself? Don't turn that dial! It's... CANWAVE TWOOOOOO!)
----
 Track: its time
 Artists:
 - BitesizeBird
@@ -1454,6 +1517,15 @@ Referenced Tracks:
 - Ground Theme (Super Mario Bros.)
 - track:penumbra-phantasm
 ---
+Track: Searching the Desert for Chiptunes
+# Unreleased Cool and New Music Team track, only released in vaporwave form
+# (as "Searching the Internet for Radiation")
+Artists:
+- TirantBacon
+Duration: '1:12'
+URLs:
+- https://hsmusic.wiki/media/misc/archive/Searching%20the%20Desert%20For%20Chiptunes.mp3
+---
 Track: timeshit
 Artists:
 - Difarem
@@ -1619,6 +1691,13 @@ Duration: '2:21'
 URLs:
 - https://www.youtube.com/watch?v=k_-P6O_n1co
 ---
+Track: 'NV: Strife'
+Artists:
+- Cecily Renns
+Duration: '1:28'
+URLs:
+- https://soundcloud.com/user-471799957/nv-strife
+---
 Track: Rematch
 Artists:
 - Pascal van den Bos
@@ -1664,6 +1743,60 @@ Duration: '3:40'
 URLs:
 - https://potatoboss.bandcamp.com/track/vexation
 ---
+Track: Wanderlust
+Artists:
+- Gordian
+Duration: '3:52'
+URLs:
+- https://soundcloud.com/realbillwatterson/wander-f
+Lyrics: |-
+    Sometimes I think about the stars
+    And Mercury and Mars
+    Knowin' I'll get to go someday
+    But then they finally come around
+    So high above the ground
+    And the feeling goes away
+    I used to wait for something more
+    To walk in through the door
+    Something I never thought I'd do
+    I guess I figured that by now
+    I'd have some kind of plan
+    Really the opposite is true
+    And it doesn't matter just how long
+    That the dream is s'posed to be
+    Cause I wanna wake up anyway
+    If they knew what I could do
+    The things that I've been through
+    They wouldn't make me have to stay
+    Running away from all my fears
+    And stopping all the tears
+    Things I was never meant to do
+    I hope you'll understand someday
+    I can't afford to stay
+    Clearly my waiting days are through
+    And it doesn't matter just how long
+    That the dream is s'posed to be
+    Cause I wanna wake up anyway
+    If they knew what I could do
+    The things that I've been through
+    They wouldn't make me have to stay
+
+    Look out the window at the stars
+    And through the iron bars
+    Looks like the sky is turning blue
+    I know what people always say
+    No one's made it all the way
+    I'm starting to think it might be true
+    And it doesn't matter just how long
+    That the dream is s'posed to be
+    Cause I wanna wake up anyway
+    If they knew what I could do
+    And the shit that I've been through
+    They wouldn't make me have to stay
+    And it doesn't matter just how long
+    That the dream was s'posed to be
+    Cause I had to wake up anyway
+---
 Track: Windwielder
 Artists:
 - Baleish