Fixes and minor additions

* Added missing Snape posing during inside Snape's office.
* Added some randomized writing when you try to use Snape's brewing station when he's there.
* Adjusted "Head" ypos posing for consistency.

game/scripts/characters/astoria/events/intro.rpy

@@ -107,7 +107,7 @@ label astoria_intro_E1:
 
                     call bld
                     gen "Now pull it." ("grin", xpos="far_left", ypos="head")
-                    ton ".................................." ("disgust", "base", "annoyed", "down", xpos="far_right", ypos="head")
+                    ton ".................................." ("disgust", "base", "annoyed", "down", xpos="far_right")
                     gen "Try a bit harder..." ("base", xpos="far_left", ypos="head")
                     ton ".............................................." ("normal", "base", "angry", "down")
                     call bld("hide")
@@ -674,8 +674,8 @@ label astoria_intro_E3:
     call ast_chibi("stand","desk","base", flip=True)
     with d3
 
-    ton @ hair neutral "Snape. How good to see you!" ("soft", "shocked", "base", "mid", xpos="far_right", ypos="head")
+    ton @ hair neutral "Snape. How good to see you!" ("soft", "shocked", "base", "mid", xpos="far_right", trans=d3)
-    sna "Save your compliments for someone else... I'm in a bit of a hurry." ("snape_03", xpos="far_right", ypos="head")
+    sna "Save your compliments for someone else... I'm in a bit of a hurry." ("snape_03", xpos="right", flip=True, trans=d3)
     ton "Still mad at me for taking your post?" ("base", "base", "angry", "mid")
     ton @ hair horny "I'd be willing to compensate you for it, you know..." ("horny", "base", "base", "mid")
     sna "..." ("snape_12")

game/scripts/characters/astoria/events/spells/imperio_tonks.rpy

@@ -294,8 +294,8 @@ label ag_st_imperio_E1:
     with d3
     pause.2
 
-    ton "Come on, Astoria. I shall escort you back to your dormitory..." ("soft", "base", "base", "L", ypos="head")
+    ton "Come on, Astoria. I shall escort you back to your dormitory..." ("soft", "base", "base", "L", xpos="base", ypos="base")
-    ast "................................................." ("annoyed", "base", "base", "down", ypos="head")
+    ast "................................................." ("annoyed", "base", "base", "down", xpos="right", ypos="base")
 
     # They both leave.
     call ast_walk(680, "base")
@@ -546,8 +546,8 @@ label ag_st_imperio_E2:
             with d3
             pause.2
 
-            ton "After you, Astoria." ("open", "base", "base", "L", ypos="head")
+            ton "After you, Astoria." ("open", "base", "base", "L", xpos="base", ypos="base")
-            ast "..........................." ("upset", "base", "base", "L", ypos="head")
+            ast "..........................." ("upset", "base", "base", "L", xpos="right", ypos="base")
 
             # They both leave.
             call ast_walk(680, "base")
@@ -852,7 +852,7 @@ label ag_st_imperio_E4:
     with d3
     pause.1
 
-    ton "Astoria, would you come in here please..." ("open", "closed", "base", "mid", ypos="head")
+    ton "Astoria, would you come in here please..." ("open", "closed", "base", "mid", xpos="right", ypos="base", flip=True)
     ast "Do I have to?"
     ton "Yes, we already talked about this..." ("open", "base", "base", "R")
     ast "Fine, whatever..."
@@ -869,7 +869,7 @@ label ag_st_imperio_E4:
     pause.5
 
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
-    ton "" ("base", "base", "base", "L", xpos="right", ypos="base")
+    ton "" ("base", "base", "base", "L", xpos="right", ypos="base", flip=False)
     ast "..." ("annoyed", "narrow", "base", "down", xpos="base", ypos="base")
 
     ton "Astoria... isn't there something you'd like to say to our Headmaster?" ("soft", "base", "shocked", "mid")
