CG Posing and Sexual Activity states

* Posed end section of Throatfuck variant.
* Added masturbate sounds.
* Added clothing checks and stripping.
* Fixed missing colour on some eye variants

* Added Sexual activity states for Cho.
* Minor writing adjustments.

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

@@ -97,9 +97,6 @@ label cc_pf_strip_T2_intro_E1:
     gen "Go on, girl. Start with the top..." ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "No!" ("scream", "happyCl", "angry", "mid", trans=hpunch)
     cho "Why are you even asking me to do such a thing?!" ("angry", "narrow", "angry", "mid")
-    #gen "Didn't you take your skirt off for me after the Hufflepuff match?" ("base", xpos="far_left", ypos="head")
-    #cho "{size=-4}Well, I probably shouldn't have done that...{/size}" ("annoyed", "base", "worried", "R")
-    #gen "Sorry?" ("base", xpos="far_left", ypos="head")
     gen "Have you already forgotten that I'm here to train you?" ("base", xpos="far_left", ypos="head")
     cho "And I'm very thankful for that sir, but..." ("open", "closed", "base", "mid")
     gen "Am I not your trusted mentor?" ("base", xpos="far_left", ypos="head")
@@ -114,9 +111,7 @@ label cc_pf_strip_T2_intro_E1:
     cho "I'm just not comfortable doing this in front of you, Sir!" ("soft", "closed", "worried", "mid")
     cho @ cheeks blush "You're really old..." ("soft", "narrow", "worried", "downR")
     gen "Pardon me?" ("base", xpos="far_left", ypos="head")
-    cho "I meant... you're our headmaster! It just feels wrong to me!" ("soft", "narrow", "worried", "mid")
-    #gen "It didn't bother you the last time you barged into my office..." ("base", xpos="far_left", ypos="head")
-    #cho "Well, we had just won the game and all that... Maybe my judgement..." ("annoyed", "closed", "worried", "R")
+    cho "I meant... You're our headmaster! It just feels wrong to me!" ("soft", "narrow", "worried", "mid")
     gen "Are you one of those shy girls, Miss Chang?" ("base", xpos="far_left", ypos="head")
     cho "No, Sir. I wouldn't say I'm shy, but..." ("soft", "narrow", "worried", "downR")
     gen "Well then prove to me that you aren't, girl!" ("base", xpos="far_left", ypos="head")
@@ -151,6 +146,8 @@ label cc_pf_strip_T2_intro_E1:
     with d3
     pause .5
 
+    $ states.cho.status.show_bra = True
+
     cho @ cheeks blush "" ("quiver", "narrow", "worried", "mid")
     call ctc
 
@@ -266,6 +263,8 @@ label cc_pf_strip_T2_intro_E1:
     cho "" (trans=d3)
     pause .5
 
+    $ states.cho.status.show_panties = True
+
     cho @ cheeks blush "" ("horny", "narrow", "base", "mid")
     call ctc
 
@@ -340,8 +339,7 @@ label cc_pf_strip_T2_intro_E1:
     # Cho leaves.
     call cho_walk(action="leave")
 
-    call bld
-    gen "She'll do it next time, I'm sure..." ("base", xpos="far_left", ypos="head")
+    gen "(She'll do it next time, I'm sure...)" ("base", xpos="far_left", ypos="head")
 
     jump end_cho_strip_event
 
@@ -412,7 +410,7 @@ label cc_pf_strip_T2_intro_E2:
     play sound "sounds/08_hop_on_desk.ogg"
     pause 1
 
-    "To your surprise, the athletic, petite girl rather playfully climbs on top of your desk."
+    nar "To your surprise, the athletic, petite girl rather playfully climbs on top of your desk."
     pause .5
     gen "Nice!" ("grin", xpos="far_left", ypos="head")
     pause .2
