Merge remote-tracking branch 'refs/remotes/origin/kinetic_text' into interface2

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

@@ -510,7 +510,8 @@ label ag_se_imperio_sb_E2:
     call cum_block
     gen "{size=+10}AHHH... YESS!!!!{/size}" ("angry", xpos="far_left", ypos="head")
     call gen_chibi("cum_behind_desk_done")
-    pause.5
+    with d3
+    pause.2
     ast "Woah... I didn't think you'd have that much in you, sir..." ("clench", "base", "base", "mid")
 
     sus @ cheeks blush "{size=+10}*Hmph*! I hope you Enjoy Azkaban, perverts!{/size}" ("angry", "base", "angry", "mid")
@@ -916,7 +917,8 @@ label ag_se_imperio_sb_E3:
     nar "You give your cock a few final pumps, working out the last of your load onto Susan's waiting face..."
 
     call gen_chibi("cum_behind_desk_done")
-    pause.5
+    with d3
+    pause.2
     gen "There we go..." ("angry", xpos="far_left", ypos="head")
     ast "Nice work, [name_genie_astoria]..." ("open", "closed", "base", "mid")
     ast "You can come out now, Suzy..." ("smile", "narrow", "base", "down")

game/scripts/characters/astoria/wardrobe_reactions.rpy

@@ -107,7 +107,7 @@ label ast_reaction_touch_fail(what):
                 $ mouse_slap()
                 ast "Don't! Do!{fast} That!" ("scream", "narrow", "angry", "mid")
                 $ mouse_slap()
-                ast "Don't! Do! That!{fast} Again!" ("scream", "closed", "angry", "mid")
+                ast "Don't! Do! That!{fast} {shudder}Again!{/shudder}" ("scream", "closed", "angry", "mid")
                 $ mouse_slap()
                 play sound "sounds/kick.ogg"
                 with hpunch
@@ -125,7 +125,7 @@ label ast_reaction_touch_fail(what):
             block:
                 ast "Hey, no nipple twisters..." ("clench", "base", "base", "mid")
             block:
-                ast "Bad Touch!" ("upset", "closed", "base", "mid")
+                ast "Bad touch!" ("upset", "closed", "base", "mid")
             block:
                 ast "*EEEH* Don't you have better things to do?" ("scream", "closed", "angry", "mid")
             block:
@@ -206,7 +206,7 @@ label ast_reaction_unequip_fail(item):
         with d5
 
         gen "Did you really have to slap me?" ("angry", xpos="far_left", ypos="head")
-        ast "You deserved it you perverted... Pervert!" ("scream", "closed", "angry", "mid")
+        ast "You deserved it you perverted... {shake}Pervert!{/shake}" ("scream", "closed", "angry", "mid")
 
     elif item.type == "bra":
         ast "Why would you even suggest that?" ("clench", "closed", "base", "mid")

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

@@ -1027,6 +1027,7 @@ label cc_pf_talk_T2_intro_E2:
     pause .2
 
     call gen_chibi("cum_behind_desk_done")
+    with d3
     pause .8
 
     cho @ cheeks blush "" ("clench", "wide", "base", "mid")
@@ -1250,6 +1251,7 @@ label cc_pf_talk_T2_E3:
         pause .2
 
         call gen_chibi("cum_behind_desk_done")
+        with d3
         pause .8
 
         cho "And put a large bucket under her, so when they--" ("soft", "closed", "base", "mid")

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

@@ -35,7 +35,7 @@ label cho_quiz:
         gen "Great!" ("base", xpos="far_left", ypos="head")
         cho "And longer!" ("smile", "narrow", "base", "mid")
         gen "Longer?" ("base", xpos="far_left", ypos="head")
-        cho "And harder!" ("angry", "narrow", "angry", "mid", trans=hpunch)
+        cho "{shudder}And harder!{/shudder}" ("angry", "narrow", "angry", "mid")
         gen "(Oh my...)" ("base", xpos="far_left", ypos="head")
         cho "But..." ("soft", "closed", "base", "mid")
         gen "Yes?" ("base", xpos="far_left", ypos="head")
