From daed273da44616006a9bb4ce9410664434d5ede6 Mon Sep 17 00:00:00 2001
From: Niklink <25875275+Niklink@users.noreply.github.com>
Date: Sun, 6 Aug 2023 12:07:55 -0400
Subject: add cyber city sound pak

---
 album/cyber-city-sound-pak.yaml        | 210 +++++++++++++++++++++++++++++++++
 album/gotta-hatch-em-all.yaml          |   6 +-
 album/references-beyond-homestuck.yaml |  19 +++
 artists.yaml                           |   4 +
 4 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 album/cyber-city-sound-pak.yaml

diff --git a/album/cyber-city-sound-pak.yaml b/album/cyber-city-sound-pak.yaml
new file mode 100644
index 00000000..82737b7f
--- /dev/null
+++ b/album/cyber-city-sound-pak.yaml
@@ -0,0 +1,210 @@
+Album: CYBER CITY SOUND PAK
+Artists:
+- Cristata
+Date: August 4, 2023
+Date Added: August 26, 2023
+URLs:
+- https://cristata.bandcamp.com/album/cyber-city-sound-pak
+Cover Artists:
+- Cristata
+Color: '#ed2da0'
+Groups:
+- Cristata
+- Beyond
+Has Track Art: false
+Cover Art File Extension: png
+Banner File Extension: png
+Banner Dimensions: 1100x180
+Wallpaper Style: 'opacity: 0.8;'
+Banner Artists:
+- Cristata
+- Niklink (edits for wiki)
+Wallpaper Artists:
+- Cristata
+Commentary: |-
+    <i>Cristata:</i>
+    HEY⠀⠀ !!! 3VER WANNA [take a ride] AROUND [[insert zipcode here]] BLAST1NG THE COOL, SWEET SOUNDS FROM THE DARK? BUT YOU CANT? BEC4USE YOURE A [$#!&ing] L1ght< ner?! WELL YOUR OLD PAL ⠀⠀⠀ !SPAMTON HAS THE BEST DEAL YOU'LL EVER [look , its over there!] ON!!!
+
+    FOR ONLY 7.99 OF YOUR PATHET1C [[wacky stacks]] YOU CAN GET THIS [[specil disk and mp3 and wav and]] THAT COMES WITH NOT [one] NOT [duo] BUT ten EXCLUSIVE SONGS I [[promise?]] YOU CANT FIND ANYWHERE EL SE! 4ND MABY A B0NUS 2... . . . . ..//?[
+
+    NOW Y OU 2 CAN [[pissing off]] THOSE STUP 1D N3IGHBORS AT [sale ends 4 am est] BECAUSE YOU CANT STOP [limited edition party juice flavor]!
+
+    THIS IS [limited time deal, act fast!] SO DONT [$@#$ing] W41T
+
+    CYBER CITY SOUND PAK! TELL YOUR [[friends and family sale going on now!]]
+
+    BUY NOW >>[[hyperlink blocked]]<<
+
+    [[hyperlink blocked]]
+
+    [[hyperlink blocked]]
+
+    [[hyperlink blocked]]
+    <hr>
+    I've been working on this since Chapter 2 dropped, and I'm so excited to finally release this to you all. This album means a whole lot to me and I'd love for you all to share around it if you like it too.
+
+    (<a href="https://www.youtube.com/watch?v=s6yN7dAL6kM">Album visualizer!</a>)
+Additional Files:
+- Title: Bandcamp Banner
+  Files:
+  - banner.png
+---
+Section: Main album
+---
+Track: ARE YOU LOST II
+Duration: '4:20'
+URLs:
+- https://cristata.bandcamp.com/track/are-you-lost-ii
+- https://www.youtube.com/watch?v=5GOFOsUsQk8
+Referenced Tracks:
+- ARE YOU LOST?
+Commentary: |-
+    <i>Cristata:</i>
+    Merry Christmas
+---
+Track: WELCOME TO THE CITY (Snow Squall Warning) 
+Duration: '4:33'
+URLs:
+- https://cristata.bandcamp.com/track/welcome-to-the-city-snow-squall-warning
+- https://www.youtube.com/watch?v=Tw7nKqRneLY
+Referenced Tracks:
+- cybercity_alt
+Commentary: |-
+    <i>Cristata:</i>
+    <b>Your computer might be at risk</b>
+    Grandma is making spaghetti tonight
+---
+Track: SMART RACE (Cristata Vs Hywell Mix)
+Duration: '5:14'
+URLs:
+- https://cristata.bandcamp.com/track/smart-race-cristata-vs-hywell-mix
+- https://www.youtube.com/watch?v=HkgjdqPGveo
+Referenced Tracks:
+- Smart Race
+- Terezi's Theme
+- Snowy
+---
+Track: ATTACK OF THE KILLER QUEEN (CORE Mix)
+Duration: '6:03'
+URLs:
+- https://cristata.bandcamp.com/track/attack-of-the-killer-queen-core-mix
+Referenced Tracks:
+- Pandora Palace
+- CORE
+- Attack of the Killer Queen
+Commentary: |-
+    <i>Cristata:</i>
+    WINNER!
+
+    <b>YOU'VE WON!</b>
+
+    CLAIM YOUR FREE GAMECLAM 3 NOW !!!!!
+---
+Track: BIG SHOT (1997 Remix)
+Duration: '7:32'
+URLs:
+- https://cristata.bandcamp.com/track/big-shot-1997-remix
+- https://www.youtube.com/watch?v=W-sd0FoRdA4
+Referenced Tracks:
+- BIG SHOT
+- THE WORLD REVOLVING
+Sampled Tracks:
+- BIG SHOT
+Lyrics: |-
+    NOW'S YOUR CHANCE TO BE A BIG SHOT
+    BE A BIG BE A BIG BE A BIG SHOT
+    NOW'S YOUR CHANCE TO BE A BIG SHOT
+    BE A BIG BE A BIG BE A BIG SHOT
+    NOW'S YOUR CHANCE NOW'S YOUR CHANCE
+    NO-NO-NO-NOW'S YOUR CHANCE TO BE A BIG SHOT
+    NOW'S YOUR CHANCE NOW'S YOUR CHANCE
+    NO-NO-NO-NOW'S YOUR CHANCE TO BE A BIG SHOT
+    NOW'S YOUR CHANCE NOW'S YOUR CHANCE
+    NO-NO-NO-NOW'S YOUR CHANCE TO BE A BIG SHOT
+    NOW'S YOUR CHANCE NOW'S YOUR CHANCE
+    NO-NO-NO-NOW'S YOUR CHANCE TO BE A BIG SHOT
+Commentary: |-
+    <i>Cristata:</i>
+    BTW Its called 1997 because its spamtons favorite year :)
+---
+Track: 𝐼𝒩𝒯𝐸𝑅𝐿𝒰𝒟𝐸- Elsewhere, in Another Time and Space, it Pours (ft Cozmia)
+Directory: interlude-elsewhere-in-another-time-and-space-it-pours-ft-cozmia
+Duration: '4:02'
+URLs:
+- https://cristata.bandcamp.com/track/elsewhere-in-another-time-and-space-it-pours-ft-cozmia
+- https://www.youtube.com/watch?v=5UGFDfU0lvM
+Referenced Tracks:
+- It's Raining Somewhere Else
+- track:penumbra-phantasm
+---
+Track: WORLD REVOLVING (1997 Edit)
+Duration: '4:27'
+URLs:
+- https://cristata.bandcamp.com/track/world-revolving-1997-edit
+- https://www.youtube.com/watch?v=xowYTUlkRzQ
+Referenced Tracks:
+- THE WORLD REVOLVING
+Lyrics: |-
+    BYE BYE!
+---
+Track: SCARLET FOREST (Lotus Mix)
+Duration: '7:35'
+URLs:
+- https://cristata.bandcamp.com/track/scarlet-forest-lotus-mix
+Referenced Tracks:
+- Scarlet Forest
+- track:upward-movement-dave-owns
+- Lotus
+Sampled Tracks:
+- track:upward-movement-dave-owns
+Commentary: |-
+    <i>Cristata:</i>
+    <big>[redacted]</big>
+---
+Track: FIELD OF HOPES AND DREAMS (Flare Mix)
+Duration: '10:25'
+URLs:
+- https://cristata.bandcamp.com/track/field-of-hopes-and-dreams-flare-mix
+- https://www.youtube.com/watch?v=W380eD18lYY
+Referenced Tracks:
+- Weird Birds
+- Field of Hopes and Dreams
+- Flare
+Sampled Tracks:
+- Weird Birds
+---
+Track: BEFORE THE STORY
+Directory: before-the-story-cyber-city-sound-pak
+Duration: '7:48'
+URLs:
+- https://cristata.bandcamp.com/track/before-the-story
+Referenced Tracks:
+- track:before-the-story
+---
+Section: Bonus tracks
+---
+Track: DISCONTECTED, UNREACHABLE
+Duration: '6:08'
+URLs:
+- https://www.youtube.com/watch?v=s6yN7dAL6kM&t=3710
+Referenced Tracks:
+- The Circus
+- THE WORLD REVOLVING
+- man
+Commentary: |-
+    <i>Cristata:</i>
+    <p style="font-family:'Wingdings', 'Zapf Dingbats', 'Webdings', symbol">PICK UP THE PHONE OH MY GOD.<br>
+    SPAMTON YOU IDIOT.<br>
+    YOU LEFT THE LIGHTS ON IN THE HOUSE AGAIN.<br>
+    DO YOU KNOW HOW HIGH THE ELECTRICITY BILL IS.<br>
+    IM NOT GOING TO RENEW YOUR FFXIV SUB IF YOU KEEP THIS UP.<br>
+    JUST FLIP THE SWITCH WHEN YOU LEAVE THE HOUSE.<br>
+    ITS. SO. SIMPLE!!!!!!!!!!!!!!!</p>
+    <hr>
+    <i>PICK UP THE PHONE OH MY GOD.<br>
+    SPAMTON YOU IDIOT.<br>
+    YOU LEFT THE LIGHTS ON IN THE HOUSE AGAIN.<br>
+    DO YOU KNOW HOW HIGH THE ELECTRICITY BILL IS.<br>
+    IM NOT GOING TO RENEW YOUR FFXIV SUB IF YOU KEEP THIS UP.<br>
+    JUST FLIP THE SWITCH WHEN YOU LEAVE THE HOUSE.<br>
+    ITS. SO. SIMPLE!!!!!!!!!!!!!!!</i>
diff --git a/album/gotta-hatch-em-all.yaml b/album/gotta-hatch-em-all.yaml
index f15a9b90..504c3d8d 100644
--- a/album/gotta-hatch-em-all.yaml
+++ b/album/gotta-hatch-em-all.yaml
@@ -1,10 +1,14 @@
 Album: Gotta Hatch 'Em All!
 Date: July 22, 2023
-Date Added: July 23, 2023
+Date Added: August 26, 2023
 URLs:
+- https://sahcon.bandcamp.com/album/gotta-hatch-em-all-sahcon-2023-album
 - https://www.youtube.com/watch?v=TzdgUxWj7Tw
 Cover Artists:
 - YoItsCro
+Art Tags:
+- Tavros
+- Tavros' lusus
 Color: '#fb6ac2'
 Has Track Art: false
 Cover Art File Extension: png
diff --git a/album/references-beyond-homestuck.yaml b/album/references-beyond-homestuck.yaml
index 133cb4c8..c6656be3 100644
--- a/album/references-beyond-homestuck.yaml
+++ b/album/references-beyond-homestuck.yaml
@@ -61,6 +61,14 @@ Duration: '5:48'
 URLs:
 - https://www.youtube.com/watch?v=OEYox7zoOvU
 ---
+Track: cybercity_alt
+# No official release, duration is from the in-game audio loop.
+Artists:
+- Toby Fox
+Duration: '2:22'
+URLs:
+- https://www.youtube.com/watch?v=WyPD3YMhwnQ
+---
 Track: Dusk for the Age of Miracles
 Artists:
 - Clark Powell
@@ -346,6 +354,17 @@ Lyrics: |-
     Now it's coming to a sort of break in the music while you're talking to the boss.
     <i>[[An Apple Disaster!!]]</i>
 ---
+Track: man
+# No official release, duration is from the in-game audio loop.
+Artists:
+- Toby Fox
+Duration: '0:11'
+URLs:
+- https://www.youtube.com/watch?v=lEJpVwvKq1g
+Commentary: |-
+    <i>Niklink:</i>
+    Originally shared in a 2012 Tumblr post as part of several "made up yume nikkis" snippets where it was known as "waltz of seccom masada".
+---
 Track: Megalo Strike Back
 Artists:
 - Toby Fox
diff --git a/artists.yaml b/artists.yaml
index c587632c..53822057 100644
--- a/artists.yaml
+++ b/artists.yaml
@@ -1118,6 +1118,7 @@ Aliases:
 - smothiefruitee
 - hywell
 - Cosmia
+- Cozmia
 - FRUITYTEE
 - hexidecimal
 - Ruedof
@@ -1127,11 +1128,14 @@ Aliases:
 - ASTERISMIS
 - irlgoomy
 - Goomy
+- Webby
+- asters
 URLs:
 - https://cristata.bandcamp.com/
 - https://soundcloud.com/cristata
 - https://www.youtube.com/@Cristata/
 - https://twitter.com/CristataMusic
+- https://cohost.org/Goomy
 - https://linktr.ee/cristatamusic
 Dead URLs:
 - https://smoothiefruitee.bandcamp.com/
-- 
cgit 1.3.0-6-gf8a5