From 66bb068fea7efb27c9a38174052ced3b99a224e1 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Thu, 27 Apr 2023 14:58:48 +0100
Subject: [PATCH 1/4] Bug fix

* Fixed Astoria's stats var reference
---
 game/scripts/interface/stats.rpy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/scripts/interface/stats.rpy b/game/scripts/interface/stats.rpy
index 2e6f34f8..fedbce53 100644
--- a/game/scripts/interface/stats.rpy
+++ b/game/scripts/interface/stats.rpy
@@ -368,7 +368,7 @@ screen stats_menuitem(xx, yy):
                                 use stat_bar(int(10/0.9), "-Reputation-", "Total Weirdo", 10) # Joke stat
                                 #use stat_bar(int(0), "{size=-10}-Wrackspurts Therapy-{/size}" , "Not started", 0) # TODO: Add word list and variable
                             elif current_category == "Astoria":
-                                use stat_bar(int(10-states.ast.mood/1.0), "-Mood-" , states.ast.mood_word, states.ast.mood)
+                                use stat_bar(int(10-states.ast.mood/1.0), "-Mood-" , ast_mood_word, states.ast.mood)
                                 use stat_bar(int(1/1), "-Favour Tier-", "", 1)
                                 use stat_bar(int(states.ast.level/0.8), "-Affection-", "", states.ast.level) # TODO: Add word list
                                 use stat_bar(int(3/0.9), "-Reputation-", "Mischievous", 4) # TODO: Add word list and variable, starts at level 4

From d36fb0f1c8b2c66d70328125bddc572371d5ba4e Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Thu, 27 Apr 2023 17:08:45 +0200
Subject: [PATCH 2/4] Improvements

* Improved writing for "Dance for me Snape" variant of Hermione's "Dance for me" favours.
* Added additional flags for inside Hermione sex events.
---
 .../events/favors/dance_for_me_snape.rpy      | 1138 +++++++++--------
 .../hermione/events/favors/lets_have_sex.rpy  |    2 +
 .../events/favors/lets_have_sex_anal.rpy      |    5 +
 3 files changed, 647 insertions(+), 498 deletions(-)

diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy
index 4a87c75d..5f4b20c8 100644
--- a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy
+++ b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy
@@ -5,7 +5,6 @@
 # Invite Snape
 
 label hg_pf_strip_T3_snape: # Fails
-    hide screen blktone
     hide hermione_main
     with d3
 
@@ -14,13 +13,13 @@ label hg_pf_strip_T3_snape: # Fails
     her "Of course, [name_genie_hermione]." ("open", "closed", "base", "mid", xpos="base", ypos="base")
     gen "Do you think you could go and fetch professor Snape for me?" ("base", xpos="far_left", ypos="head")
     her "... Professor Snape?" ("annoyed", "squint", "base", "mid")
-    her "May I ask, why, [name_genie_hermione]?"
+    her "May I ask, why, [name_genie_hermione]?" ("annoyed", "squint", "base", "mid")
     gen "Oh, I just think you could use a bigger audience for your striptease performance." ("base", xpos="far_left", ypos="head")
     her "My striptease performance...?!!" ("shock", "wide", "base", "stare")
     her "Are you completely out of your mind, [name_genie_hermione]?" ("angry", "base", "angry", "mid")
     her "Wasn't it enough that I've had to embarrass myself in front my teacher once before?" ("open", "base", "angry", "mid")
-    her "And now you expect me to do it again... but willingly?!" ("scream", "closed", "angry", "mid")
-    gen "Short answer... yes." ("base", xpos="far_left", ypos="head")
+    her "And now you expect me to do it again... But willingly?!" ("scream", "closed", "angry", "mid")
+    gen "I wouldn't put it that way, I just figured--" ("base", xpos="far_left", ypos="head")
     her "I'm leaving!" ("angry", "base", "angry", "mid")
 
     call her_walk(action="leave")
@@ -31,63 +30,81 @@ label hg_pf_strip_T3_snape: # Fails
     jump end_hermione_event
 
 
-
 ### Tier 4 ###
 
 # Invite Snape
 
 label hg_pf_strip_T4_snape:
+
+    $ _wearing_clothes = False #Check if she has to put clothing back on at the end
+
     if not states.her.ev.dance_for_me.snape_invited:
         $ states.her.ev.dance_for_me.snape_invited = True
 
-        hide screen blktone
         hide hermione_main
         with d3
 
-        gen "[name_hermione_genie], before you start I have one more favour to ask of you." ("base", xpos="far_left", ypos="head")
+        gen "[name_hermione_genie], before you start..." ("base", xpos="far_left", ypos="head")
 
-        her "Of course, [name_genie_hermione]." ("open", "closed", "base", "mid", xpos="base", ypos="base")
-        gen "Do you think you could go and fetch professor Snape for me?" ("base", xpos="far_left", ypos="head")
+        her "Yes, [name_genie_hermione]?" ("open", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
+        gen "I think it'd be a good idea if you went and fetched professor Snape." ("base", xpos="far_left", ypos="head")
         her "... Professor Snape?" ("annoyed", "squint", "base", "mid")
-        her "May I ask, why, [name_genie_hermione]?"
-        gen "Oh, I just think you could use a bigger audience for your striptease performance." ("base", xpos="far_left", ypos="head")
-        her "My striptease performance...?!!" ("shock", "wide", "base", "stare")
+        if hermione.is_any_worn("top", "bottom", "panties", "bra"): #Other items may not fit the category of "clothes"
+            $ _wearing_clothes = True
+            gen "Yes, I figured that you might want to include him in the audience for your striptease performance." ("base", xpos="far_left", ypos="head")
+            her "I'd want him to--{w=0.2} During my striptease performance...?!!" ("shock", "wide", "base", "stare")
+        else:
+            gen "Yes, I figured that you might want to include him in the audience for your performance." ("base", xpos="far_left", ypos="head")
+            her "I'd want him to--{w=0.2} During my performance...?!!" ("shock", "wide", "base", "stare")
         her "With all due respect, [name_genie_hermione]..." ("angry", "base", "angry", "mid")
-        her "{size=-5}(Which I have oh so little left for you...){/size}" ("normal", "squint", "angry", "mid")
+        her "{size=-5}(Which I currently have little left for you...){/size}" ("normal", "squint", "angry", "mid")
         her "I refuse to degrade myself for professor Snape's amusement!" ("scream", "closed", "angry", "mid")
-        gen "No, no, you got it all wrong, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
+        gen "No, no, you've got it all wrong, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
         her "*Hmm*...?" ("soft", "base", "base", "mid")
-        gen "I want to prove that professor Snape is dirty, and I need your help." ("base", xpos="far_left", ypos="head")
+        gen "I figured it was implied, but I wanted to give you an opportunity to find out just how dirty professor Snape can get with his students." ("base", xpos="far_left", ypos="head")
         her "!!!" ("shock", "wide", "base", "stare")
-        gen "Yes, I want to catch him in the act!" ("base", xpos="far_left", ypos="head")
-        her "[name_genie_hermione], I didn't realise..." ("open", "base", "worried", "mid")
-        her "I see now..." ("base", "base", "base", "mid")
-        her "I am sorry for doubting you [name_genie_hermione]..."
-        gen "No biggie. Now go find professor Snape and bring him here." ("base", xpos="far_left", ypos="head")
+        gen "If you had a better idea of the type of favours he's currently selling..." ("base", xpos="far_left", ypos="head")
+        her "Then I'd be able to stay ahead of Slytherin in points, no problem..." ("open", "base", "worried", "mid")
+        gen "Precisely..." ("base", xpos="far_left", ypos="head")
+        her "I--{w=0.4} I should've known..." ("soft", "base", "worried", "mid")
+        her "I'm sorry for doubting your intentions, [name_genie_hermione]..." ("soft", "base", "worried", "mid")
+        gen "No worries [name_hermione_genie], I should've made it more clear." ("base", xpos="far_left", ypos="head")
+        gen "Now, will you go find professor Snape, and bring him here?" ("base", xpos="far_left", ypos="head")
+        if hermione.is_any_worn("top", "bottom", "panties", "bra"): #Other items may not fit the category of "clothes"
+            her "But--{w=0.2} *Ehm*...{w=0.4} Undressing in front of Snape..." ("annoyed", "base", "worried", "mid")
+        else:
+            her "But--{w=0.2} *Ehm*...{w=0.4} Performing in front of Snape..." ("annoyed", "base", "worried", "mid")
+        her "I'm not sure if--" ("angry", "base", "worried", "mid")
+        gen "Yes, it's not an easy task... I am aware of that, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
+        gen "But if anyone is strong willed--" ("base", xpos="far_left", ypos="head")
+        gen "(And slutty...)" ("base", xpos="far_left", ypos="head")
+        gen "--Enough to do it, it'd be you...{w=0.4} Unless you know some other Gryffindor student who'd be up for the task?" ("base", xpos="far_left", ypos="head")
+        her "That's true... I am the only one who could do it..." ("annoyed", "narrow", "worried", "down")
+        gen "In that case, if you truly want Gryffindor to have a chance at winning the cup, then I'm afraid you'll have to muster up the courage to--" ("base", xpos="far_left", ypos="head")
+        her "Yes, must do it!" ("scream", "closed", "angry", "mid")
+        her "I'll {b}have{/b} to do it, for Gryffindor!" ("scream", "closed", "angry", "mid")
+        gen "There's that Gryffindor resolve that I love!" ("grin", xpos="far_left", ypos="head")
+        gen "Now then [name_hermione_genie], if you're ready... Put on a big smile, fetch professor Snape, and make your house proud!" ("grin", xpos="far_left", ypos="head")
         her "Right away [name_genie_hermione]!" ("smile", "base", "angry", "mid")
 
     else:
-        hide screen blktone
         hide hermione_main
         with d3
 
-        gen "[name_hermione_genie], before you start I have one more favour to ask of you." ("base", xpos="far_left", ypos="head")
-
-        her "Of course, [name_genie_hermione]." ("open", "closed", "base", "mid", xpos="base", ypos="base")
-        gen "Do you think you could go and fetch professor Snape again?" ("base", xpos="far_left", ypos="head")
-        her "... professor Snape?" ("annoyed", "squint", "base", "mid")
-        her "May I ask why, [name_genie_hermione]?"
-        gen "Oh, I just want you to dance for us." ("base", xpos="far_left", ypos="head")
-        her "!!!" ("open", "base", "base", "mid")
-        gen "I want to prove that professor Snape is dirty, and I need your help." ("base", xpos="far_left", ypos="head")
-        her "But didn't we already establish that last time I did this?" ("annoyed", "base", "worried", "R")
-        gen "Well, *Ehm*... sure..." ("base", xpos="far_left", ypos="head")
-        gen "But I will need more proof if I am to take this issue to the ministry of magic!" ("base", xpos="far_left", ypos="head")
-        her "....." ("angry", "base", "angry", "mid")
-        gen "So, what do you say [name_hermione_genie]?" ("base", xpos="far_left", ypos="head")
-        gen "One more dance for the greater good?" ("base", xpos="far_left", ypos="head")
-        her "Well, alright..." ("disgust", "narrow", "base", "mid_soft")
-        gen "Good. Go find professor Snape then." ("base", xpos="far_left", ypos="head")
+        gen "Hold on, [name_hermione_genie]... Before you start." ("base", xpos="far_left", ypos="head")
+        her "Yes, [name_genie_hermione]?" ("open", "closed", "base", "mid", xpos="base", ypos="base", trans=d3)
+        gen "Why don't you go and fetch professor Snape?" ("base", xpos="far_left", ypos="head")
+        her "... Professor Snape?" ("annoyed", "squint", "base", "mid")
+        if hermione.is_any_worn("top", "bottom", "panties", "bra"): #Other items may not fit the category of "clothes"
+            $ _wearing_clothes = True
+            gen "Yes, I figured it may be a good time for you to perform another striptease for us both." ("base", xpos="far_left", ypos="head")
+        else:
+            gen "Yes, I figured it may be a good time for you to dance for us both again." ("base", xpos="far_left", ypos="head")
+        her "Again, [name_genie_hermione]?" ("annoyed", "squint", "base", "mid")
+        gen "Yes, [name_hermione_genie]... Don't you think it would help to know where your competition is currently at?" ("base", xpos="far_left", ypos="head")
+        her "But... Don't you think I've learned enough, last time I did this?" ("annoyed", "base", "worried", "R")
+        gen "I wouldn't have suggested it, if that's what I thought." ("base", xpos="far_left", ypos="head")
+        her "Very well, [name_genie_hermione]..." ("annoyed", "narrow", "worried", "R")
 
     call her_walk(action="leave")
 
@@ -112,8 +129,8 @@ label hg_pf_strip_T4_snape:
     sna "Miss Granger here will be performing, I presume?"
     her ".............." ("angry", "happyCl", "worried", "mid", emote="sweat", xpos="mid", ypos="base")
     gen "Yes, our little minx is more than happy to take off her clothes for our entertainment." ("base", xpos="far_left", ypos="head")
-    her "............" ("angry", "happyCl", "worried", "mid", emote="sweat")
-    gen "Aren't you, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head")
+    her "............" ("annoyed", "happyCl", "worried", "mid", emote="sweat")
+    gen "Aren't you, Miss Granger?" ("base", xpos="far_left", ypos="head")
     pause.5
 
     her "" ("angry", "happy", "worried", "R")
