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

game/scripts/characters/astoria/chitchats.rpy

@@ -51,7 +51,7 @@ label astoria_chitchat:
         block:
             ast "Why can't we learn something more useful, like how to make stink pellets or Dung bombs?" ("upset", "narrow", "base", "R")
             ast "When am I ever going to use something as stupid as a Hiccoughing Potion!?" ("annoyed", "base", "base", "mid")
-            ast "*Hick*...{w=0.8}...{w=0.8} *Hick!*{w=0.6} Damnit..." ("open", "narrow", "worried", "down")
+            ast "{shudder}*Hick*...{w=0.8}...{w=0.8} *Hick!*{/shudder}{w=0.6} Damnit..." ("open", "narrow", "worried", "down")
 
         block:
             ast "I found the perfect use for the Wingardium leviosa charm today..." ("smile", "base", "base", "mid")

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

@@ -272,15 +272,15 @@ label astoria_intro_E2_hermione:
     gen "I-- *Uhm*...{w} She thought maybe you could be of help finding her?" ("base", xpos="far_left", ypos="head")
     her "Of course, Sir." ("base", "happyCl", "base", "mid")
     gen "Apparently a student got hit by an \"unforgivable curse\" here at the school." ("base", xpos="far_left", ypos="head")
-    her "AN unforgivable CURSE!!!" ("scream", "wide", "base", "stare", trans=hpunch)
+    her "{shake}AN unforgivable CURSE!!!{/shake}" ("scream", "wide", "base", "stare", trans=hpunch)
     her "AT our school?!" ("shock", "wide", "base", "mid")
     her "SOMEONE COULD BE DEAD!" ("scream", "wide", "base", "R")
     her "OR TORTURED!!" ("disgust", "happyCl", "worried", "mid")
     her "OR WORSE!!!" ("angry", "squint", "worried", "mid")
     her "Exp--" ("disgust", "base", "worried", "stare")
     gen "Expelled?" ("base", xpos="far_left", ypos="head")
-    her "Exploited!" ("angry", "squint", "worried", "mid")
+    her "{shake}Exploited!{/shake}" ("angry", "squint", "worried", "mid")
-    gen "really?" ("base", xpos="far_left", ypos="head")
+    gen "Really?" ("base", xpos="far_left", ypos="head")
     her "Those are the only things that can happen with an unforgivable curse, [name_genie_hermione]!" ("open", "base", "worried", "mid")
     gen "Of course... I'm just making sure you were aware of them..." ("base", xpos="far_left", ypos="head")
     gen "So, how does it work exactly?" ("base", xpos="far_left", ypos="head")
@@ -288,7 +288,7 @@ label astoria_intro_E2_hermione:
     gen "Yes... I need to make sure you've done your studies." ("base", xpos="far_left", ypos="head")
     her "Sir, It's one of the first lessons we ever received in defence against the dark arts." ("open", "closed", "base", "mid")
     gen "..." ("base", xpos="far_left", ypos="head")
-    her "*Sigh*... The curse lowers the target's inhibitions, making them more prone to follow the command, depending on the skill of the user casting it or their own mental resolve not to abide by the command." ("open", "closed", "base", "mid")
+    her "{bounce}*Sigh*{/bounce} The curse lowers the target's inhibitions, making them more prone to follow the command, depending on the skill of the user casting it or their own mental resolve not to abide by the command." ("open", "closed", "base", "mid")
     gen "You could've just said it's like a suggestion spell." ("base", xpos="far_left", ypos="head")
     her "Sorry?"
     gen "Never played D&D?" ("base", xpos="far_left", ypos="head")
@@ -303,7 +303,7 @@ label astoria_intro_E2_hermione:
     her "So, how do you expect me to find out who did it?" ("soft", "base", "base", "R")
     gen "I'm certain that it's the work of another student..." ("base", xpos="far_left", ypos="head")
     gen "(or Snape has finally snapped...)" ("base", xpos="far_left", ypos="head")
-    gen "so I'll need you to go undercover to find out who cast it." ("base", xpos="far_left", ypos="head")
+    gen "So I'll need you to go undercover to find out who cast it." ("base", xpos="far_left", ypos="head")
     her @ cheeks blush "Really? You're depending on me to find a criminal within our school?" ("soft", "narrow", "base", "down")
     gen "If it's not too much troub--" ("base", xpos="far_left", ypos="head")
     her "I'd be honoured, [name_genie_hermione]!" ("scream", "closed", "base", "mid")