@@ -428,7 +426,7 @@ label cc_pf_strip_T2_intro_E2:
     play music "music/GrapeSodaIsFuckingRawbyjrayteam6.ogg" fadein 1 if_changed
     cho "Then..." ("angry", "base", "worried", "down")
     cho @ cheeks blush "I-I'll do it..." ("soft", "narrow", "worried", "down")
-    gen "(Shit. Is she crying?)" ("base", xpos="far_left", ypos="head")
+    gen "(Shit... Is she crying?)" ("base", xpos="far_left", ypos="head")
     gen "(Can she even cry?)" ("base", xpos="far_left", ypos="head")
     gen "Are you alright, girl?" ("base", xpos="far_left", ypos="head")
     cho "No.{w} I'm already regretting climbing up here!!!" ("mad", "closed", "worried", "mid")
@@ -495,7 +493,7 @@ label cc_pf_strip_T2_intro_E2:
         gen "First, I'd like you to..." ("base", xpos="far_left", ypos="head")
         "\"Show me those big, juicy \"Quaffles\" of yours!\"":
             play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
-            cho @ cheeks blush "*uhhh*..." ("upset", "wide", "base", "mid")
+            cho @ cheeks blush "*Uhhh*..." ("upset", "wide", "base", "mid")
             gen "Those two mean, hearty \"bludgers\"!" ("grin", xpos="far_left", ypos="head")
             cho @ cheeks heavy_blush "Sir? Could it be that you are talking about my breasts?" ("soft", "narrow", "worried", "mid")
             gen "Yes indeed! Very good." ("base", xpos="far_left", ypos="head")
@@ -645,6 +643,10 @@ label cc_pf_strip_T2_intro_E2:
     cho "" (trans=d3)
     pause .5
 
+    $ states.cho.status.stripping = True
+    $ states.cho.status.show_tits = True
+    $ states.cho.status.show_pussy = True
+
     cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "mid")
     call ctc
 
@@ -702,7 +704,6 @@ label cc_pf_strip_T2_intro_E2:
 
     call cho_walk("door", "base")
 
-    call bld
     gen "Miss Chang." ("base", xpos="far_left", ypos="head")
     hide screen bld1
     with d3
@@ -740,10 +741,9 @@ label cc_pf_strip_T2_intro_E2:
     # Cho leaves.
     call cho_walk(action="leave")
 
-    call bld
-    gen "She's so cute..." ("base", xpos="far_left", ypos="head")
-    gen "And sexy!" ("grin", xpos="far_left", ypos="head")
-    gen "But also a bit intimidating..." ("base", xpos="far_left", ypos="head")
+    gen "(She's so cute...)" ("base", xpos="far_left", ypos="head")
+    gen "(And sexy!)" ("grin", xpos="far_left", ypos="head")
+    gen "(But also a bit intimidating...)" ("base", xpos="far_left", ypos="head")
 
     jump end_cho_strip_event
 

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

@@ -1596,7 +1596,7 @@ label cc_pf_strip_T3_intro_E3:
     show cho_strip_personal_t3_e3_on_knees cho_mouth_annoyed cho_eyes_open_down as cg
     with d3
 
-    gen "Heh-Heh..."
+    gen "*Heh-Heh*..."
 
     show cho_strip_personal_t3_e3_on_knees tonks_mouth_smile as cg
     with d3
@@ -1844,8 +1844,8 @@ label cc_pf_strip_T3_intro_E3:
     show cho_strip_personal_t3_e3_on_knees tonks_mouth_base cho_mouth_lip_bite cho_eyes_open_down as cg
     with d3
 
-    if states.cho.status.blowjob:
-        cho "But I've already seen-- I mean..."
+    if states.cho.status.dick_seen:
+        cho "But I've already seen--{w=0.2} I mean..."
     else:
         cho "..."
 
@@ -2769,6 +2769,8 @@ label cc_pf_strip_T3_intro_E3:
             play sound "sounds/giggle2_loud.ogg"
             ton "*giggles*..."
 
