« get me outta code hell

Merge branch 'a-grand-new-era' of vriska/hsmusic-data into staging-yaml - hsmusic-data - Data files for https://hsmusic.wiki - track, album, artist & flash info, etc
summary refs log tree commit diff
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2022-05-25 00:08:52 +0000
committerGogs <gogitservice@gmail.com>2022-05-25 00:08:52 +0000
commitf8bd5105dca359b8961eb5610b7876450880feff (patch)
tree042192578a37278ef937b3bb20e98a09447f1396
parent77975686fabd08ee3bf3e2e236a74f5a9ffbc363 (diff)
parent45b0dd03ca82df51e7a8466ee63e225af5ef4146 (diff)
Merge branch 'a-grand-new-era' of vriska/hsmusic-data into staging-yaml
-rw-r--r--album/cool-and-new-volume-ii.yaml3
-rw-r--r--album/references-beyond-homestuck.yaml176
-rw-r--r--artists.yaml50
3 files changed, 228 insertions, 1 deletions
diff --git a/album/cool-and-new-volume-ii.yaml b/album/cool-and-new-volume-ii.yaml
index ea28b192..69b4b7b0 100644
--- a/album/cool-and-new-volume-ii.yaml
+++ b/album/cool-and-new-volume-ii.yaml
@@ -280,10 +280,11 @@ Art Tags:
 - Jack Noir
 Referenced Tracks:
 - Liquid Negrocity
+- 'A Grand New Era ~Ending~'
 Sampled Tracks:
 - Liquid Negrocity
 - 'Metal Gear Rising: Revengeance'
-- 'A Grand New Era ~Ending~ - SilvaGunner: Rebooted'
+- 'A Grand New Era ~Ending~'
 - Jojo's Bizarre Adventure
 - JoJo Sono Chi no Kioku ~end of THE WORLD~
 - Titanic
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 95c19e70..9869d668 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -358,6 +358,15 @@ Duration: '1:55'
 URLs:
 - https://www.youtube.com/watch?v=cPWBG6_jn4Y
 ---
+Track: Bright Spinning Planet
+Artists:
+- Kirby
+- Hirokazu Ando
+Duration: '1:09'
+URLs:
+- https://www.youtube.com/watch?v=VOwsYDtnFOE
+- https://open.spotify.com/track/48wfJa6hyfiXB0RZnzUKRJ
+---
 Track: Calamari Inkantation
 Artists:
 - Splatoon
@@ -382,6 +391,17 @@ Duration: '2:00'
 URLs:
 - https://www.youtube.com/watch?v=g-s-VQBoUdc
 ---
+Track: DK Rap
+Artists:
+- Donkey Kong
+- Grant Kirkhope
+Contributors:
+- George Andreas (lyrics, vocals)
+- Chris Sutherland (vocals)
+Duration: '3:28'
+URLs:
+- https://www.youtube.com/watch?v=q-yZ7_enlWA
+---
 Track: Dragon Roost Island
 Artists:
 - The Legend of Zelda
@@ -469,6 +489,15 @@ Duration: 0:34
 URLs:
 - https://youtu.be/n0dgaYe2LZw
 ---
+Track: GO MY WAY!!
+Artists:
+- THE iDOLM@STER
+- Satoru Kousaki
+- yura
+Duration: '2:09'
+URLs:
+- https://www.youtube.com/watch?v=iYcRQBrUbd0
+---
 Track: Guile's Theme
 Artists:
 - Street Fighter
@@ -476,6 +505,26 @@ Duration: '4:05'
 URLs:
 - https://www.youtube.com/watch?v=Iof5pRAIZmw
 ---
+Track: Haltmann Works Co. HQ
+Artists:
+- Kirby
+- Hirokazu Ando
+Duration: '2:46'
+URLs:
+- https://www.youtube.com/watch?v=wmhFKDCP9a0
+- https://open.spotify.com/track/2HQS5vlZqlOV4QLYBKF550
+Referenced Tracks:
+- Haltmann Works Co. Theme Song
+---
+Track: Haltmann Works Co. Theme Song
+Artists:
+- Kirby
+- Hirokazu Ando
+Duration: '1:25'
+URLs:
+- https://www.youtube.com/watch?v=RPLz7UIeQv8
+- https://open.spotify.com/track/4F9muAB4BFreVBPDW6mVVi
+---
 Track: Historia Crux
 Artists:
 - Final Fantasy