@@ -63,7 +63,7 @@ label cho_quiz:
     # Repeat
     else:
         gen "I'm ready to make my case on how Quidditch is a knock-off of basketball..." ("base", xpos="far_left", ypos="head")
-        cho "Really sir... again?" ("open", "narrow", "angry", "L")
+        cho "Really sir... Again?" ("open", "narrow", "angry", "L")
         gen "Of course, it's an important subject for your education..." ("base", xpos="far_left", ypos="head")
         cho "I can't really see how, but I'm sure you know what you're talking about..." ("open", "base", "base", "mid")
         gen "Alright, so..." ("base", xpos="far_left", ypos="head")
@@ -164,7 +164,7 @@ label cho_quiz:
             show screen meter(confidence_meter)
             $ renpy.music.set_volume(1.0)
             play sound "sounds/kung-fu-punch.ogg"
-            gen "Ah!{w=0.4} Well, I guess that is different... Lastly though..." ("angry", xpos="far_left", ypos="head")
+            gen "{shudder}Ah!{/shudder}{w=0.4} Well, I guess that is different... Lastly though..." ("angry", xpos="far_left", ypos="head")
 
 
     # Question 4
@@ -505,7 +505,7 @@ label cho_quiz_checkpoint:
             show screen meter(confidence_meter)
             play sound "sounds/gasp.ogg"
             cho "That's right!" ("smile", "wide", "base", "mid")
-            gen "What?" ("angry", xpos="far_left", ypos="head")
+            gen "{shudder}What?{/shudder}" ("angry", xpos="far_left", ypos="head")
             cho "Nobody knows what happens! There isn't any rule for it..." ("open", "wide", "raised", "L")
             gen "Why wouldn't there be a rule for it?" ("angry", xpos="far_left", ypos="head")
             cho "Why would the defensive leave the pitch... they'd just leave the goal open..." ("soft", "base", "worried", "mid")
@@ -600,11 +600,11 @@ label cho_quiz_checkpoint:
 label ss_he_cho_E2:
 
     call bld
-    gen "So It looks like I might need some information about Quidditch..." ("base", xpos="far_left", ypos="head")
+    gen "So it looks like I might need some information about Quidditch..." ("base", xpos="far_left", ypos="head")
     sna "I see, I guess it was only a matter of time before you got yourself involved..." ("snape_01", ypos="head")
     gen "Oh, I don't care much about the sport..." ("base", xpos="far_left", ypos="head")
     sna "Worried you will lose the bet?" ("snape_03")
-    gen "No?{w} Let's say it's more of a plot device to push the narrative forward..." ("base", xpos="far_left", ypos="head")
+    gen "No? Let's say it's more of a plot device to push the narrative forward..." ("base", xpos="far_left", ypos="head")
     sna "Of course you can't teach the girl Quidditch if you know nothing about it..." ("snape_09")
     sna "Did she call your bluff?" ("snape_13")
     gen "Of course not..." ("base", xpos="far_left", ypos="head")

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

@@ -104,7 +104,7 @@ label cho_quid_E14_retrospection:
     show cho_quidditch_outro pitch -snape_smile as cg with d3
 
     with vpunch
-    cho "Gross!!"
+    cho "{shake}Gross!!{/shake}"
     cho "(What am I thinking...)"
     cho "(I can't achieve my goals like this!)"
 

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

@@ -135,7 +135,7 @@ label cc_st_return:
         cho "Or know if our tactics work against them, for that matter..." ("annoyed", "narrow", "base", "mid")
         gen "I'm on it..." ("base", xpos="far_left", ypos="head")
         cho "And that's not all... I heard some people saying that Hermione won't commentate anymore!" ("angry", "narrow", "angry", "mid", emote="angry")
