Kinetic text

* Fixed navigation menu being clickable during pseudo hide event
* Fixed wrong menu being displayed when accesses from the quick menu

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 "Well whose is it then?{w} The house-elves?" ("soft", "narrow", "base", "mid")
+        cho "{shudder}*Argh*!{/shudder}" ("angry", "narrow", "angry", "mid", trans=hpunch)
+        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/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")