@@ -585,7 +585,7 @@ label astoria_intro_E3:
         gen "You may leave..." ("base", xpos="far_left", ypos="head")
 
     her "..." ("annoyed", "narrow", "angry", "R")
-    ast "*cough*... {size=-4}mudblood...{/size}" ("annoyed", "narrow", "angry", "R", xpos="mid", ypos="base", trans=dissolve)
+    ast "*Cough*... {size=-4}mudblood...{/size}" ("annoyed", "narrow", "angry", "R", xpos="mid", ypos="base", trans=dissolve)
     her "*Tzzzs!*..." ("angry", "closed", "angry", "mid")
     if d_flag_01:
         her "I'll go {i}fetch{/i} professor Snape then..." ("annoyed", "narrow", "angry", "R")
@@ -867,7 +867,7 @@ label nt_he_astoria_E1:
     ton "Some of them are very stuck-up and spoiled, for that reason." ("upset", "base", "base", "R")
     ton "It's quite the norm for most pure-blood families, actually." ("open", "closed", "base", "mid")
     gen "Get to the point..." ("base", xpos="far_left", ypos="head")
-    ton "*Sigh*" ("disgust", "base", "base", "down")
+    ton "{bounce}*Sigh*{/bounce}" ("disgust", "base", "base", "down")
     ton "One of the Greengrass' ancestors was put under a blood curse, and I fear that parts of this curse have trickled down through the generations and surfaced in Astoria." ("upset", "base", "worried", "mid")
     ton "Its original purpose was to bring down the family and make them appear weak in the eyes of the wizarding community." ("normal", "base", "base", "R")
     ton "Every now and then one of the family members would become frail and live a short life." ("normal", "closed", "worried", "mid")

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

@@ -119,7 +119,7 @@ label ag_se_imperio_sb_E1:
 
     call ast_chibi("wand",530,"base")
     ast "Is so that I could put a curse on you!" ("grin", "narrow", "angry", "mid", xpos="base", ypos="base")
-    sus "P-Put a curse on me?!!" ("open", "wide", "shocked", "stare", xpos="right", ypos="base")
+    sus "{shake}P-Put a curse on me?!!{/shake}" ("open", "wide", "shocked", "stare", xpos="right", ypos="base")
 
     call ast_chibi("wand_casting",530,"base")
     sus "No! Professor, do someth--" ("angry", "base", "base", "mid")
@@ -127,7 +127,7 @@ label ag_se_imperio_sb_E1:
     # Astoria casts imperio.
     stop music fadeout 2.0
     hide susan_main
-    ast "IMPERIO!" ("scream", "base", "angry", "mid")
+    ast "{shake}IMPERIO!{/shake}" ("scream", "base", "angry", "mid")
 
     scene onlayer dolls
     hide screen bld1
@@ -376,7 +376,7 @@ label ag_se_imperio_sb_E2:
     # Astoria casts imperio.
     stop music fadeout 2.0
     hide susan_main
-    ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder
+    ast "{shake}IMPERIO!{/shake}{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) # Screams it even louder
 
     scene onlayer dolls
     hide screen bld1
@@ -391,7 +391,7 @@ label ag_se_imperio_sb_E2:
 
     play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
     sus "..." ("soft", "happy", "shocked", "stare")
-    ast "*ha-ha-ha-ha!*" ("grin", "closed", "base", "mid")
+    ast "*Ha-ha-ha-ha!*" ("grin", "closed", "base", "mid")
     ast "Her face was priceless when you said milk duds..." ("grin", "base", "base", "L")
     gen "You liked that?" ("base", xpos="far_left", ypos="head")
     ast "Of course! Anything to bring Bessy here down a peg." ("smile", "base", "base", "L")
@@ -667,7 +667,7 @@ label ag_se_imperio_sb_E3:
     # Astoria casts imperio.
     stop music fadeout 2.0
     hide susan_main
-    ast "IMPERIO!{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch)
+    ast "{shake}IMPERIO!{/shake}{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch)
 
     scene onlayer dolls
     hide screen bld1
@@ -724,7 +724,7 @@ label ag_se_imperio_sb_E3:
     pause.8
 
     nar "Susan's eyes drift down to her exposed chest."
-    sus "WHAT?!?!?" ("angry", "wide", "shocked", "down", trans=hpunch)
+    sus "{shake}WHAT?!?!?{/shake}" ("angry", "wide", "shocked", "down", trans=hpunch)
     sus @ cheeks blush "I'm so sorry, professor Dumbledore!" ("open", "wide", "worried", "stare")
     sus @ cheeks blush "I don't know what's come over me!" ("angry", "happyCl", "sad", "mid")
     ast "Maybe it's just because you're a nasty slut!" ("annoyed", "base", "base", "L")