@@ -122,8 +139,8 @@ label hg_pf_strip_T4_snape:
     her "" ("angry", "happy", "worried", "mid")
     pause 1.5
 
-    her "Yes, [name_genie_hermione]." ("angry", "happyCl", "worried", "mid", emote="sweat")
-    gen "Let's get started then!" ("base", xpos="far_left", ypos="head")
+    her "Yes, sir." ("angry", "happyCl", "worried", "mid", emote="sweat")
+    gen "Well then, better get started." ("base", xpos="far_left", ypos="head")
     hide hermione_main
     with d3
     pause.2
@@ -140,113 +157,116 @@ label hg_pf_strip_T4_snape:
     call her_chibi("dance","on_desk","on_desk")
     call sna_chibi("stand","desk_close","desk_close")
 
-    # her "" (animation=bob)
     her "............." ("open", "closed", "base", "mid", ypos="head", flip=False)
-    sna "......................" ("snape_05")
-    gen ".........................." ("base", xpos="far_left", ypos="head")
+    sna "......................"
+    gen ".........................."
 
-    hide screen bld1
     hide screen blkfade
     with d5
     pause.8
 
-    call bld
     gen "So... Severus... How's life?" ("base", xpos="far_left", ypos="head")
-    sna "Well, you know... same old, same old..." ("snape_09")
-    sna " The Students are causing me grief..." ("snape_06")
-    sna "In fact, miss Granger here managed to cause me more stress than any other student..." ("snape_03")
+    sna "Well, you know... Same old, same old..." ("snape_09")
+    sna "The Students are causing me grief, as usual..." ("snape_06")
+    sna "In fact, Miss Granger here, has managed to cause me more stress than any other student..." ("snape_03")
     pause.2
     her "..............................." ("grin", "base", "base", "R", xpos="mid", ypos="base")
     gen "Oh, I am sure she is very sorry about that..." ("base", xpos="far_left", ypos="head")
     her "{size=-4}(Not even a little bit!){/size}" ("base", "happyCl", "base", "mid")
-    gen "And will make up for it today, won't you, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head")
+    gen "And I'm sure she'll make up for it today... Won't you, Miss Granger?" ("base", xpos="far_left", ypos="head")
     pause.2
 
-    her "*Ehm*... Yes, [name_genie_hermione]." ("base", "happy", "base", "mid")
+    her "*Ehm*... Yes sir." ("base", "happy", "base", "mid")
     pause.2
 
     nar "Hermione starts to sway her hips seductively."
 
     if hermione.is_worn("top"):
-        nar "Hermione reaches to take off her top..."
+        nar "Hermione reaches for her top, and then takes it off..."
         $ hermione.strip("top")
-
+        play sound "sounds/cloth_sound3.ogg"
+        pause.5
     call ctc
 
+    #TODO should this section have a repeat variant?
     her "..................." ("open", "narrow", "worried", "down")
     sna "*Hmm*... You are being suspiciously quiet, Miss Granger." ("snape_05")
     her "{size=-4}(Oh no! Is he onto us?){/size}" ("shock", "wide", "base", "stare")
-    her "I'm just doing what the headmaster told me to, Professor Snape..." ("grin", "happyCl", "worried", "mid", emote="sweat")
-    sna "Aren't you going to lecture me on the \"corruption that is taking over Hogwarts\" like you do every other day during classes?" ("snape_03")
+    her "I'm just doing what is expected from a student... Or am I somehow being out of line?" ("grin", "happyCl", "worried", "mid", emote="sweat")
+    sna "Aren't you going to lecture me on the \"corruption that is taking over Hogwarts\" like you've done every other day during classes?" ("snape_03")
     gen "Severus..." ("base", xpos="far_left", ypos="head")
-    sna "No Albus, I want to hear what little miss perfect has to say." ("snape_03")
-    her "I just want you to have a good time, Professor Snape..." ("grin", "happyCl", "worried", "mid", emote="sweat")
+    sna "No Albus, I want to hear what {i}little miss perfect{/i} has to say." ("snape_03")
+    her "..." ("grin", "happyCl", "worried", "mid")
+    sna "Well?" ("snape_03")
+    her "Oh, of course won't lecture you, professor Snape... After all, trading sexual favours for house points is common practice at Hogwarts." ("grin", "happyCl", "worried", "mid", emote="sweat")
     sna "Oh! It's \"Professor Snape\" now, is it?" ("snape_03")
-    sna "What happened to \"snape'o'doodle\" and \"Professor Snivellus\"??!" ("snape_10")
-    gen "{size=-5}({i}snape'o'doodle{/i}, heh... that's funny.){/size}" ("grin", xpos="far_left", ypos="head")
-    her "............." ("grin", "happyCl", "worried", "mid", emote="sweat")
-    sna "Yes, I know what you are calling me behind my back, you wretched girl!" ("snape_08")
-    her "Well, maybe that's because you deserve it... {i}Snivellus!{/i}" ("scream", "base", "angry", "mid", emote="angry")
+    sna "What happened to \"Snape'o'doodle\" and \"Professor Snivellus\"??!" ("snape_10")
+    gen "{size=-5}({i}Snape'o'doodle{/i}...{w=0.4} *Heh*--{w=0.2} That's funny.){/size}" ("grin", xpos="far_left", ypos="head")
+    her "*Giggle*" ("grin", "happyCl", "worried", "mid", emote="sweat")
+    sna "Yes, I am well aware of what you've been calling me behind my back, you wretched girl!" ("snape_08")
+    her "Well, maybe it's warranted... Have you considered--" ("scream", "base", "angry", "mid", emote="angry")
     sna "{size=+2}What did you just say?!{/size}" ("snape_10")
-    sna "How dare you....?"
+    sna "How dare you to speak to your superiors this way?" ("snape_10")
     sna "Who do you think you are? You filthy mudbl--" ("snape_15")
-    her "[name_genie_hermione], one of your staff members is verbally abusing me!" ("scream", "closed", "angry", "mid")
-    her "Are you going to allow this?"
-    sna "Verbally abusing...?! You have some nerve, girl!" ("snape_08")
-    sna "Albus, will you allow her to talk back to a teacher like that?" ("snape_10")
-    her "[name_genie_hermione]!" ("scream", "closed", "angry", "mid")
-    sna "Albus!" ("snape_10")
+    her "Headmaster, one of your staff members is verbally abusing me!" ("scream", "closed", "angry", "mid")
+    sna "Verbally abusing--{w=0.2} You have some nerve, girl!" ("snape_08")
+    sna "Albus, are you truly going to allow such insolent behaviour from a student?" ("snape_10")
+    her "Professor, please don't listen to him! He's just trying to manipulate you." ("scream", "closed", "angry", "mid")
+    sna "Know your place girl, or your so called abuse will be anything but verbal." ("snape_10")
 
     menu:
-        gen "..." ("base", xpos="far_left", ypos="head")
-        "\"[name_hermione_genie], show some respect!\"":
+        "\"Miss Granger, show some respect!\"":
             $ states.her.mood += 9
             her "What?" ("annoyed", "base", "angry", "mid")
-            her "But [name_genie_hermione]!"
-            gen "[name_hermione_genie], you {size=+4}will{/size} calm down now." ("base", xpos="far_left", ypos="head")
+            her "But sir!"
+            gen "And calm yourself." ("base", xpos="far_left", ypos="head")
             her "*Tsk*!" ("disgust", "narrow", "base", "mid_soft")
+            gen "Remember what we discussed... Focus on that task..." ("base", xpos="far_left", ypos="head")
+            her "Fine..." ("disgust", "narrow", "base", "R")
             if hermione.is_worn("bottom"):
                 gen "And take off your bottoms already, would you?" ("base", xpos="far_left", ypos="head")
                 her "......." ("annoyed", "narrow", "angry", "R")
             sna "..........." ("snape_13")
 
-        "\"Severus, you started this.\"":
-            $ states.sna.level -= 5
+        "\"Severus, you started this.\"": #Flogging
             sna "What? Me?!" ("snape_10")
-            her "Thank you, [name_genie_hermione]." ("base", "base", "base", "mid")
+            her "Thank you sir." ("base", "base", "base", "mid")
             sna "Albus, you are spoiling the girl! She must be taught a lesson!" ("snape_08")
-            gen "............... Severus." ("base", xpos="far_left", ypos="head")
+            gen "Severus..." ("base", xpos="far_left", ypos="head")
             gen "Did you hit your head?!" ("angry", xpos="far_left", ypos="head")
             sna "I beg your pardon?" ("snape_03")
-            gen "The girl is already stripping for you!" ("angry", xpos="far_left", ypos="head")
+            if hermione.is_any_worn("clothes"):
+                gen "The girl is already stripping for you!" ("angry", xpos="far_left", ypos="head")
+            else:
+                gen "The girl is already putting on a show for you!" ("angry", xpos="far_left", ypos="head")
             gen "What punishment are you talking about?" ("angry", xpos="far_left", ypos="head")
             sna "*Tsk*... How about a flogging?" ("snape_16")
             gen "Severus!" ("angry", xpos="far_left", ypos="head")
             sna "Alright, alright, I see your point..." ("snape_17")
-            gen "[name_hermione_genie], are you going to strip or are you going to climb on my desk to give us a better view?" ("base", xpos="far_left", ypos="head")
-            her "*Ehm*..." ("open", "narrow", "worried", "down")
+            gen "Miss Granger, are you alright?" ("base", xpos="far_left", ypos="head")
+            gen "Shall we end it for today?" ("base", xpos="far_left", ypos="head")
+            her "*Ehm*... It's okay sir... I agreed to do this after all." ("open", "narrow", "worried", "down")
             if hermione.is_worn("bottom"):
-                gen "Take off your bottoms, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head")
-                her "Yes, [name_genie_hermione]..." ("soft", "base", "base", "mid")
+                gen "Take off your bottoms, Miss Granger!" ("base", xpos="far_left", ypos="head")
+                her "Yes sir..." ("soft", "base", "base", "mid")
 
-        "\"Both of you, calm the fuck down.\"":
+        "\"Both of you, calm yourselves.\"":
             gen "You, tall-dark-and-handsome, calm down a bit, would you?" ("base", xpos="far_left", ypos="head")
             sna "I beg your pardon?" ("snape_03")
-            her "Yes! You tell him profess--" ("annoyed", "narrow", "angry", "R")
-            gen "You as well, you perverted little minx!" ("base", xpos="far_left", ypos="head")
+            her "Yes! You tell him--" ("annoyed", "narrow", "angry", "R")
+            gen "That goes for you as well, you perverted little minx!" ("base", xpos="far_left", ypos="head")
             if hermione.is_worn("bottom"):
-                gen "Calm down and take your bottoms off already." ("base", xpos="far_left", ypos="head")
+                gen "And take your bottoms off already." ("base", xpos="far_left", ypos="head")
             else:
-                gen "Calm down and keep doing what you were paid to do!" ("base", xpos="far_left", ypos="head")
+                gen "And keep doing what you're here for!" ("base", xpos="far_left", ypos="head")
             her "I am not perverted..." ("annoyed", "narrow", "annoyed", "mid")
             if hermione.is_worn("bottom"):