+            $ states.cho.status.cumshot = True
+
     stop music fadeout 1.0
     show screen blkfade
     with d5
@@ -3005,8 +3007,7 @@ label cc_pf_strip_T3_intro_E3:
     with d5
     pause .5
 
-    call bld
-    gen "And Tonks, next time we do this, wear the clothes I usually ask you to wear around my office." ("grin", xpos="far_left", ypos="head")
+    gen "And Tonks... Next time we do this, wear the clothes I usually ask you to wear around my office." ("grin", xpos="far_left", ypos="head")
     ton @ hair horny "With pleasure." ("base", "narrow", "base", "mid", ypos="head", flip=False)
 
     if game.daytime:
@@ -3041,6 +3042,7 @@ label cc_pf_strip_T3_intro_E3:
     $ hermione.equip(her_outfit_last)
 
     $ states.ton.busy = True
+    $ states.cho.status.dick_seen = True
 
     # End event.
     jump end_cho_strip_event

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

@@ -37,7 +37,7 @@ label cc_pf_blowjob_T3_intro_E1:
 
     if states.cho.ev.suck_it.variant == None:
         gen "[name_cho_genie], ready to reward your coach for a job well done?" ("base", xpos="far_left", ypos="head")
-        cho "Of course... a deal's a deal." ("open", "narrow", "base", "mid")
+        cho "Of course... A deal's a deal." ("open", "narrow", "base", "mid")
         gen "Great, in that case I think a blowjob is in order!" ("base", xpos="far_left", ypos="head")
         cho "A blowjob?!!" ("disgust", "wide", "base", "mid")
         gen "And some hand action as well of course!" ("base", xpos="far_left", ypos="head")
@@ -130,11 +130,17 @@ label cc_pf_blowjob_T3_intro_E1:
         pause 0.5
         $ camera.set(pos=(0, -750), t=3.5, pause=True)
         $ camera.set(pos=(150, 400), t=2)
-        cho "By Merlin's beard!" #Wide eyed looking at dick #open mouth
-        gen "Something wrong?"
-        $ camera.set_image("mid_surprised")
-        cho "N-No...{w=0.4} It's just...{w=0.4} This close...{w=0.4} It's so much larger than--" #Looking at dick
-        gen "Good, then stop staring and put your hand on it..."
+
+        if not states.cho.status.dick_seen:
+            cho "By Merlin's beard!" #Wide eyed looking at dick #open mouth
+            gen "Something wrong?"
+            $ camera.set_image("mid_surprised")
+            cho "N-No...{w=0.4} It's just...{w=0.4} This close...{w=0.4} It's so much larger than--" #Looking at dick
+            gen "Good, then stop staring and put your hand on it..."
+        else:
+            cho "..." #Wide eyed looking at dick #open mouth
+            gen "Go on... Stop staring, and put your hand on it."
+
         $ camera.set_image("mid_surprised_blush")
         cho "Okay..." #Blush #Normal mouth
         $ camera.set_imagepath("cho_bj/hj/")
@@ -197,9 +203,15 @@ label cc_pf_blowjob_T3_intro_E1:
         cho "Can't I just keep jerking you off?"
         gen "You agreed to a blowjob did you not?"
         $ camera.set_image("mid_worried")
-        cho "I...{w=0.4} Well, that was before you showed me your..." #Looks back down
+        if not states.cho.status.dick_seen:
+            cho "I...{w=0.4} Well, that was before you showed me your..." #Looks back down
+        else:
+            cho "Well, now that I'm seeing it again... I'm not so sure..." #Looks back down
         $ camera.set_image("away_blush")
         cho "How is this even..." #Cuts to dialog Menu choice
+
+        $ states.cho.status.handjob = True
+        $ states.cho.status.dick_seen = True
     else: # Alternate intro if first event has failed
         gen "Ready to continue with your training?" ("base", xpos="far_left", ypos="head")
         cho "Of course!" ("open", "base", "base", "mid")