-        gen "What?" ("angry", xpos="far_left", ypos="head")
+        gen "{shudder}What?{/shudder}" ("angry", xpos="far_left", ypos="head")
         cho "I know, you better do something about it!" ("open", "narrow", "angry", "mid")
         gen "*Ugh*... Do I have to?" ("angry", xpos="far_left", ypos="head")
         cho "Yes!" ("angry", "base", "angry", "mid")

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

@@ -79,7 +79,7 @@ label cho_training:
                     gen "My plan is that we use Cedric's obsession with panties to distract him during the game." ("base", xpos="far_left", ypos="head")
                     cho @ cheeks blush "I don't really see how that would be--" ("annoyed", "base", "base", "downR")
                     gen "You'll have to wear a skirt of course." ("base", xpos="far_left", ypos="head")
-                    cho @ cheeks heavy_blush "A skirt?" ("clench", "wide", "base", "mid") #shocked
+                    cho @ cheeks heavy_blush "{shudder}A skirt?{/shudder}" ("clench", "wide", "base", "mid") #shocked
                     gen "Of course!" ("grin", xpos="far_left", ypos="head")
                     gen "If he's too focused on your panties, then there's no way he'll catch that snatch!" ("grin", xpos="far_left", ypos="head")
                 else:
@@ -90,7 +90,7 @@ label cho_training:
                         cho "Got a better plan? One that doesn't involve showing off my panties?" ("annoyed", "base", "base", "mid")
                         gen "..." ("base", xpos="far_left", ypos="head")
                         cho "Didn't think so..." ("open", "narrow", "raised", "mid")
-                        gen "(Damn... maybe I need to work on her confidence a bit...)" ("base", xpos="far_left", ypos="head")
+                        gen "(Damn... Maybe I need to work on her confidence a bit...)" ("base", xpos="far_left", ypos="head")
                         gen "(Some more favours should surely do it...)" ("grin", xpos="far_left", ypos="head")
 
                         jump cho_training.choices
@@ -232,7 +232,7 @@ label cho_training:
                     gen "That's the point." ("angry", xpos="far_left", ypos="head")
                     cho "But, but, but!" ("open", "closed", "worried", "mid")
                     gen "That's probably what the crowd will be chanting..." ("grin", xpos="far_left", ypos="head")
-                    cho "Teasing Cedric is one thing... but the Slytherins..." ("mad", "happyCl", "worried", "down")
+                    cho "Teasing Cedric is one thing... But the Slytherins..." ("mad", "happyCl", "worried", "down")
                     cho "I can't see myself doing...{w=0.4} this..." ("base", "base", "base", "mid")
                     gen "Well, that's your loss I guess..." ("base", xpos="far_left", ypos="head")
                     cho @ cheeks blush "..." ("normal", "happyCl", "base", "mid")
@@ -434,7 +434,7 @@ label cho_tactics:
     jump cho_tactics.choices
 
     # Change Tactic
-    #TODO This plays once cho has agreed to the tactic/clothing and during the first intro
+    # This plays once cho has agreed to the tactic/clothing and during the first intro
     # Once you pick the right option, the practice match option unlocks (Maybe we should have it say Try out tactic?)
     # The various options should go away once you've tried it once
 
@@ -571,7 +571,7 @@ label cho_tactics:
             gen "Yes, we should definitely try this during your next practice match against them." ("base", xpos="far_left", ypos="head")
             cho "..." ("normal", "base", "raised", "mid") #annoyed
             gen "When is that again?" ("base", xpos="far_left", ypos="head")
-            cho "*Sigh* Just let me know when and I'll set one up with their captain." ("open", "narrow", "base", "R")
+            cho "{bounce}*Sigh*{/bounce} Just let me know when and I'll set one up with their captain." ("open", "narrow", "base", "R")
             gen "Excellent." ("base", xpos="far_left", ypos="head")
 
             if states.env.daytime:

game/scripts/characters/cho/events/requests/manipulate_girls.rpy

@@ -12,7 +12,7 @@ label cc_pr_manipulate_girls_start:
 
         if not states.cho.ev.spy_on_girls.t3_e2_complete:
             # Return if player has not spied on Alicia just yet.
-            gen "Let’s try and manipulate the girls on the enemy team!" ("base", xpos="far_left", ypos="head")
+            gen "Let's try and manipulate the girls on the enemy team!" ("base", xpos="far_left", ypos="head")
             cho "You're expecting me to just jump in blind?" ("angry", "base", "base", "mid")
             cho "I don't know any of these girls, how do you expect me to manipulate them in any way without knowing what I'm dealing with?" ("annoyed", "wide", "base", "mid")
             gen "Good point, perhaps we should consider spying on them a bit beforehand." ("base", xpos="far_left", ypos="head")
@@ -77,7 +77,7 @@ label cc_pr_manipulate_girls_start:
         gen "Assertiveness!" ("grin", xpos="far_left", ypos="head")
         cho "..." ("clench", "base", "raised", "mid") #Changes from worried looking down to looking at genie
         cho "Yes, I will!" ("mad", "base", "raised", "mid")
-        gen "Great, off you go!" ("grin", xpos="far_left", ypos="head")
+        gen "Great! Off you go!" ("grin", xpos="far_left", ypos="head")
 
     elif not states.cho.ev.manipulate_girls.t3_e3_complete: # Completed Katie Bell - Part 2?
         # Katie Bell - Part 2
@@ -87,7 +87,7 @@ label cc_pr_manipulate_girls_start:
         gen "Follow that girl again!" ("base", xpos="far_left", ypos="head")
         cho "Sir?" ("mad", "base", "raised", "mid")
         gen "I mean... Today's mission is to follow that Bell girl again..." ("base", xpos="far_left", ypos="head")
-        cho @ cheeks blush "But... isn't one time enough?" ("disgust", "narrow", "base", "mid")
+        cho @ cheeks blush "But... Isn't one time enough?" ("disgust", "narrow", "base", "mid")
         cho @ cheeks blush "My butt is still sore from last time..." ("clench", "narrow", "base", "downR")
         gen "There can never be too much of a good thing." ("base", xpos="far_left", ypos="head")
         cho @ cheeks blush "Fine..." ("open", "narrow", "base", "down")
@@ -113,7 +113,7 @@ label cc_pr_manipulate_girls_start:
         gen "You seem to have gotten to know the Gryffindor girls quite well by now, [name_cho_genie]." ("base", xpos="far_left", ypos="head")
         gen "If you're not careful, you might turn into one yourself." ("grin", xpos="far_left", ypos="head")
         cho @ cheeks blush "As if... Ravenclaw always comes first!" ("angry", "base", "base", "mid")
-        gen "You do? No shame in that!" ("grin", xpos="far_left", ypos="head")
+        gen "You do? No shame in that!" ("grin", xpos="far_left", ypos="head") #Orgasm joke
         gen "So...{w=0.4} Today we're up against their team Captain, Angelina Johnson." ("base", xpos="far_left", ypos="head")
         gen "Once you've managed to bond with her, I'm sure you'll have no problem winning the cup." ("base", xpos="far_left", ypos="head")
         cho "Yes!" ("grin", "closed", "base", "mid")
@@ -205,7 +205,7 @@ label cc_pr_manipulate_girls_T3_alicia:
     gen "Great plan!" ("base", xpos="far_left", ypos="head")
     gen "But for now, you better get some rest and ready yourself to take on the other two." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "..." ("disgust", "narrow", "base", "down")
-    gen "Don't look so dejected, [name_cho_genie]. You had a beautiful girl kiss you today... surely you can't be disappointed by that?" ("base", xpos="far_left", ypos="head")
+    gen "Don't look so dejected, [name_cho_genie]. You had a beautiful girl kiss you today... Surely you can't be disappointed by that?" ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "It's...{w=0.4} it's not that...{w=0.4} I'm just used to it being me who..." ("annoyed", "closed", "base", "mid")
     cho @ cheeks blush "..." ("upset", "closed", "base", "mid") #Blush
     cho @ cheeks heavy_blush "Never mind, good night then." ("normal", "base", "base", "downR")
