feat(audio): play music sad2 coda, hook, outro

game/bad_ending.rpy

@@ -7,9 +7,9 @@ label bad_ending:
     scene bg funeral
     with fade
 
-    queue music sad3_verse
+    play music sad3_verse
 
-    "In the final scene, you stand alone at a grave, holding a bouquet of flowers."
+    "You stand alone at a grave, holding a bouquet of flowers."
 
     player "I brought you flowers."
     player "I’m sorry I wasn’t there for you."

game/class_1.rpy

@@ -38,8 +38,8 @@ label class_1:
             classmate "Haha, aren’t we all?"
             classmate @ shy "But I hear the exams are pretty tough."
             player "Oh, I didn't know about that."
-            player "I enrolled since I saw the class ratings were pretty high."
-            classmate "We’ll get through it."
+            player "I thought it would be an easy class since the ratings were so high."
+            classmate "We’ll make it through."
             player "For sure!"
 
         "I want to learn how psychology applies to our everyday lives.":
@@ -61,16 +61,15 @@ label class_1:
 
     teacher "Alright, class is starting.{w=0.2} Today we’re going to learn about Pavlov’s dog."
 
-    stop music fadeout 2
-
     jump after_class_1
 
 label after_class_1:
+    stop music fadeout 2
+    queue music [sad4_verse, sad4_hook]
+
     scene bg uni
     with fade
 
-    queue music [sad4_verse, sad4_hook]
-
     "You find yourself strolling with [classmate.name] after class."
 
     show classmate smile
@@ -106,7 +105,7 @@ label after_class_1:
             classmate surprised "Like how we can train dogs to do almost anything?"
             player "Yeah, I wonder what we’re conditioned to that we’re unaware of."
             classmate smile "Good question.{w=0.2} Probably more than what you expect."
-            player "For sure."
+            player "Indeed."
 
     menu:
         "Want to grab a snack?":
@@ -120,12 +119,11 @@ label after_class_1:
 
 label after_class_1_break:
     stop music fadeout 2
+    queue music [sad8_verse, sad8_hook]
 
     scene bg restaurant
     with dissolve
 
-    play music [sad8_verse, sad8_hook]
-
     "You and [classmate.name] make way to the cafeteria."
 
     show classmate smile at left
@@ -163,10 +161,10 @@ label after_class_1_break:
             $ affection += 1
             classmate "I enjoy reading and painting.{w=0.2} It’s a good way to relax."
             player "What kind of genres do you read?"
-            classmate @ embarrassed "Mostly fiction and self-help."
+            classmate @ embarrassed "I’ve recently been into philosophy and self-help."
             player "Do you have any recommendations?"
             classmate @ surprised "I really liked “Meditations” by Marcus Aurelius."
-            player "Thanks for the recommendation, I’ll take a look."
+            player "Thanks for the recommendation, I’ll check it out."
 
         "Did you hear that mental illness is on the rise?":
             classmate surprised "I haven’t,{w=0.1} that’s troubling to hear."
@@ -184,12 +182,11 @@ label after_class_1_break:
 
 label after_class_1_study:
     stop music fadeout 2
+    queue music sad2_intro
 
     scene bg library
     with fade
 
-    play music sad8_outro fadein 1
-
     "You went to the library and studied for a few hours."
     "Feeling exhausted, you decide to wrap up the session."
 
@@ -198,11 +195,10 @@ label after_class_1_study:
 
     "As you head back home, you bump into someone familiar."
 
-    stop music fadeout 2
-
     jump after_class_1_hangout
 
 label after_class_1_hangout:
+    stop music fadeout 2
     queue music sad14_refrain
     queue music sad14_hook
 
@@ -243,9 +239,9 @@ label after_class_1_hangout:
             $ affection += 1
             player "Have you thought about what you want to do in the future?"
             classmate embarrassed "I have some ideas, but I’m not sure yet."
-            player "Don’t worry, you still have time to figure things out."
+            player "Don’t worry, you still have time."
             classmate smile "I hope so."
-            "You and [classmate.name] spend some time watching the clouds before parting ways."
+            "You and [classmate.name] watch the drifting clouds before parting ways."
 
         "Text your friends to see what they’re doing.":
             $ affection -= 1
@@ -257,13 +253,13 @@ label after_class_1_hangout:
     jump after_class_1_home
 
 label after_class_1_home:
-    play music sad8_outro fadein 1
+    stop music fadeout 2
+    queue music sad8_outro fadein 1
 
     scene black
     with fade
 
     "You went home exhausted, took a quick shower, and fell asleep shortly after."
     "You look forward to tomorrow’s psych class."
 
-    stop music fadeout 2
     jump before_class_2

game/class_2.rpy

@@ -3,11 +3,11 @@ label before_class_2:
     jump class_2
 
 label class_2:
+    queue music [dark_intro, dark_verse]
+
     scene bg lecturehall
     with dissolve
 
-    queue music [dark_intro, dark_verse]
-
     "You enter the classroom and sit next to [classmate.name], who’s still in a good mood."
 
     show classmate surprised at left
@@ -27,8 +27,9 @@ label class_2:
             classmate "Agreed."
 
         "Could be better.":
-            classmate surprised "Oh, anything you want to talk about?"
-            player "So-"
+            classmate surprised "Oh, anything you’d like to talk about?"
+            player "Let me try to remember."
+            player "So today I-"
 
     show classmate smile at left, scale(0.8)
     with dissolve
@@ -38,13 +39,12 @@ label class_2:
 
     teacher "Class is starting.{w=0.2} Today we’re going to learn about the magical number 7 plus or minus 2."
 
-    stop music fadeout 2
-
     jump after_class_2
 
 label after_class_2:
-    queue music sad1_intro
-    queue music sad1_verse
+    stop music fadeout 2
+    queue music sad2_outro
+    queue music [sad2_hook, sad2_coda]
 
     scene bg uni
     with fade
@@ -55,14 +55,14 @@ label after_class_2:
     with dissolve
 
     player "Need help with any subjects?"
-    classmate "Actually, yes.{w=0.2} I’m struggling with our psychology assignment."
+    classmate embarrassed "Actually, yes.{w=0.2} I’m struggling with our psychology assignment."
 
     menu:
         "Tell her that she’s not studying enough.":
             $ affection -= 1
 
-            player "You have to study more."
-            classmate embarrassed "I hear you, but even that might not be enough."
+            player "You need to study more."
+            classmate "I hear you, but even that might not be enough."
             player "I know, but there’s a correlation between how much time you study and your overall grades."
             classmate "..."
             player "Alright, I’m going to head home and study."
@@ -81,13 +81,12 @@ label after_class_2:
 
 label after_class_2_study:
     stop music fadeout 2
+    queue music sad9_intro
+    queue music [sad9_verse, sad9_hook]
 
     scene bg library
     with fade
 
-    play music sad9_intro
-    queue music [sad9_verse, sad9_hook]
-
     show classmate smile at flip
     with dissolve
 
@@ -139,17 +138,16 @@ label after_class_2_study:
 
     "You and [classmate.name] spend a few more hours at the library before leaving feeling productive."
 
-    stop music fadeout 2
     jump after_class_2_home
 
 label after_class_2_home:
-    play music sad8_outro fadein 1
+    stop music fadeout 2
+    queue music sad8_outro fadein 1
 
     scene black
     with fade
 
     "You went home and studied some more before going to bed."
     "You look forward to tomorrow’s psych class."
 
-    stop music fadeout 2
     jump before_class_3

game/class_4.rpy

@@ -3,14 +3,14 @@ label before_class_4:
     jump class_4
 
 label class_4:
+    queue music chill_intro
+    queue music chill_verse
+
     scene bg lecturehall
     with dissolve
 
     show classmate sad at left
 
-    queue music chill_intro
-    queue music chill_verse
-
     "You notice [classmate.name] is quieter than usual."
 
     show classmate sad at left, flip
@@ -31,11 +31,10 @@ label class_4:
 
     "Class begins, but you can’t help but notice [classmate.name]’s distracted state.{w=0.2} The teacher discusses the importance of mental health, which deeply resonates with you."
 
-    stop music fadeout 2
-
     jump after_class_4
 
 label after_class_4:
+    stop music fadeout 2
     queue music sad1_intro
     queue music sad1_verse
 
@@ -119,15 +118,13 @@ label after_class_4_home:
             "You feel things will be better after a good night’s rest."
 
     stop music fadeout 2
+    queue music sad8_outro fadein 1
 
     scene black
     with fade
 
-    play music sad8_outro fadein 1
-
     "You tried to do some more studying, but something doesn’t feel right."
     "You decide to shower and go to bed early."
     "After some tossing and turning, you eventually fell asleep."
 
-    stop music fadeout 2
     jump before_class_5

game/class_5.rpy

@@ -3,12 +3,12 @@ label before_class_5:
     jump class_5
 
 label class_5:
-    scene bg lecturehall
-    with fade
-
     queue music tense_intro
     queue music tense_verse
 
+    scene bg lecturehall
+    with fade
+
     "You get to class the next day and notice that [classmate.name] is absent. The room feels tense."
     player "{alpha=0.7}{i}(thinking){/i}{/alpha}{w=0.1} Where’s [classmate.name]?{w=0.2} She said she’d be here today."
 

game/good_ending.rpy

@@ -1,6 +1,6 @@
 label good_ending:
     stop music fadeout 1
-    play music tropical_house1_intro fadein 4
+    queue music tropical_house1_intro fadein 2
     queue music tropical_house1_verse
 
     show teacher very sad at scale(0.6), right
@@ -38,7 +38,7 @@ label good_ending:
     show classmate smile
     with dissolve
 
-    classmate "{alpha=0.7}{i}(smiling){/i}{/alpha}{w=0.1} Thanks for everything.{w=0.2} I really appreciate you being there for me."
+    classmate "Thanks for everything.{w=0.2} I really appreciate you being there for me."
     player "Anytime.{w=0.2} We’re in this together."
 
     scene bg uni

game/personality_test.rpy

@@ -1,5 +1,6 @@
 label personality_test_intro(start=False):
     if not start:
+        stop music fadeout 2
         queue music lofi_verse
 
         scene bg school hallway
@@ -228,15 +229,15 @@ label personality_test_openness:
     teacher open smile "Thanks for answering my questions."
 
     if openness > 0:
-        teacher "You’re {b}open{/b} to experiences."
+        teacher "You’re {b}open to experiences{/b}."
         teacher "You’re a daydreamer who seeks new experiences and intellectual pursuits.{w=0.2} Curious about the world, you’re eager to learn new things."
 
     elif openness < 0:
-        teacher "You’re {b}closed{/b} to experiences."
+        teacher "You’re {b}closed to experiences{/b}."
         teacher "You’re down to earth and prefer familiar routines to new experiences.{w=0.2} You tend to be conventional with a narrower range of interests."
 
     else:
-        teacher "You’re somewhat {b}open{/b} to experiences."
+        teacher "You’re somewhat {b}open to experiences{/b}."
         teacher "You keep an open mind and are realistic about new things.{w=0.2} You find a happy medium between creativity and traditional thinking."
 
     teacher "I appreciate your honesty."