From 7aa6c50874efebc47309de1e1d78480a84e40cd9 Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 14 Jan 2022 17:58:50 -0600 Subject: Stage 1 --- album/s-collide.yaml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 album/s-collide.yaml (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml new file mode 100644 index 0000000..3528134 --- /dev/null +++ b/album/s-collide.yaml @@ -0,0 +1,64 @@ +Album: [S] Collide. +Cover Art: Homestuck +Track Art: Homestuck +Wallpaper Art: Rah-Bop +Date: April 6, 2016 +Date Added: November 15, 2019 +Color: #cc3322 +Groups: Official +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 +------------------------------------------------------------------------------- +Track: Creata (Canon Edit) +Artist: Seth Peelle +Duration: 1:56 +References: Creata +URLs: +- https://homestuck.bandcamp.com/track/creata-canon-edit-2 +- https://youtu.be/43XGeVEiihM +------------------------------------------------------------------------------- +Track: Oppa Toby Style +Artist: Toby Fox +Contributors: +- James Roach (editing, cheers) +Duration: 5:39 +URLs: +- https://homestuck.bandcamp.com/track/oppa-toby-style-2 +- https://youtu.be/bjAK8D5ytiU +References: +- Ham And Steak +- Rex Duodecim Angelus +- English +- Cascade (Beta) +- track:doctor +- Crystalanthemums +- track:crustacean +- Liquid Negrocity +Commentary: + James Roach: + 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 THESE CHEERS 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) +Artist: Malcolm Brown +Duration: 3:34 +References: Eternity Served Cold +URLs: +- https://homestuck.bandcamp.com/track/eternity-served-cold-canon-edit-2 +- https://youtu.be/Ow8PeoCrfcg +------------------------------------------------------------------------------- +Track: Heir of Grief +Artist: Tensei +Contributors: James Roach (editing) +Duration: 6:12 +References: Heir Conditioning +URLs: +- https://homestuck.bandcamp.com/track/heir-of-grief-2 +- https://youtu.be/Es5mh7pBeec +Commentary: + James Roach: + 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 -- cgit 1.3.0-6-gf8a5 From 88044c9ead13a5478f8fcd72c8fec6a8a71ba0b1 Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 14 Jan 2022 18:02:33 -0600 Subject: Stage 2 --- album/s-collide.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index 3528134..048b7d6 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -1,29 +1,29 @@ -Album: [S] Collide. +Album: '[S] Collide.' Cover Art: Homestuck Track Art: Homestuck Wallpaper Art: Rah-Bop Date: April 6, 2016 Date Added: November 15, 2019 -Color: #cc3322 +Color: '#cc3322' Groups: Official 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 -------------------------------------------------------------------------------- +--- Track: Creata (Canon Edit) Artist: Seth Peelle -Duration: 1:56 +Duration: '1:56' References: Creata URLs: - https://homestuck.bandcamp.com/track/creata-canon-edit-2 - https://youtu.be/43XGeVEiihM -------------------------------------------------------------------------------- +--- Track: Oppa Toby Style Artist: Toby Fox Contributors: - James Roach (editing, cheers) -Duration: 5:39 +Duration: '5:39' URLs: - https://homestuck.bandcamp.com/track/oppa-toby-style-2 - https://youtu.be/bjAK8D5ytiU @@ -36,29 +36,29 @@ References: - Crystalanthemums - track:crustacean - Liquid Negrocity -Commentary: +Commentary: |- James Roach: 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 THESE CHEERS 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) Artist: Malcolm Brown -Duration: 3:34 +Duration: '3:34' References: Eternity Served Cold URLs: - https://homestuck.bandcamp.com/track/eternity-served-cold-canon-edit-2 - https://youtu.be/Ow8PeoCrfcg -------------------------------------------------------------------------------- +--- Track: Heir of Grief Artist: Tensei Contributors: James Roach (editing) -Duration: 6:12 +Duration: '6:12' References: Heir Conditioning URLs: - https://homestuck.bandcamp.com/track/heir-of-grief-2 - https://youtu.be/Es5mh7pBeec -Commentary: +Commentary: |- James Roach: 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 -- cgit 1.3.0-6-gf8a5 From 6643cb617aeb06292e1bd93981808b7322f4a6af Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 14 Jan 2022 19:48:54 -0600 Subject: Listify list fields --- album/s-collide.yaml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index 048b7d6..bf56b2a 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -1,20 +1,25 @@ Album: '[S] Collide.' -Cover Art: Homestuck -Track Art: Homestuck -Wallpaper Art: Rah-Bop Date: April 6, 2016 Date Added: November 15, 2019 Color: '#cc3322' -Groups: Official +Groups: +- Official 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 +Wallpaper Artists: +- Rah-Bop --- Track: Creata (Canon Edit) Artist: Seth Peelle Duration: '1:56' -References: Creata +References: +- Creata URLs: - https://homestuck.bandcamp.com/track/creata-canon-edit-2 - https://youtu.be/43XGeVEiihM @@ -45,16 +50,19 @@ Commentary: |- Track: Eternity, Served Cold (Canon Edit) Artist: Malcolm Brown Duration: '3:34' -References: Eternity Served Cold +References: +- Eternity Served Cold URLs: - https://homestuck.bandcamp.com/track/eternity-served-cold-canon-edit-2 - https://youtu.be/Ow8PeoCrfcg --- Track: Heir of Grief Artist: Tensei -Contributors: James Roach (editing) +Contributors: +- James Roach (editing) Duration: '6:12' -References: Heir Conditioning +References: +- Heir Conditioning URLs: - https://homestuck.bandcamp.com/track/heir-of-grief-2 - https://youtu.be/Es5mh7pBeec -- cgit 1.3.0-6-gf8a5 From a14691171577b34e3609e1d5f2885ce4d4400930 Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 14 Jan 2022 21:46:01 -0600 Subject: Field renames --- album/s-collide.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index bf56b2a..fedf44c 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -18,11 +18,11 @@ Wallpaper Artists: Track: Creata (Canon Edit) Artist: Seth Peelle Duration: '1:56' -References: -- Creata URLs: - https://homestuck.bandcamp.com/track/creata-canon-edit-2 - https://youtu.be/43XGeVEiihM +Referenced Tracks: +- Creata --- Track: Oppa Toby Style Artist: Toby Fox @@ -32,7 +32,12 @@ Duration: '5:39' URLs: - https://homestuck.bandcamp.com/track/oppa-toby-style-2 - https://youtu.be/bjAK8D5ytiU -References: +Commentary: |- + James Roach: + 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 THESE CHEERS 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 +Referenced Tracks: - Ham And Steak - Rex Duodecim Angelus - English @@ -41,28 +46,21 @@ References: - Crystalanthemums - track:crustacean - Liquid Negrocity -Commentary: |- - James Roach: - 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 THESE CHEERS 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) Artist: Malcolm Brown Duration: '3:34' -References: -- Eternity Served Cold URLs: - https://homestuck.bandcamp.com/track/eternity-served-cold-canon-edit-2 - https://youtu.be/Ow8PeoCrfcg +Referenced Tracks: +- Eternity Served Cold --- Track: Heir of Grief Artist: Tensei Contributors: - James Roach (editing) Duration: '6:12' -References: -- Heir Conditioning URLs: - https://homestuck.bandcamp.com/track/heir-of-grief-2 - https://youtu.be/Es5mh7pBeec @@ -70,3 +68,5 @@ Commentary: |- James Roach: 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 +Referenced Tracks: +- Heir Conditioning -- cgit 1.3.0-6-gf8a5 From df626fd8e8fa64c48ea1cf88177e157264042e9c Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 14 Jan 2022 22:18:36 -0600 Subject: Sorting --- album/s-collide.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index fedf44c..9612674 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -1,9 +1,6 @@ Album: '[S] Collide.' Date: April 6, 2016 Date Added: November 15, 2019 -Color: '#cc3322' -Groups: -- Official URLs: - https://homestuck.bandcamp.com/album/homestuck-vol-9-10-with-s-collide-and-act-7 - https://www.youtube.com/watch?v=OcwqP0pMxGE @@ -12,6 +9,9 @@ Cover Artists: - Homestuck Default Track Cover Artists: - Homestuck +Color: '#cc3322' +Groups: +- Official Wallpaper Artists: - Rah-Bop --- @@ -32,11 +32,6 @@ Duration: '5:39' URLs: - https://homestuck.bandcamp.com/track/oppa-toby-style-2 - https://youtu.be/bjAK8D5ytiU -Commentary: |- - James Roach: - 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 THESE CHEERS 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 Referenced Tracks: - Ham And Steak - Rex Duodecim Angelus @@ -46,6 +41,11 @@ Referenced Tracks: - Crystalanthemums - track:crustacean - Liquid Negrocity +Commentary: |- + James Roach: + 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 THESE CHEERS 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) Artist: Malcolm Brown @@ -64,9 +64,9 @@ Duration: '6:12' URLs: - https://homestuck.bandcamp.com/track/heir-of-grief-2 - https://youtu.be/Es5mh7pBeec +Referenced Tracks: +- Heir Conditioning Commentary: |- James Roach: 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 -Referenced Tracks: -- Heir Conditioning -- cgit 1.3.0-6-gf8a5 From 9e389a0dc36cafdd3b02624ffa711b498d99b1ef Mon Sep 17 00:00:00 2001 From: Gio Date: Sat, 15 Jan 2022 15:35:57 -0600 Subject: Pluralize non-artist.txt artists. --- album/s-collide.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index 9612674..7d410c2 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -16,7 +16,8 @@ Wallpaper Artists: - Rah-Bop --- Track: Creata (Canon Edit) -Artist: Seth Peelle +Artists: +- Seth Peelle Duration: '1:56' URLs: - https://homestuck.bandcamp.com/track/creata-canon-edit-2 @@ -25,7 +26,8 @@ Referenced Tracks: - Creata --- Track: Oppa Toby Style -Artist: Toby Fox +Artists: +- Toby Fox Contributors: - James Roach (editing, cheers) Duration: '5:39' @@ -48,7 +50,8 @@ Commentary: |- 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) -Artist: Malcolm Brown +Artists: +- Malcolm Brown Duration: '3:34' URLs: - https://homestuck.bandcamp.com/track/eternity-served-cold-canon-edit-2 @@ -57,7 +60,8 @@ Referenced Tracks: - Eternity Served Cold --- Track: Heir of Grief -Artist: Tensei +Artists: +- Tensei Contributors: - James Roach (editing) Duration: '6:12' -- cgit 1.3.0-6-gf8a5 From 326545886642a5f7524951689bebeb1dadc99865 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sun, 20 Mar 2022 22:50:47 -0300 Subject: all official tags, fandom through lofam 2 --- album/s-collide.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index 7d410c2..07114b4 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -9,6 +9,8 @@ Cover Artists: - Homestuck Default Track Cover Artists: - Homestuck +Art Tags: +- Earth Color: '#cc3322' Groups: - Official -- cgit 1.3.0-6-gf8a5 From 0f01ac26f90dce5e5467dbb9972341cf8b2dd995 Mon Sep 17 00:00:00 2001 From: Niklink Date: Thu, 31 Mar 2022 13:32:38 -0400 Subject: closing various data issues fixes #48, #49, #52, #56, #57, #58, #59, #60 + robert jailbreak lyrics --- album/s-collide.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index 07114b4..25a6ca2 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -60,6 +60,7 @@ URLs: - https://youtu.be/Ow8PeoCrfcg Referenced Tracks: - Eternity Served Cold +- Typheus --- Track: Heir of Grief Artists: -- cgit 1.3.0-6-gf8a5 From 47b97e8a8ec03eacc87da0eff6b4b3aca846b492 Mon Sep 17 00:00:00 2001 From: Niklink Date: Thu, 5 May 2022 23:10:20 -0400 Subject: Fixes & remove 7th gate project cover fixes #48, #64, #65, #66, #74, #76, #77, #79 --- album/s-collide.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index 25a6ca2..784128c 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -73,6 +73,7 @@ URLs: - https://youtu.be/Es5mh7pBeec Referenced Tracks: - Heir Conditioning +- Typheus Commentary: |- James Roach: 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) -- cgit 1.3.0-6-gf8a5 From 559f2daee0970039c57588b5bd395667f14a6b90 Mon Sep 17 00:00:00 2001 From: Niklink Date: Fri, 6 May 2022 14:36:56 -0400 Subject: Add art tags to comic screencaps, remove MC tag misc fixes 7th gate, canwc vol1, strife, team paradox, hs vol2, hvs vol1 --- album/s-collide.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index 784128c..d30a952 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -20,6 +20,11 @@ Wallpaper Artists: 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 @@ -30,6 +35,13 @@ Referenced Tracks: 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' @@ -54,6 +66,18 @@ Commentary: |- 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 @@ -67,6 +91,12 @@ 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 -- cgit 1.3.0-6-gf8a5 From de26705ab1b4144c6cda288235d4a584c691f8cb Mon Sep 17 00:00:00 2001 From: Niklink Date: Mon, 23 May 2022 13:20:50 -0400 Subject: add songs unsung --- album/s-collide.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'album/s-collide.yaml') diff --git a/album/s-collide.yaml b/album/s-collide.yaml index d30a952..313e6ec 100644 --- a/album/s-collide.yaml +++ b/album/s-collide.yaml @@ -87,6 +87,7 @@ Referenced Tracks: - Typheus --- Track: Heir of Grief +Directory: heir-of-grief-collide Artists: - Tensei Contributors: @@ -102,7 +103,7 @@ URLs: - https://homestuck.bandcamp.com/track/heir-of-grief-2 - https://youtu.be/Es5mh7pBeec Referenced Tracks: -- Heir Conditioning +- track:heir-of-grief - Typheus Commentary: |- James Roach: -- cgit 1.3.0-6-gf8a5