fixes

game/script.rpy

@@ -748,7 +748,7 @@ init python:
     marisa_progress = 0
     time_traveling = False
     asked_office_location = False
-    did_not_submit_passcode = False
+    did_not_submit_passcode = True
     has_correct_passcode = False
     chose_reimu_question = False
     first_time_traveling_through_time = True
@@ -757,6 +757,7 @@ init python:
     reimuClue = False
     marisaClue = False
     binaryClue = False
+    asked_office_location = False
 
     # not included in run save
     did_not_visit_faculty = True
@@ -770,57 +771,55 @@ init python:
     tt_Goal_Lecture_Mention = False
     tt_Goal_Consultation_Mention = False
     tt_Goal_Exam_Mention = False
-
+    asked_field_faculty = True # TODO: Probably make this a choice variable
-    class RunSave:
-        def __init__(self, attacked_student, garden_of_the_sun_lecture, janitor_talks, revolution, exam_cancelled, investigation_progress, reimu_progress, alice_progress, marisa_progress, time_traveling, asked_office_location, did_not_submit_passcode, has_correct_passcode, chose_reimu_question, first_time_traveling_through_time, time_travel_without_choice, aliceClue, reimuClue, marisaClue, binaryClue, inventory_items):
-            self.attacked_student = attacked_student
-            self.garden_of_the_sun_lecture = garden_of_the_sun_lecture
-            self.janitor_talks = janitor_talks
-            self.revolution = revolution
-            self.exam_cancelled = exam_cancelled
-            self.investigation_progress = investigation_progress
-            self.reimu_progress = reimu_progress
-            self.alice_progress = alice_progress
-            self.marisa_progress = marisa_progress
-            self.time_traveling = time_traveling
-            self.asked_office_location = asked_office_location
-            self.did_not_submit_passcode = did_not_submit_passcode
-            self.has_correct_passcode = has_correct_passcode
-            self.chose_reimu_question = chose_reimu_question
-            self.first_time_traveling_through_time = first_time_traveling_through_time
-            self.time_travel_without_choice = time_travel_without_choice
-            self.aliceClue = aliceClue
-            self.reimuClue = reimuClue
-            self.marisaClue = marisaClue
-            self.binaryClue = binaryClue
-            self.inventory_items = inventory_items
             
     def SaveChoices(): # for a future run
-        save = RunSave(attacked_student, garden_of_the_sun_lecture, janitor_talks, revolution, exam_cancelled, investigation_progress, reimu_progress, alice_progress, marisa_progress, time_traveling, asked_office_location, did_not_submit_passcode, has_correct_passcode, chose_reimu_question, first_time_traveling_through_time, time_travel_without_choice, aliceClue, reimuClue, marisaClue, binaryClue, inventory_items)
+        persistent.attacked_student = attacked_student
-        return save
+        persistent.garden_of_the_sun_lecture = garden_of_the_sun_lecture
+        persistent.janitor_talks = janitor_talks
+        persistent.revolution = revolution
+        persistent.exam_cancelled = exam_cancelled
+        persistent.investigation_progress = investigation_progress
+        persistent.reimu_progress = reimu_progress
+        persistent.alice_progress = alice_progress
+        persistent.marisa_progress = marisa_progress
+        persistent.time_traveling = time_traveling
+        persistent.asked_office_location = asked_office_location
+        persistent.did_not_submit_passcode = did_not_submit_passcode
+        persistent.has_correct_passcode = has_correct_passcode
+        persistent.chose_reimu_question = chose_reimu_question
+        persistent.first_time_traveling_through_time = first_time_traveling_through_time
+        persistent.time_travel_without_choice = time_travel_without_choice
+        persistent.aliceClue = aliceClue
+        persistent.reimuClue = reimuClue
+        persistent.marisaClue = marisaClue
+        persistent.binaryClue = binaryClue
+        persistent.inventory_items = inventory_items
+        renpy.save_persistent()
+
+    def RestoreChoices(): # from a past run
+        attacked_student = persistent.attacked_student
+        garden_of_the_sun_lecture = persistent.garden_of_the_sun_lecture
+        janitor_talks = persistent.janitor_talks
+        revolution = persistent.revolution
+        exam_cancelled = persistent.exam_cancelled
+        investigation_progress = persistent.investigation_progress
+        reimu_progress = persistent.reimu_progress
+        alice_progress = persistent.alice_progress
+        marisa_progress = persistent.marisa_progress
+        time_traveling = persistent.time_traveling
+        asked_office_location = persistent.asked_office_location
+        did_not_submit_passcode = persistent.did_not_submit_passcode
+        has_correct_passcode = persistent.has_correct_passcode
+        chose_reimu_question = persistent.chose_reimu_question
+        first_time_traveling_through_time = persistent.first_time_traveling_through_time
+        time_travel_without_choice = persistent.time_travel_without_choice
+        aliceClue = persistent.aliceClue
+        reimuClue = persistent.reimuClue
+        marisaClue = persistent.marisaClue
+        binaryClue = persistent.binaryClue
+        inventory_items = persistent.inventory_items
 
-    def RestoreChoices(save): # from a past run
-        attacked_student = save.attacked_student
-        garden_of_the_sun_lecture = save.garden_of_the_sun_lecture
-        janitor_talks = save.janitor_talks
-        revolution = save.revolution
-        exam_cancelled = save.exam_cancelled
-        investigation_progress = save.investigation_progress
-        reimu_progress = save.reimu_progress
-        alice_progress = save.alice_progress
-        marisa_progress = save.marisa_progress
-        time_traveling = save.time_traveling
-        asked_office_location = save.asked_office_location
-        did_not_submit_passcode = save.did_not_submit_passcode
-        has_correct_passcode = save.has_correct_passcode
-        chose_reimu_question = save.chose_reimu_question
-        first_time_traveling_through_time = save.first_time_traveling_through_time
-        time_travel_without_choice = save.time_travel_without_choice
-        aliceClue = save.aliceClue
-        reimuClue = save.reimuClue
-        marisaClue = save.marisaClue
-        binaryClue = save.binaryClue
-        inventory_items = save.inventory_items
 label start:
 
     if hedgehog_dilemma_solved.has() or they_have_your_back.has() or she_has_your_back.has():
@@ -1988,7 +1987,7 @@ label start:
                         play music conversation loop
 
                     show yuuka amused:
-                        xalign -0.2
+                        xalign -0.35
                     with dissolve
 
                     yuuka "Good morning, class."
@@ -2119,7 +2118,7 @@ label start:
                         yuuka "{i}The students seemed to be getting the picture by then, the situation dawning on their gaping faces.{/i}" (cb_name="")
 
                         show reimu angry:
-                            xalign 0.3
+                            xalign 0.4
                             yalign 0.5
                         with ease
 
@@ -2183,6 +2182,12 @@ label start:
 
                         show yuuka irritated unmarked
 
+                        show marisa concerned
+
+                        show reimu concerned
+
+                        show alice worried
+
                         yuuka "{i}They took to my \"sense of humor\" well enough, earning me one or two very polite chuckles.{/i}" (cb_name="")
 
                         show yuuka neutral
@@ -2227,6 +2232,8 @@ label start:
 
                         yuuka "Do not harm any of the flowers. You {sc}WILL{/sc} pay your debt if you do."
 
+                        show marisa defiant
+
                         show chills at idle_horizontal:
                             xalign 1.1
                             yalign -0.5
@@ -2249,12 +2256,16 @@ label start:
 
                         $ renpy.pause(1.5)
 
+                        stop music fadeout 2.0
+
                         marisa "Hey, teach! I think my flower's broken!"
 
                         alice "I'm not getting anywhere with this."
 
                         narrator "Reimu was the only one out of the three still taking the assignment seriously at this point."
 
+                        play sound "wind1.mp3"
+
                         reimu "Listen to their voice..."
 
                         yuuka "{i}She was staring at her group's potted plant so hard you'd think she'd burn a hole.{/i}" (cb_name="")
@@ -2263,6 +2274,8 @@ label start:
 
                         alice "Marisa, shut up. Let her focus."
 
+                        play sound "wind2.mp3"
+
                         reimu "{cps=1}...{/cps}{nw}"
 
                         scene bg classroom
@@ -2275,7 +2288,7 @@ label start:
                             xalign 0.4
                             yalign -0.5
 
-                        show marisa surprise:
+                        show marisa neutral:
                             xalign 0.75
                             yalign -0.5
 
@@ -2284,8 +2297,12 @@ label start:
                             yalign -0.5
                         with fade
 
+                        $ renpy.pause(1.0)
+
                         reimu "...{fast}I've got nothing."
 
+                        play music conversation loop
+
                         yuuka "Let's wrap this up class! Return to your seats."
 
                         show yuuka neutral
@@ -4793,6 +4810,8 @@ label faculty:
 
                 marisa "I am deeply uncomfortable with you saying you're holding the students' beating heart."
 