@@ -294,7 +294,7 @@ label cc_pr_manipulate_girls_T3_katie_part1:
     cho @ cheeks blush "Next time?" ("clench", "base", "base", "mid")
     gen "Just agree on a safe-word, if it gets too much." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "It's a tree! It's not going to agree to anything!" ("clench", "wide", "base", "mid")
-    cho @ cheeks blush "She tricked me into this!" ("scream", "base", "angry", "R")
+    cho @ cheeks blush "{shake}She tricked me into this!{/shake}" ("scream", "base", "angry", "R")
     gen "..." ("angry", xpos="far_left", ypos="head")
     cho @ cheeks blush "I bet I ruined it anyway..." ("annoyed", "base", "angry", "R")
     cho @ cheeks blush "Because as soon as the tree lowered us back to the ground, Katie rushed off." ("upset", "base", "base", "downR")
@@ -355,7 +355,7 @@ label cc_pr_manipulate_girls_T3_katie_part2:
     gen "Yes?" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks blush "That's when the tree threw one of its branches about and swung it at us, smacking our butts..." ("soft", "happyCl", "base", "mid")
     gen "Got to bless mother nature!" ("grin", xpos="far_left", ypos="head")
-    cho @ cheeks blush "And It just kept doing it, over and over, until our cheeks turned all red..." ("clench", "base", "base", "downR")
+    cho @ cheeks blush "And it just kept doing it, over and over, until our cheeks turned all red..." ("clench", "base", "base", "downR")
     cho @ cheeks blush "It was as if my body had caught on fire!" ("horny", "narrow", "base", "down")
     cho @ cheeks blush "As it continued, Katie looked up at me and reached out to grab my hand..." ("soft", "narrow", "base", "down")
     cho @ cheeks blush "And as I finally managed to grab it, the tree smacked us hard across our cheeks." ("angry", "narrow", "base", "downR")
@@ -364,7 +364,7 @@ label cc_pr_manipulate_girls_T3_katie_part2:
     cho @ cheeks heavy_blush "It...{w=0.4} yes, I think she might've." ("upset", "base", "base", "mid")
     gen "Still too early to admit it?" ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "Too early to admit what?" ("mad", "base", "base", "mid")
-    gen "Never mind... did anything else happen after that?" ("base", xpos="far_left", ypos="head")
+    gen "Never mind... Did anything else happen after that?" ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "Not much, as far as I recall..." ("base", "base", "base", "downR")
     cho @ cheeks blush "All I remember is the tree lowering us to the ground and the sound of Katie's breathing..." ("soft", "closed", "base", "mid")
     cho @ cheeks blush "I just laid there for a while, catching my breath, until the only thing I could hear was the sound of the surrounding forest..." ("open", "closed", "base", "mid")
@@ -428,7 +428,7 @@ label cc_pr_manipulate_girls_T3_angelina:
     cho "But as I waited to find out what it was, they suddenly went quiet, and I couldn't hear any of them." ("angry", "base", "raised", "mid")
     gen "Left for the changing room?" ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "That's what I thought, until I removed my ear from the hole to have a look..." ("disgust", "base", "base", "down")
-    cho @ cheeks blush "No, they hadn't left... when I took a peek through the hole I found all three of them staring back at me..." ("open", "wide", "base", "mid")
+    cho @ cheeks blush "No, they hadn't left... When I took a peek through the hole I found all three of them staring back at me..." ("open", "wide", "base", "mid")
     gen "Busted!" ("grin", xpos="far_left", ypos="head")
     gen "So what did you do, run away?" ("grin", xpos="far_left", ypos="head")
     cho @ cheeks blush "At first I just sort of stood there in shock, not knowing what to do..." ("clench", "narrow", "base", "down")
@@ -495,7 +495,7 @@ label cc_pr_manipulate_girls_T3_angelina:
     gen "She was testing you..." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "She was..." ("clench", "wide", "base", "down")
     gen "Yes...{w=0.4} Not only that...{w=0.4} I think you passed!" ("grin", xpos="far_left", ypos="head")