@@ -557,6 +606,15 @@ Duration: '1:59'
 URLs:
 - https://www.youtube.com/watch?v=iIowwZThIXM
 ---
+Track: 'Milky Way Wishes: Shooting'
+Artists:
+- Kirby
+- Shogo Sakai
+- Megumi Ohara
+Duration: '2:17'
+URLs:
+- https://www.youtube.com/watch?v=DuVGZdzEGF8
+---
 Track: Moon Over the Castle
 Artists:
 - Gran Turismo
@@ -625,6 +683,17 @@ Duration: '2:24'
 URLs:
 - https://www.youtube.com/watch?v=XKfXsTkA71I
 ---
+Track: Venturing into the Mechanized World
+Artists:
+- Kirby
+- Hirokazu Ando
+Duration: '1:36'
+URLs:
+- https://www.youtube.com/watch?v=xVMSnXfJCxk
+- https://open.spotify.com/track/7jQt4d7Rv3YZkxEBuURgtA
+Referenced Tracks:
+- Haltmann Works Co. Theme Song
+---
 Track: Pushing Onwards
 Artists:
 - VVVVVV
@@ -887,6 +956,19 @@ Duration: '2:50'
 URLs:
 - https://www.youtube.com/watch?v=J6YwX03nFQM
 ---
+Track: Vagrant Counting Song of Retrospection
+Artists:
+- Kirby
+- Hirokazu Ando
+Duration: '3:07'
+URLs:
+- https://www.youtube.com/watch?v=tK1_m7f1UhA
+- https://open.spotify.com/track/1NQNE28NAB4PFmF6NVwQzV
+Referenced Tracks:
+- Bright Spinning Planet
+- 'Milky Way Wishes: Shooting'
+- Haltmann Works Co. HQ
+---
 Track: Vela-Nova
 Artists:
 - Sonic the Hedgehog
@@ -1051,6 +1133,19 @@ Lyrics: |-
     Drift
     Away 
 ---
+Track: Family Guy Main Theme
+Artists:
+- Family Guy
+- Walter Murphy
+Contributors:
+- Alex Borstein (vocals)
+- Mila Kunis (vocals)
+- Seth Green (vocals)
+- Seth MacFarlane (vocals)
+Duration: '0:32'
+URLs:
+- https://www.youtube.com/watch?v=VileKLJz6tQ
+---
 Track: Futurama Main Theme
 Artists:
 - Futurama
@@ -1639,6 +1734,21 @@ Duration: '1:36'
 URLs:
 - https://www.youtube.com/watch?v=mjjkHg5FOhk
 ---
+Track: The Simpsons Theme
+Artists:
+- The Simpsons
+- Danny Elfman
+Duration: '1:28'
+URLs:
+- https://www.youtube.com/watch?v=HXec1gfg21w
+---
+Track: The Time Is Now
+Artists:
+- John Cena
+Duration: '2:56'
+URLs:
+- https://www.youtube.com/watch?v=svjMiqVeiG8
+---
 Track: Tower of Mistakes
 Artists:
 - Steven Universe
@@ -2048,6 +2158,35 @@ URLs:
 Sampled Tracks:
 - '300'
 ---
+Track: A Grand New Era ~Ending~
+Artists:
+- SilvaGunner
+Duration: '4:43'
+URLs:
+- https://www.youtube.com/watch?v=eionH4HdkW8
+- https://gilvasunner.bandcamp.com/track/a-grand-new-era-ending
+Referenced Tracks:
+- Vagrant Counting Song of Retrospection
+- Meet the Flintstones
+- 'The Flintstones: The Rescue of Dino & Hoppy - Title Theme/Ending'
+- Family Guy Main Theme
+- Venturing into the Mechanized World
+- Interior Crocodile Alligator
+- GO MY WAY!!
+- track:megalovania-undertale
+- DK Rap
+- Onett Theme
+- Gangnam Style
+- Fuck Bees
+- The Time Is Now
+- Do Your Best
+Sampled Tracks:
+- Vinesauce Joel reacts to GRAND DAD
+- Loud Nigra
+- Why I Gave the Pope UNDERTALE!
+- Howie Scream
+- FOUR HOURS!
+---
 Track: A Song About a Circle Constant
 Directory: a-song-about-a-circle-constant-vi-hart
 Artists:
