Merge branch 'staging' into release

1 files changed, 109 insertions, 0 deletions

diff --git a/album/s-collide.yaml b/album/s-collide.yaml
new file mode 100644
index 0000000..5dc5289
--- /dev/null
+++ b/album/s-collide.yaml
@@ -0,0 +1,109 @@
+Album: '[S] Collide.'
+Date: April 6, 2016
+Date Added: November 15, 2019
+URLs:
+- https://homestuck.bandcamp.com/album/homestuck-vol-9-10-with-s-collide-and-act-7
+- https://www.youtube.com/watch?v=OcwqP0pMxGE
+- https://www.youtube.com/playlist?list=PLnVpmehyaOFaNcNe2AtQUyDcLSJrzSQbe
+Cover Artists:
+- Homestuck
+Default Track Cover Artists:
+- Homestuck
+Art Tags:
+- Earth
+Color: '#cc3322'
+Groups:
+- group:official
+Wallpaper Artists:
+- Rah-Bop
+---
+Track: Creata (Canon Edit)
+Artists:
+- Seth Peelle
+Art Tags:
+- Skaia
+- Prospit
+- LoHaC
+- LoPaN
+Duration: '1:56'
+URLs:
+- https://homestuck.bandcamp.com/track/creata-canon-edit-2
+- https://youtu.be/43XGeVEiihM
+Referenced Tracks:
+- Creata
+---
+Track: Oppa Toby Style
+Artists:
+- Toby Fox
+Art Tags:
+- The Condesce
+- John
+- Rose
+- Roxy
+- John's nanna
+- Derse
+Contributors:
+- James Roach (editing, cheers)
+Duration: '5:39'
+URLs:
+- https://homestuck.bandcamp.com/track/oppa-toby-style-2
+- https://youtu.be/bjAK8D5ytiU
+Referenced Tracks:
+- Ham And Steak
+- Cascade (Beta)
+- track:doctor
+- Crystalanthemums
+- track:crustacean
+- Liquid Negrocity
+Commentary: |-
+    <i>James Roach:</i>
+    i love cheers in songs (i edited the cheers into tobys song for [s] collide, and have written them into a few things) so the sword/shield gym theme really does it for me
+    I JUST VERY SELFISHLY ADDED <a href="https://youtu.be/bjAK8D5ytiU?t=82">THESE CHEERS</a> TO AN ALREADY GOOD SONG LMAO
+    toby had written a really cool song but i wanted to give andrew some hits that were less on the downbeat for the animation so while i was editing the tracks down for length and extending bits here and there i ended up adding them in because i wanted the section to feel hype
+---
+Track: Eternity, Served Cold (Canon Edit)
+Artists:
+- Malcolm Brown
+Art Tags:
+- Lord English
+- Aradia
+- Kanaya
+- Eridan
+- Equius
+- Rufioh
+- Mituna
+- Kankri
+- Latula
+- Horuss
+- Cronus
+Duration: '3:34'
+URLs:
+- https://homestuck.bandcamp.com/track/eternity-served-cold-canon-edit-2
+- https://youtu.be/Ow8PeoCrfcg
+Referenced Tracks:
+- Eternity Served Cold
+- Typheus
+---
+Track: Heir of Grief
+Directory: heir-of-grief-collide
+Artists:
+- Tensei
+Contributors:
+- James Roach (editing)
+Art Tags:
+- Dave
+- Dirk
+- Terezi
+- Jack Noir
+- LoTaK
+Duration: '6:12'
+URLs:
+- https://homestuck.bandcamp.com/track/heir-of-grief-2
+- https://youtu.be/Es5mh7pBeec
+Referenced Tracks:
+- track:heir-of-grief
+- Typheus
+Commentary: |-
+    <i>James Roach:</i>
+    the rest of the edits i did for collide were like... timing things. theres a part at the end where we needed one more bar of hits during heir of grief because one extra thing happens (the part where the condesce gets stabbed is the previous 4 bars copied and edited in)
+    you might notice this if you're music savvy to the point where you're like wait why is there a 12 bar phrase in an otherwise 16 bar pattern. its because that part wasnt long enough for the animation and andrew suggested asking to re-record it and i was like thatll take too long