@@ -513,6 +525,8 @@ label cc_pf_blowjob_1:
                             # Set cum on doll
                             $ cho.set_cum(face="heavy", hair="light")
 
+                            $ states.cho.status.cumshot = True
+
                         "-Cum on her tits-":
                             gen "Get back a little, quick!"
 
@@ -558,6 +572,8 @@ label cc_pf_blowjob_1:
                             # Set cum on doll
                             $ cho.set_cum(breasts="heavy")
 
+                            $ states.cho.status.cumshot = True
+
                 "-Don't-":
                     $ warned_her = False
                     $ states.cho.mood += 4
@@ -572,7 +588,7 @@ label cc_pf_blowjob_1:
 
                     $ camera.set_image("cho_hj mid")
                     $ camera.set(zoom=0.45, pos=(150, 70), t=2.0)
-                    cho "*huh*?!" #Wide eyed
+                    cho "*Huh*?!" #Wide eyed
 
                     with vpunch
                     $ camera.set_image("cho_hj cum face tits")
@@ -596,6 +612,8 @@ label cc_pf_blowjob_1:
                     # Set cum on doll
                     $ cho.set_cum(face="heavy", hair="light", breasts="heavy")
 
+                    $ states.cho.status.cumshot = True
+
     hide screen animatedCG
     with fade
 
@@ -1308,6 +1326,7 @@ label cc_pf_blowjob_T3_E2:
                     gen "(Not the worst of combinations.)" ("base", xpos="far_left", ypos="head")
                     #Cho leaves
                     #End Scene #Marks at completed
+                    $ states.cho.status.gokkun = True
 
         "-Just cum down her throat-":
             $ states.cho.ev.suck_it.variant = "throat"
@@ -1381,6 +1400,7 @@ label cc_pf_blowjob_T3_E2:
             cho @ cheeks heavy_blush "{size=-4}Seriously... Just ask first...{/size}" ("disgust", "base", "angry", "down", flip=True, trans=d3) #Small text #Pout #Blush
 
             call cho_walk(action="leave")
+            $ states.cho.status.gokkun = True
 
     jump end_cc_pf_blowjob
 
@@ -1742,4 +1762,6 @@ label cc_pf_blowjob_T3_E3:
     gen "(Turns out I'm a better coach than I gave myself credit for.)" ("base", xpos="far_left", ypos="head")
     gen "(Time for the next step!)" ("grin", xpos="far_left", ypos="head")
 
+    $ states.cho.status.gokkun = True
+
     jump end_cc_pf_blowjob

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

@@ -30,7 +30,7 @@ label cho_quid_E14_retrospection:
     cho "*Sniff*"
 
     cho "(No, that's liquid luck alright, no doubts about it...)"
-    cho "(Of course, he would know that you can't trick a Ravenclaw after all.)"
+    cho "(After all, he would know that you can't trick a Ravenclaw...)"
     cho "(But to think he'd give me this... Just so I could win the finals...)"
     cho "(...)"
     cho "(I'll just put it in my pocket for now...)"

game/scripts/characters/cho/vars.rpy

@@ -17,12 +17,20 @@ default states.cho.map_location = "training_grounds"
 
 # Sexual activity states
 
-# default states.cho.status.kissing = False
-# default states.cho.status.stripping = False
-# default states.cho.status.handjob = False
+default states.cho.status.show_bra = False
+default states.cho.status.show_tits = False
+default states.cho.status.show_panties = False
+default states.cho.status.show_pussy = False
+default states.cho.status.stripping = False
+default states.cho.status.dick_seen = False
+default states.cho.status.cumshot = False
+default states.cho.status.handjob = False
 default states.cho.status.blowjob = False
+default states.cho.status.gokkun = False
+default states.cho.status.deepthroat = False
 # default states.cho.status.masturbating = False
-# default states.cho.status.sex = False
+default states.cho.status.sex = False
+default states.cho.status.creampie = False
 # default states.cho.status.anal = False
 
 # Event flags