@@ -2196,6 +2335,13 @@ Duration: '3:02'
 URLs:
 - https://www.youtube.com/watch?v=mREi_Bb85Sk
 ---
+Track: Crank That
+Artists:
+- Soulja Boy
+Duration: '3:58'
+URLs:
+- https://www.youtube.com/watch?v=8UFIYGkROII
+---
 Track: Creeping in My Soul
 Artists:
 - Cryoshell
@@ -2238,6 +2384,13 @@ Duration: '4:56'
 URLs:
 - https://www.youtube.com/watch?v=u6-U-apEUZI
 ---
+Track: Do Your Best
+Artists:
+- Geethanjali Kids
+Duration: '3:05'
+URLs:
+- https://www.youtube.com/watch?v=jGatO6vMPqw
+---
 Track: Drop It Like It's Hot
 Artists:
 - Snoop Dogg
@@ -2575,6 +2728,15 @@ Lyrics: |-
     (Well thank you Scott. Thank goodness for comedians. You know? It lightens our day.)
     (It-that-it wasn't supposed to be funny.)
 ---
+Track: Fuck Bees
+Artists:
+- Happening.tv
+Duration: '3:08'
+URLs:
+- https://www.youtube.com/watch?v=C1RYSy55KtA
+Referenced Tracks:
+- Hip To Be Square
+---
 Track: Fuck tha Police
 Artists:
 - N.W.A.
@@ -2678,6 +2840,13 @@ URLs:
 Referenced Tracks:
 - What's Up
 ---
+Track: Hip To Be Square
+Artists:
+- Huey Lewis and the News
+Duration: '3:51'
+URLs:
+- https://www.youtube.com/watch?v=LB5YkmjalDg
+---
 Track: How Do I Live
 Artists:
 - Diane Warren
@@ -2751,6 +2920,13 @@ Duration: '2:45'
 URLs:
 - https://www.youtube.com/watch?v=ARLPT5rKjWo
 ---
+Track: Interior Crocodile Alligator
+Artists:
+- Chip tha Ripper
+Duration: '1:50'
+URLs:
+- https://www.youtube.com/watch?v=0OEbuDP5Yys
+---
 Track: Isle Unto Thyself
 Artists:
 - Tally Hall
diff --git a/artists.yaml b/artists.yaml
index ad519c1d..b8f05777 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -109,6 +109,8 @@ URLs:
 - https://soundcloud.com/alexamlie/
 - https://www.youtube.com/user/nemecic9199
 ---
+Artist: Alex Borstein
+---
 Artist: Alex Krokus
 URLs:
 - https://twitter.com/loudandsmart
@@ -682,6 +684,8 @@ Artist: Childish Gambino
 ---
 Artist: Chimune
 ---
+Artist: Chip tha Ripper
+---
 Artist: Chris Durel
 URLs:
 - http://www.chrisdurel.com/
@@ -702,6 +706,8 @@ Artist: Chris Patstone
 ---
 Artist: Chris Roper
 ---
+Artist: Chris Sutherland
+---
 Artist: Christina Rosetti
 URLs:
 - https://www.poetryfoundation.org/poets/christina-rossetti
@@ -923,6 +929,8 @@ URLs:
 - https://twitter.com/recentlydanny
 - http://www.neo-kosmos.com/
 ---
+Artist: Danny Elfman
+---
 Artist: Dante Basco
 ---
 Artist: DarkHakao
@@ -1055,6 +1063,8 @@ URLs:
 ---
 Artist: Domble
 ---
+Artist: Donkey Kong
+---
 Artist: Donomon
 URLs:
 - https://donomon.tumblr.com/
@@ -1225,6 +1235,8 @@ Artist: Fabricio Podestá
 ---
 Artist: Facetious (Alex Votl) & Friends
 ---
+Artist: Family Guy
+---
 Artist: FauxMonstur
 Dead URLs:
 - http://irrisorie.webs.com/
@@ -1345,6 +1357,8 @@ URLs:
 - https://ghastaboo.tumblr.com/
 - https://twitter.com/ghastaboo
 ---
+Artist: Geethanjali Kids
+---
 Artist: Gene
 URLs:
 - https://trainwreckgenerator.tumblr.com/
@@ -1355,6 +1369,8 @@ URLs:
 - https://twitter.com/cartoonfuntime
 - https://www.genevahodgson.com/
 ---
+Artist: George Andreas
+---
 Artist: George Frideric Handel
 ---
 Artist: George Michael
@@ -1421,6 +1437,8 @@ URLs:
 ---
 Artist: Gran Turismo
 ---
+Artist: Grant Kirkhope
+---
 Artist: Griever
 URLs:
 - https://mspfa.com/?s=13714&p=1
@@ -1487,6 +1505,8 @@ URLs:
 - http://saffronscarf.deviantart.com
 - https://www.deviantart.com/saffronscarf
 ---
+Artist: Happening.tv
+---
 Artist: Haunter
 ---
 Artist: Haven Daniels-Taylor
@@ -1685,6 +1705,8 @@ Artist: Johann Sebastian Bach
 ---
 Artist: John Alexander
 ---
+Artist: John Cena
+---
 Artist: John Frederick Coots
 ---
 Artist: John Hatchford
@@ -1920,6 +1942,8 @@ Artist: King of the Hill
 ---
 Artist: KingCochino
 ---
+Artist: Kirby
+---
 Artist: Kirin J. Callinan
 ---
 Artist: Kirvia
@@ -2362,6 +2386,8 @@ Artist: Meghan Kininger
 ---
 Artist: Megumi Inoue
 ---
+Artist: Megumi Ohara
+---
 Artist: Mel
 ---
 Artist: Melancholy Robot
@@ -2442,6 +2468,8 @@ URLs:
 - https://twitter.com/Thelilhamstar
 - https://www.behance.net/mikkynga
 ---
+Artist: Mila Kunis
+---
 Artist: Minish
 Aliases:
 - minishLAN
@@ -3281,6 +3309,8 @@ URLs:
 ---
 Artist: Sarcastic Fringehead
 ---
+Artist: Satoru Kousaki
+---
 Artist: Saw
 ---
 Artist: Sbahjsic
@@ -3345,6 +3375,10 @@ URLs:
 ---
 Artist: Set It Off
 ---
+Artist: Seth Green
+---
+Artist: Seth MacFarlane
+---
 Artist: Seth Massey
 Aliases:
 - slogbait
@@ -3419,6 +3453,8 @@ URLs:
 - https://www.youtube.com/c/Shirokishi
 - https://shirokishi.carrd.co/
 ---
+Artist: Shogo Sakai
+---
 Artist: Shoona
 URLs:
 - https://shoona.tumblr.com/
@@ -3519,6 +3555,8 @@ Artist: Sondra Crawford
 ---
 Artist: Sonic the Hedgehog
 ---
+Artist: Soulja Boy
+---
 Artist: Sozzay
 URLs:
 - https://sozzay.tumblr.com/
@@ -3775,6 +3813,8 @@ Artist: The Haydn Quartet
 URLs:
 - https://en.wikipedia.org/wiki/Haydn_Quartet_(vocal_ensemble)
 ---
+Artist: THE iDOLM@STER
+---
 Artist: The Knack
 ---
 Artist: The Legend of Zelda
@@ -3798,6 +3838,8 @@ Artist: The Refreshments
 ---
 Artist: The Rolling Stones
 ---
+Artist: The Simpsons
+---
 Artist: The Super Mario Players
 ---
 Artist: The Winstons
@@ -4042,6 +4084,8 @@ URLs:
 ---
 Artist: Walter Donovan
 ---
+Artist: Walter Murphy
+---
 Artist: Walter Rollins
 ---
 Artist: wank_wank
@@ -4183,6 +4227,8 @@ URLs:
 - https://www.instagram.com/aidosaur/
 - http://www.johnnywander.com/
 ---
+Artist: yura
+---
 Artist: Zach Callison
 ---
 Artist: Zack Morrison
@@ -4539,6 +4585,8 @@ Artist: Hideki Naganuma
 ---
 Artist: Hiroaki Tominaga
 ---
+Artist: Hirokazu Ando
+---
 Artist: Hirokazu Tanaka
 ---
 Artist: Hiroki Hashimoto
@@ -4552,6 +4600,8 @@ URLs:
 ---
 Artist: Hoyt Curtin
 ---
+Artist: Huey Lewis and the News
+---
 Artist: hywell
 URLs:
 - https://smoothiefruitee.bandcamp.com/