@@ -769,7 +769,7 @@ label ag_se_imperio_sb_E3:
     ast "Well seeing as how you asked..." ("open", "closed", "base", "mid")
     ast "Suzy, are you listening?" ("open", "narrow", "base", "L")
 
-    sus "yes..." ("soft", "narrow", "base", "stare")
+    sus "Yes..." ("soft", "narrow", "base", "stare")
     ast "I want you to crawl under the headmaster's desk." ("grin", "base", "base", "L")
     gen "I thought you didn't want her to suck me off?" ("base", xpos="far_left", ypos="head")
     ast "Shut it, and stop being so disgusting!" ("scream", "closed", "angry", "mid")
@@ -791,7 +791,7 @@ label ag_se_imperio_sb_E3:
     call ctc
 
     ast "And you're not allowed to come out until I say so." ("open", "closed", "base", "mid")
-    sus "yes..."
+    sus "Yes..."
     ast "And if you actually are just a slut, then I want you to let that slut out! Show us that you really love it!" ("clench", "narrow", "base", "down")
     sus "...{w=0.4} Love it?"
     sus "I love it..."
@@ -827,7 +827,7 @@ label ag_se_imperio_sb_E3:
     sus "Where am I?"
     ast "Don't you remember crawling under your headmaster's desk, begging him to jerk his nasty old cock for you?" ("open", "closed", "base", "mid")
     with hpunch
-    sus "WHAT?"
+    sus "{shake}WHAT?{/shake}"
     sus "I'd never do something like that!"
     ast "Really? Because it sure looks like you did..." ("grin", "base", "base", "R")
     sus "I--{w} I don't know why..."
@@ -892,14 +892,14 @@ label ag_se_imperio_sb_E3:
     sus "Alright..."
     sus "{size=-5}I'm a...{/size} {size=-3}slut...{/size}"
     ast "*Hmm*... I'm not sure I heard anything. What about you, sir?" ("annoyed", "base", "base", "R")
-    gen "*Ah*...{w=0.3} almost..." ("base", xpos="far_left", ypos="head")
+    gen "{bounce}*Ah*...{/bounce}{w=0.3} almost..." ("base", xpos="far_left", ypos="head")
     ast "Go on Suzy... one more time..." ("smile", "narrow", "base", "down")
     with hpunch
     sus "I'm a slut, OK!"
-    gen "*Ah*... YES..." ("angry", xpos="far_left", ypos="head")
+    gen "{bounce}*Ah*...{/bounce} YES..." ("angry", xpos="far_left", ypos="head")
     sus "I'm a nasty slut who crawled under her headmaster's desk and--"
 
-    gen "HERE IT COMES SLUT!" ("angry", xpos="far_left", ypos="head")
+    gen "{shake}HERE IT COMES SLUT!{/shake}" ("angry", xpos="far_left", ypos="head")
     hide screen bld1
     call gen_chibi("cum_behind_desk")
     call cum_block

game/scripts/characters/astoria/gifts.rpy

@@ -123,7 +123,7 @@ label give_ast_gift(gift_item):
             ast "You want me to do more school work?" ("annoyed", "base", "angry", "mid")
             call ast_mood(1)
         else:
-            ast "magazines?" ("open", "narrow", "base", "mid")
+            ast "Magazines?" ("open", "narrow", "base", "mid")
             call give_gift(_("You give an assortment of educational magazines to Astoria..."), gift_item)
             ast "I was hoping for something a bit more risqué..." ("annoyed", "narrow", "base", "mid")
             call ast_mood(0)
@@ -344,7 +344,7 @@ label give_ast_gift(gift_item):
             ast "Handcuffs? And a Ball gag?" ("annoyed", "narrow", "base", "mid")
             call give_gift(_("You give the handcuffs to Astoria..."), gift_item)
             ast "I can break these cuffs!" ("upset", "base", "angry", "mid")
-            ast "*HNNNNNGH!" ("upset", "base", "angry", "mid")
+            ast "{shake}*HNNNNNGH!{/shake}" ("upset", "base", "angry", "mid")
             ast "I can't break those cuffs..." ("annoyed", "narrow", "base", "mid")
             ast "Do you have a key?" ("annoyed", "narrow", "base", "mid")
             call ast_mood(0)
@@ -357,22 +357,22 @@ label give_ast_gift(gift_item):
 
     elif gift_item == anal_plugs_ITEM:
         if states.ast.level < 6:
-            ast "anal plugs?" ("base", "narrow", "angry", "mid")
+            ast "Anal plugs?" ("base", "narrow", "angry", "mid")
             ast "Yuck, what the hell is wrong with you... do you know where these go?" ("upset", "base", "angry", "mid")
             ast "Of course you do... you detestable dingbat." ("upset", "base", "angry", "mid")
             call ast_mood(2)
         elif states.ast.level > 5 and states.ast.level < 12:
-            ast "anal plugs?" ("base", "narrow", "angry", "mid")
+            ast "Anal plugs?" ("base", "narrow", "angry", "mid")
             ast "Why don't you try and sit on one yourself..." ("upset", "base", "angry", "mid")
             call ast_mood(1)
         elif states.ast.level > 11 and states.ast.level < 18:
-            ast "anal plugs?" ("base", "narrow", "angry", "mid")
+            ast "Anal plugs?" ("base", "narrow", "angry", "mid")
             call give_gift(_("You give the anal plugs to Astoria..."), gift_item)
             ast "Why are you giving me this?" ("annoyed", "narrow", "base", "mid")
             ast "I'll take it I guess..." ("annoyed", "narrow", "base", "mid")
             call ast_mood(0)
         else:
-            ast "anal plugs?" ("base", "base", "base", "mid")
+            ast "Anal plugs?" ("base", "base", "base", "mid")
             call give_gift(_("You give the anal plugs to Astoria..."), gift_item)
             ast "You do know these hurts a bit if you're not used to them?" ("annoyed", "narrow", "base", "mid")
             nar "Astoria absent-mindedly pockets the anal plug."

game/scripts/characters/cho/chitchats.rpy

@@ -58,7 +58,7 @@ label cho_chitchat:
                 cho "" ("base", "base", "base", "mid")
 
             block:
-                cho "It's a shame Brooms are so easy to spot... Even flying close to smaller muggle villages is a risk." ("open", "base", "base", "R")
+                cho "It's a shame brooms are so easy to spot... Even flying close to smaller muggle villages is a risk." ("open", "base", "base", "R")
 
     elif states.cho.tier == 2: #Pre Slytherin
 
@@ -96,7 +96,7 @@ label cho_chitchat:
                 cho @ cheeks blush "I wonder how many people saw it before Granger pointed it out..." ("soft", "narrow", "base", "down")
 
             block:
-                cho "People skirting the rules in Quidditch is more common than most people think." ("open", "closed", "base", "mid")
+                cho "Players skirting the rules in Quidditch is more common than most people think." ("open", "closed", "base", "mid")
                 cho "Illegal broom tampering... Jinxing off the other team's robes..." ("open", "narrow", "base", "downR")
                 cho "I'm surprised that you found there's nothing rule breaking about adjustments to your own clothing." ("smile", "narrow", "base", "mid")
 

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

@@ -14,7 +14,7 @@ label cc_pf_strip_T2_E3_hermione:
     her "You wanted to see me, Sir?" ("soft", "closed", "base", "mid", xpos="base", ypos="base", flip=False, trans=d3)
 
     her "...{w=0.4}{nw}" ("soft", "base", "worried", "L")
-    her "...{fast}Cho?!" ("clench", "wide", "worried", "shocked")
+    her "...{fast}{shudder}Cho?!{/shudder}" ("clench", "wide", "worried", "shocked")
 
     play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
 
@@ -30,7 +30,7 @@ label cc_pf_strip_T2_E3_hermione:
     cho "You know, just the usual..." ("soft", "base", "base", "L")
     cho "Like stripping for our dear headmaster!" ("smile", "narrow", "angry", "L")
     cho "I trust that you're more than familiar with it..." ("soft", "closed", "base", "L")
-    her "You've told her?" ("clench", "base", "angry", "mid")
+    her "{shake}You've told her?{/shake}" ("clench", "base", "angry", "mid")
     cho "So you really {b}did{/b} do it!" ("open", "wide", "base", "L")
     her "It's none of your business what I do at this school! You slut!" ("angry", "narrow", "angry", "R")
     cho "Are you sure about that?{w=0.6} I believe there are some people that would think otherwise..." ("grin", "narrow", "base", "mid")
@@ -65,7 +65,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
     menu:
         "\"Definitely!\"":
             $ states.her.mood += 10