@@ -1469,10 +1469,10 @@ label ag_st_imperio_E5:
     with d5
 
     # Snape enters...
-    sna "Genie, I was wondering if you could help me with--" ("snape_35", ypos="head")
+    sna "Genie, I was wondering if you could help me with--" ("snape_35",xpos="base",ypos="base", trans=d3)
     stop music fadeout 2.0
     play sound "sounds/scratch.ogg"
-    sna "!!!" ("snape_11", ypos="head")
+    sna "!!!" ("snape_11")
     hide screen bld1
     with d3
     pause.1
@@ -1553,8 +1553,8 @@ label ag_st_imperio_E5:
     hide screen astoria_wand_drop
     pause.5
 
-    sna "You may leave, Astoria." ("snape_09", ypos="head")
+    sna "You may leave, Astoria." ("snape_09")
-    ast "..." ("clench", "base", "base", "down", ypos="head", flip=True)
+    ast "..." ("clench", "base", "base", "down", flip=True)
     sna "Miss Greengrass..." ("snape_04")
     ast "Yes sir." ("annoyed", "base", "base", "down")
 

game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy

@@ -87,7 +87,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
                 with d3
             pause .6
 
-            cho "What are you doing?" ("soft", "narrow", "base", "L", ypos="head", flip=False)
+            cho "What are you doing?" ("soft", "narrow", "base", "L", xpos="right", flip=False)
 
             # Hermione picks them up and runs off.
             call bld("hide")
@@ -106,8 +106,8 @@ label cc_pf_strip_T2_E3_hermione_choices:
             call cho_chibi(flip=True)
             with d3
 
-            her "Hey seeker, looks like someone will have to seek their way to their dorm without any clothes tonight." ("open", "base", "angry", "mid", ypos="head", flip=False)
+            her "Hey seeker, looks like someone will have to seek their way to their dorm without any clothes tonight." ("open", "base", "angry", "mid", xpos="base", ypos="base", flip=False)
-            cho "Hey!" ("clench", "narrow", "angry", "L", ypos="head", flip=True)
+            cho "Hey!" ("clench", "narrow", "angry", "L", flip=True)
 
             # Hermione leaves out of the door.
             hide screen bld1
@@ -136,7 +136,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
 
             pause .2
 
-            cho "{size=+4}Give them back, you bitch!{/size}" ("scream", "narrow", "angry", "L", ypos="head", flip=True, trans=hpunch)
+            cho "{size=+4}Give them back, you bitch!{/size}" ("scream", "narrow", "angry", "L", trans=hpunch)
 
             play sound "sounds/run_03.ogg"
             call cho_walk(action="leave", speed=2)

game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy

@@ -724,12 +724,12 @@ label cc_pf_strip_T3_intro_E2:
     call bld
     gen "*Hmm*...?" ("base", xpos="far_left", ypos="head")
     with hpunch
-    gen "{b}Balls!{/b}" ("angry", xpos="far_left", ypos="head")
+    gen "{shudder}Balls!{/shudder}" ("angry", xpos="far_left", ypos="head")
-    sna "..." ("snape_47", ypos="head") #smirk
+    sna "..." ("snape_47", xpos="far_right", ypos="base") #smirk
-    ton "What? No, I was talking about her--" ("soft", "narrow", "base", "mid", ypos="head", flip=False)
+    ton "What? No, I was talking about her--" ("soft", "narrow", "base", "mid", flip=False)
     with hpunch
-    cho "Professor Snape?!" ("open", "wide", "raised", "L", ypos="head", flip=True) # shock
+    cho "Professor Snape?!" ("open", "wide", "raised", "L", flip=True) # shock
-    sna "Oh-- now what do we have here?..." ("snape_13", ypos="head")
+    sna "Oh-- now what do we have here?..." ("snape_13")
     call bld("hide")
     pause .2
 
