pray general review

5 files changed, 96 insertions, 49 deletions

diff --git a/album/deltarune-ch2-ost.yaml b/album/deltarune-ch2-ost.yaml
index 28f3f061..3c813e83 100644
--- a/album/deltarune-ch2-ost.yaml
+++ b/album/deltarune-ch2-ost.yaml
@@ -183,6 +183,14 @@ URLs:
 - https://open.spotify.com/track/30hbRoex1LUK0fShzTLR1C
 Referenced Tracks:
 - '74'
+Commentary: |-
+    <i>Toby Fox:</i> ([Twitter](https://x.com/tobyfox/status/1173210559149486081), 9/15/2019)
+
+    🎵Welcome to the CITY🎵
+
+    <video src="media/misc/welcome-to-the-city.mp4" width="450" pixelate>
+
+    (Note: the City is extremely small.)
 ---
 Track: Mini Studio
 Duration: 0:51
@@ -317,6 +325,18 @@ URLs:
 - https://tobyfox.bandcamp.com/track/lost-girl
 - https://www.youtube.com/watch?v=P89rxnT7lKw
 - https://open.spotify.com/track/4OaDjTKDu5wNML5Ia1AqOI
+Commentary: |-
+    <i>Toby Fox:</i> ([Twitter](https://x.com/tobyfox/status/1173215290349559808), 9/15/2019)
+
+    Lost Girl (Noelle)
+
+    <video src="media/misc/lost-girl-noelle.mp4" width="450" pixelate>
+
+    (I said this was Noelle's Theme but it's actually the kind of song that gets used repeatedly all over the game, even when she's not around...)
+
+    Of course, that's not the only version of that song. Lots and lots of things happen. I just hope you can be friends with everyone someday.
+
+    <video src="media/misc/lost-girl-alt.mp4" width="450" pixelate>
 ---
 Track: Ferris Wheel
 Duration: '1:19'
diff --git a/album/pray.yaml b/album/pray.yaml
index 28a6e653..d8aff1e7 100644
--- a/album/pray.yaml
+++ b/album/pray.yaml
@@ -1,6 +1,6 @@
 Album: PRAY
 Artists:
-- Itoki Hana (all vocals, programming, mellotron, flute)
+- Itoki Hana
 Date: August 30, 2018
 Date Added: December 9, 2024
 URLs:
@@ -16,20 +16,28 @@ Groups:
 Wallpaper Artists:
 - ruby
 Wallpaper File Extension: png
+Commentary: |-
+    <i>Quasar Nebula:</i> (wiki editor)
+
+    This album is a CD release and also available on streaming platforms, but not completely on YouTube. We've included individual track links where available. The durations on this album are from the CD release; on streaming all tracks are around two seconds shorter.
+
+    Track 6, [[track:cycle-pray]], is listed on iTunes Store as an album-only track (it cannot be bought individually). It can't be streamed as part of the album on Apple Music and is excluded from the album on Spotify. The streaming links for this track are for its single/EP release instead.
 ---
 Track: きみでないのなら
-Additional Names:
-- Name: Kimidenainonara
-  Annotation: Apple Music (Romaji)
 Directory: kimidenainonara
-Artists:
-- Itoki Hana (vocals, lyrics, composition)
+Additional Names:
+- Name: >-
+    Kimidenainonara
+  Annotation: >-
+    [Apple Music](https://music.apple.com/album/kimidenainonara/1418425430?i=1418425437) (Romaji)
 Contributors:
+- Itoki Hana (vocals, lyrics, composition)
 - kidlit (arrangement, programming & piano)
 Duration: '4:35'
 URLs:
 - https://open.spotify.com/track/5XOoFnzpoNCEnRjZrNSTkF
 - https://music.apple.com/album/kimidenainonara/1418425430?i=1418425437
+- https://www.youtube.com/watch?v=Q6n3c2SI1ZE
 Lyrics: |-
     永遠でないのなら、いますぐに壊したい。
     もしも君でないのなら、誰もいなくていい。
@@ -58,12 +66,13 @@ Lyrics: |-
     もしも君でないのなら･･･
 ---
 Track: ROLE PLAY
-Artists:
+Contributors:
 - Itoki Hana (vocals, lyrics, composition, arrangement)
 Duration: '4:54'
 URLs:
 - https://open.spotify.com/track/6UbCyXkJW8WCbRywpi8iDz
 - https://music.apple.com/album/role-play/1418425430?i=1418425438
+- https://www.youtube.com/watch?v=UkIMcSJiffg
 Lyrics: |-
     『望んでくれるなら、ぼくは勇者になろう。
     ･･･代わりが もう、いるんだね。
@@ -116,15 +125,21 @@ Lyrics: |-
 ---
 Track: '74'
 Additional Names:
-- Name: Seventy Four
-  Annotation: Apple Music
+- Name: >-
+    Seventy Four
+  Annotation: >-
+    [Apple Music](https://music.apple.com/album/seventy-four/1418425430?i=1418425439)
 Artists:
+- Itoki Hana
+- Toby Fox
+Contributors:
 - Itoki Hana (vocals, lyrics, arrangement)
 - Toby Fox (vocals, lyrics, composition)
-Duration: '4:35'
+Duration: '3:35'
 URLs:
 - https://open.spotify.com/track/0Q2eLJmspNc9jUAtOhotAe
 - https://music.apple.com/album/seventy-four/1418425430?i=1418425439
+- https://www.youtube.com/watch?v=poKI_MY0Bkw
 Lyrics: |-
     Seventy-three
     時だけが過ぎてゆく
@@ -192,9 +207,8 @@ Lyrics: |-
     Seventy-four
 ---
 Track: Pillowman
-Artists:
-- Itoki Hana (vocals, lyrics, composition, arrangement)
 Contributors:
+- Itoki Hana (vocals, lyrics, composition, arrangement)
 - Naofumi Onoda (drums)
 Duration: '4:55'
 URLs:
@@ -266,12 +280,13 @@ Lyrics: |-
     Believin'in you
 ---
 Track: A love suicide
-Artists:
+Contributors:
 - Itoki Hana (vocals, arrangement)
 Duration: '3:29'
 URLs:
 - https://open.spotify.com/track/6IEkzYYw1XdaVKExfVvmyY
 - https://music.apple.com/album/a-love-suicide/1418425430?i=1418425441
+- https://www.youtube.com/watch?v=Xuhe0B5XDq0
 Referenced Tracks:
 - 'A love suicide~The theme of RULE of ROSE~'
 Lyrics: |-
@@ -314,13 +329,12 @@ Lyrics: |-
     It is pure white just like sin
 ---
 Track: 環 -cycle-
+Suffix Directory: true
 Additional Names:
 - Name: cycle
   Annotation: localized name
-Directory: cycle
-Artists:
-- Itoki Hana (vocals)
 Contributors:
+- Itoki Hana (vocals)
 - Koko Komine (lyrics)
 - Tomohiko Kira (composition, arrangement)
 - Yoko Ueno (arrangement)
@@ -335,7 +349,8 @@ Contributors:
 Duration: '3:43'
 URLs:
 - https://open.spotify.com/track/5xW5oJXwQTdfhvngvKpGN3
-- https://music.apple.com/album/cycle/1418425430?i=1418425442
+- https://music.apple.com/album/cycle/1297865208?i=1297865212
+- https://www.youtube.com/watch?v=SP-k9OeA2Ts
 Lyrics: |-
     枝に結ぶ実が熟す前に
     落ちてしまわぬよう
@@ -357,13 +372,14 @@ Lyrics: |-
     ここへ 迷わずに帰 れるはずだから
 ---
 Track: 不眠症ロンリーガール
-Additional Names:
-- Name: Fuminsho Lonely Girl
-  Annotation: Apple Music (Romaji)
 Directory: fuminsho-lonely-girl
-Artists:
-- Itoki Hana (vocals, lyrics, composition, arrangement)
+Additional Names:
+- Name: >-
+    Fuminsho Lonely Girl
+  Annotation: >-
+    [Apple Music](https://music.apple.com/album/fuminsho-lonely-girl/1418425430?i=1418425443) (Romaji)
 Contributors:
+- Itoki Hana (vocals, lyrics, composition, arrangement)
 - scndworks (arrangement, programming)
 Duration: '5:00'
 URLs:
@@ -425,11 +441,13 @@ Lyrics: |-
     あけてゆく空に 夢 ひびかせて
 ---
 Track: 忘却舞踏
-Additional Names:
-- Name: Boukyakubutou
-  Annotation: Apple Music (Romaji)
 Directory: boukyakubutou
-Artists:
+Additional Names:
+- Name: >-
+    Boukyakubutou
+  Annotation: >-
+    [Apple Music](https://music.apple.com/album/boukyakubutou/1418425430?i=1418425444) (Romaji)
+Contributors:
 - Itoki Hana (vocals, lyrics, composition, arrangement)
 Duration: '5:27'
 URLs:
@@ -489,11 +507,13 @@ Lyrics: |-
     わたしは 今 わたしに 出会う
 ---
 Track: 四角い世界
-Additional Names:
-- Name: Shikakuisekai
-  Annotation: Apple Music (Romaji)
 Directory: shikakuisekai
-Artists:
+Additional Names:
+- Name: >-
+    [Shikakuisekai](https://music.apple.com/album/shikakuisekai/1418425430?i=1418425445)
+  Annotation: >-
+    Apple Music (Romaji)
+Contributors:
 - Itoki Hana (vocals, lyrics, composition, arrangement)
 Duration: '4:25'
 URLs:
@@ -529,14 +549,15 @@ Lyrics: |-
     か細いひとすじの、虹を みつけたの
 ---
 Track: Wither
-Artists:
-- Itoki Hana (vocals, lyrics, composition, arrangement)
+Suffix Directory: true
 Contributors:
+- Itoki Hana (vocals, lyrics, composition, arrangement)
 - Ryo "Lefty" Miyata (programming)
 Duration: '5:10'
 URLs:
 - https://open.spotify.com/track/3YDvlDuVAKxGRlB1k5R1uu
 - https://music.apple.com/album/wither/1418425430
+- https://www.youtube.com/watch?v=yK3VWFZhUpg
 Lyrics: |-
     耳を ふさいでいた
     心が枯れる音 が、した。
@@ -569,19 +590,21 @@ Lyrics: |-
     あかいろが にじむ
 ---
 Track: 体内時計
-Additional Names:
-- Name: Tainaidokei
-  Annotation: Apple Music (Romaji)
 Directory: tainaidokei
-Artists:
-- Itoki Hana (vocals, lyrics, composition, arrangement)
+Additional Names:
+- Name: >-
+    [Tainaidokei](https://music.apple.com/album/tainaidokei/1418425430?i=1418425447)
+  Annotation: >-
+    Apple Music (Romaji)
 Contributors:
+- Itoki Hana (vocals, lyrics, composition, arrangement)
 - Tomoya.S (E. guitar)
 - Ryo "Lefty" Miyata (programming)
 Duration: '6:19'
 URLs:
 - https://open.spotify.com/track/18LHeucbhdsQOyeWhcOdkI
 - https://music.apple.com/album/tainaidokei/1418425430?i=1418425447
+- https://www.youtube.com/watch?v=ygd3SnVK8XM
 Lyrics: |-
     見たい夢も ない、と
     拗ねたように かたく 目を 閉じる
@@ -619,18 +642,20 @@ Lyrics: |-
     わたしの朝 は、 まだ、だよ。
 ---
 Track: あこがれ
-Additional Names:
-- Name: Akogare
-  Annotation: Apple Music (Romaji)
 Directory: akogare
-Artists:
-- Itoki Hana (vocals, lyrics, composition, arrangement)
+Additional Names:
+- Name: >-
+    Akogare
+  Annotation: >-
+    [Apple Music](https://music.apple.com/album/akogare/1418425430?i=1418425448) (Romaji)
 Contributors:
+- Itoki Hana (vocals, lyrics, composition, arrangement)
 - Naofumi Onoda (drums)
 Duration: '6:14'
 URLs:
 - https://open.spotify.com/track/2IA8qrfVaJuTZceXAoe1GY
 - https://music.apple.com/album/akogare/1418425430?i=1418425448
+- https://www.youtube.com/watch?v=5hpQJmEbhAg
 Lyrics: |-
     風が 季節を はこぶ
     鳥が あしたを うたう
diff --git a/album/skies-forever-blue.yaml b/album/skies-forever-blue.yaml
index a895442e..72803c34 100644
--- a/album/skies-forever-blue.yaml
+++ b/album/skies-forever-blue.yaml
@@ -2,7 +2,7 @@ Album: Skies Forever Blue
 Artists:
 - Toby Fox
 - Itoki Hana
-Date: November 1, 2022 
+Date: November 1, 2022
 Date Added: October 25, 2023
 URLs:
 - https://110ki.bandcamp.com/album/skies-forever-blue
@@ -32,10 +32,9 @@ Commentary: |-
     The music video was handled by OMOCAT LLC, who you may know as the creators of OMORI! We made the video in quite a rush, but it was fun to be able to work together on something. Many other people helped out too, so check the credits.
 ---
 Track: Skies Forever Blue
-Artists:
-- Toby Fox (music by)
-- Itoki Hana (vocals, vocal arrangement, base midi arrangement)
 Contributors:
+- Toby Fox (music)
+- Itoki Hana (vocals, vocal arrangement, base midi arrangement)
 - Carlos Eiene (live instrument arrangement & performance)
 - FamilyJules (guitar & bass)
 Duration: '4:36'
@@ -79,10 +78,9 @@ Lyrics: |-
     To finally say finally, I love you
 ---
 Track: (Off Vocal) Skies Forever Blue
-Artists:
-- Toby Fox (music by)
-- Itoki Hana (base midi arrangement)
 Contributors:
+- Toby Fox (music)
+- Itoki Hana (base midi arrangement)
 - Carlos Eiene (live instrument arrangement & performance)
 - FamilyJules (guitar & bass)
 Duration: '4:34'
diff --git a/groups.yaml b/groups.yaml
index 6198106c..ce90b5c8 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -516,6 +516,7 @@ Series:
   Albums:
   - Super Smash Bros. Ultimate
   - 'Pokémon Sword & Pokémon Shield + Expansion Pass: Super Music Collection' # effectively 11/8/2019, via https://www.pokemon.com/us/pokemon-news/a-special-letter-and-song-from-undertale-game-creator-toby-fox
+  - PRAY
   - U.U.F.O.
   - Pale Rain
   - I'm Your Treasure Box * You have found captain Marine in a treasure chest
diff --git a/static-page/changelog.yaml b/static-page/changelog.yaml
index c4ebf2a0..8a9c7595 100644
--- a/static-page/changelog.yaml
+++ b/static-page/changelog.yaml
@@ -210,6 +210,7 @@ Content: |-
     - added Tumblr commentary to [[track:dawn-of-man]] (thanks, Lilith!)
     - added commentary blurbs from Bandcamp and YouTube, as well as additional names mostly from YouTube, across [[album:the-funk-mclovin-homestuck-experience]], [[album:class-act]], and [[album:class-act-b-side]]
     - added album release commentary to [[album:gravity-makes-the-flame-rise]] and [[album:ulterior-motives]]
+    - added Twitter commentary to [[track:welcome-to-the-city]] and [[track:lost-girl]] (thanks, Lan!)
     - added Tumblr commentary to [[track:horsecatska]] (thanks, Lilith!)
     - added SoundCloud commentary and additional name to [[track:hankage-fantazumu-2]] (thanks, Lilith!)
     - added Tumblr commentary and listening links to [[track:skaian-shuffle]], [[track:valor-toby-fox]], [[track:cheer-up-crabface-its-halloween]], and [[track:flight-of-the-white-wolf]] (thanks, Lilith, Whisper!)
@@ -360,6 +361,7 @@ Content: |-
     - fixed [[track:probable-cause]] not also sampling its referenced tracks (thanks, Lilith!)
     - fixed [[track:adventurous-ascent]] ([[album:lofam5a2]]) not referencing [[track:adventurous-ascent-single-version]] (thanks, Lilith!)
     - fixed [[track:anarchy-gravity-makes-the-flame-rise]] not sampling [[track:nothing-but-the-best]] (thanks, ruby!)
+    - fixed [[track:welcome-to-the-city]] referencing [[track:almost-to-the-guys]], instead of the other way around, and not referencing [[track:74]] (thanks, ruby, Cello, FF!)
     - fixed [[track:nows-your-chance-to-be-a]] and [[track:big-shot]] not sampling [[track:wow-mother]] (thanks, ruby!)
     - fixed [[track:festive-domain]] referencing [[track:rainfalls]] instead of [[track:rozepiano]] (thanks, Lan!)
     - fixed [[track:cheer-up-crabface-its-halloween]] not referencing [[track:crustacean]] and [[track:rex-duodecim-angelus]] (thanks, Lilith!)
@@ -373,6 +375,7 @@ Content: |-
     - fixed [[track:vaporwave-2016-track1]] not crediting [[artist:marcy-nabors]] as co-artist (thanks, Lilith!)
     - fixed [[track:hankage-fantazumu-2]] not crediting [[artist:difarem]] - nor anyone at all! - as artist (thanks, Lilith!)
     - fixed [[track:voids-edge]] not crediting [[artist:rainy]] as co-artist (thanks, Lilith!)
+    - fixed [[track:skies-forever-blue]] and [[track:off-vocal-skies-forever-blue]] not crediting [[artist:toby-fox]] and [[artist:itoki-hana]] with specific contributions (thanks, ruby!)
     - fixed all tracks in [[album:unknown-diva]], as well as [[track:betsu-sekai]], [[track:chuuku-no-niwa]], [[track:tenshi-no-agape]], and [[track:tokusya-seizon-wonder-la-der]], specifying "vocals" credits in artists instead of contributors (thanks, ruby!)
     - fixed [[track:in-the-end]] crediting [[artist:limp-bizkit]] instead of [[artist:linkin-park]] (thanks, Cello, Jebb!)
     - fixed [[track:roundabout]] crediting Eddie Offord (as artist) in addition to [[artist:yes]] (thanks, Cello, Lan, Whisper!)