-            her "What?!" ("open", "wide", "base", "stare")
+            her "{shudder}What?!{/shudder}" ("open", "wide", "base", "stare")
             cho "See, I told you!{w=0.6} How could he pick a walking bush on legs over this!" ("smile", "narrow", "angry", "L")
             her "" ("angry", "base", "angry", "mid")
             cho "Now tell her. Tell her why my body is superior compared to hers." ("soft", "closed", "base", "mid")
@@ -74,7 +74,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             cho "That's right, I am!" ("soft", "wide", "base", "mid")
             her "*Humph*..." ("annoyed", "narrow", "angry", "R")
             cho "And? What else?" ("smile", "narrow", "base", "L")
-            gen "And Cho's thighs are probably the most impressive ones I've seen in the last hund-- decade or more!" ("angry", xpos="far_left", ypos="head")
+            gen "And your thighs are probably the most impressive ones I've seen in the last hund-- decade or more!" ("angry", xpos="far_left", ypos="head")
             her "Well, in that case..." ("soft", "closed", "base", "mid")
             her "In that case, I'll give you a great opportunity to stare at them indefinitely." ("angry", "base", "angry", "mid")
             cho "What are you talking about, Granger?" ("soft", "narrow", "raised", "L")
@@ -308,7 +308,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             cho "*Mhmm*" ("base", "closed", "base", "mid") # Self assured.
             her "Fine..." ("soft", "narrow", "angry", "R")
             her "\"Poor\", I'd say..." ("soft", "closed", "base", "mid")
-            cho "How dare you!{w=0.6} You snobby skunk!" ("scream", "narrow", "angry", "L", trans=hpunch)
+            cho "How dare you!{w=0.6} {shake}You snobby skunk!{/shake}" ("scream", "narrow", "angry", "L", trans=hpunch)
             her "" ("base", "base", "base", "R")
             gen "(Is that better or worse than \"troll?\")" ("base", xpos="far_left", ypos="head") # Snape explained school ratings during the match.
             cho "Our Professor asked you to rate my body truthfully!" ("mad", "narrow", "angry", "L")
@@ -327,7 +327,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             her "Maybe once your Quidditch endeavours all fail, you can apply for a profession to model male underwear..." ("soft", "closed", "base", "mid")
             cho "I wonder where you're getting {b}your{/b} undergarments from..." ("soft", "closed", "base", "mid")
             cho "Stealing them from Madam Pomfrey, are you?" ("smile", "narrow", "angry", "mid")
-            her "I do not!!!" ("open", "wide", "base", "stare")
+            her "{shake}I do not!!!{/shake}" ("open", "wide", "base", "stare")
             gen "Girls, we all know what really counts is how we appear on the inside." ("base", xpos="far_left", ypos="head")
             her "" ("angry", "closed", "angry", "mid")
             cho "Oh, shut up!" ("angry", "narrow", "angry", "mid")
@@ -366,7 +366,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             with d3
 
             hide screen blkfade
-            cho "I have to say, [name_genie_cho], doing these favours is fun!" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", flip=False, trans=fade)
+            cho "I have to say, [name_genie_cho], this was a lot of fun!" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", flip=False, trans=fade)
             gen "I'm glad you're enjoying yourself." ("base", xpos="far_left", ypos="head")
             cho "Believe me, Sir. I am." ("smile", "narrow", "angry", "mid")
             cho "" ("horny", "narrow", "angry", "mid")
@@ -428,7 +428,7 @@ label cc_pf_strip_T2_E3_hermione_repeat:
     cho "Granger, instead of spitting out insults, why don't you join me and have some fun for once?" ("soft", "base", "raised", "L")
     cho "Strip down for your headmaster as well, like you usually do..." ("smile", "narrow", "angry", "L")
     cho "Or would it bother you too much, now that I'm here?" ("horny", "narrow", "base", "L")
-    her "*glare*" ("angry", "base", "angry", "mid")
+    her "{shake}*Glare*{/shake}" ("angry", "base", "angry", "mid")
     cho "Maybe then you'd have a chance to win against me!{w} And earn some useless Gryffindor points while you're at it." ("soft", "base", "base", "L")
     her "I don't think that will be necessary..." ("soft", "closed", "base", "mid")
     cho "Well, we all already know how this is going to turn out don't we, [name_genie_cho]?" ("soft", "base", "base", "mid")

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

@@ -43,8 +43,8 @@ label cho_panties_response_T2:
         gen "That makes sense to me..." ("base", xpos="far_left", ypos="head")
         cho "So you admit that you did it?" ("soft", "narrow", "angry", "mid")
         gen "It's not my cum..." ("base", xpos="far_left", ypos="head")