-    gen "Maybe I underestimated those girls... they aren't easy to boss around, that's for sure..." ("base", xpos="far_left", ypos="head")
+    gen "Maybe I underestimated those girls... They aren't easy to boss around, that's for sure..." ("base", xpos="far_left", ypos="head")
     gen "But no matter..." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "..." ("upset", "happyCl", "base", "mid") #pout
     gen "We shall see soon enough what comes from this..." ("base", xpos="far_left", ypos="head")

game/scripts/characters/cho/events/requests/spy_on_the_boys.rpy

@@ -16,7 +16,7 @@ label cc_pr_spy_boys_start:
             gen "Time to target the boys for a classic espionage mission C." ("base", xpos="far_left", ypos="head")
             cho "C? Is that some sort of spy name?" ("soft", "base", "base", "mid")
             gen "Yep! C is the perfect spy name for you." ("base", xpos="far_left", ypos="head")
-            cho "Where do you get all these ideas from... seriously." ("annoyed", "base", "base", "mid")
+            cho "Where do you get all these ideas from... Seriously." ("annoyed", "base", "base", "mid")
             gen "That's your cup-size, is it not?" ("base", xpos="far_left", ypos="head")
             cho "..." ("disgust", "wide", "base", "mid") #Blushes
             cho "You're such an old pervert, you know that, right?" ("soft", "base", "angry", "mid")
@@ -55,7 +55,7 @@ label cc_pr_spy_boys_start:
         cho "What is today's assign--{w=0.4} mission then?" ("open", "base", "base", "mid")
         gen "Today's mission, if you choose to accept it..." ("base", xpos="far_left", ypos="head")
         gen "And by choose I mean there's not really much choice in the matter." ("base", xpos="far_left", ypos="head")
-        cho "..." ("normal", "narrow", "base", "mid") #rolls eyes, bit pissed off
+        cho "{wave}...{/wave}" ("normal", "narrow", "base", "mid") #rolls eyes, bit pissed off
         gen "I'd like you to spy on the beaters... Those {i}Weasel{/i} twins." ("base", xpos="far_left", ypos="head")
         cho "Weasley..." ("soft", "narrow", "base", "mid")
         gen "Yeah, that!" ("base", xpos="far_left", ypos="head")
@@ -156,7 +156,7 @@ label cc_pr_spy_boys_T3_twins:
     cho @ cheeks blush "*Giggles*" ("smile", "closed", "base", "mid")
     cho @ cheeks blush "Anyhow...{w=0.4} It completely ruined her clothes, and as she deflated she quickly ran off stark naked and crying to her dormitory." ("annoyed", "closed", "base", "mid")
     gen "Wait, so the clothes didn't expand as well?" ("base", xpos="far_left", ypos="head")
-    cho "It's not a spell... she ate it, so why would her clothes be affected?" ("clench", "base", "raised", "mid")
+    cho "It's not a spell... She ate it, so why would her clothes be affected?" ("clench", "base", "raised", "mid")
     gen "Sounds like amateurish magic to me... If they just imbued those sweets with some sort of effect which allows the consumer's sweat to permeate their clothes, then..." ("base", xpos="far_left", ypos="head")
     cho "..." ("disgust", "wide", "angry", "mid")
     gen "*Ahem*...{w=0.4} I suppose I better have a word with those two..." ("base", xpos="far_left", ypos="head")

game/scripts/characters/cho/events/requests/spy_on_the_girls.rpy

@@ -34,7 +34,7 @@ label cc_pr_spy_girls_start:
             gen "No, not your name...{w=0.4} I'm not that unimaginative..." ("base", xpos="far_left", ypos="head")
             cho "" ("annoyed", "narrow", "base", "mid")
             gen "C is your cup-size, is it not?" ("base", xpos="far_left", ypos="head")