-                gen "Your bottoms, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head")
+                gen "Your bottoms, Miss Granger!" ("base", xpos="far_left", ypos="head")
                 her "......" ("annoyed", "narrow", "angry", "R")
             sna "............." ("snape_13")
 
         "-Unleash your rage {size=-2}(Hardcore){/size}-" if game.difficulty >= 3: #Hardcore difficulty dialogue.
             $ states.her.mood += 18
-            $ states.sna.level -= 10
             gen "Both of you..." ("base", xpos="far_left", ypos="head")
             stop music
             with hpunch
@@ -254,22 +274,29 @@ label hg_pf_strip_T4_snape:
             gen "You!... You good for nothing, ugly-faced, crooked-nosed-wannabe-wizard!" ("angry", xpos="far_left", ypos="head")
             with hpunch
             sna "(...)" ("snape_11")
-            her "(... yikes!)" ("angry", "wink", "base", "mid")
+            her "(... Yikes!)" ("angry", "wink", "base", "mid")
             sna "(What did he just say to me?!)" ("snape_08")
-            gen "Shut your stupid mouth or I will send you flying out that bloody window!" ("angry", xpos="far_left", ypos="head")
-            gen "That bitch is already stripping for you, so what more do you want?!" ("angry", xpos="far_left", ypos="head")
-            her "That B-Bitc--" ("shock", "wide", "base", "stare")
-            gen "And you... stripper-whore!" ("angry", xpos="far_left", ypos="head")
-            gen "Do what you are paid for and start stripping already!!!" ("angry", xpos="far_left", ypos="head")
+            gen "Shut your stupid mouth, or I will send you flying out that bloody window!" ("angry", xpos="far_left", ypos="head")
+            if hermione.is_any_worn("clothes"):
+                gen "That bitch is already stripping for you, so what more do you want?!" ("angry", xpos="far_left", ypos="head")
+            else:
+                gen "That bitch is already butt naked, so what more do you want?!" ("angry", xpos="far_left", ypos="head")
+            her "That B--{w=0.2} Bitch?!" ("shock", "wide", "base", "stare")
+            gen "And you... Stripper-whore!" ("angry", xpos="far_left", ypos="head")
+            gen "Do what you are paid to do, and start stripping already!!!" ("angry", xpos="far_left", ypos="head")
             her "......" ("angry", "closed", "angry", "mid", emote="angry")
             sna "............." ("snape_05")
             her "..." ("mad", "squint", "angry", "mid")
 
+            play music "music/Dark Fog.ogg" fadein 1 if_changed
+
     pause.5
 
     if hermione.is_worn("bottom"):
-        nar "Hermione swiftly takes off her bottoms, showing off her muggle-born ass."
+        nar "Hermione swiftly takes off her bottoms, showing off her shapely ass."
+        play sound "sounds/cloth_sound3.ogg"
         $ hermione.strip("bottom")
+        pause .5
         call ctc
 
         sna "*Hmm*..."
@@ -282,481 +309,596 @@ label hg_pf_strip_T4_snape:
         nar "Hermione keeps on dancing, now wearing nothing but her bra."
     elif hermione.is_worn("panties"):
         nar "Hermione keeps on dancing, now wearing nothing but her panties."
+    else:
+        nar "Hermione keeps on dancing, as if the previous interaction never occurred."
+
+    gen "Now then... If we're all feeling calm, collected... And focused." ("base", xpos="far_left", ypos="head")
+    her "..." ("soft", "base", "base", "mid")
 
     menu:
         gen "..." ("base", xpos="far_left", ypos="head")
-        "\"Severus, what about that Potter boy?\"":
+        "\"Severus, let's talk about that Potter boy.\"": #Potter
             her "(.....?)" ("soft", "base", "base", "mid")
             sna "What about him?" ("snape_09")
             gen "Is he still causing you grief?" ("base", xpos="far_left", ypos="head")
             sna "Oh..." ("snape_09")
-            sna "Not really, no..."
+            sna "Not really, no..." ("snape_09")
             sna "To be honest, I never really had a problem with the boy himself..." ("snape_06")
-            sna "Although I did plan to make his life here miserable because of his father..."
+            sna "Although I did plan to make his life here miserable because of his father..." ("snape_06")
             sna "But lately I have way more interesting projects to occupy myself with..." ("snape_02")
             her "..................." ("soft", "base", "base", "mid")
 
-        "\"Severus, what about the Weasels?\"":
-            sna "Weasels?" ("snape_05")
-            sna "Oh you mean Weasley's..." ("snape_09")
-            sna "What about them?" ("snape_09")
-            gen "Are they still causing you trouble?" ("base", xpos="far_left", ypos="head")
-            sna "Yes... More than ever." ("snape_09")
-            gen "*Hmm*...?" ("base", xpos="far_left", ypos="head")
-            gen "You seem surprisingly indifferent about that..." ("base", xpos="far_left", ypos="head")
-            sna "That's because I know that they will get what they deserve eventually..." ("snape_05")
-            gen "Revenge? Cool! What do you have in mind?" ("base", xpos="far_left", ypos="head")
+        "\"Severus, anything you'd like to get off your chest?\"": #Weasley
+            sna "Is this really the best time to ask such questions?" ("snape_05")
+            gen "I don't see why not..." ("base", xpos="far_left", ypos="head")
+            gen "Now tell me... Anyone been causing you trouble lately?" ("base", xpos="far_left", ypos="head")
+            sna "*Hmph*... Well, I suppose there's the Weasley twins..." ("snape_09")
+            gen "Really? Who doesn't love a pair of twins?" ("base", xpos="far_left", ypos="head")
+            sna "If they were female, perhaps..." ("snape_09")
+            her "....." ("disgust", "narrow", "angry", "down")
+            gen "So, what kind of trouble have they been causing?" ("base", xpos="far_left", ypos="head")
+            sna "It doesn't matter... They'll get what is coming to them, eventually..." ("snape_09")
+            gen "A revenge plot? Cool! What do you have in mind?" ("base", xpos="far_left", ypos="head")
             her "!!!" ("soft", "base", "base", "mid")
-            sna "*Hmm*... Can't discuss this with \"the enemy\" present." ("snape_06")
+            sna "*Hmm*... It's not exactly something I'm willing to discuss with the \"present company\"." ("snape_06")
             her "*Tsk*!" ("annoyed", "narrow", "angry", "R")
-            sna "All I can say is that it involves their beloved little sister Ginny..." ("snape_13")
-            gen "Ginny? *Hmm*... What a curious name for a girl..." ("base", xpos="far_left", ypos="head")
-            gen "............." ("base", xpos="far_left", ypos="head")
-            gen "So, you plan to fuck her then?" ("base", xpos="far_left", ypos="head")
+            sna "All I can say, is that it involves a girl that they're very close to..." ("snape_13")
+            her "{size=-5}(Ginny...?){/size}" ("open", "narrow", "worried", "down")
+            gen "I see... So it's a revenge fuck type of situation?" ("base", xpos="far_left", ypos="head")
             sna "!!?" ("snape_08")
-            sna "Albus, please, not in front of the girl!" ("snape_17")
+            sna "Albus, please... Not in front of the girl!" ("snape_17")
             gen "Alright, alright..." ("base", xpos="far_left", ypos="head")
-            her "{size=-5}(Ginny...){/size}" ("open", "narrow", "worried", "down")
 
-        "\"How would you grade Hermione's butt?\"":
-            sna "miss Granger's buttocks?" ("snape_05")
-            her "!!!............" ("annoyed", "narrow", "angry", "R")
-            gen "Yes! As you would grade a paper." ("base", xpos="far_left", ypos="head")
+        "\"Severus, tell me what grade you'd give Miss Granger's butt.\"": #Butt
+            sna "What grade?" ("snape_05")
+            her "............" ("annoyed", "narrow", "angry", "R")
+            gen "Yes! How do you normally grade her papers?" ("base", xpos="far_left", ypos="head")
             sna "*Hmm*..." ("snape_13")
+            sna "\"Outstanding\"..." ("snape_13")
+            her "You perverted--" ("disgust", "narrow", "angry", "down")
+            sna "That's the grade I'm usually forced to put on her papers..." ("snape_13")
+            sna "That said... How shall I grade something like this..." ("snape_13")
             pause.1
             nar "Professor Snape gives Hermione's buttocks an appraising look..."
-            her ".........?" ("upset", "wink", "base", "mid")
-            sna "I would say..." ("snape_13")
+            sna "I'd say..." ("snape_13")
             her "............?!" ("base", "narrow", "worried", "down")
-            sna "Yes... \"Dreadful\"." ("snape_09")
+            sna "\"Dreadful\"..." ("snape_09")
             her "(What?!)" ("shock", "wide", "base", "stare")
-            sna "Unsatisfactory..." ("snape_09")
-            sna "Look at that pitiful thing. Tiny and skinny... That's a boy's butt."
-            her "!!!!!!!!!!" ("angry", "narrow", "annoyed", "mid", emote="angry")
+            sna "Look at that pitiful thing. Tiny and skinny... That's a boy's butt." ("snape_09")
+            her "It is not a boy's--" ("angry", "narrow", "annoyed", "mid", emote="angry")
+            sna "Truly?" ("snape_09")
+            her "Of course not!" ("upset", "wink", "base", "mid")
+            sna "Then I suppose there must be some other magic at hand to have cause this... Deformation." ("snape_09")
+            sna "Miss Granger..." ("snape_09")
+            sna "Remind me what potion contains two shrivel figs, four daisy roots, five hairy caterpillars, four leeches, and a rat spleen?" ("snape_09")
+            her "*Ehm*... A shrinking solution?" ("angry", "narrow", "worried", "down")
+            sna "That's right..." ("snape_09")
+            sna "Perhaps you accidentally sat in one..." ("snape_09")
+            her "*Hmph*" ("annoyed", "narrow", "worried", "down")
+
+    gen "Miss Granger, I'm not seeing a lot happening..." ("base", xpos="far_left", ypos="head")
+    her "Right..." ("open", "narrow", "worried", "down")
 
     if hermione.is_worn("bra"):
-        gen "Why don't you take off your bra now, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head")
+        gen "Why don't you take off your bra, Miss Granger?" ("base", xpos="far_left", ypos="head")
         her "............." ("open", "narrow", "worried", "down")
-        nar "Hermione undoes her bra and then slowly takes it off."
-        pause .5
+        nar "Hermione undoes her bra and then lets it fall to the floor."
+        play sound "sounds/cloth_sound3.ogg"
         $ hermione.strip("bra")
-
+        pause .5
         call ctc
     else:
         nar "Hermione cups her breasts playfully, squeezing them in the process."
 
-    gen "Alright! We Finally get to the good stuff!" ("base", xpos="far_left", ypos="head")
+    gen "Alright! Finally getting to the good stuff!" ("base", xpos="far_left", ypos="head")
     sna "*Hmm*..." ("snape_13")
     her "........" ("annoyed", "closed", "base", "mid")
 
+    $ _watch = False #Played watch variant.
+    $ _masturbate = False #Jacked off at any point.
+    $ _masturbate_finished = False #Jacked off until completion.
+
     menu:
         gen "..." ("base", xpos="far_left", ypos="head")
         "-Start jerking off-":
             jump hg_pf_strip_T4_snape_masturbate
-
         "-Just keep on watching-":
             jump hg_pf_strip_T4_snape_watch