-        cho "*Argh*!" ("angry", "narrow", "angry", "mid", trans=hpunch)
+        cho "{shudder}*Argh*!{/shudder}" ("angry", "narrow", "angry", "mid", trans=hpunch)
-        cho "Well whose is it then?{w} The house-elves?" ("soft", "narrow", "base", "mid")
+        cho "Well, whose is it then?{w} The house-elves?" ("soft", "narrow", "base", "mid")
         gen "*Uhm*...{w} Yes?" ("base", xpos="far_left", ypos="head")
         cho "It's disgusting!" ("annoyed", "narrow", "base", "down")
         cho "I better get them cleaned immediately..." ("angry", "narrow", "worried", "down")
@@ -70,12 +70,12 @@ label cho_panties_response_T2:
         jump main_room_menu
 
     else:
-        gen "Your panties, that's right!{w} I've got them right here..." ("grin", xpos="far_left", ypos="head")
+        gen "Your panties, that's right!{w=0.4} I've got them right here..." ("grin", xpos="far_left", ypos="head")
 
         play sound "sounds/sniff.ogg"
         nar "You bring the panties to your nose and give them one last sniff."
 
-        gen "*Aaahhh*!{w} Wonderful!" ("angry", xpos="far_left", ypos="head")
+        gen "{shudder}*Aaahhh*!{/shudder}{w=0.4} Wonderful!" ("angry", xpos="far_left", ypos="head")
         cho "(...)" ("annoyed", "narrow", "base", "mid")
         gen "There, take them..." ("base", xpos="far_left", ypos="head")
 
@@ -139,7 +139,7 @@ label cho_panties_response_T3:
         play sound "sounds/sniff.ogg"
         nar "You bring the panties to your nose and give them one last sniff."
 
-        gen "*Aaahhh*!{w} Wonderful!" ("angry", xpos="far_left", ypos="head")
+        gen "{shudder}*Aaahhh*!{/shudder}{w=0.4} Wonderful!" ("angry", xpos="far_left", ypos="head")
         cho "(...)" ("base", "narrow", "base", "down")
         gen "Here, come and take them..." ("base", xpos="far_left", ypos="head")
 

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

@@ -78,7 +78,7 @@ label cc_gt_return:
 
     cho "[_gold]!" ("clench", "closed", "base", "mid")
     play sound "sounds/gulp.ogg"
-    gen "*Gulp*..." ("angry", xpos="far_left", ypos="head")
+    gen "{bounce}*Gulp*{/bounce}" ("angry", xpos="far_left", ypos="head")
     gen "Surely there must be some spare brooms around the castle." ("angry", xpos="far_left", ypos="head")
     cho "I assure you... Even the brooms provided for flying lessons are terrible." ("disgust", "narrow", "angry", "mid")
     gen "I'm sure they're fine..." ("base", xpos="far_left", ypos="head")

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

@@ -278,7 +278,7 @@ label hufflepuff_match:
     call her_chibi("stand", 300, 400, flip=True) # Temp Bugfix
     pause .5
 
-    her "Good Morning everyone, and welcome to the i-inaugural--" ("soft", "base", "worried", "mid", flip=True, xpos=290, ypos="base", trans=d3)
+    her "Good morning everyone, and welcome to the i-inaugural--" ("soft", "base", "worried", "mid", flip=True, xpos=290, ypos="base", trans=d3)
     her "" ("normal", "base", "worried", "mid")
     sna "Speak up girl! And would it kill you to enunciate?!" ("snape_03", ypos="head")
     her "*Grrr*" ("mad", "narrow", "angry", "R")
@@ -495,7 +495,7 @@ label hufflepuff_match:
             call gen_chibi("stand", 240, 400, flip=True)
             with d3
 
-            gen "But they'll never take away our freedom!" ("angry")
+            gen "But they'll never take away {shake}our freedom!{/shake}" ("angry")
 
             hide genie
             call quidditch_stands(crowd_react=[None, None, None], spotlight=False)
@@ -528,7 +528,7 @@ label hufflepuff_match:
             with d3
 
             nar "A confused murmur falls over the crowd."
-            gen "Ugh..." ("base")
+            gen "*Ugh*..." ("base")
 
             play sound "sounds/microphone_feedback.ogg"
             gen "Is this thing on?" ("base")
@@ -586,7 +586,7 @@ label hufflepuff_match:
     with d3
     pause .8
 