-            cho @ cheeks blush "My cup-size?!" ("angry", "wide", "base", "mid")
+            cho @ cheeks blush "{shake}My cup-size?!{/shake}" ("angry", "wide", "base", "mid")
             gen "That's right." ("grin", xpos="far_left", ypos="head")
             cho @ cheeks heavy_blush "But that's not even correct! Mine is--" ("disgust", "happyCl", "base", "mid")
             cho @ cheeks blush "I mean...{w=0.4} Where do you get all these ideas from, seriously!?" ("upset", "narrow", "angry", "R")
@@ -299,7 +299,7 @@ label cc_pr_spy_girls_T3_alicia:
     pause .8
     call bld
     gen "Changed your mind?" ("base", xpos="far_left", ypos="head")
-    cho @ cheeks blush "N-- No, Good night!" ("open", "happyCl", "base", "mid", xpos="base", flip=True) # head
+    cho @ cheeks blush "N--{w=0.2} No, good night!" ("open", "happyCl", "base", "mid", xpos="base", flip=True) # head
 
     # Cho leaves.
     call cho_walk(action="leave")
@@ -325,7 +325,7 @@ label cc_pr_spy_girls_T3_katie:
     cho "She's a freak!" ("soft", "narrow", "angry", "mid") # angry
     gen "Whoa, that's a bit uncalled-for, don't you think?" ("base", xpos="far_left", ypos="head")
     gen "I'm sure she looks perfectly fine." ("base", xpos="far_left", ypos="head")
-    cho "No, not her looks... what she's been doing." ("open", "closed", "angry", "mid") # blush
+    cho "No, not her looks... What she's been doing." ("open", "closed", "angry", "mid") # blush
     cho "I followed her all the way down to the lake today. And then hid behind a tree to observe her." ("open", "narrow", "angry", "mid")
     gen "Something wrong with a little swim?" ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "No, but...{w=0.5} she went in there butt-naked!" ("disgust", "narrow", "base", "mid")

game/scripts/characters/luna/events/favors/inspect_her_body.rpy

@@ -238,8 +238,9 @@ label ll_pf_inspect_T2_E1_intro:
     lun @ cheeks blush "I can't believe it!" ("grin", "base", "base", "mid")
 
     call cum_block
-    pause .5
     call gen_chibi("cum_behind_desk_done")
+    with d3
+    pause.2
 
     gen "{bounce}*Ah*...{w=0.4}*Ah*...{/bounce}{w=0.4} What..." ("base", xpos="far_left", ypos="head")
     lun @ cheeks blush "Cumming...{w=0.4} You came again!" ("base", "happyCl", "base", "mid")

game/scripts/characters/luna/events/spectrespecs/spectrespecs.rpy

@@ -287,7 +287,8 @@ label spectrespecs_E4:
 
     pause 1.5
     call gen_chibi("cum_behind_desk_done")
-    pause .8
+    with d3
+    pause.2
 
     gen "{bounce}*Ah*...{w=0.4} *Ah*...{w=0.4} *Ah*...{/bounce}" ("base", xpos="far_left", ypos="head")
     lun "I saw them!" ("clench", "wide", "base", "mid")

game/scripts/characters/susan/wardrobe_reactions.rpy

@@ -71,7 +71,7 @@ label sus_reaction_touch_fail(what):
     if what == "head":
         $ mouse_slap()
 
-        sus @ cheeks blush "*Eeek*!" ("angry", "happyCl", "sad", "mid")
+        sus @ cheeks blush "{shake}*Eeek*!{/shake}" ("angry", "happyCl", "sad", "mid")
         sus @ cheeks blush "I'm sorry sir, you scared me..." ("angry", "base", "sad", "mid")
         gen "(Poor thing isn't used to human touch...)" ("base", xpos="far_left", ypos="head")
 
@@ -203,7 +203,7 @@ label sus_reaction_equip_outfit_fail(item):
     ########################
     if item == sus_outfit_lace1:
         gen "Could you put on this lingerie for me please?" ("base", xpos="far_left", ypos="head")
-        sus @ cheeks blush "L--{w=0.2} Lingerie!?" ("angry", "wide", "shocked", "mid")
+        sus @ cheeks blush "L--{w=0.2} {shake}Lingerie!?{/shake}" ("angry", "wide", "shocked", "mid")
         gen "Yep." ("base", xpos="far_left", ypos="head")
         sus @ cheeks blush "I--{w=0.2} I--{w=0.2} Why would you ask me to--" ("angry", "happyCl", "worried", "mid")
         gen "...{w=0.4} Maybe some other time then." ("base", xpos="far_left", ypos="head")
@@ -213,7 +213,7 @@ label sus_reaction_equip_outfit_fail(item):
     ##############################
     elif item ==sus_outfit_latex1:
         gen "Put your latex underwear on for me." ("base", xpos="far_left", ypos="head")
-        sus @ cheeks blush "The-- The what?!?" ("angry", "wide", "shocked", "mid")
+        sus @ cheeks blush "The-- {shake}The what?!?{/shake}" ("angry", "wide", "shocked", "mid")
         gen "These!" ("grin", xpos="far_left", ypos="head")
         sus @ cheeks blush "Oh, by Merlin's beard!" ("clench", "wide", "base", "down")
         sus @ cheeks blush "I can't wear these!" ("open", "happyCl", "worried", "mid")

game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy

@@ -22,7 +22,7 @@ label nt_pr_teach_start:
             gen "It would be best if we start small, don't you think?" ("base", xpos="far_left", ypos="head")
             gen "You should build up a bit of a reputation for yourself, before we start trying anything crazy." ("base", xpos="far_left", ypos="head")
             ton "A reputation?" ("normal", "base", "raised", "mid")
-            ton "Think I'll get a nickname?{w} Maybe they'll call me touchy tonks?" ("soft", "narrow", "shocked", "mid")
+            ton "Think I'll get a nickname?{w} Maybe they'll call me touchy Tonks?" ("soft", "narrow", "shocked", "mid")
             gen "Maybe..." ("base", xpos="far_left", ypos="head")
             ton "What did you do with Hermione on her first favour?" ("open", "narrow", "shocked", "down")
             gen "*Ugh*... I think I got her to make \"a silly face\", or something..." ("base", xpos="far_left", ypos="head")
@@ -382,6 +382,7 @@ label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl
     gen "For being a tease!" ("grin", xpos="far_left", ypos="head")
     ton "Very well..." ("grin", "base", "base", "mid")
     ton "Twenty points for Slytherin!" ("open", "closed", "base", "mid")
+    $ states.env.slytherin += 20
     ton "Now, if you don't mind... It's getting a bit late..." ("open", "base", "base", "R")
     gen "Yes. You may leave..." ("base", xpos="far_left", ypos="head")
     ton "Good night, [name_genie_tonks]." ("base", "happyCl", "base", "mid")
@@ -389,8 +390,6 @@ label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl
 
     # Tonks leaves
 
-    $ states.env.slytherin += 20
-
     if states.ton.public_level < 4: # Points til 4.
         $ states.ton.public_level += 1
 
@@ -653,7 +652,7 @@ label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy
     ton "I demanded of him to start jacking it..." ("soft", "base", "annoyed", "mid")
     ton "It was actually pretty cute at first..." ("open", "closed", "base", "mid")
     ton "Then just as he was about to blow his load..." ("soft", "closed", "base", "mid")
-    ton "Boom! Petrficus Totalus!" ("scream", "shocked", "angry", "mid", trans=vpunch)
+    ton "Boom! {shake}Petrficus Totalus!{/shake}" ("scream", "shocked", "angry", "mid", trans=vpunch)
     gen "{i}Petrifi{/i}-{w} {i}Petrifico{/i}?-{w} {i}Petrificato{/i}--" ("base", xpos="far_left", ypos="head")
     ton "I petrified him!" ("open", "wide", "angry", "mid")
     gen "*Ahh*..." ("base", xpos="far_left", ypos="head")