@@ -745,7 +745,7 @@ label cc_pf_strip_T3_intro_E2:
     $ cho.zorder = 15 # reset to default.
     $ tonks.zorder = 16 # in front of Cho. 15 is default.
     play music "music/Dark Fog.ogg" fadein 1 if_changed
-    sna "" ("snape_40", xpos=560, ypos="base")
+    sna "" ("snape_40")
     cho "" ("normal", "wide", "base", "L", xpos=275, ypos="base", flip=True)
     ton "" ("annoyed", "narrow", "annoyed", "L", xpos=390, ypos="base", flip=True)
 
@@ -773,9 +773,9 @@ label cc_pf_strip_T3_intro_E2:
     ton "" ("annoyed", "narrow", "raised", "up")
     sna "As head of the slytherin house, I'd like to personally congratulate her on her fair play." ("snape_37")
     sna "Your performance was quite remarkable, Miss Chang." ("snape_13")
-    sna "Putting your best {b}ass{/b}ets on display for everyone was quite the sight." ("snape_46")
+    sna "Putting your best {wave}ass{/wave}ets on display for everyone was quite the sight." ("snape_46")
     cho @ cheeks heavy_blush "..." ("angry", "narrow", "worried", "downR") # embarrassed
-    sna "How very -- {b}ass{/b}piring of you..." ("snape_41")
+    sna "How very -- {shake}ass{/shake}piring of you..." ("snape_41")
     cho @ cheeks heavy_blush "{size=-4}Please do something, sir.{/size}" ("soft", "base", "angry", "mid") #small text
     gen "What?" ("base", xpos="far_left", ypos="head")
     gen "(Oh, right... I should probably do something about this...)" ("base", xpos="far_left", ypos="head")
@@ -930,15 +930,16 @@ label cc_pf_strip_T3_intro_E2:
     with d3
     pause .5
 
-    sna "Until then, Albus... Miss Chang..." ("snape_20", xpos="base", ypos="head")
+    sna "Until then, Albus... Miss Chang..." ("snape_20", xpos="base", ypos="base")
-    sna "{cps=7}Nymphadora...{/cps}" ("snape_41", xpos="base", ypos="head")
+    sna "{cps=7}Nymphadora...{/cps}" ("snape_41")
-    ton @ hair angry "Stop calling me--" ("clench", "closed", "angry", "mid", ypos="head", flip=True)
+    ton @ hair angry "Stop calling me--" ("clench", "closed", "angry", "mid", xpos=310, ypos="base", flip=True)
 
     # Snape leaves.
     call sna_chibi("stand", "door", "base", flip=True)
     with d3
     call sna_chibi("leave")
-    pause .5
+    hide tonks_main
+    with d3
 
     call bld
     gen "Fucking guy..." ("base", xpos="far_left", ypos="head")
@@ -998,11 +999,11 @@ label cc_pf_strip_T3_intro_E2:
     with d5
     pause .5
 
-    ton "Thank you for your time, Professor." ("base", "base", "base", "mid", ypos="head", flip=False)
+    ton "Thank you for your time, Professor." ("base", "base", "base", "mid", xpos="base", ypos="base", flip=False)
     if states.env.daytime:
-        cho "Good day, Sir." ("base", "base", "base", "mid", ypos="head", flip=False)
+        cho "Good day, Sir." ("base", "base", "base", "mid", xpos="right", ypos="base", flip=False)
     else:
-        cho "Good night, Sir." ("base", "base", "base", "mid", ypos="head", flip=False)
+        cho "Good night, Sir." ("base", "base", "base", "mid", xpos="right", ypos="base", flip=False)
     gen "Until next time." ("grin", xpos="far_left", ypos="head")
     call bld("hide")
     pause .1
@@ -3030,7 +3031,7 @@ label cc_pf_strip_T3_intro_E3:
     pause .5
 
     gen "And Tonks... Next time we do this, wear the clothes I usually ask you to wear around my office." ("grin", xpos="far_left", ypos="head")