-    her "Ugh... thank you for that, professor Dumbledore..." ("soft", "narrow", "base", "R_soft", flip=True, xpos=290, ypos="base", trans=d3)
+    her "*Ugh*... Thank you for that, professor Dumbledore..." ("soft", "narrow", "base", "R_soft", flip=True, xpos=290, ypos="base", trans=d3)
     her "Now, to get this game underway!" ("open", "closed", "base", "mid")
 
     # Player introduction
@@ -619,7 +619,7 @@ label hufflepuff_match:
     with d3
     pause .1
 
-    her "*grrrrr*"
+    her "*Grrrrr*"
 
     call quidditch_stands(crowd_react=[None, None, None])
     with d3
@@ -672,7 +672,7 @@ label hufflepuff_match:
     qcr "START THE GAME! START THE GAME!"
     nar "Hermione's voice eventually gets drowned out by the growing restlessness of the crowd."
     her "" ("normal", "base", "base", "mid", xpos=290, ypos="base", flip=True)
-    her "Ugh, fine...{w=0.3} If everyone wants us to begin play without knowing {b}a single thing{/b}...{w=0.8} then that's {b}OK!{/b}" ("annoyed", "narrow", "annoyed", "R", trans=d3)
+    her "*Ugh*, fine...{w=0.3} If everyone wants us to begin play without knowing {b}a single thing{/b}...{w=0.8} then that's {b}OK!{/b}" ("annoyed", "narrow", "annoyed", "R", trans=d3)
     her "A good commentator knows when to accommodate for a crowd's impatience!" ("soft", "closed", "base", "mid")
     hide hermione_main
     with d3
@@ -722,7 +722,7 @@ label hufflepuff_match:
     call ctc
 
     her @ cheeks blush "" ("open", "wide", "worried", "shocked")
-    qcr "!!!" # [screenshake?]
+    qcr "{shudder}!!!{/shudder}" 
     play background "sounds/crowd.ogg" fadein 2
     mal "..."
     play sound "sounds/murmur.ogg"
@@ -868,7 +868,7 @@ label hufflepuff_match:
     with d3
 
     her "Oh no!" ("clench", "happyCl", "worried", "mid")
-    sna "{size=+4}HA-HA-HA-HA!!{/size}" ("snape_28", ypos="head")
+    sna "{shake}HA-HA-HA-HA!!{/shake}" ("snape_28", ypos="head")
     her "Somebody on the Ravenclaw team just got hit by a bludger!" ("open", "base", "worried", "L")
     gen "What an amazing turn of events!" ("grin", xpos="far_left", ypos="head")
     sna "See, I told you!" ("snape_22", ypos="head")
@@ -954,7 +954,7 @@ label hufflepuff_match:
     her "playing the game?" ("smile", "closed", "base", "mid")
     cho "The game is over, you dipstick!" ("scream", "narrow", "angry", "L")
     cho "" ("mad", "narrow", "angry", "L")
-    her "What? Already?" ("shock", "wide", "worried", "stare")
+    her "{shudder}What?{/shudder} Already?" ("shock", "wide", "worried", "stare")
     her "But who caught the Snitch?" ("open", "wide", "base", "stare")
     cho "" ("upset", "narrow", "angry", "L")
 
@@ -983,7 +983,6 @@ label hufflepuff_match:
     cho "" ("annoyed", "narrow", "angry", "L")
     her "Cho Chang managed to catch the snitch..." ("smile", "happyCl", "base", "mid")
     her "With the help of her ridiculously short skirt!" ("crooked_smile", "base", "angry", "mid")
-    #cho "{size=+10}!!!{/size}" ("clench", "closed", "angry", "mid")
     hide hermione_main
     with d3
     cho @ cheeks heavy_blush "" ("normal", "wide", "base", "L")

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

