diff --git a/game/script.rpy b/game/script.rpy index 10bc7bc..bae4cc9 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -2063,12 +2063,40 @@ label hallway: menu: "Where does Yuuka go?" - "Exit school": scene bg black with fade - if did_not_visit_classroom: + if(not asked_field_faculty): + yuuka "There's something I wanted to ask." + + "Faculty Member" "Yes?" + + yuuka "There was this field I was fond of, not too far from here. It's been {sc}DESTROYED{/sc} since, do you know what happened?" + + "Faculty Member" "Ah. Apologies but I don't think I've heard about that." + + yuuka "I see." + + "Faculty Member" "What a shame... I think I've seen that same field." + + "Faculty Member" "When will we stop this shameless destruction?" + + yuuka "We? This school has done {sc}similar{/sc} things before?" + + "Faculty Member" "God, I hope not." + + "Faculty Member" "I'm just speaking in general, about all of humanity." + + "Faculty Member" "We've devastated the world enough, haven't we? Not that our leaders listen." + + yuuka "...no, they certainly don't. I'm glad to see you understand." + + yuuka "..." + + $ asked_field_faculty = True + + elif(not asked_office_location): yuuka "{i}And leave I did.{/i}" (cb_name="") @@ -2394,7 +2422,36 @@ label hallway: # they explain that its yumemi's exam materials that are printed wirelessly but if she wants to rewrite them individually and manually she's free to do so # she holds that they should all do it - if(not asked_office_location): + if(not asked_field_faculty): + yuuka "There's something I wanted to ask." + + "Faculty Member" "Yes?" + + yuuka "There was this field I was fond of, not too far from here. It's been {sc}DESTROYED{/sc} since, do you know what happened?" + + "Faculty Member" "Ah. Apologies but I don't think I've heard about that." + + yuuka "I see." + + "Faculty Member" "What a shame... I think I've seen that same field." + + "Faculty Member" "When will we stop this shameless destruction?" + + yuuka "We? This school has done {sc}similar{/sc} things before?" + + "Faculty Member" "God, I hope not." + + "Faculty Member" "I'm just speaking in general, about all of humanity." + + "Faculty Member" "We've devastated the world enough, haven't we? Not that our leaders listen." + + yuuka "...no, they certainly don't. I'm glad to see you understand." + + yuuka "..." + + $ asked_field_faculty = True + + elif(not asked_office_location): "Faculty Member" "Ah, looking for something?" @@ -2604,7 +2661,7 @@ label hallway: "{cps=1}...{/cps}" "{cps=1}...{/cps}" "{cps=1}...{/cps}" - jump hallway_navigation + jump hallway_navigation2 if(has_correct_passcode): @@ -2741,11 +2798,12 @@ label hallway: "Where does Yuuka go?" "Exit school": + scene bg black with fade yuuka "{i}Of course, I went home.{/i}" (cb_name="") yuuka "{i}I had to be up and rested for today.{/i}" (cb_name="") - yuuka "{i}Let's run through said day, shall we?{/i}" (cb_name="") + yuuka "{i}Let's do a run through of said day, shall we?{/i}" (cb_name="") $ day = 4 @@ -2753,15 +2811,119 @@ label hallway: jump day_transition "Go to the faculty room" if did_not_visit_faculty: - "" + scene bg faculty with fade + + if(not asked_field_faculty): + yuuka "There's something I wanted to ask." + + "Faculty Member" "Yes?" + + yuuka "There was this field I was fond of, not too far from here. It's been {sc}DESTROYED{/sc} since, do you know what happened?" + + "Faculty Member" "Ah. Apologies but I don't think I've heard about that." + + yuuka "I see." + + "Faculty Member" "What a shame... I think I've seen that same field." + + "Faculty Member" "When will we stop this shameless destruction?" + + yuuka "We? This school has done {sc}similar{/sc} things before?" + + "Faculty Member" "God, I hope not." + + "Faculty Member" "I'm just speaking in general, about all of humanity." + + "Faculty Member" "We've devastated the world enough, haven't we? Not that our leaders listen." + + yuuka "...no, they certainly don't. I'm glad to see you understand." + + yuuka "..." + + $ asked_field_faculty = True + + elif(not asked_office_location): + + "Faculty Member" "Ah, looking for something?" + + yuuka "I was just wondering where Professor Okazaki's teaching materials are, I was hoping to take a look at them." + + yuuka "{i}And destroy it so I'd see the look on her face when she returns.{/i}" + + "Faculty Member" "She didn't share it with you? Odd, but she has her own office." + + "Faculty Member" "It's around the corner, behind a keypad. Did she tell you the passcode?" + + yuuka "No, I believe I was too late to catch her before she left." + + "Faculty Member" "Well that's a shame, for all she gushes about her new phone, she's a difficult person to contact." + + "Faculty Member" "You'd know her better than me, probably. It's a four-digit code, can't be that hard to guess right?" + + yuuka "...sure." + + yuuka "I have another concern actually." + + $ asked_office_location = True + + yuuka "Professor Okazaki should be arriving in a few days, right?" + + "Faculty Member" "Well, that was the plan but you know how she can get." + + "Faculty Member" "Brilliant but impulsive. She's coming back tomorrow." + + yuuka "Tomorrow... that's sooner than I thought." + + yuuka "Good. That's less time until I get to face with her." + + "Faculty Member" "You're close with her?" + + yuuka "Ah, well, keep your friends close..." + + "Faculty Member" "?" + jump hallway_navigation3 "Go to the auditorium" if did_not_visit_auditorium: - "" + scene bg auditorium with fade + + # marisa + + yuuka "Huh, Marisa." + + show marisa neutral with fade + + marisa "That's the name." + + marisa "You figure out the field buisiness?" + jump hallway_navigation3 "Go to her classroom" if did_not_visit_classroom: - "" + scene bg classroom with fade + + # the one enthusiastic student who you couldve attacked at the start + + yuuka "Hm." + + "Student" "Oh! Good afternoon, Miss! I was just arranging the seats." + + yuuka "Good afternoon." + + yuuka "Hard working aren't you?" + + "Student" "I try, Miss." + + "Student" "I'm excited." + + yuuka "Well, the exam's over after all." + + "Student" "Not that, though I'm happy to be free of it." + + # "Student" "a little humanizing time" + + # TODO: Up next + jump hallway_navigation3 "Wait here" if janitor_talks < 3: @@ -2772,7 +2934,7 @@ label hallway: "{cps=1}...{/cps}" "{cps=1}...{/cps}" "{cps=1}...{/cps}" - jump hallway_navigation + jump hallway_navigation3 if(has_correct_passcode): @@ -2907,28 +3069,45 @@ label hallway: menu: "Where does Yuuka go?" - "Exit school": + "{sc}Exit school{/sc}": "" + # TODO: What the heck happens here? Finale if you have everything assembled or maybe yuuka falls into a lull and the bad version of the 7th ending jump day_transition "Go to the faculty room" if did_not_visit_faculty: - "" + scene bg faculty with fade + + "{cps=1}...{/cps}" + "{cps=1}...{/cps}" + "{cps=1}...{/cps}" + $ did_not_visit_faculty = False + jump hallway_navigation4 "Go to the auditorium" if did_not_visit_auditorium: - "" + + "{cps=1}...{/cps}" + "{cps=1}...{/cps}" + "{cps=1}...{/cps}" + $ did_not_visit_auditorium = False jump hallway_navigation4 "Go to her classroom" if did_not_visit_classroom: - "" + "{cps=1}...{/cps}" + "{cps=1}...{/cps}" + "{cps=1}...{/cps}" + $ did_not_visit_classroom = False jump hallway_navigation4 "Wait here" if janitor_talks < 4: + + $ janitor_talks = 4 + if("Keycard" in inventory_items): "{cps=1}...{/cps}" "{cps=1}...{/cps}" "{cps=1}...{/cps}" - jump hallway_navigation + jump hallway_navigation4 if(has_correct_passcode): @@ -2958,6 +3137,7 @@ label hallway: "{cps=1}...{/cps}" jump hallway_navigation4 + "Go to Yumemi's office" if did_not_submit_passcode and asked_office_location: scene bg hallway at flip with fade @@ -3021,10 +3201,7 @@ label hallway: yuuka "Nah, saying it out loud makes it obvious that's just asking for people to turn on me. I'll find another approach to this." "No, not yet.": - jump hallway_navigation - else: - "Day is currently set to [day]. This should be impossible. You've likely encountered a bug." - return + jump hallway_navigation4 label faculty: if day == 2: