merge "Flare (horizon's lyricover)" into "Flare (With Vocals)" (#370)

3 files changed, 38 insertions, 59 deletions

diff --git a/album/canwave-2.yaml b/album/canwave-2.yaml
index e10949ba..0b1db611 100644
--- a/album/canwave-2.yaml
+++ b/album/canwave-2.yaml
@@ -62,10 +62,10 @@ Art Tags:
 Duration: '03:41'
 Referenced Tracks:
 - Flare
-- Flare (horizon's lyricover)
+- Flare (With Vocals)
 Sampled Tracks:
 - Flare
-- Flare (horizon's lyricover)
+- Flare (With Vocals)
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/i-wanted-so-much-more
 - https://youtu.be/YMC-pmtAbSA
@@ -1089,10 +1089,10 @@ Art Tags:
 Duration: '01:34'
 Referenced Tracks:
 - Flare
-- Flare (horizon's lyricover)
+- Flare (With Vocals)
 Sampled Tracks:
 - Flare
-- Flare (horizon's lyricover)
+- Flare (With Vocals)
 URLs:
 - https://coolandnewwebcomic.bandcamp.com/track/all-were-gonna-get
 - https://youtu.be/W-aP2qE2azk
diff --git a/album/lofam2.yaml b/album/lofam2.yaml
index 56b29290..24856d7b 100644
--- a/album/lofam2.yaml
+++ b/album/lofam2.yaml
@@ -510,15 +510,41 @@ Art Tags:
 Referenced Tracks:
 - Flare
 Lyrics: |-
-    Things fall apart so easily;<br>they break away at the seams
-    And it seems<br>this is the life I was fated to lead<br>Dreams dead in the water<br>and you ought to let them pass
-    I wanted something better than this;<br>than a postmortem kiss<br>and three years to miss you<br>but it seems that's all I'm gonna get;<br>it's best to forget
-    Last night I dreamt of you -<br>you were beautiful, amidst a sky of blue
-    It was only the two of us,<br>hearts beating synchronously
+    Things fall apart so easily
+    They break away at the seams
+    And it seems
+    This is the life I was fated to lead
+    Dreams dead in the water
+    And you ought to let them pass
+
+    I wanted something better than this
+    Than a postmortem kiss
+    Three years to miss you
+    But it seems that's all I'm gonna get
+    It's best to forget
+
+    Last night I dreamt of you
+    You were beautiful, amidst a sky of blue
+
+    It was only the two of us
+    Hearts beating synchronously
+
     Do you feel for me?
-    I heard a song the other day;<br>it reminded me of the way<br>I love you<br>and how I never got to say that to you
-    So many things I wanted to do;<br>so many dreams<br>left for dead in the water<br>drowned and gone;<br>just smile and let them go
-    I wanted so much more<br>than a game we were born to lose<br>I wanted so much more<br>so much more for you
+
+    I heard a song the other day
+    It reminded me of the way
+    I love you
+    And how I never got to say that to you
+
+    So many things I wanted to do
+    So many dreams
+    Left for dead in the water
+    Drowned and gone, just smile and let them go
+
+    I wanted so much more
+    Than a game we were born to lose
+    I wanted so much more
+    So much more for you
 Commentary: |-
     <i>horizon:</i>
     Flare has always struck a place in my heart, for many reasons. Plazmataz has always, always impressed me, but Flare just evoked something simply raw in the depths of my mind; I knew then that I had to use that feeling as a kind of empathy towards the Beta kids. Though it was used in a specific moment in canon, I chose to write lyrics from the point of view I could most appreciate -- the pain associated with love when life hands you something you don't know how to survive.
diff --git a/album/more-homestuck-fandom.yaml b/album/more-homestuck-fandom.yaml
index d76ec38c..0f2bbcad 100644
--- a/album/more-homestuck-fandom.yaml
+++ b/album/more-homestuck-fandom.yaml
@@ -1265,53 +1265,6 @@ Referenced Tracks:
 - Three in the Morning
 - Liquid Negrocity
 ---
-Track: Flare (horizon's lyricover)
-Artists:
-- horizon
-Duration: '3:03'
-URLs:
-- https://www.youtube.com/watch?v=btHd1zrjkqY
-Referenced Tracks:
-- Flare
-Sampled Tracks:
-- Flare
-Lyrics: |-
-    Things fall apart so easily
-    They break away at the seams
-    And it seems
-    This is the life I was fated to lead
-    Dreams dead in the water
-    And you ought to let them pass
-
-    I wanted something better than this
-    Than a postmortem kiss
-    Three years to miss you
-    But it seems that's all I'm gonna get
-    It's best to forget
-
-    Last night I dreamt of you
-    You were beautiful, amidst a sky of blue
-
-    It was only the two of us
-    Hearts beating synchronously
-
-    Do you feel for me?
-
-    I heard a song the other day
-    It reminded me of the way
-    I love you
-    And how I never got to say that to you
-
-    So many things I wanted to do
-    So many dreams
-    Left for dead in the water
-    Drowned and gone, just smile and let them go
-
-    I wanted so much more
-    Than a game we were born to lose
-    I wanted so much more
-    So much more for you
----
 Track: Friendsim 2 Prologue End Fanfare
 Artists:
 - Funk McLovin