@@ -26,7 +26,7 @@ label cho_summon_setup:
         if 5 > states.cho.mood >= 1:
             cho "Yes, [name_genie_cho]?" ("annoyed", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
         elif 10 > states.cho.mood >= 5:
-            cho "*Sigh*... Yes, [name_genie_cho]?" ("open", "base", "base", "R", xpos="base", ypos="base", trans=d3)
+            cho "{bounce}*Sigh*{/bounce} Yes, [name_genie_cho]?" ("open", "base", "base", "R", xpos="base", ypos="base", trans=d3)
         elif 20 > states.cho.mood >= 10:
             cho "What is it, [name_genie_cho]?" ("annoyed", "base", "angry", "mid", xpos="base", ypos="base",trans=d3)
         elif 30 > states.cho.mood >= 20:

game/scripts/characters/cho/gifts.rpy

@@ -193,7 +193,7 @@ label give_cho_gift(gift_item):
 
     elif gift_item == porn_mag_ITEM:
         if states.cho.tier <= 1:
-            cho "What is this!?!" ("angry", "wide", "raised", "mid")
+            cho "{shudder}What is this!?!{/shudder}" ("angry", "wide", "raised", "mid")
             cho "Porn magazines?" ("open", "wide", "angry", "mid")
             cho "Sir, why would you even think of giving me something like this?" ("scream", "narrow", "angry", "L")
             call cho_mood(3)
@@ -270,7 +270,7 @@ label give_cho_gift(gift_item):
             cho @ cheeks blush "Lingerie?" ("soft", "narrow", "raised", "down")
             cho @ cheeks blush "very sexy... Did you pick them out yourself?" ("base", "wink", "base", "mid")
             cho @ cheeks blush "You've got good taste... I tore mine during the ball last year..." ("smile", "narrow", "base", "R")
-            cho @ cheeks blush "That's what I get for thinking they'd fit, even after doing so many squats, I suppose..." ("smile", "narrow", "base", "mid")
+            cho @ cheeks blush "That's what I get for thinking they'd fit, even after doing so many squats..." ("smile", "narrow", "base", "mid")
             call give_gift(_("You give the lingerie to Cho..."), gift_item)
             cho @ cheeks blush "Thank you, [name_genie_cho]." ("base", "base", "base", "mid")
             call cho_mood(-3)
@@ -451,9 +451,9 @@ label give_cho_gift(gift_item):
 
         if states.cho.tier <= 1:
             cho "A broom! Finally, something better than my old--" ("smile", "base", "base", "down")
-            cho "Hold on, is that a double ended dildo sticking out of it?!?" ("angry", "wide", "base", "down")
+            cho "Hold on, {shake}is that a double ended dildo sticking out of it?!?{/shake}" ("angry", "wide", "base", "down")
             cho "What's wrong with you?" ("scream", "happyCl", "base", "mid")
-            cho "Get that away from my--{w=0.4} From me!" ("angry", "narrow", "base", "mid")
+            cho "Get that away from my--{w=0.4} {shake}From me!{/shake}" ("angry", "narrow", "base", "mid")
             call cho_mood(4)
         elif states.cho.tier == 2:
             cho "Is that a broom with dildos stuck to it?" ("disgust", "wide", "base", "down")
@@ -476,7 +476,7 @@ label give_cho_gift(gift_item):
         if states.cho.tier <= 1:
             cho @ cheeks blush "A sex doll? What the heck... Why do you have this?" ("angry", "base", "base", "down")
             cho @ cheeks blush "And more importantly..." ("angry", "closed", "base", "mid")
-            cho @ cheeks blush "{size=+4}Why are you giving it to me?{/size}" ("disgust", "wide", "angry", "mid")
+            cho @ cheeks blush "{shake}Why are you giving it to me?{/shake}" ("disgust", "wide", "angry", "mid")
             cho @ cheeks blush "You disgust me..." ("upset", "closed", "angry", "mid")
             call cho_mood(4)
         elif states.cho.tier == 2:

game/scripts/characters/cho/talk.rpy

@@ -123,7 +123,7 @@ label name_cho_genie:
             cho @ cheeks blush "Fine... I guess that's fair..." ("open", "narrow", "base", "R")
     elif name_cho_genie == _("Boy"):
         if states.cho.tier <= 3:
-            cho "You want to call me what?!" ("angry", "base", "base", "mid")
+            cho "You want to call me {shake}what?!{/shake}" ("angry", "base", "base", "mid")
             gen "Boy!" ("base", xpos="far_left", ypos="head")
             cho "But [name_genie_cho]!" ("disgust", "narrow", "base", "mid")
             cho "I'm not a boy!" ("clench", "narrow", "base", "mid")
@@ -149,7 +149,7 @@ label name_cho_genie:
         cho @ cheeks heavy_blush "You want to call me..." ("soft", "narrow", "base", "down")
         gen "A slut!" ("base", xpos="far_left", ypos="head")
         cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "stare") #horny
-        cho @ cheeks heavy_blush "*Ah*...{w=0.4} Yes, I suppose that's fine..." ("soft", "narrow", "base", "mid")
+        cho @ cheeks heavy_blush "{bounce}*Ah*...{/bounce}{w=0.4} Yes, I suppose that's fine..." ("soft", "narrow", "base", "mid")
     elif name_cho_genie == _("Princess"): #Custom choice
         if states.cho.tier <= 3:
             cho "Princess?!" ("angry", "base", "base", "mid")