-
-label hg_pf_strip_T4_snape_watch:
-    play music "music/Dark Fog.ogg" fadein 1 if_changed
-
-    her "I will just keep on dancing then..." ("open", "closed", "base", "mid")
-
-    # her "" (animation=bob)
-    call her_chibi("dance","on_desk","on_desk")
-    call ctc
-
-    nar "Hermione squeezes her breasts and shakes her hips slightly..."
-
-    gen "Yes, [name_hermione_genie]. Very good." ("base", xpos="far_left", ypos="head")
-    sna "*Ahem*! Acceptable performance, miss Granger." ("snape_12")
-    her "...." ("open", "closed", "base", "mid")
-    gen "Heh..." ("base", xpos="far_left", ypos="head")
-    gen "So... how would you grade her tits?" ("base", xpos="far_left", ypos="head")
-    her "......" ("annoyed", "closed", "base", "mid")
-    sna "*Hmm*......" ("snape_20")
-    her "........" ("annoyed", "closed", "base", "mid")
-    sna "\"B+\"!" ("snape_12")
-    her "!!!" ("open", "wide", "base", "stare")
-    gen "Really?" ("base", xpos="far_left", ypos="head")
-    sna "Yes. I do give credit where it's due." ("snape_12")
-    her "(Professor...)" ("angry", "wide", "base", "stare")
-    her "(Time for my finishing act then!)" ("open", "closed", "base", "mid")
-    pause.1
-
-    if hermione.is_worn("panties"):
-        nar "Hermione bends over and slides her panties down."
-        nar "Her movements lack grace..."
-        nar "But a pretty pussy is always a welcome sight nonetheless..."
-        pause.5
-
-        $ hermione.strip("panties")
-
-        call ctc
-
-        sna "Yes... Yes..." ("snape_20")
-    sna "Now shake those B+ titties for me, you harlot!"
-    her "......." ("angry", "happyCl", "worried", "mid")
-
-    pause.5
-
-    nar "All of a sudden Hermione breaks into a series of rather complex pirouettes."
-    sna "Yes, such grace..." ("snape_19")
-    sna "That lithe, flexible body!" ("snape_20")
-    her "{size=-5}(Three-two-one... Three-two-one... And step!){/size}" ("open", "closed", "base", "mid")
-    nar "Hermione seems very focused on her dancing routine."
-    sna "Yes, and now another pirouette!" ("snape_19")
-    sna "Magnificent!"
-    show screen blkfade
-    with d5
-
-    nar "Hermione performs another set of movements and pirouettes..."
-    nar "Gives a little curtsy bow to the imaginary audience..."
-    nar "And then exhaustedly slumps down on her butt."
-
-    call her_chibi("sit_naked","on_desk","on_desk")
-
-    call hide_characters
-    hide screen blktone
-    hide screen bld1
-    hide screen blkfade
-    with d5
-    call ctc
-
-    show screen bld1
-    sna "Good job, you harlot!" ("snape_22")
-    her "............." ("soft", "happy", "base", "R", animation=None)
-
-    if game.daytime:
-        sna "Well, my class is about to start so I will be leaving now." ("snape_22")
-        sna "Don't you have potion class with me today, Miss Granger?"
-        her "Yes, [name_genie_hermione]..." ("annoyed", "narrow", "base", "dead")
-        sna "Well, don't be late, girl..." ("snape_22")
-        sna "Albus..." ("snape_02")
-        gen "See you soon, Severus." ("grin", xpos="far_left", ypos="head")
-    else:
-        sna "Well, it is getting rather late. I think I will be leaving now." ("snape_22")
-        sna "Good night, Albus."
-        gen "Severus." ("base", xpos="far_left", ypos="head")
-        sna "Harlot." ("snape_22")
-        her "Professor..." ("annoyed", "narrow", "base", "dead")
-
-    call ctc
-
-    call hide_characters
-    show screen blkfade
-    with d5
-
-    nar "Professor Snape leaves..."
-    stop music fadeout 1.0
-    her "...................." ("annoyed", "narrow", "base", "dead", ypos="head", flip=False)
-    pause.5
-
-    her "May I... may I get paid now... [name_genie_hermione]...?" ("normal", "happyCl", "worried", "mid")
-
-    jump end_hg_pf_strip
-
 label hg_pf_strip_T4_snape_masturbate:
+    $ _masturbate = True
     play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed
-    pause.2
 
     call hide_characters
     show screen blkfade
     with d5
     pause.2
 
-    her "[name_genie_hermione]?!" ("open", "wide", "base", "stare", ypos="head", flip=False)
-    gen "It's alright, [name_hermione_genie]. Don't mind me..." ("base", xpos="far_left", ypos="head")
-    sna "Oh, we're doing it like this then?" ("snape_12", ypos="head")
-    sna "Well, don't mind if I do..." ("snape_12")
-    her "!!!" (animation=None)
+    her "Sir?!" ("open", "wide", "base", "stare", ypos="head", flip=False)
+    gen "It's alright, Miss Granger..." ("base", xpos="far_left", ypos="head")
+    sna "Oh, we're doing this now, are we?" ("snape_12", ypos="head")
+    sna "Well... Don't mind if I do." ("snape_12")
+    her "!!!" ("open", "wide", "base", "stare")
 
     call gen_chibi("jerk_off","behind_desk","base")
     call her_chibi("dance_pause","on_desk","on_desk")
     call sna_chibi("jerk_off","desk_close", "desk_close")
-    hide screen blktone
+    hide screen blkfade
+    with d5
+    call ctc
+    if states.her.tier < 5: # Hermione is not okay with it.
+        her "Guys--{w=0.2} *Ehm*... I mean, sirs! *Ehm*...{w=0.4} Professors!" ("angry", "wide", "base", "stare", xpos="mid", ypos="base")
+        gen "Don't you mind us Miss Granger, just keep doing your thing." ("base", xpos="far_left", ypos="head")
+        her "But..." ("angry", "wide", "base", "stare")
+        her "No! I refuse to dance, when those things are pointed at me!" ("angry", "happyCl", "worried", "mid")
+        her "You need to put them away, or the dance is over!" ("angry", "happyCl", "worried", "mid")
+        gen "You aren't in any position to give us orders, Miss Granger." ("base", xpos="far_left", ypos="head")
+        her "That was not an order, sir... It was an ultimatum." ("clench", "base", "angry", "mid", emote="angry")
+
+        menu:
+            gen "..." ("base", xpos="far_left", ypos="head")
+            "\"Alright Severus, let's be civil...\"": # Jumps to watch variant.
+                hide hermione_main
+                with d3
+                pause.2
+                sna "I see Miss Granger has managed to remain exceptionally stubborn in every situation..." ("snape_03")
+                call hide_characters
+                with d5
+
+                call gen_chibi("sit_behind_desk")
+                call sna_chibi("stand","desk","base")
+                with fade
+                pause.3
+
+                $ states.gen.masturbating = False
+
+                jump hg_pf_strip_T4_snape_watch
+            "\"*Psst*, Hermione! Remember why you're doing this!\"": # Hermione tries to push on, but fails.
+                $ states.her.mood += 15
+
+                her "{size=-5}Oh... Right...{/size}" ("open", "wide", "base", "stare")
+                her "...{w}...{w}{nw}" ("angry", "happyCl", "worried", "mid")
+                her "......{fast}No, I can't! This is just not worth it!" ("angry", "wide", "worried", "mid")
+
+                call hide_characters
+                show screen blkfade
+                with d5
+
+                call gen_chibi("sit_behind_desk")
+                call her_chibi("stand","desk","base")
+                call sna_chibi("stand","mid","base")
+
+                $ hermione.wear("all")
+                if _wearing_clothes:
+                    play sound "sounds/cloth_sound3.ogg"
+                    nar "Hermione jumps off the desk and begins dressing herself."
+                else:
+                    nar "Hermione jumps off the desk."
+
+                hide screen blkfade
+                with d5
+
+                sna "Well, this was awfully anticlimactic..." ("snape_03")
+                gen "You don't say..." ("angry", xpos="far_left", ypos="head")
+                sna "Well, since the show is over, I suppose I may as well find some fun elsewhere... I will talk to you later, Albus." ("snape_03")
+                gen "Severus..." ("base", xpos="far_left", ypos="head")
+                sna "Miss Granger..." ("snape_04")
+                her "Professor..." ("angry", "happyCl", "worried", "mid", ypos="head", flip=False)
+
+                call sna_walk(action="leave")
+
+                her "...................." ("annoyed", "narrow", "base", "dead", xpos="mid", ypos="base")
+
+                her "I'd like my points now..." ("open", "narrow", "base", "dead")
+                gen "Have you not forgotten something" ("base", xpos="far_left", ypos="head")
+                her "...?" ("annoyed", "narrow", "base", "dead")
+                gen "The reason why you did this in the first, place [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
+                her "..." ("annoyed", "narrow", "base", "stare")
+                gen "The whole point was so that you could see just how far Professor Snape would take things."
+                her "Oh... Right..." ("clench", "base", "worried", "mid")
+
+                jump hg_pf_strip_T4_snape_results
+
+    $ _masturbate_finished = True
+
+    her "{size=-5}Focus on the task...{/size}" ("shock", "wide", "base", "stare")
+    sna "What was that?" ("snape_05")
+    her "Oh, don't mind me, sir... I'm just being silly..." ("clench", "happyCl", "worried", "mid", emote="sweat")
+    sna "*Hmm*...?" ("snape_05")
+    her "Go ahead, please continue touching yourself in front of me..." ("clench", "happyCl", "worried", "mid", emote="sweat")
+    her "I do not mind it at all..." ("open", "happyCl", "worried", "mid", emote="sweat")
+    sna "Right..." ("snape_05")
+    her "*Ahem*...{w=0.2} Please...{w=0.2} Allow me to--{w=0.2} assist you..." ("open", "happyCl", "worried", "R", emote="sweat")
+
+    call her_chibi("dance","on_desk","on_desk")
+
+    nar "You keep jerking off, while Hermione awkwardly dances in front of you both."
+    her "(Please... Just finish already...)"
+    nar "Hermione squeezes her breasts, and shakes her hips in an attempted seductive manner."
+
+    gen "That's it, Miss Granger... Very good." ("base", xpos="far_left", ypos="head")
+    sna "*Ahem*! Acceptable performance..." ("snape_12")
+    her "...." ("open", "closed", "base", "mid")
+    gen "*Heh*..." ("base", xpos="far_left", ypos="head")
+    gen "So... How would you grade her tits?" ("base", xpos="far_left", ypos="head")
+    her "......" ("annoyed", "closed", "base", "mid")
+    sna "*Hmm*......" ("snape_20")
+    her "........" ("annoyed", "closed", "base", "mid")
+    sna "I'd say they \"Exceed expectations\"..." ("snape_12")
+    her "!!!" ("open", "wide", "base", "stare")
+    gen "Really? I'm surprised you'd grade them so high." ("base", xpos="far_left", ypos="head")
+    sna "As an honourable man, I do give credit where it's due..." ("snape_12")
+    her "(*Ugh*... I can't stand him... Honourable, my ass...)" ("angry", "narrow", "base", "stare")
+    her "(Better finish this up, quickly...)" ("annoyed", "closed", "base", "mid")
+    pause.1
+
+    if hermione.is_worn("panties"):
+
+        nar "Hermione bends over and slides her panties down."
+        nar "Her movements lack grace..."
+        play sound "sounds/cloth_sound3.ogg"
+        $ hermione.strip("panties")
+        pause.5
+        call ctc
+
+        nar "But a pretty pussy is always a welcome sight nonetheless..."
+        nar "You show your appreciation by stroking your cock even faster..."
+
+    sna "Yes..." ("snape_20")
+    sna "Now shake those titties for me, you harlot!"
+    her "......." ("angry", "happyCl", "worried", "mid")
+    pause .5
+
+    nar "All of a sudden, Hermione breaks into a series of rather complex pirouettes."
+    sna "Yes, such grace..." ("snape_19")
+    sna "That lithe, flexible body!" ("snape_20")
+    her "{size=-5}(Three-two-one... Three-two-one... And step!){/size}" ("grin", "narrow", "annoyed", "up")
+
+    nar "Hermione seems very focused on her dancing routine."
+
+    sna "Yes, and now another pirouette!" ("snape_19")
+    sna "Magnificent!"
+    sna "I would applaud you, but one of my hands is very busy at the moment." ("snape_13")
+    gen "{size=-4}(Was that an attempt at a joke?){/size}" ("base", xpos="far_left", ypos="head")
+    gen "{size=-4}(Aroused Snape is weird...){/size}" ("base", xpos="far_left", ypos="head")
+    show screen blkfade
+    with d5
+
+    nar "She then performs another set of movements, and pirouettes..."
+    nar "Once finished, she gives a little curtsy bow to an imaginary audience..."
+    nar "And then exhaustedly slumps down onto the desk."
+
+    call her_chibi("sit_naked","on_desk","on_desk")
+
+    call hide_characters
+    hide screen blkfade
+    with d5
+    call ctc
+    her "Whew... This was--" ("open", "closed", "base", "mid")
+    with hpunch
+
+    gen "*ARGH*! YOU FUCKING WHORE!" ("angry", xpos="far_left", ypos="head")
+
+    call cum_block
+    call gen_chibi("cum","behind_desk","base")
+    pause.2
+
+    $ hermione.set_cum(face="light")
+    pause 0.7
+    $ hermione.set_cum(breasts="light")
+    pause 1
+    $ hermione.set_cum(hair="light")
+
+
+    her "??!!!" ("shock", "wide", "base", "stare")
+    her "" ("angry", "happyCl", "worried", "mid")
+    call ctc
+
+    sna "Good job, harlot!" ("snape_18")
+    sna "Here is your reward!" ("snape_21")
+
+    call cum_block
+    call sna_chibi("cum","desk_close","desk_close")
+    pause.2
+
+    $ hermione.set_cum(face="heavy")
+    pause 0.7
+    $ hermione.set_cum(breasts="heavy", body="heavy")
+    pause 1
+    $ hermione.set_cum(crotch="light")
+
+    her "!!!!!!!!!!!" ("shock", "wide", "base", "stare")
+    call ctc
+
+    sna "Oh... Yes..." ("snape_21")
+    gen "Look at that, she's completely covered!" ("angry", xpos="far_left", ypos="head")
+    her "..............................." ("soft", "narrow", "annoyed", "up")
+
+    sna "*Ha-ha-ha*! This is magnificent!" ("snape_21")
+    gen "I know, right!?" ("grin", xpos="far_left", ypos="head")
+
+    call gen_chibi("cum_done","behind_desk","base")
+    call sna_chibi("cum_done","desk_close","desk_close")
+
+    sna "Yes... We should do this more often." ("snape_22")
+    her "................." ("grin", "narrow", "annoyed", "up")
+
+    sna "*Ahem*... I mean, I deem this performance acceptable..." ("snape_20")
+    her "Thank you........." ("annoyed", "narrow", "base", "dead")
+    sna "No Miss Granger, you don't understand..." ("snape_19")
+    her "..........." ("annoyed", "narrow", "base", "dead")
+    sna "That's how I'd grade it...." ("snape_22")
+    her "............" ("annoyed", "narrow", "base", "dead")
+    sna "\"Acceptable\"..." ("snape_10")
+    stop music
+
+    her "{size=+5}Wait, what?!!!{/size}" ("shock", "wide", "base", "stare")
+    sna "Indeed... Quite a few things could use some improvement..." ("snape_09")
+
+    play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed
+
+    her "I cannot believe this!" ("clench", "base", "angry", "mid", emote="angry")
+    pause.5
+
+    call hide_characters
+    show screen blkfade
+    with d5
+
+    nar "Hermione jumps off your desk furiously."
+    pause 2
+    hide hermione_main
+
+    call sna_chibi("hold_dick","mid","base")
+    call gen_chibi("sit_behind_desk")
+    call her_chibi("stand","desk","base", flip=True)
+
     hide screen blkfade
     with d5
     call ctc
 