+                show reimu concerned
+
                 show chills:
                     xalign 1.1
 
@@ -4923,9 +4942,9 @@ label exam:
         # VAR   Y
 
         # This leads to the 7th ending
-        if exam_cancelled:
+        # if exam_cancelled:
-            $ day += 1
+        #     $ day += 1
-            jump finale
+        #     RRR
 
         label exam_proper:
 
@@ -5076,7 +5095,9 @@ label exam:
             reimu "{i}Assuming this isn't just a plot of hers.{/i}"
             reimu "{i}...I hope it isn't. Besides, she's more of the brute force type anyway.{/i}"
 
-            jump hallway
+            $ day = 4
+
+            jump penultimate_presentation
     else:
         "Day is currently set to [day]. This should be impossible. You've likely encountered a bug."
         $ raise Exception("Impossible day " + day + " for location") 
@@ -5384,7 +5405,7 @@ label penultimate_presentation:
 
             if they_have_your_back.has():
                 "They Have Your Back already has been completed. Consider finding a different ending."
-            elif not dontsavefutureruns:
+            elif not persistent.dontsavefutureruns:
                 $ persistent.officialrun = SaveChoices()
                 $ persistent.dontsavefutureruns = True
                 play sound "teleport.opus"
@@ -5402,16 +5423,16 @@ label penultimate_presentation:
         elif reimu_progress >= 2 or alice_progress >= 2 or marisa_progress >= 2:
 
             transform leftbottompresent:
-                xalign 0.10
+                xalign -0.05
-                yalign -0.5
+                ypos 250
 
             transform midleftbottompresent:
-                xalign 0.4
+                xalign 0.3
-                yalign -0.5
+                ypos 250
 
             transform midbottompresent:
-                xalign 0.7
+                xalign 0.65
-                yalign -0.5
+                ypos 250
 
             if reimu_progress >= 2:
                 if alice_progress >= 2:
@@ -5445,7 +5466,7 @@ label penultimate_presentation:
 
                         reimu "Your school is a madhouse wearing a thin mask. Whether from the Outside World or Gensokyo, I can't overlook all these humans here."
 
-                        show alice angry # at somwhere
+                        show alice angry zorder 400 at midleftbottompresent, flip
 
                         alice "This has gone on long enough. You're teaching a mockery of magic to earnest young students."
 
@@ -5569,7 +5590,7 @@ label penultimate_presentation:
 
             if she_has_your_back.has():
                 "She Has Your Back already has been completed. Consider finding a different ending."
-            elif not dontsavefutureruns:
+            elif not persistent.dontsavefutureruns:
                 $ persistent.officialrun = SaveChoices()
                 $ persistent.dontsavefutureruns = True
                 play sound "teleport.opus"
@@ -5632,7 +5653,7 @@ label penultimate_presentation:
 
             if hedgehog_dilemma_solved.has():
                 "Hedgehog's Dilemma Solved already has been completed. Consider finding a different ending."
-            elif not dontsavefutureruns:
+            elif not persistent.dontsavefutureruns:
                 $ persistent.officialrun = SaveChoices()
                 $ persistent.dontsavefutureruns = True
                 play sound "teleport.opus"
@@ -6104,7 +6125,11 @@ label day_transition:
 
         yuuka "I have my plans. I do hope you eagerly await the fruits of my labor."
 
-        stop music
+        stop music fadeout 0.5
+
+        scene black with fade
+
+        $ renpy.pause(1)
     elif day == 2:
         # TODO
         # TEXT  N
@@ -6130,7 +6155,11 @@ label day_transition:
 
         yuuka "I will take great pleasure in seeing her downfall, as well."
 
-        stop music
+        stop music fadeout 0.5
+
+        scene black with fade
+
+        $ renpy.pause(1)
     elif day == 3:
         # TODO
         # TEXT  N
@@ -6156,7 +6185,11 @@ label day_transition:
 
         yuuka "...I really hope you'll understand."
 
-        stop music
+        stop music fadeout 0.5
+
+        scene black with fade
+
+        $ renpy.pause(1)
     elif day == 4:
         # TODO
         # TEXT  N
@@ -6183,7 +6216,11 @@ label day_transition:
         else:
             "{cps=1}Are{/cps}... {cps=1}headed{/cps}... {cps=1}with{/cps}...{nw}"
 
-        stop music
+        stop music fadeout 2.5
+
+        scene black with fade
+
+        $ renpy.pause(2.5)
 
         # TODO: Test if this works in this context and still lets us time travel out