-    ton @ hair horny "With pleasure." ("base", "narrow", "base", "mid", ypos="head", flip=False)
+    ton @ hair horny "With pleasure." ("base", "narrow", "base", "mid", xpos="base", ypos="base", flip=False)
 
     if states.env.daytime:
         ton @ hair horny "I'll escort you back to classes, Miss Chang." ("open", "narrow", "base", "L")
@@ -3040,7 +3041,7 @@ label cc_pf_strip_T3_intro_E3:
         ton @ hair horny "Have a good night, Professor." ("base", "narrow", "base", "mid")
 
     gen "Until next time." ("grin", xpos="far_left", ypos="head")
-    cho @ cheeks heavy_blush "..." ("upset", "happyCl", "worried", "mid", ypos="head", flip=False)
+    cho @ cheeks heavy_blush "..." ("upset", "happyCl", "worried", "mid", xpos="right", ypos="base", flip=False)
     call bld("hide")
     pause .1
 

game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy

@@ -1420,14 +1420,16 @@ label .end_event:
 
     call bld
     if states.env.daytime:
-        ton "We should get going, Miss Chang. Classes are about to start..." ("open", "base", "base", "L", ypos="head", flip=False)
+        ton "We should get going, Miss Chang. Classes are about to start..." ("open", "base", "base", "L", xpos="base", ypos="base", flip=False)
-        cho "Until next time, Professor." ("grin", "base", "base", "mid", ypos="head", flip=False)
+        cho "Until next time, Professor." ("grin", "base", "base", "mid", xpos="right", ypos="base", flip=False)
     else:
-        ton "Let me escort you back to your dormitories, Miss Chang." ("open", "base", "base", "L", ypos="head", flip=False)
+        ton "Let me escort you back to your dormitories, Miss Chang." ("open", "base", "base", "L", xpos="base", ypos="base", flip=False)
-        cho "Good night, Professor." ("grin", "base", "base", "mid", ypos="head", flip=False)
+        cho "Good night, Professor." ("grin", "base", "base", "mid", xpos="right", ypos="base", flip=False)
 
     call bld("hide")
-    pause .1
+    hide tonks_main
+    hide cho_main
+    with d3
 
     # They both leave.
     call cho_chibi(flip=True)

game/scripts/characters/cho/events/intro.rpy

@@ -926,7 +926,7 @@ label cho_intro_E3:
     with d3
     pause .2
 
-    her "{shake}*Glare*{/shake}" ("normal", "base", "angry", "mid", ypos="head", flip=False)
+    her "{shake}*Glare*{/shake}" ("normal", "base", "angry", "mid", xpos="base", ypos="base", flip=False)
     # Add Cho glaring back with her 'head' image.
 
     call her_chibi("stand", "door", "base",flip=True)

game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy

@@ -2554,7 +2554,7 @@ label gryffindor_match_return:
     with fade
 
     gen "That... was amazing!" ("grin", xpos="far_left", ypos="head")
-    cho @ cheeks heavy_blush "...{w=0.5}{nw}" ("soft", "narrow", "base", "stare", xpos="base", ypos="base", trans=d3)
+    cho @ cheeks heavy_blush "...{w=0.5}{nw}" ("soft", "narrow", "base", "stare", xpos="mid", ypos="base", trans=d3)
     cho @ cheeks heavy_blush "...{fast}" ("soft", "wide", "base", "stare")
     gen "[name_cho_genie]?" ("base", xpos="far_left", ypos="head")
     cho @ cheeks heavy_blush "Oh my god...{w=0.4} The potion!" ("disgust", "wide", "base", "stare")

game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy

@@ -186,7 +186,7 @@ label hufflepuff_match:
 
     # Sound check
     if get_volume_preference('music') < 0.1 or get_volume_preference('sfx') < 0.1:
-        nar "This section of the game is best played with the sound turned on. Go to preferences to set the volume."
+        nar "This section of the game is best played with the sound turned on. Go to settings, then audio to adjust the volume."
 
     pause 1
 
@@ -369,10 +369,8 @@ label hufflepuff_match:
     with d3
     pause 2.0
 
-    gen "" ("angry")
-
     menu:
-        "(Shit, what do I even talk about?)"
+        gen "(Shit, what do I even talk about?)" ("angry")
         "-Miracles-":
             play background "music/fanfare.ogg" fadein 1.0
             gen "Great moments are born from great opportunity." ("base")

game/scripts/rooms/snape_office/objects/brewing_station.rpy

@@ -31,20 +31,25 @@ label brewing_station:
 
         if not states.map.snape_office.intro_e2:
             gen "(*Hmm*... I didn't know Snape was into distillery. Let's see if I can guess the type of booze by the smell.)" ("base", xpos="far_left", ypos="head")
-            "*Sniff* *Sniff*"
+            gen "*Sniff* *Sniff*" ("base", xpos="far_left", ypos="head")
             gen "*Ugh*! It smells like wet hair mixed with cat poo or something!" ("angry", xpos="far_left", ypos="head")
-            sna "*Snickers* What did you expect? Lillies?"
+            sna "*Snickers* What did you expect? Lillies?" ("snape_37", ypos="head")
-            gen "I thought you were soaking some hooch in here." ("base", xpos="far_left", ypos="head")
+            gen "I thought you had been soaking some hooch in here." ("base", xpos="far_left", ypos="head")
-            sna "W-What?!" # blushing
+            sna "W-What?!" ("snape_14")
-            sna "Madam Hooch is not my type." # blushing, eyes closed
+            sna "Madam Hooch is not my type." ("snape_12")
-            gen "Figures. I had a feeling you're more into old wines." ("base", xpos="far_left", ypos="head")
+            random:
-            sna "Huh? What is that supposed to--" # annoyed
+                gen "Figures. I had a feeling you're more into old wines." ("base", xpos="far_left", ypos="head")
-            sna "*Tsk* You know what, forget it, just let me work in peace."
+                gen "Figures... I had a feeling you'd be the type who'd only be interested in a more mature vintage..." ("base", xpos="far_left", ypos="head")
+                gen "So you're a snob... Well, can't say that I'm surprised." ("base", xpos="far_left", ypos="head")
+                gen "Whatever it is you've been keeping from me, you better be prepared to share..." ("base", xpos="far_left", ypos="head")
+                gen "You say that, but I bet that's only because you've never had a taste." ("base", xpos="far_left", ypos="head")
+            sna "Huh? What is that supposed to--" ("snape_14") # annoyed
+            sna "*Tsk* You know what, forget it, just let me work in peace." ("snape_03")
             gen "(His alcoholism is a touchy subject I guess...)" ("base", xpos="far_left", ypos="head")
         elif states.map.snape_office.intro_e3:
-            sna "What did I tell you?"
+            sna "What did I tell you?" ("snape_01", ypos="head")
-            sna "You can use my brewing station when I'm not in the office..."
+            sna "You can use my brewing station when I'm not in the office..." ("snape_39")
-            sna "I don't want to smell your failure." # grin
+            sna "I don't want to smell your failure." ("snape_37") # grin
             gen "Asshole..." ("base", xpos="far_left", ypos="head")
 
     jump snape_office_menu

game/scripts/rooms/snape_office/objects/desk.rpy

@@ -40,6 +40,6 @@ label snape_at_desk:
         else:
             gen "I'd better leave his desk alone." ("base", xpos="far_left", ypos="head")
     else:
-        sna "Can't you see that I'm busy, Genie?"
+        sna "Can't you see that I'm busy, Genie?" ("snape_03", ypos="head")
 
     jump snape_office_menu