-    her "No, guys... *Err*... I mean, sirs! *Ehm*... professors!" ("angry", "wide", "base", "stare", xpos="mid", ypos="base")
-    gen "Don't you mind us [name_hermione_genie], just keep on doing your thing." ("base", xpos="far_left", ypos="head")
-    her "But..."
-    her "No! I refuse to dance with those things pointed at me!" ("angry", "happyCl", "worried", "mid")
-    her "You need to put them away or the dance is over!"
-    gen "You aren't in any position to give us orders, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
-    her "that was not an order, [name_genie_hermione]. It was an ultimatum." ("clench", "base", "angry", "mid", emote="angry")
+    her "I demand a higher grade than that!" ("soft", "base", "angry", "mid", xpos="right", ypos="base", flip=True)
+    sna "You do not demand a grade Miss Granger, you earn it." ("snape_09")
+    her "I did earn it!" ("open", "base", "base", "R")
+    her "And could you at least have the decency to stop touching yourself when partaking in such an important discussion, professor!" ("annoyed", "narrow", "angry", "R")
+    sna "*Tch*..." ("snape_12")
+    hide hermione_main
+    with d3
 
-    menu:
-        gen "..." ("base", xpos="far_left", ypos="head")
-        "\"Alright Severus, let's be civil...\"":
-            hide hermione_main
-            with d3
-            pause.2
-            sna "I see Miss Granger manages to remain exceptionally stubborn in any situation..." ("snape_03")
-            call hide_characters
-            hide screen bld1
-            with d5
+    gen "(Are they for real?)" ("base", xpos="far_left", ypos="head")
+    pause.2
 
-            call gen_chibi("sit_behind_desk")
-            call sna_chibi("stand","desk","base")
-            with fade
-            pause.3
+    show screen blkfade
+    with d5
 
-            jump hg_pf_strip_T4_snape_watch
+    nar "You watch Snape with his dick still hanging out and the cum-covered Hermione argue loudly about her imaginary grade."
+    nar "After a while, Professor Snape agrees to change Hermione's grade from \"F+\" to \"D-\"."
+    nar "Then he beats a hasty retreat before Hermione has a chance to start another argument."
+    pause 1
 
-        "\"(Psst, Hermione! Remember why we are doing this!)\"":
-            pass
+    call sna_chibi("stand","mid","base", flip=False)
+    hide screen blkfade
+    with d5
 
+    pause.5
+
+    call her_chibi("stand","desk","base", flip=False)
+    pause.2
+
+    gen "Good job, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
+    her "Thank you, [name_genie_hermione]..." ("normal", "happyCl", "worried", "mid")
+    gen "Now then..." ("base", xpos="far_left", ypos="head")
+
+    jump hg_pf_strip_T4_snape_results
+
+label hg_pf_strip_T4_snape_watch:
+    $ _watch = True
+
+    her "I will just keep on dancing then..." ("open", "closed", "base", "mid")
+
+    call her_chibi("dance","on_desk","on_desk")
+
+    nar "Hermione squeezes her breasts and shakes her hips slightly..."
+
+    gen "That's it, Miss Granger... Very good." ("base", xpos="far_left", ypos="head")
+    sna "*Ahem*! Acceptable performance..." ("snape_12")
+    her "...." ("open", "closed", "base", "mid")
+    gen "*Heh*..." ("base", xpos="far_left", ypos="head")
+    gen "So... How would you grade her tits?" ("base", xpos="far_left", ypos="head")
+    her "......" ("annoyed", "closed", "base", "mid")
+    sna "*Hmm*......" ("snape_20")
+    her "........" ("annoyed", "closed", "base", "mid")
+    sna "I'd say they \"Exceed expectations\"..." ("snape_12")
+    her "!!!" ("open", "wide", "base", "stare")
+    gen "Really? I'm surprised you'd grade them so high." ("base", xpos="far_left", ypos="head")
+    sna "As an honourable man, I do give credit where it's due..." ("snape_12")
+    her "(*Ugh*... I can't stand him... Honourable, my ass...)" ("angry", "narrow", "base", "stare")
+    her "(Better finish this up, quickly...)" ("annoyed", "closed", "base", "mid")
+    pause.1
+
+    if hermione.is_worn("panties"):
+
+        nar "Hermione bends over and slides her panties down."
+        nar "Her movements lack grace..."
+        play sound "sounds/cloth_sound3.ogg"
+        $ hermione.strip("panties")
+        pause.5
+        call ctc
+
+        nar "But a pretty pussy is always a welcome sight nonetheless..."
+        nar "You show your appreciation by stroking your cock even faster..."
+
+    sna "Yes..." ("snape_20")
+    sna "Now shake those titties for me, you harlot!"
+    her "......." ("angry", "happyCl", "worried", "mid")
+    pause .5
+
+    nar "All of a sudden, Hermione breaks into a series of rather complex pirouettes."
+    sna "Yes, such grace..." ("snape_19")
+    sna "That lithe, flexible body!" ("snape_20")
+    her "{size=-5}(Three-two-one... Three-two-one... And step!){/size}" ("grin", "narrow", "annoyed", "up")
+
+    nar "Hermione seems very focused on her dancing routine."
+
+    sna "Yes, and now another pirouette!" ("snape_19")
+    sna "Magnificent!"
+
+    show screen blkfade
+    with d5
+
+    nar "She then performs another set of movements, and pirouettes..."
+    nar "Once finished, she gives a little curtsy bow to an imaginary audience..."
+    nar "And then exhaustedly slumps down onto the desk."
+
+    call her_chibi("sit_naked","on_desk","on_desk")
+
+    call hide_characters
+    hide screen blkfade
+    with d5
+    call ctc
+
+    sna "Good job, harlot!" ("snape_22")
+    her "............." ("soft", "happy", "base", "R")
+
+    if game.daytime:
+        sna "Well, my class is about to start, so I will be leaving now." ("snape_22")
+        sna "Don't you have potion class with me today, Miss Granger?"
+        her "Yes..." ("annoyed", "narrow", "base", "dead")
+        sna "Well, don't be late, girl..." ("snape_22")
+        sna "Albus..." ("snape_02")
+        gen "See you soon, Severus." ("grin", xpos="far_left", ypos="head")
+    else:
+        sna "Well, it is getting rather late... I think I will be leaving now." ("snape_22")
+        sna "Good night, Albus." ("snape_22")
+        gen "Severus." ("base", xpos="far_left", ypos="head")
+        sna "Harlot." ("snape_22")
+        her "Professor..." ("annoyed", "narrow", "base", "dead")
+    call sna_walk(action="leave")
+    pause.5
+
+    call her_chibi("stand","desk","base", flip=False)
+    pause.2
+
+    gen "Good job, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
+    her "Thank you, [name_genie_hermione]..." ("normal", "happyCl", "worried", "mid")
+    gen "Now then..."
+
+    jump hg_pf_strip_T4_snape_results
+label hg_pf_strip_T4_snape_results:
+
+    if _wearing_clothes or _masturbate_finished:
+        if _wearing_clothes:
+            her "One moment [name_genie_hermione]... Let me just put something on..." ("normal", "narrow", "worried", "mid")
+            if _masturbate_finished:
+                her "I'd also like to clean this off as soon as possible if you don't mind..." ("normal", "narrow", "worried", "mid")
+                gen "Certainly..." ("base", xpos="far_left", ypos="head")
+        else:
+            her "If you don't mind, [name_genie_hermione]... I'd like to clean myself as soon as possible..." ("normal", "narrow", "worried", "mid")
+            gen "Certainly..." ("base", xpos="far_left", ypos="head")
 
-    if states.her.tier < 5: # Hermione is NOT ok with it.
-        $ states.her.mood += 15
-        her "Oh..." ("open", "wide", "base", "stare")
-        her "No, I can't! This is just not worth it!" ("angry", "happyCl", "worried", "mid")
-        call hide_characters
         show screen blkfade
         with d5
 
+        $ hermione.set_cum(None)
         $ hermione.wear("all")
-        nar "Hermione jumps off the desk and starts to put her clothes back on."
-        sna "Well, this was awfully anticlimactic..." ("snape_03")
-        gen "You don't say..." ("angry", xpos="far_left", ypos="head")
-        sna "May as well leave now I suppose. I will talk to you later, Albus." ("snape_03")
-        gen "Yes, later, Severus." ("base", xpos="far_left", ypos="head")
-        sna "Miss Granger..." ("snape_04")
-        her "Professor..." ("angry", "happyCl", "worried", "mid", ypos="head", flip=False)
-
-        call sna_chibi("hide")
-        call gen_chibi("sit_behind_desk")
-        call her_chibi("stand","desk","base")
-        play sound "sounds/door.ogg"
-        nar "Professor Snape leaves."
-        stop music fadeout 1.0
-        hide screen blkfade
-        with d5
-
-        her "...................." ("annoyed", "narrow", "base", "dead", xpos="mid", ypos="base")
-        call ctc
-
-        her "... Can I get paid now... [name_genie_hermione]...?" ("normal", "happyCl", "worried", "mid")
-
-        jump end_hg_pf_strip
-
-
-    else: # Hermione IS ok with it.
-        her "Oh, right..." ("shock", "wide", "base", "stare")
-        sna "What was that?" ("snape_05")
-        her "Please don't mind what I just said..." ("silly", "happyCl", "worried", "mid", emote="sweat")
-        sna "*Hmm*...?" ("snape_05")
-        her "I do not mind you touching yourself in front of me..." ("silly", "happyCl", "worried", "mid", emote="sweat")
-        her "Yes, I do not mind it at all..."
-        her "I will just keep on dancing then..."
-
-        call her_chibi("dance","on_desk","on_desk")
-        # her "" (animation=bob)
-
-        nar "You keep on jerking off while you're watching Hermione dance."
-        nar "Hermione squeezes her breasts and shakes her hips slightly."
-
-        gen "Yes, [name_hermione_genie]. Very good." ("base", xpos="far_left", ypos="head")
-        sna "*Ahem*! Acceptable performance, miss Granger." ("snape_12")
-        her "...................." ("angry", "happyCl", "worried", "mid")
-        gen "Heh..." ("base", xpos="far_left", ypos="head")
-        gen "So, how would you grade her tits?" ("base", xpos="far_left", ypos="head")
-        her "......" ("open", "wide", "base", "stare")
-        sna "*Hmm*......" ("snape_13")
-        her "........" ("annoyed", "narrow", "angry", "R")
-        sna "\"B+\"!" ("snape_12")
-        her "!!!" ("open", "wide", "base", "stare")
-        gen "Really?" ("base", xpos="far_left", ypos="head")
-        sna "Yes. I do give credit where credit is due." ("snape_12")
-        her "(Professor...)" ("annoyed", "closed", "base", "mid")
-        her "(Time for my finishing act then!)" ("open", "closed", "base", "mid")
-        pause.1
-
-        if hermione.is_worn("panties"):
-            pause.5
-            $ hermione.strip("panties")
-            nar "Hermione bends over and slides her panties down."
-            nar "Her movements lack grace..."
-            nar "But a pretty pussy is always a welcome sight nonetheless..."
-            nar "You show your appreciation by stroking your cock even faster..."
-            call ctc
-
-        sna "Yes... Yes!!!" ("snape_18")
-        sna "Now shake those B+ titties for me, you harlot!"
-        her "......." ("angry", "happyCl", "worried", "mid")
-        pause.5
-
-        nar "All of a sudden Hermione breaks into a series of rather complex pirouettes."
-        sna "Yes, such grace..." ("snape_19")
-        sna "That lithe, flexible body!" ("snape_20")
-        her "........." ("grin", "narrow", "annoyed", "up")
-        sna "Oh, yes!" ("snape_20")
-        her "{size=-5}(Three-two-one... Three-two-one... And step!){/size}" ("grin", "narrow", "annoyed", "up")
-        nar "Hermione seems very focused on her dancing routine."
-        sna "Yes, and now another pirouette!" ("snape_19")
-        sna "Magnificent!"
-        sna "I would applaud you but one of my hands is very busy at the moment." ("snape_13")
-        gen "{size=-4}(Was that an attempt at a joke?){/size}" ("base", xpos="far_left", ypos="head")
-        gen "{size=-4}(Man, horny Snape is weird...){/size}" ("base", xpos="far_left", ypos="head")
-
-        her "" (animation=None)
         call hide_characters
-        show screen blkfade
-        with d5
 
-        nar "Hermione performs another set of movements and pirouettes..."
-        nar "Gives a little curtsy bow to the imaginary audience..."
-        nar "And then exhaustedly slumps down on her butt."
-
-        call her_chibi("sit_naked","on_desk","on_desk")
-
-        hide screen blktone
-        hide screen bld1
         hide screen blkfade
-        with d5
-        call ctc
-
-        her "Whew... This was--" ("open", "closed", "base", "mid")
-        with hpunch
-
-        gen "*ARGH*! YOU FUCKING WHORE!" ("angry", xpos="far_left", ypos="head")
-        hide screen bld1
         with d3
 
-        call cum_block
-        call gen_chibi("cum","behind_desk","base")
-        pause.2
+    stop music fadeout 1.0
 
-        $ hermione.set_cum(face="light")
-        pause 0.7
-        $ hermione.set_cum(breasts="light")
-        pause 1
-        $ hermione.set_cum(hair="light")
+    gen "I'd say that was a great success." ("base", xpos="far_left", ypos="head")
+    her "You think so, [name_genie_hermione]?" ("base", "base", "base", "mid")
+    gen "Most certainly." ("base", xpos="far_left", ypos="head")
+    gen "Now, why don't you tell me what you've learned?" ("base", xpos="far_left", ypos="head")
 
+    #TODO These only show once you've picked a certain menu option earlier in the event, the player may replay those same menu options, but these should only be shown once, (search for "#flogging", "#weasley", "#potter", "#butt")
 
-        her "??!!!" ("shock", "wide", "base", "stare")
-        her "" ("angry", "happyCl", "worried", "mid")
-        hide screen bld1
-        with d3
-        call ctc
+    #flogging:
+        #her "I've learned that he doesn't seem to have any problems with hitting his students..." ("base", "base", "base", "mid")
+        #gen "*Hmm*... I'd say that his statement isn't exactly conclusive enough to make that assumption." ("base", xpos="far_left", ypos="head")
+        #her "*Hmph*... Perhaps..." ("base", "base", "base", "mid")
+        #gen "Anything else?" ("base", xpos="far_left", ypos="head")
+    #weasley:
+        #her "I've learned that he's been eyeing up a student outside of Slytherin..." ("base", "base", "base", "mid")
+        #gen "Really? What gave you that idea?" ("base", xpos="far_left", ypos="head")
+        #her "From what he said about the Weasley twins..." ("base", "base", "base", "mid")
+        #her "Unless they've got some friend in Slytherin... Which I highly doubt..." ("base", "base", "base", "mid")
+        #her "He must've been talking about--" ("base", "base", "base", "mid")
+        #gen "Yes?" ("base", xpos="far_left", ypos="head")
+        #her "*Hmm*... Nevermind..." ("base", "base", "base", "mid")
+        #gen "Anything else?" ("base", xpos="far_left", ypos="head")
+    #potter:
+        #her "I've learned that he finally stopped targeting Harry..." ("base", "base", "base", "mid")
+        #her "Probably due to being busy with all the favour trading..." ("base", "base", "base", "mid")
+        #her "So I suppose there's at least one positive thing about those Slytherin girls whoring themselves out..." ("base", "base", "base", "mid")
+        #gen "Anything else?" ("base", xpos="far_left", ypos="head")
+    #butt:
+        #her "I learned that he's got absolutely zero depth perception..." ("base", "base", "base", "mid")
+        #gen "Really? What makes you say that?" ("base", xpos="far_left", ypos="head")
+        #her "He called it dreadful!" ("base", "base", "base", "mid")
+        #her "And that my butt is like that of a boy's!" ("base", "base", "base", "mid")
+        #if _watch:
+            #gen "He did mention that your breasts exceeded his expectations." ("base", xpos="far_left", ypos="head")
+            #her "He never commented on their size." ("base", "base", "base", "mid")
+            #gen "That is true..." ("base", xpos="far_left", ypos="head")
+        #else:
+            #gen "Yes, how could he say such things... That just isn't true."
+            #her "Thank you [name_genie_hermione]... Although I was trying to get validated..." ("base", "base", "base", "mid")
+        #gen "Anything else?" ("base", xpos="far_left", ypos="head")
 
-        sna "Good job, you harlot!" ("snape_18")
-        sna "Here is your reward!" ("snape_21")
+    her "*Hmm*... Let me think..." ("base", "base", "base", "mid")
 
-        call cum_block
-        call sna_chibi("cum","desk_close","desk_close")
-        pause.2
+    #TODO "first time" should only play the first time after it has occured during the event. (These should just need regular permanent flags?)
+    if _masturbate:
+        #first time
+            her "Well... I learned that guys doesn't seem to mind masturbating together..." ("base", "base", "base", "mid")
+            gen "I just thought I'd see just how far he would be willing to go." ("base", xpos="far_left", ypos="head")
+            if states.her.tier < 5:
+                her "Quite far it seems..." ("base", "base", "base", "mid")
+                her "If I hadn't ended it, he probably would've gone all the way..." ("base", "base", "base", "mid")
+                gen "I suppose we'll never know..." ("base", xpos="far_left", ypos="head")
+                her "..." ("base", "base", "base", "mid") #annoyed
+        #subsequent times
+            her "Well... I learned that you two masturbating over me has become a frequent occurrence..." ("base", "base", "base", "mid")
+            gen "At least now you know just how far he's willing to go." ("base", xpos="far_left", ypos="head")
+            her "(Like I didn't know that already...)" ("base", "base", "base", "mid")
+            if states.her.tier < 5:
+                her "Once again, I don't doubt he would've seen it through to the end, had I not ended it." ("base", "base", "base", "mid")
+                gen "Well, you never know..." ("base", "base", "base", "mid")
+                her "..." ("base", "base", "base", "mid") #annoyed
+    #TODO "first time" should only play the first time after it has occured during the event. (should these just use regular permanent flags?)
+    if _masturbate_finished:
+        # first time
+            if not states.her.status.cum_body:
+                $ states.her.status.cum_body = True #Cum on her body for the first time
+                her "I... I've never let somebody do that to me before... Let alone two people." ("base", "base", "base", "mid")
+                gen "Do what?" ("base", xpos="far_left", ypos="head")
+                her "Ejaculate...{w=0.4} On my body..." ("base", "base", "base", "mid")
+                gen "I see..." ("base", xpos="far_left", ypos="head")
+            else:
+                her "I didn't think that you'd go as far as finishing..." ("base", "base", "base", "mid")
+            her "Oh well... At least now I know what Snape expects from something like this..." ("base", "base", "base", "mid")
+        # subsequent times
+            her "I'm not really sure why I allowed it to go all the way to you both finishing again..." ("base", "base", "base", "mid")
+            her "I already know just how much Snape expects from a student performing a task like this." ("base", "base", "base", "mid")
+            gen "Then more the reason to see it through." ("base", xpos="far_left", ypos="head")
+            her "I suppose..." ("base", "base", "base", "mid")
 
-        $ hermione.set_cum(face="heavy")
-        pause 0.7
-        $ hermione.set_cum(breasts="heavy", body="heavy")
-        pause 1
-        $ hermione.set_cum(crotch="light")
+    if _watch:
+        gen "Did Severus act the way you expected?" ("base", xpos="far_left", ypos="head")
+        her "Yes, he's just as self absorbed and perverted as he's ever been." ("base", "base", "base", "mid")
+        random:
+            her "Calling a girl a harlot... Such a typical thing for him to say..." ("base", "base", "base", "mid")
+            her "There's no doubt, with how easily he threw out terms like \"shake those titties, you harlot\", that the Slytherin girls must be shaking theirs at him frequently." ("base", "base", "base", "mid")
+            her "He barely flinched when I squeezed my breasts, which tells me he's used to that sort of thing..." ("base", "base", "base", "mid")
+            block:
+                her "The way he carries himself, is of a man who expects his students to act a certain way... I almost feel sorry for the Slytherin girls..." ("base", "base", "base", "mid")
+                her "Almost." ("base", "base", "base", "mid")
 
-        her "!!!!!!!!!!!" ("shock", "wide", "base", "stare")
-        hide screen bld1
-        with d3
-        call ctc
+    if states.her.tier == 4:
+        her "May I have my points now?" ("base", "base", "base", "mid")
+    else:
+        gen "You've certainly earned your points today." ("base", xpos="far_left", ypos="head")
+        her "Oh, right... The points..." ("base", "base", "base", "mid")
 
-        sna "Oh... Yes..." ("snape_21")
-        gen "Little slut!" ("angry", xpos="far_left", ypos="head")
-        her "..............................." ("grin", "narrow", "annoyed", "up")
-
-        sna "Ha-ha-ha! This is magnificent!" ("snape_21")
-        gen "I know, right!?" ("grin", xpos="far_left", ypos="head")
-
-        call gen_chibi("cum_done","behind_desk","base")
-        call sna_chibi("cum_done","desk_close","desk_close")
-
-        sna "Yes... We should do this more often." ("snape_22")
-        her "................." ("grin", "narrow", "annoyed", "up")
-
-        sna "Your performance was acceptable, miss Granger..." ("snape_20")
-        her "Thank you........." ("annoyed", "narrow", "base", "dead")
-        sna "But if I were to grade it..." ("snape_19")
-        her "..........." ("annoyed", "narrow", "base", "dead")
-        sna "*Hmm*...." ("snape_22")
-        her "............" ("annoyed", "narrow", "base", "dead")
-        sna "{size=+5}F+!{/size}" ("snape_10")
-        stop music
-
-        her "{size=+5}WHAT?!!!{/size}" ("shock", "wide", "base", "stare")
-        sna "Yes... Quite a few things could use some improvement actually." ("snape_09")
-        play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed
-        her "I cannot believe this!" ("clench", "base", "angry", "mid", emote="angry")
-        pause.5
-
-        call hide_characters
-        show screen blkfade
-        with d5
-
-        nar "Hermione furiously jumps off your desk."
-        pause 2
-        hide hermione_main
-
-        call sna_chibi("hold_dick","mid","base")
-        call gen_chibi("sit_behind_desk")
-        call her_chibi("stand","desk","base", flip=True)
-
-        hide screen bld1
-        hide screen blktone
-        hide screen blkfade
-        with d5
-        call ctc
-
-        her "I demand a higher grade than that!" ("soft", "base", "angry", "mid", xpos="right", ypos="base", flip=True)
-        sna "You do not demand a grade miss Granger, you earn it." ("snape_09")
-        her "I did earn it!" ("open", "base", "base", "R")
-        her "And could you at least have the decency to stop touching yourself, professor!" ("annoyed", "narrow", "angry", "R")
-        sna "*Tch*..." ("snape_12")
-        hide hermione_main
-        with d3
-
-        gen "(Are they for real?)" ("base", xpos="far_left", ypos="head")
-        hide screen bld1
-        with d3
-        pause.2
-
-        show screen blkfade
-        with d5
-
-        nar "You watch Snape with his dick still hanging out and the cum-covered Hermione argue loudly about her imaginary grade."
-        nar "After a while Professor Snape agrees to change Hermione's grade from \"F+\" to \"D-\"."
-        nar "Then he beats a hasty retreat before Hermione has a chance to start another argument."
-        pause 1
-
-        call sna_chibi("stand","mid","base", flip=True)
-        hide screen blkfade
-        with d5
-
-        call sna_walk(action="leave")
-        pause.5
-
-        call her_chibi("stand","desk","base")
-        pause.2
-
-        her "Well..." ("annoyed", "base", "worried", "R", xpos="mid", ypos="base", flip=False)
-        her "Was our mission a success, [name_genie_hermione]?"
-
-        menu:
-            gen "..." ("base", xpos="far_left", ypos="head")
-            "\"*huh*? What mission?\"":
-                $ states.her.mood += 7
-                her "I only agreed to this so that you could catch professor Snape in the act, [name_genie_hermione]!" ("scream", "happyCl", "worried", "mid")
-                her "So that we would have definite proof that he is \"dirty\"!" ("normal", "happyCl", "worried", "mid")
-                gen "Oh, that mission..." ("base", xpos="far_left", ypos="head")
-                gen "Yes. Mission accomplished!" ("base", xpos="far_left", ypos="head")
-            "\"Yes! Thanks to you!\"":
-                pass
-
-        gen "Good job, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
-        her "I am happy to have been of help, [name_genie_hermione]!" ("normal", "happyCl", "worried", "mid")
-        pause.5
-        show screen blkfade
-        with d5
-
-        her "... Can I get paid now, please?" ("angry", "happyCl", "worried", "mid", emote="sweat", ypos="head", flip=False)
-
-        jump end_hg_pf_strip
+    jump end_hg_pf_strip
diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
index 722103f2..beabf3bd 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
@@ -1773,6 +1773,8 @@ label hg_sex_3:
     gen "{size=+7}Me too!{/size}"
     menu:
         "-Fill her up!-":
+            $ states.her.status.creampie = True
+
             show her_sex_personal cum_inside as cg
 
             gen "{size=+7}*Argh*, Yes!!!{/size}"
diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
index 4fe75387..a3b64e40 100644
--- a/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
+++ b/game/scripts/characters/hermione/events/favors/lets_have_sex_anal.rpy
@@ -468,6 +468,7 @@ label hg_anal_sex_1_intro:
 
     menu:
         "-Fill her up-":
+            $ states.her.status.anal_creampie = True
 
             gen "Here it comes!"
             show her_sex_personal mouth_clench eyes_wide_r eyebrows_worried cheeks_blush tears_soft as cg
@@ -992,6 +993,8 @@ label hg_anal_sex_2_intro:
     menu:
         gen "!!!"
         "-Fill her up-":
+            $ states.her.status.anal_creampie = True
+
             show her_sex_personal cum_inside as cg
 
             gen "{size=+7}TAKE THIS, WHORE!!!{/size}"
@@ -1444,6 +1447,8 @@ label hg_anal_sex_3:
 
     menu:
         "-Fill that greedy hole!-":
+            $ states.her.status.anal_creampie = True
+
             show her_sex_personal cum_inside as cg
 
             gen "{size=+7}TAKE my cum!!!{/size}"

From 2cf60f97f6e4e0b18774048a9fcd857aa0ccc382 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Sat, 29 Apr 2023 23:19:31 +0100
Subject: [PATCH 3/4] Tonks' headgear variants for hairstyles

* Added headgear variants for each hairstyle for Tonks using DynamicCloth class functionality
---
 .../tonks/poses/default/clothes/headgear/antlers/base/0.webp   | 3 +++
 .../poses/default/clothes/headgear/antlers/base/outline.webp   | 3 +++
 .../default/clothes/headgear/antlers/mechanic_hair/0.webp      | 3 +++
 .../clothes/headgear/antlers/mechanic_hair/outline.webp        | 3 +++
 .../poses/default/clothes/headgear/bunny/mechanic_hair/0.webp  | 3 +++
 .../poses/default/clothes/headgear/bunny/mechanic_hair/1.webp  | 3 +++
 .../default/clothes/headgear/bunny/mechanic_hair/outline.webp  | 3 +++
 .../default/clothes/headgear/classy_hat/default/mask.webp      | 3 +++
 .../default/clothes/headgear/classy_hat/default/outline.webp   | 3 ---
 .../tonks/poses/default/clothes/headgear/elf/base/0.webp       | 3 +++
 .../tonks/poses/default/clothes/headgear/elf/base/1.webp       | 3 +++
 .../tonks/poses/default/clothes/headgear/elf/base/extra.webp   | 3 +++
 .../tonks/poses/default/clothes/headgear/elf/base/outline.webp | 3 +++
 .../poses/default/clothes/headgear/elf/mechanic_hair/0.webp    | 3 +++
 .../poses/default/clothes/headgear/elf/mechanic_hair/1.webp    | 3 +++
 .../default/clothes/headgear/elf/mechanic_hair/extra.webp      | 3 +++
 .../default/clothes/headgear/elf/mechanic_hair/outline.webp    | 3 +++
 .../tonks/poses/default/clothes/headgear/horns/base/0.webp     | 3 +++
 .../tonks/poses/default/clothes/headgear/horns/base/1.webp     | 3 +++
 .../poses/default/clothes/headgear/horns/base/outline.webp     | 3 +++
 .../poses/default/clothes/headgear/horns/mechanic_hair/0.webp  | 3 +++
 .../poses/default/clothes/headgear/horns/mechanic_hair/1.webp  | 3 +++
 .../default/clothes/headgear/horns/mechanic_hair/outline.webp  | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/base/0.webp    | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/base/1.webp    | 3 +++
 .../default/clothes/headgear/mechanic_cap/base/extra.webp      | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/base/mask.webp | 3 +++
 .../default/clothes/headgear/mechanic_cap/base/outline.webp    | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/base/skin.webp | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/new/0.webp     | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/new/1.webp     | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/new/extra.webp | 3 +++
 .../default/clothes/headgear/mechanic_cap/new/outline.webp     | 3 +++
 .../poses/default/clothes/headgear/mechanic_cap/new/skin.webp  | 3 +++
 .../tonks/poses/default/clothes/headgear/police/base/0.webp    | 3 +++
 .../tonks/poses/default/clothes/headgear/police/base/1.webp    | 3 +++
 .../tonks/poses/default/clothes/headgear/police/base/2.webp    | 3 +++
 .../tonks/poses/default/clothes/headgear/police/base/mask.webp | 3 +++
 .../poses/default/clothes/headgear/police/base/outline.webp    | 3 +++
 .../tonks/poses/default/clothes/headgear/police/base/skin.webp | 3 +++
 .../poses/default/clothes/headgear/police/mechanic_hair/0.webp | 3 +++
 .../poses/default/clothes/headgear/police/mechanic_hair/1.webp | 3 +++
 .../poses/default/clothes/headgear/police/mechanic_hair/2.webp | 3 +++
 .../default/clothes/headgear/police/mechanic_hair/mask.webp    | 3 +++
 .../default/clothes/headgear/police/mechanic_hair/outline.webp | 3 +++
 .../default/clothes/headgear/police/mechanic_hair/skin.webp    | 3 +++
 46 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/antlers/base/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/antlers/base/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/mask.webp
 delete mode 100644 game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/base/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/base/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/base/extra.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/base/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/extra.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/horns/base/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/horns/base/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/horns/base/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/extra.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/mask.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/skin.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/extra.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/skin.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/base/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/base/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/base/2.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/base/mask.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/base/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/base/skin.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/0.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/1.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/2.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/mask.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/outline.webp
 create mode 100644 game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/skin.webp

diff --git a/game/characters/tonks/poses/default/clothes/headgear/antlers/base/0.webp b/game/characters/tonks/poses/default/clothes/headgear/antlers/base/0.webp
new file mode 100644
index 00000000..ac5b9915
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/antlers/base/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34beab485e0f9831dc5a7ba5e6c808fbe2f52cf3e29c765de7f184510955620d
+size 5110
diff --git a/game/characters/tonks/poses/default/clothes/headgear/antlers/base/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/antlers/base/outline.webp
new file mode 100644
index 00000000..1c4c13c2
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/antlers/base/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0749bbabeb6fb043acdb7c69e1ec79333a5e9d95f81602211ade9952c789d5f1
+size 4000
diff --git a/game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/0.webp b/game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/0.webp
new file mode 100644
index 00000000..367e9df4
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb8ee28a39bc2971ec5b19fbf553d499d7c56313c6ba274389f1005057279375
+size 5052
diff --git a/game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/outline.webp
new file mode 100644
index 00000000..a84a2eaa
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/antlers/mechanic_hair/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fefb49325127119e44dc95b9381d2d8971e01312263605d3633e44d1ecc1304e
+size 3938
diff --git a/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/0.webp b/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/0.webp
new file mode 100644
index 00000000..7a059e03
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e877d3dc10b1b2d8bb69b3d8639c09dd0c6daf2c5e5527e827074c9af13dbb60
+size 4590
diff --git a/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/1.webp b/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/1.webp
new file mode 100644
index 00000000..324426a5
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b60e0b0e136cdc2f4a4e06f384858cce9f501ae62534e18041ef60807320e82
+size 2884
diff --git a/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/outline.webp
new file mode 100644
index 00000000..6b091911
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/bunny/mechanic_hair/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9577562f0c4dd87bbcb5f44a4783036340698b7c1630c5dabca6a73af52e16c3
+size 5738
diff --git a/game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/mask.webp b/game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/mask.webp
new file mode 100644
index 00000000..32a121ff
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/mask.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:296b5b8d8374f44075d3766f70121bbc27a02b3e15bfcdd3efc683c00fda1124
+size 2852
diff --git a/game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/outline.webp
deleted file mode 100644
index ad03e1c4..00000000
--- a/game/characters/tonks/poses/default/clothes/headgear/classy_hat/default/outline.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa0ee667760f23a46fbde2de29847c554b6fbd712dd92b6c3339b3a970610ece
-size 166
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/base/0.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/base/0.webp
new file mode 100644
index 00000000..b87e7bb8
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/base/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35ed58eac8adcbd012c34fac2e0501e8245550113442b8232e2c33486f219993
+size 7220
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/base/1.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/base/1.webp
new file mode 100644
index 00000000..13a68cb6
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/base/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:251159fe38264c759e61567dc5d6df16f1b4108619d76769d8712fdc37bb9aa9
+size 6286
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/base/extra.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/base/extra.webp
new file mode 100644
index 00000000..806dfb18
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/base/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:912869947f6b0172286e96ce472d64329ab52fac615f0da59c9c786e6a1b0fab
+size 2684
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/base/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/base/outline.webp
new file mode 100644
index 00000000..188ed136
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/base/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05b6eeab8952a3ebb35595f610a09bb80eeac6660da8cfe5f13ec27160bd8339
+size 8510
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/0.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/0.webp
new file mode 100644
index 00000000..84275825
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f7db8408a2b6012091c5c4f484641ba981bdcae5c2fa07f4eb7bc5b4fe5dec5
+size 6588
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/1.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/1.webp
new file mode 100644
index 00000000..1b548f3f
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aaaa041b6715f855b4b3acbe735d194baec54d0eb7a998974240beb676538559
+size 4780
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/extra.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/extra.webp
new file mode 100644
index 00000000..957ca1de
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb6d62575e8d14886e8c3859bcdddfc776f9b39b5af76f94dbd1362d8d6fdc27
+size 2408
diff --git a/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/outline.webp
new file mode 100644
index 00000000..ad039ac3
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/elf/mechanic_hair/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9e842abb61d98208868da901593bc7ae64b7ce914abb7d39edc99f430a0b726
+size 7088
diff --git a/game/characters/tonks/poses/default/clothes/headgear/horns/base/0.webp b/game/characters/tonks/poses/default/clothes/headgear/horns/base/0.webp
new file mode 100644
index 00000000..9a35e637
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/horns/base/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e72a07aa66359950af22c0a8538f3243af39ec96fa0c721d31fbca76153d1f76
+size 2162
diff --git a/game/characters/tonks/poses/default/clothes/headgear/horns/base/1.webp b/game/characters/tonks/poses/default/clothes/headgear/horns/base/1.webp
new file mode 100644
index 00000000..21a5bb2d
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/horns/base/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a561f49fbcd4e5fcc55e2af5f245399f1dbd03219d7b2b89bb66338b1ea76dc0
+size 2224
diff --git a/game/characters/tonks/poses/default/clothes/headgear/horns/base/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/horns/base/outline.webp
new file mode 100644
index 00000000..5a8722d6
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/horns/base/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc1dddadaaa4e53a770e79e4bd159b4a725f00281606ad14d90383d5182e51a4
+size 3514
diff --git a/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/0.webp b/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/0.webp
new file mode 100644
index 00000000..40adb732
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf88e7383442b0e2957778cada3eaef5874d53df2971bb3dd708d70b4594ccba
+size 2024
diff --git a/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/1.webp b/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/1.webp
new file mode 100644
index 00000000..4c0fc832
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:600d3a025fd73f53d53de4e7f9809ba0fddd0b53f0bedc057b5c94b102e0bd6f
+size 2124
diff --git a/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/outline.webp
new file mode 100644
index 00000000..29c19e66
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/horns/mechanic_hair/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:768b1f71e3956492c7efd1cd3499fe088ea176f90a164f79d7ede943934179b5
+size 3404
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/0.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/0.webp
new file mode 100644
index 00000000..221e3a84
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02162583e4f2c0825318604d2376278c0a88f5238c93f74efed9edcc21dec7f4
+size 4696
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/1.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/1.webp
new file mode 100644
index 00000000..50456541
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42704d2b6f5a4577139890b71bbd8ab43eaf946abaf0c7f8c090cb370ab4519a
+size 4158
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/extra.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/extra.webp
new file mode 100644
index 00000000..b1090a36
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf9d8015ea58556a1b74b9fb4854d4977a4e7bba1e059700a1cbbaca40d8ce66
+size 898
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/mask.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/mask.webp
new file mode 100644
index 00000000..7178d904
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/mask.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d8bde298a5cf3a5382f87eb8a7894d1c408abc64088c12964dc2d6114951515
+size 3560
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/outline.webp
new file mode 100644
index 00000000..5567c29e
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a25ed934ad67d93eb03d90506894375dcbde3002d309a1358113675e1138bbb9
+size 6166
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/skin.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/skin.webp
new file mode 100644
index 00000000..4640b08a
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/base/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f4d0df4f78f76b30323b93c5d4308ad09952876518473ef1443b296e0b4092b
+size 1914
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/0.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/0.webp
new file mode 100644
index 00000000..59e04e93
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff2897c5dc3bdbd1e5b1bfa5973b817670acf6747d40ca9a3a244ee02bfb9e93
+size 5958
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/1.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/1.webp
new file mode 100644
index 00000000..dd92d201
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2cb28676f3ef1839e51b7e0e69460cf5865613af37b0ef10bc6d645977d5e36
+size 5552
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/extra.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/extra.webp
new file mode 100644
index 00000000..ff8c2eea
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/extra.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d86ddbd7f18332b1c305affba02afad2e74834cfd1f1a26047b7f5bc05747b7
+size 1060
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/outline.webp
new file mode 100644
index 00000000..b853d362
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38fcdf8def3c27f7094eb321d84975673ee5515e184d089798fd3ae45bea6e5f
+size 8214
diff --git a/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/skin.webp b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/skin.webp
new file mode 100644
index 00000000..cfe1ee19
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/mechanic_cap/new/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44fac3158800a28cf3a45ec8b16de3ebd886214c63d1a3108e880c122f8e7a8b
+size 2078
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/base/0.webp b/game/characters/tonks/poses/default/clothes/headgear/police/base/0.webp
new file mode 100644
index 00000000..d3422fa7
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/base/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e4548254f398b83b215af919a909a484ee011bb5e90396fe56e4e025990e5d3
+size 7614
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/base/1.webp b/game/characters/tonks/poses/default/clothes/headgear/police/base/1.webp
new file mode 100644
index 00000000..766a1133
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/base/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31edd097dfc18de19bfe5c4101910b2b6ab79051bdc684b8378551bae2940023
+size 5854
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/base/2.webp b/game/characters/tonks/poses/default/clothes/headgear/police/base/2.webp
new file mode 100644
index 00000000..132cfd3e
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/base/2.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7c436009ed0f57f55336d1bd4daea15d80c69d59aa84bee05c2113884a65dc8
+size 926
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/base/mask.webp b/game/characters/tonks/poses/default/clothes/headgear/police/base/mask.webp
new file mode 100644
index 00000000..66c410ed
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/base/mask.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95e85be1abb6634869d095b5823e7a9524fba1574e3bc601134d3a91ec938941
+size 5968
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/base/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/police/base/outline.webp
new file mode 100644
index 00000000..0b753b18
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/base/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad3306fbe1dbfcb903876682256917ad12c383ad4312af02bc4562a5079b97ff
+size 7424
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/base/skin.webp b/game/characters/tonks/poses/default/clothes/headgear/police/base/skin.webp
new file mode 100644
index 00000000..4d1e69ed
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/base/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d549d1763de9487cc3104d76f0051fe076b051052ff476ab798ad0561b0ca961
+size 2356
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/0.webp b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/0.webp
new file mode 100644
index 00000000..bad95c68
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/0.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b67d47cea425f3e02c4a8031dd00d10f78512e1bbc5617f10e35f62831f1ad53
+size 6056
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/1.webp b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/1.webp
new file mode 100644
index 00000000..b48f42ab
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/1.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c18f231a8e2b1722f6d5f8467721cf004bd640e00a6d765440aef7254ed6da6b
+size 4994
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/2.webp b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/2.webp
new file mode 100644
index 00000000..2dcfb504
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/2.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c164904bf61b41871d923b36161b2c57af10780d29d2a4c51636ad065bad63e
+size 826
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/mask.webp b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/mask.webp
new file mode 100644
index 00000000..92103706
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/mask.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c379ee7395fad72048feabd2ceed2a3942648969753c2db4a891175ae4cebbe
+size 5478
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/outline.webp b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/outline.webp
new file mode 100644
index 00000000..50f859fb
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/outline.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:687bfe4cd83e0757a6f6325b0b24b926fb8cd5a241347b3f8c80bbbce98bd4de
+size 6014
diff --git a/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/skin.webp b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/skin.webp
new file mode 100644
index 00000000..e2c98e82
--- /dev/null
+++ b/game/characters/tonks/poses/default/clothes/headgear/police/mechanic_hair/skin.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffefed4d249144b83722a8d0a04c4a25f916f2fae9295264a5748a1c98a398f3
+size 1666

From d96b9743d3c5f8b80f73e831d052982ba9a8d433 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Sun, 30 Apr 2023 00:31:14 +0100
Subject: [PATCH 4/4] Bug fixes

* Fixed styling issues in preference menus
---
 game/scripts/gui/main_menu.rpy   |  2 +-
 game/scripts/gui/preferences.rpy | 36 ++++++++++++++++++--------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/game/scripts/gui/main_menu.rpy b/game/scripts/gui/main_menu.rpy
index 2c88d5fd..2f1480cd 100644
--- a/game/scripts/gui/main_menu.rpy
+++ b/game/scripts/gui/main_menu.rpy
@@ -169,7 +169,7 @@ screen game_menu(title, scroll=None, yinitial=0.0):
 
     use navigation(title)
 
-    label title anchor (0.5, 0.5) align (0.86, 0.15)
+    label title anchor (0.5, 0.5) align (0.9, 0.15)
 
     if main_menu and not title == "Updater":
         key "game_menu" action ShowMenu("main_menu")
diff --git a/game/scripts/gui/preferences.rpy b/game/scripts/gui/preferences.rpy
index 5385f23a..18a7a639 100644
--- a/game/scripts/gui/preferences.rpy
+++ b/game/scripts/gui/preferences.rpy
@@ -226,8 +226,11 @@ screen preferences_sound():
 
 screen preferences_accessibility():
 
-    text "Disclaimer" size 18 xalign 0.5
-    text "These menu options are intended to improve accessibility and may not work well in all cases where text might overflow. When changing font, text size or spacing try to keep it close to the default size." size 14
+    vbox:
+        text "Disclaimer" size 18 xalign 0.5
+        hbox:
+            xmaximum 731
+            text "These menu options are intended to improve accessibility and may not work well in all cases where text might overflow. When changing font, text size or spacing try to keep it close to the default size." size 14
 
     hbox:
         box_wrap True
@@ -270,7 +273,8 @@ screen preferences_accessibility():
                 textbutton "Large" action Preference("font line spacing", 1.2)
                 textbutton "V. Large" action Preference("font line spacing", 1.4)
 
-        if not renpy.mobile:
+    if not renpy.mobile:
+        hbox:
             vbox:
                 style_prefix gui.theme("check")
 
@@ -441,19 +445,19 @@ style slider_vbox is pref_vbox:
     xsize 320
 
 screen _self_voicing():
-        zorder 1500
+    zorder 1500
 
-        if _preferences.self_voicing == "clipboard":
-            $ message = _("Clipboard voicing enabled. Press 'shift+C' to disable.")
-        elif _preferences.self_voicing == "debug":
-            $ message = _("Text-to-speech would say \"[renpy.display.tts.last]\". Press 'alt+shift+V' to disable.")
-        else:
-            $ message = _("Text-to-speech enabled. Press 'shift+v' to disable.")
+    if _preferences.self_voicing == "clipboard":
+        $ message = _("Clipboard voicing enabled. Press 'shift+C' to disable.")
+    elif _preferences.self_voicing == "debug":
+        $ message = _("Text-to-speech would say \"[renpy.display.tts.last]\". Press 'alt+shift+V' to disable.")
+    else:
+        $ message = _("Text-to-speech enabled. Press 'shift+v' to disable.")
 
-        text message:
-            alt ""
+    text message:
+        alt ""
 
-            xpos 10
-            ypos 35
-            color "#fff"
-            outlines [ (1, "#0008", 0, 0)]
+        xpos 10
+        ypos 35
+        color "#fff"
+        outlines [ (1, "#0008", 0, 0)]