From b4f7c45e13ce99844e99c09645aae5017b546429 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Thu, 21 Nov 2024 17:44:00 +0000 Subject: [PATCH] Address incompatible transform logic change --- .../characters/astoria/events/intro.rpy | 10 ++++---- .../astoria/events/spells/imperio_susan.rpy | 15 ++++++------ .../astoria/events/spells/imperio_tonks.rpy | 24 +++++++++---------- .../events/favors/inspect_her_body_tier2.rpy | 22 ++++++++--------- .../inspect_her_body_tier2_hermione.rpy | 8 +++---- .../events/favors/inspect_her_body_tier3.rpy | 6 ++--- .../cho/events/favors/talk_to_me.rpy | 14 +++++------ game/scripts/characters/cho/events/intro.rpy | 24 +++++++++---------- .../scripts/characters/cho/events/panties.rpy | 4 ++-- .../cho/events/quidditch/hufflepuff_match.rpy | 10 ++++---- .../cho/events/quidditch/intros.rpy | 16 ++++++------- .../characters/cho/events/quidditch/quiz.rpy | 2 +- .../cho/events/quidditch/slytherin_match.rpy | 6 ++--- .../cho/events/requests/manipulate_boys.rpy | 6 ++--- .../hermione/events/favors/dance_for_me.rpy | 2 +- .../events/favors/give_me_a_handy.rpy | 2 +- .../events/favors/give_me_a_tittyjob.rpy | 2 +- .../hermione/events/favors/grope_her_ass.rpy | 6 ++--- .../events/favors/grope_her_breasts.rpy | 2 +- .../characters/hermione/events/forest.rpy | 4 ++-- .../hermione/events/items/butt_plugs.rpy | 2 +- .../events/potions/polyjuice_luna.rpy | 2 +- .../characters/hermione/events/tutoring.rpy | 2 +- .../characters/tonks/events/clothing.rpy | 2 +- .../characters/tonks/events/clothing_old.txt | 2 +- .../characters/tonks/events/hangout.rpy | 6 ++--- .../scripts/characters/tonks/events/intro.rpy | 10 ++++---- .../events/requests/detention_with_tonks.rpy | 14 +++++------ game/scripts/events/ending.rpy | 2 +- .../inventory/potions/addictive_potion.txt | 4 ++-- .../inventory/potions/milking_potion.txt | 4 ++-- .../inventory/potions/polyjuice_potion.txt | 4 ++-- .../minigames/mirror/events/whose_points.rpy | 2 +- 33 files changed, 120 insertions(+), 121 deletions(-) diff --git a/game/scripts/characters/astoria/events/intro.rpy b/game/scripts/characters/astoria/events/intro.rpy index 1829f38a..71bdfe98 100644 --- a/game/scripts/characters/astoria/events/intro.rpy +++ b/game/scripts/characters/astoria/events/intro.rpy @@ -272,7 +272,7 @@ 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 "{shake}AN unforgivable CURSE!!!{/shake}" ("scream", "wide", "base", "stare", trans=hpunch) + her "{shake}AN unforgivable CURSE!!!{/shake}" ("scream", "wide", "base", "stare") with 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") @@ -468,7 +468,7 @@ label astoria_intro_E3: her "Get in here, Astoria!" ("annoyed", "narrow", "angry", "R", flip=True) ast "{size=+2}{b}No!{/b}{/size}" - her "Do you want to make this worse?" ("scream", "closed", "base", "mid", trans=hpunch) + her "Do you want to make this worse?" ("scream", "closed", "base", "mid") with hpunch ast "No..." hide hermione_main hide screen bld1 @@ -625,8 +625,8 @@ label astoria_intro_E3: sna "I expect better than this from my students, Miss Greengrass..." ("snape_10") sna "The very first lesson I give you is...{w=0.4} Don't--" ("snape_08") - sna "Get--" ("snape_08", trans=hpunch) - sna "Caught!" ("snape_15", trans=hpunch) + sna "Get--" ("snape_08") with hpunch + sna "Caught!" ("snape_15") with hpunch pause.5 sna "Do you have anything to say for yourself?" ("snape_10") @@ -726,7 +726,7 @@ label astoria_intro_E3: ton "Want to tell me what you made her do?" ("horny", "base", "angry", "L") gen "(Doesn't she already know that?)" ("base", xpos="far_left", ypos="head") ast "I might have made her show her boobs to some students..." ("annoyed", "narrow", "base", "R") - ton "*Ha-ha-ha-ha*!" ("silly", "happyCl", "base", "mid", trans=hpunch) + ton "*Ha-ha-ha-ha*!" ("silly", "happyCl", "base", "mid") with hpunch ast "Only for a second!" ("clench", "base", "base", "mid") gen "(What's going on here?)" ("base", xpos="far_left", ypos="head") ton "Is that all?" ("open", "base", "raised", "L") diff --git a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy index 9a9ea3fc..1b0338b7 100644 --- a/game/scripts/characters/astoria/events/spells/imperio_susan.rpy +++ b/game/scripts/characters/astoria/events/spells/imperio_susan.rpy @@ -365,7 +365,7 @@ label ag_se_imperio_sb_E2: gen "I am, Miss Bones..." ("base", xpos="far_left", ypos="head") gen "Hiding away those glorious milk duds of yours is a serious offence!" ("grin", xpos="far_left", ypos="head") ast "(*Pffft*, gloriously gross...)" ("annoyed", "base", "angry", "R", xpos="base", ypos="base") - sus @ cheeks blush "P-professor Dumbledore! Why would you say s-something like that!" ("angry", "wide", "sad", "stare", trans=hpunch) #Perhaps she should be a bit intrigued =Blush + sus @ cheeks blush "P-professor Dumbledore! Why would you say s-something like that!" ("angry", "wide", "sad", "stare") with hpunch #Perhaps she should be a bit intrigued =Blush call ast_chibi("wand",530,"base") sus @ cheeks blush "I think I better go..." ("disgust", "base", "sad", "right") @@ -376,7 +376,7 @@ label ag_se_imperio_sb_E2: # Astoria casts imperio. stop music fadeout 2.0 hide susan_main - ast "{shake}IMPERIO!{/shake}{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") with hpunch # Screams it even louder scene onlayer dolls hide screen bld1 @@ -668,7 +668,7 @@ label ag_se_imperio_sb_E3: # Astoria casts imperio. stop music fadeout 2.0 hide susan_main - ast "{shake}IMPERIO!{/shake}{w=0.8}{nw}" ("scream", "base", "angry", "mid", trans=hpunch) + ast "{shake}IMPERIO!{/shake}{w=0.8}{nw}" ("scream", "base", "angry", "mid") with hpunch scene onlayer dolls hide screen bld1 @@ -725,7 +725,7 @@ label ag_se_imperio_sb_E3: pause.8 nar "Susan's eyes drift down to her exposed chest." - sus "{shake}WHAT?!?!?{/shake}" ("angry", "wide", "shocked", "down", trans=hpunch) + sus "{shake}WHAT?!?!?{/shake}" ("angry", "wide", "shocked", "down") with 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") @@ -747,7 +747,7 @@ label ag_se_imperio_sb_E3: sus "..." ("soft", "narrow", "base", "stare") ast "Alright... that'll shut her up...{w} what should we make her do this time, [name_genie_astoria]?" ("open", "closed", "base", "mid") gen "*Hmm*... Are you actually going to let me choose this time, or are you just asking to be annoying?" ("base", xpos="far_left", ypos="head") - ast "Hey! I am not annoying!" ("scream", "narrow", "angry", "mid", trans=vpunch) + ast "Hey! I am not annoying!" ("scream", "narrow", "angry", "mid") with vpunch gen "So, are you going to let me pick then?" ("base", xpos="far_left", ypos="head") ast "Fine... Just nothing too disgusting!" ("clench", "narrow", "base", "mid") ast "Or boring... that'd be even worse!" ("upset", "narrow", "angry", "mid") @@ -881,7 +881,7 @@ label ag_se_imperio_sb_E3: sus "The way Professor Dumbledore's stroking his {b}cock{/b}..." ast "" ("smile", "narrow", "angry", "R") sus "I just want to--" - ast "(*Eeeegh*...)" ("scream", "closed", "angry", "mid",trans=hpunch) + ast "(*Eeeegh*...)" ("scream", "closed", "angry", "mid") with hpunch sus "..." nar "You hear Susan's words trail off into nothingness, as she takes another breath..." @@ -895,8 +895,7 @@ label ag_se_imperio_sb_E3: ast "*Hmm*... I'm not sure I heard anything. What about you, sir?" ("annoyed", "base", "base", "R") 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!" + sus "I'm a slut, OK!" with hpunch 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--" diff --git a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy index 26270870..edabe9a3 100644 --- a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy +++ b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy @@ -184,7 +184,7 @@ label ag_st_imperio_E1: # Astoria casts imperio. stop music fadeout 2.0 - ast "{shake}IMPERIO!{/shake}{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") with hpunch # Screams it even louder scene onlayer dolls hide screen bld1 @@ -252,7 +252,7 @@ label ag_st_imperio_E1: ast "Do it already!" ("angry", "base", "angry", "L") ast "*Oink!*{w=0.8}-*oink*!{w=0.8}-*oink*!" ("clench", "closed", "angry", "mid") # Angry gen "*He-he-he!*" ("grin", xpos="far_left", ypos="head") - ast "*Oink*...{w=0.8} you pig!" ("scream", "base", "angry", "L", trans=hpunch) # Screaming + ast "*Oink*...{w=0.8} you pig!" ("scream", "base", "angry", "L") with hpunch # Screaming ast "" ("clench", "narrow", "angry", "L") gen "I don't believe she's going to do it..." ("base", xpos="far_left", ypos="head") ast "But!" ("clench", "closed", "base", "mid") @@ -274,7 +274,7 @@ label ag_st_imperio_E1: ton @ cheeks blush "Oh my..." ("soft", "base", "worried", "down", xpos="right", ypos="base") ton @ cheeks blush "Well that was fun!" ("base", "happyCl", "base", "down") # Happy ast "No it wasn't!" ("clench", "narrow", "angry", "mid") - ast "Why weren't you doing pig noises!?" ("scream", "closed", "angry", "mid", trans=hpunch) + ast "Why weren't you doing pig noises!?" ("scream", "closed", "angry", "mid") with hpunch ast "You refused to do what I demanded!" ("annoyed", "narrow", "angry", "R") ton "Yes I did!" ("soft", "base", "base", "R") ton "It was quite easy, actually." ("normal", "base", "raised", "down") @@ -334,7 +334,7 @@ label ag_st_imperio_E2: # Astoria casts imperio. stop music fadeout 2.0 - ast "{shake}IMPERIO!{/shake}{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") with hpunch # Screams it even louder scene onlayer dolls hide screen bld1 @@ -433,7 +433,7 @@ label ag_st_imperio_E2: ast "Do it again piggy! Ten times!" ("clench", "narrow", "angry", "L") # Angry ton @ cheeks blush "*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*{w=0.2}-*oink*!" ("open_wide_tongue", "wide", "base", "ahegao") gen "......................." ("base", xpos="far_left", ypos="head") - ast "Agai--" ("scream", "closed", "angry", "mid", trans=hpunch) + ast "Agai--" ("scream", "closed", "angry", "mid") with hpunch gen "That's enough, Astoria!" ("angry", xpos="far_left", ypos="head") ast "Fine..." ("annoyed", "narrow", "angry", "R") @@ -470,7 +470,7 @@ label ag_st_imperio_E2: # Astoria casts imperio. stop music fadeout 2.0 - ast "{shake}IMPERIO!{/shake}{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") with hpunch # Screams it even louder scene onlayer dolls hide screen bld1 @@ -703,7 +703,7 @@ label ag_st_imperio_E3: # Astoria casts imperio. stop music fadeout 2.0 - ast "{shake}IMPERIO!{/shake}{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") with hpunch # Screams it even louder scene onlayer dolls hide screen bld1 @@ -763,7 +763,7 @@ label ag_st_imperio_E3: gen "And she'll love every second of it!" ("grin", xpos="far_left", ypos="head") ast "And she'll--" ("smile", "closed", "angry", "R") ton @ hair angry "*Tzzzzz*!..." ("upset", "closed", "annoyed", "mid", emote="angry") - ton "That's enough!" ("scream", "base", "angry", "R", trans=hpunch) + ton "That's enough!" ("scream", "base", "angry", "R") with hpunch # Tonks returns to normal, and puts her clothes back on. play sound "sounds/cloth_sound3.ogg" @@ -920,7 +920,7 @@ label ag_st_imperio_E4: # Astoria casts imperio. stop music fadeout 2.0 - ast "{shake}IMPERIO!{/shake}{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") with hpunch # Screams it even louder scene onlayer dolls hide screen bld1 @@ -1317,7 +1317,7 @@ label ag_st_imperio_E5: ast "Take off the rest of your clothes!" ("clench", "base", "angry", "L") # angry gen "Yes!" ("grin", xpos="far_left", ypos="head") - ast "Take them off, you slut!" ("scream", "closed", "angry", "mid", trans=hpunch) # scream + ast "Take them off, you slut!" ("scream", "closed", "angry", "mid") with hpunch # scream ton @ cheeks blush "........{heart}" ("normal", "wide", "shocked", "stare") # Strip naked. Removes clothes and stockings. @@ -1406,7 +1406,7 @@ label ag_st_imperio_E5: ast "" ("horny", "base", "angry", "L") ton "............" ("grin", "base", "base", "mid") ast "She's really doing everything I tell her!" ("smile", "base", "angry", "mid") - ast "Look how easy it is, Professor!" ("smile", "closed", "base", "mid", emote="hearts",trans=hpunch) + ast "Look how easy it is, Professor!" ("smile", "closed", "base", "mid", emote="hearts") with hpunch nar "Astoria joyfully jumps up and down on the spot, making a happy squeal..." scene onlayer dolls @@ -1490,7 +1490,7 @@ label ag_st_imperio_E5: pause.5 ast "*Huh*?!" ("annoyed", "narrow", "worried", "L", xpos="mid", flip=True) - ast "*Aaaaaaaaaah*!!!......................." ("scream", "base", "base", "L", emote="shocked", trans=hpunch) # Screams + ast "*Aaaaaaaaaah*!!!......................." ("scream", "base", "base", "L", emote="shocked") with hpunch # Screams hide astoria_main hide screen bld1 with d3 diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy index f57291b7..10bfeb0f 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy @@ -105,7 +105,7 @@ label cc_pf_strip_T2_intro_E1: cho @ cheeks blush "{shudder}!!!{/shudder}" ("soft", "wide", "base", "mid") play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed 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 @ cheeks blush "No!" ("scream", "happyCl", "angry", "mid") with hpunch cho "Why are you even asking me to do such a thing?!" ("angry", "narrow", "angry", "mid") 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") @@ -235,7 +235,7 @@ label cc_pf_strip_T2_intro_E1: "\"Nope, you lose\"": $ states.cho.mood += 6 - cho "{shudder}What?!{/shudder}" ("scream", "wide", "angry", "mid", trans=hpunch) + cho "{shudder}What?!{/shudder}" ("scream", "wide", "angry", "mid") with hpunch cho "" ("angry", "narrow", "angry", "mid") gen "I'm afraid, Miss Granger is simply...{w} how shall I put it...{w} sexier!" ("base", xpos="far_left", ypos="head") cho "But she doesn't even do workouts!" ("clench", "narrow", "angry", "mid") @@ -318,7 +318,7 @@ label cc_pf_strip_T2_intro_E1: $ cho_mad_about_stripping = True # Flag that enables different dialogue that is a bit more "lewd" in the next favour repeat. cho "" ("angry", "wide", "base", "mid") # Shock gen "Now take off that bra of yours and show me those titties!" ("grin", xpos="far_left", ypos="head") - cho "[name_genie_cho], how can you talk to me like that!" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "[name_genie_cho], how can you talk to me like that!" ("scream", "closed", "angry", "mid") with hpunch cho "I'm your student!" ("clench", "narrow", "angry", "mid") gen "And a very pretty one at that!" ("grin", xpos="far_left", ypos="head") cho "You disgust me, sir..." ("soft", "narrow", "angry", "mid") @@ -445,7 +445,7 @@ label cc_pf_strip_T2_intro_E2: cho "No.{w} I'm already regretting climbing up here!!!" ("mad", "closed", "worried", "mid") cho @ cheeks blush "(What were you thinking, Cho?!)" ("angry", "narrow", "worried", "down") gen "You can come back down if it's too much for yo--" ("base", xpos="far_left", ypos="head") - cho "{shudder}Shut up!{/shudder}" ("scream", "closed", "angry", "mid", trans=hpunch) # Scream + cho "{shudder}Shut up!{/shudder}" ("scream", "closed", "angry", "mid") with hpunch # Scream cho "Can't you see what I'm trying to do here?" ("angry", "narrow", "angry", "mid") gen "Not really, no." ("base", xpos="far_left", ypos="head") cho @ cheeks blush "I-I'm... testing my limits, Sir." ("angry", "narrow", "worried", "down") @@ -482,7 +482,7 @@ label cc_pf_strip_T2_intro_E2: cho "What?!" ("soft", "wide", "base", "mid") cho "But Sir!" ("soft", "base", "worried", "mid") gen "You can go now..." ("base", xpos="far_left", ypos="head") - cho "You can't do that!" ("scream", "narrow", "angry", "mid", trans=hpunch) + cho "You can't do that!" ("scream", "narrow", "angry", "mid") with hpunch cho "" ("angry", "narrow", "angry", "mid") gen "Didn't you just beg me to do just that?" ("angry", xpos="far_left", ypos="head") play music "music/GrapeSodaIsFuckingRawbyjrayteam6.ogg" fadein 1 if_changed @@ -491,7 +491,7 @@ label cc_pf_strip_T2_intro_E2: cho @ cheeks blush "How can I overcome my fear of losing if I can't even do... this!" ("annoyed", "base", "worried", "down") cho "You're supposed to encourage me!{w=0.6} Get me through any challenges I'm confronted with." ("soft", "narrow", "angry", "mid") gen "Including stripping?" ("base", xpos="far_left", ypos="head") - cho "Including bloody stripping!" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "Including bloody stripping!" ("scream", "closed", "angry", "mid") with hpunch cho "" ("annoyed", "narrow", "angry", "mid") gen "To my defence. I got some mixed messages from you earlier..." ("base", xpos="far_left", ypos="head") cho "(...)" ("annoyed", "narrow", "angry", "R") # Annoyed @@ -582,7 +582,7 @@ label cc_pf_strip_T2_intro_E2: cho "And you'd be called a dead man, if you try to trick me!" ("clench", "narrow", "angry", "mid") gen "Well technically I'm a geni--" ("base", xpos="far_left", ypos="head") play sound "sounds/kick.ogg" - cho "" ("annoyed", "narrow", "angry", "mid", trans=vpunch) + cho "" ("annoyed", "narrow", "angry", "mid") with vpunch gen "Aaaaah!" ("angry", xpos="far_left", ypos="head") nar "Cho does a daunting stomp on your desk..." cho "Don't think for a second I wouldn't do it! After all of this!" ("scream", "narrow", "angry", "mid") @@ -671,7 +671,7 @@ label cc_pf_strip_T2_intro_E2: gen "I can see why Hermione is so jealous." ("base", xpos="far_left", ypos="head") cho @ cheeks blush "" ("upset", "base", "base", "mid") pause .8 - cho @ cheeks blush "She is?" ("scream", "wide", "base", "mid", trans=vpunch) + cho @ cheeks blush "She is?" ("scream", "wide", "base", "mid") with vpunch cho @ cheeks heavy_blush "" ("horny", "base", "base", "down") gen "Look who perked up all of a sudden." ("base", xpos="far_left", ypos="head") cho @ cheeks blush "She should be jealous!{w=0.6} These thighs could snap a broom in half if I tried hard enough." ("smile", "narrow", "angry", "mid") @@ -730,7 +730,7 @@ label cc_pf_strip_T2_intro_E2: gen "Aren't you forgetting about something?" ("base", xpos="far_left", ypos="head") cho "Sir?" ("soft", "narrow", "base", "mid") gen "You're still naked...{w} I wouldn't go out there if I were you..." ("base", xpos="far_left", ypos="head") - cho @ cheeks blush "Oh, of course!" ("soft", "wide", "base", "mid", trans=hpunch) + cho @ cheeks blush "Oh, of course!" ("soft", "wide", "base", "mid") with hpunch call cho_walk("desk", "base") pause .5 @@ -855,7 +855,7 @@ label cc_pf_strip_T2_intro_E3: gen "We had an eyewitness, for what it's worth..." ("base", xpos="far_left", ypos="head") cho "Seriously?! Who was it?" ("smile", "base", "base", "mid") gen "Snape..." ("base", xpos="far_left", ypos="head") - cho "What?! Professor Snape?" ("scream", "wide", "base", "mid", trans=hpunch) + cho "What?! Professor Snape?" ("scream", "wide", "base", "mid") with hpunch cho "" ("smile", "wide", "base", "mid") gen "He sort of just walked in on the action.{w} After all, the door wasn't locked..." ("base", xpos="far_left", ypos="head") cho "That's too funny! I wish I could have been there!" ("smile", "base", "base", "R") @@ -1146,7 +1146,7 @@ label cc_pf_strip_T2_E3_fail: gen "Actually, she doesn't..." ("base", xpos="far_left", ypos="head") cho "What? But I thought she'd--" ("soft", "wide", "base", "mid") - cho "Why do you ask me to do these favours, and not Granger?" ("open", "narrow", "angry", "mid", trans=hpunch) + cho "Why do you ask me to do these favours, and not Granger?" ("open", "narrow", "angry", "mid") with hpunch gen "Let's just say, she isn't as progressive as you...{w} yet." ("base", xpos="far_left", ypos="head") cho "You haven't even seen her naked?" ("angry", "base", "base", "mid") cho "What favours are you even buying from her?" ("open", "base", "angry", "mid") diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy index bfce570b..c9756c38 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy @@ -24,7 +24,7 @@ label cc_pf_strip_T2_E3_hermione: call her_walk(660, "base") cho "" ("smile", "narrow", "angry", "L", xpos="mid", ypos="base", flip=True) - her "What the bloody hell is going on here?!" ("scream", "closed", "base", "mid", xpos="right", ypos="base", trans=hpunch) # Scream + her "What the bloody hell is going on here?!" ("scream", "closed", "base", "mid", xpos="right", ypos="base") with hpunch # Scream her "" ("angry", "base", "angry", "mid") cho "You know, just the usual..." ("soft", "base", "base", "L") @@ -136,7 +136,7 @@ label cc_pf_strip_T2_E3_hermione_choices: pause .2 - cho "{size=+4}Give them back, you bitch!{/size}" ("scream", "narrow", "angry", "L", trans=hpunch) + cho "{size=+4}Give them back, you bitch!{/size}" ("scream", "narrow", "angry", "L") with hpunch play sound "sounds/run_03.ogg" call cho_walk(action="leave", speed=2) @@ -159,7 +159,7 @@ label cc_pf_strip_T2_E3_hermione_choices: cho "Sir, could you please repeat that for me?" ("clench", "closed", "angry", "mid") gen "Hermione's body is superior." ("base", xpos="far_left", ypos="head") her "No surprise there..." ("base", "base", "base", "R") - cho "No!{w} It clearly isn't!" ("scream", "narrow", "angry", "mid", trans=hpunch) + cho "No!{w} It clearly isn't!" ("scream", "narrow", "angry", "mid") with hpunch cho "Are you mad, old man?" ("angry", "narrow", "angry", "mid") her "Don't use that tone with the headmaster..." ("soft", "closed", "base", "mid") cho "Nobody asked you!" ("mad", "narrow", "angry", "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} {shake}You snobby skunk!{/shake}" ("scream", "narrow", "angry", "L", trans=hpunch) + cho "How dare you!{w=0.6} {shake}You snobby skunk!{/shake}" ("scream", "narrow", "angry", "L") with 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") diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy index 4053bbb2..04d1c865 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy @@ -794,7 +794,7 @@ label cc_pf_strip_T3_intro_E2: "\"Severus! Please, stay and watch.\"": if cc_strip_no_snape: # Cho clearly told you she won't strip for Snape. $ states.cho.mood += 30 - cho "{shake}Are you mad?!{/shake}" ("clench", "base", "angry", "mid", trans=hpunch) + cho "{shake}Are you mad?!{/shake}" ("clench", "base", "angry", "mid") with hpunch cho "Sir, I clearly told you before, I won't do this in front of Professor Snape!" ("open", "base", "angry", "mid") sna "So you actually considered inviting me..." ("snape_20") cho @ cheeks blush "" ("normal", "base", "angry", "L") @@ -849,7 +849,7 @@ label cc_pf_strip_T3_intro_E2: $ cho_chibi.zorder = 3 # Reset to default. call cho_chibi("stand", 314, 366, flip=True) ton "" ("annoyed", "narrow", "raised", "downR") - cho "But the entire Slytherin team drank some! They were even bragging about it!" ("clench", "narrow", "angry", "L", xpos=275, ypos="base", flip=True, trans=hpunch) + cho "But the entire Slytherin team drank some! They were even bragging about it!" ("clench", "narrow", "angry", "L", xpos=275, ypos="base", flip=True) with hpunch sna "I suppose if that's what they said, then who am I to refute it..." ("snape_37") #smirk sna "Now, if you'll excuse me..." ("snape_09") @@ -875,7 +875,7 @@ label cc_pf_strip_T3_intro_E2: play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed sna "" ("snape_13") ton @ hair horny "" ("annoyed", "shocked", "raised", "stare", xpos=310, ypos="base", flip=True) - cho "First you're going to explain yourself!" ("clench", "base", "angry", "L", xpos=415, ypos="base", flip=True, trans=hpunch) + cho "First you're going to explain yourself!" ("clench", "base", "angry", "L", xpos=415, ypos="base", flip=True) with hpunch ton @ cheeks blush hair horny "" ("clench", "wide", "shocked", "L") cho "You somehow tricked them! They played far better than usual." ("mad", "base", "angry", "L") ton @ cheeks heavy_blush hair horny "" ("horny", "narrow", "worried", "down") diff --git a/game/scripts/characters/cho/events/favors/talk_to_me.rpy b/game/scripts/characters/cho/events/favors/talk_to_me.rpy index e9c9ae2b..d4183389 100644 --- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy @@ -59,7 +59,7 @@ label cc_pf_talk_T1_intro_E1: cho "What would you like to talk about?" ("soft", "base", "base", "mid") gen "Do you have a boyfriend, Miss Chang?" ("base", xpos="far_left", ypos="head") - cho "Excuse me?" ("open", "wide", "base", "mid", trans=hpunch) # Shocked + cho "Excuse me?" ("open", "wide", "base", "mid") with hpunch # Shocked gen "I asked if you have a boyfriend... Anybody you fool around with?" ("base", xpos="far_left", ypos="head") cho @ cheeks blush "Me? sir? Ha--{w=0.4} hav--{w=0.4} a boyfriend?" ("open", "wide", "base", "R") # Reluctant, Embarassed gen "Or a girlfriend! That would be even better, now that I think about it!" ("grin", xpos="far_left", ypos="head") @@ -119,7 +119,7 @@ label cc_pf_talk_T1_intro_E1: gen "Very sexual!" ("angry", xpos="far_left", ypos="head") cho "{shake}!!!{/shake}" ("annoyed", "wide", "base", "mid") gen "Lots of acrobatic stuff!" ("grin", xpos="far_left", ypos="head") - cho "No Sir, please!{w=0.5} I don't want to know any of that!" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "No Sir, please!{w=0.5} I don't want to know any of that!" ("scream", "closed", "angry", "mid") with hpunch cho "(Gross!{w=0.5} Keep it to yourself...)" ("angry", "narrow", "worried", "R") gen "I just wanted to expand my backstory a little bit...{w=0.5} What's so wrong with that..." ("base", xpos="far_left", ypos="head") @@ -706,7 +706,7 @@ label cc_pf_talk_T2_intro_E1: cho "We'll be playing against them next." ("annoyed", "narrow", "base", "R") cho "And of course they have to behave like the absolute worst!" ("soft", "narrow", "angry", "mid") - cho "They deserve to be publicly disgraced in front of the whole school!{w=0.8} The whole lot of them!" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "They deserve to be publicly disgraced in front of the whole school!{w=0.8} The whole lot of them!" ("scream", "closed", "angry", "mid") with hpunch cho "I'll make sure of it, [name_genie_cho]!{w=0.6} The Slytherin team will lose!" ("mad", "narrow", "angry", "mid") gen "(And I'll win my bet with Snape even sooner! Sweet!)" ("grin", xpos="far_left", ypos="head") gen "Anything you can tell me about them?{w=0.6} Are they better than Hufflepuff?" ("base", xpos="far_left", ypos="head") @@ -762,7 +762,7 @@ label cc_pf_talk_T2_intro_E1: cho @ cheeks blush "After all, I'm only a small, helpless girl{w=0.6}, and they are a group of strong, ruthless alpha males!" ("soft", "base", "worried", "R") cho "Their attempts are pathetic!" ("angry", "narrow", "angry", "mid") - cho "They are pathetic!!!" ("clench", "narrow", "angry", "mid", trans=hpunch) + cho "They are pathetic!!!" ("clench", "narrow", "angry", "mid") with hpunch cho "Trying to lift my skirt with first-year spells..." ("soft", "narrow", "angry", "R") cho "Stealing my underwear while I'm taking a shower after practice..." ("angry", "narrow", "angry", "downR") if states.gen.masturbating: @@ -1016,7 +1016,7 @@ label cc_pf_talk_T2_intro_E2: call cum_block pause .8 - cho @ cheeks heavy_blush "[name_genie_cho]! What the bloody hell are you doing?!" ("angry", "wide", "base", "mid", trans=hpunch) + cho @ cheeks heavy_blush "[name_genie_cho]! What the bloody hell are you doing?!" ("angry", "wide", "base", "mid") with hpunch gen "{size=-4}(Oh no!){/size}" ("base", xpos="far_left", ypos="head") gen "{size=-4}(I'm busted!){/size}" ("angry", xpos="far_left", ypos="head") @@ -1035,7 +1035,7 @@ label cc_pf_talk_T2_intro_E2: cho @ cheeks heavy_blush "Don't tell me you were..." ("disgust", "happyCl", "worried", "mid") gen "I was merely scratching my leg!" ("angry", xpos="far_left", ypos="head") cho "Don't lie to me, [name_genie_cho]!{w=0.6} I know exactly what you were doing!" ("clench", "narrow", "angry", "mid") - cho "{size=+4}You were touching yourself!{/size}" ("scream", "closed", "angry", "mid", trans=hpunch) # Scream + cho "{size=+4}You were touching yourself!{/size}" ("scream", "closed", "angry", "mid") with hpunch # Scream cho "" ("angry", "narrow", "angry", "mid") gen "Not so loud! People might hear you!" ("angry", xpos="far_left", ypos="head") cho @ cheeks blush "Why would you think I care?!" ("open", "narrow", "angry", "L") @@ -1266,7 +1266,7 @@ label cc_pf_talk_T2_E3: gen "(...)" ("base", xpos="far_left", ypos="head") cho "While there are bludgers flying around, hitting her disgusting udders..." ("soft", "narrow", "angry", "downR") gen "*Uhm*..." ("base", xpos="far_left", ypos="head") - cho "What?!" ("angry", "narrow", "angry", "mid", trans=hpunch) # Angry + cho "What?!" ("angry", "narrow", "angry", "mid") with hpunch # Angry gen "Don't you think that's a bit extreme?" ("base", xpos="far_left", ypos="head") cho "Why? For putting Granger in her natural habitat?" ("annoyed", "narrow", "angry", "mid") cho "Enclosed on a vast grassy field..." ("soft", "closed", "base", "mid") diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index ca7c2206..1dde6644 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -195,7 +195,7 @@ label cho_intro_E1: with d3 her "Professor, I'm sorry to bother you, but I wanted to..." ("open", "closed", "base", "mid", xpos="base", ypos="base", flip=False) - her "{shudder}!!!{/shudder}" ("normal", "wide", "base", "stare", trans=hpunch) + her "{shudder}!!!{/shudder}" ("normal", "wide", "base", "stare") with hpunch call her_walk(570, "base") call her_chibi("stand",570,"base") @@ -210,10 +210,10 @@ label cho_intro_E1: cho "Oh, you know...{w=0.5} Just having a discussion with our dear headmaster..." ("soft", "base", "base", "R") play sound "sounds/slap_03.ogg" - her "{size=-5}Bitch...{/size}" ("angry", "closed", "angry", "mid", trans=hpunch) + her "{size=-5}Bitch...{/size}" ("angry", "closed", "angry", "mid") with hpunch play sound "sounds/slap_02.ogg" - cho "{size=-5}Whore...{/size}" ("clench", "closed", "angry", "mid", trans=hpunch) + cho "{size=-5}Whore...{/size}" ("clench", "closed", "angry", "mid") with hpunch her @ cheeks blush "..." ("normal", "squint", "angry", "L") cho "..." ("upset", "narrow", "base", "L") her @ cheeks blush "So... What have you been discussing?{w=0.4} Anything I should know?" ("open", "squint", "base", "mid") @@ -328,7 +328,7 @@ label cho_intro_E1: cho "*Hmph*... There's no argument here..." ("open", "narrow", "angry", "L") cho "I'm sure that Hermione's reasons for interrupting are totally valid..." ("upset", "narrow", "angry", "R") her "And I'm sure Cho wasn't just coming here to flaunt her body..." ("soft", "narrow", "base", "L") - cho "{shake}What's that supposed to mean?!?{/shake}" ("clench", "narrow", "angry", "R", trans=vpunch) + cho "{shake}What's that supposed to mean?!?{/shake}" ("clench", "narrow", "angry", "R") with vpunch gen "(I guess I'll just have to wait this one out...)" ("base", xpos="far_left", ypos="head") # Black screen @@ -344,14 +344,14 @@ label cho_intro_E1: play sound "sounds/snore1.ogg" gen "*Snore*{w=2.0}{nw}" her "" ("annoyed", "narrow", "annoyed", "R") - cho "As if I'm going to believe that nonsense, Granger!" ("angry", "narrow", "angry", "R", trans=vpunch) + cho "As if I'm going to believe that nonsense, Granger!" ("angry", "narrow", "angry", "R") with vpunch play sound "sounds/snore2.ogg" gen "......{w=0.5}*Snore*{w=1.0}{nw}" her "I had completely legitimate reasons for coming here..." ("soft", "closed", "base", "mid") her "You tell her Professor!" ("open", "base", "annoyed", "mid") play sound "sounds/snore3.ogg" gen "*Sn{cps=8}oooooooreeee*{/cps}{w=2.0}{nw}" - her "{shake}Professor!{/shake}" ("scream", "base", "angry", "mid", trans=hpunch) + her "{shake}Professor!{/shake}" ("scream", "base", "angry", "mid") with hpunch gen "*Grunt* {size=-4}Huh, what?{/size}" ("angry", xpos="far_left", ypos="head") her "I always have a valid reason for coming here, don't I?" ("base", "base", "base", "mid") gen "Of course you--" ("base", xpos="far_left", ypos="head") @@ -432,7 +432,7 @@ label cho_intro_E2: call cho_walk("desk", "base") pause .2 - cho "{shake}I hate her!{/shake}" ("scream", "closed", "angry", "mid", xpos="mid", ypos="base", trans=hpunch) + cho "{shake}I hate her!{/shake}" ("scream", "closed", "angry", "mid", xpos="mid", ypos="base") with hpunch cho "" ("clench", "narrow", "angry", "mid") gen "Miss Chang! My favourite student!" ("grin", xpos="far_left", ypos="head") @@ -443,7 +443,7 @@ label cho_intro_E2: gen "{size=-4}Please don't hurt me.{/size}" ("angry", xpos="far_left", ypos="head") cho "How could you have done this?{w=0.6} Sending this dim-witted Gryffindor tramp after me?" ("open", "narrow", "angry", "mid") gen "W-who?" ("angry", xpos="far_left", ypos="head") - cho "{shake}Granger!{/shake}" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "{shake}Granger!{/shake}" ("scream", "closed", "angry", "mid") with hpunch gen "Aaa-h!" ("angry", xpos="far_left", ypos="head") # Girly scream cho "Gryffindor's role model student..." ("angry", "narrow", "angry", "mid") cho "She's out there spreading mean rumours about me!" ("open", "narrow", "angry", "R") @@ -451,7 +451,7 @@ label cho_intro_E2: cho "The worst kind! That I'm cheating at Quidditch!" ("angry", "narrow", "angry", "down") cho "How am I cheating, Professor? Ravenclaw is always in last place?!" ("soft", "narrow", "worried", "downR") cho "Not to mention that she's told everyone that I'm whoring myself out to my other classmates, and even my teachers!" ("open", "narrow", "angry", "L") - cho "I did none of that, Professor! {shudder}None!{/shudder}" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "I did none of that, Professor! {shudder}None!{/shudder}" ("scream", "closed", "angry", "mid") with hpunch cho "And she still won't lay off her stupid equality movement thing!" ("annoyed", "narrow", "angry", "mid") gen "You need to calm down, girl." ("base", xpos="far_left", ypos="head") cho "{size=-4}When I'm out of here I'm going to rip that bitch's head off...{/size}" ("clench", "narrow", "angry", "downR") @@ -475,7 +475,7 @@ label cho_intro_E2: cho "Then do something about it!" ("clench", "closed", "angry", "mid") cho "And don't even think about calling me to your office again..." ("open", "narrow", "angry", "mid") cho "Not until you've dealt with that skank!" ("clench", "narrow", "angry", "mid") - cho "Do I make myself clear, Sir?" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "Do I make myself clear, Sir?" ("scream", "closed", "angry", "mid") with hpunch cho "" ("angry", "narrow", "angry", "mid") gen "I suppose..." ("base", xpos="far_left", ypos="head") @@ -737,7 +737,7 @@ label cho_intro_E3: her "I worked very hard on gathering all records of past Quidditch matches, throughout the complete history of Quidditch!" ("open", "wink", "base", "mid") her "You'd be surprised just how few female--" ("soft", "closed", "base", "mid") gen "I'll give you ten house points." ("base", xpos="far_left", ypos="head") - her "Ten points?" ("soft", "wide", "base", "stare", trans=hpunch) + her "Ten points?" ("soft", "wide", "base", "stare") with hpunch her "Sir, do you even realise how much time it took me to do all that research?" ("angry", "squint", "angry", "mid") gen "Twenty?" ("base", xpos="far_left", ypos="head") her "One hundred!" ("angry", "closed", "angry", "mid") @@ -768,7 +768,7 @@ label cho_intro_E3: pass "\"Fifty points!\"": - her "What?... Only Fifty?!" ("shock", "wide", "base", "stare", trans=hpunch) + her "What?... Only Fifty?!" ("shock", "wide", "base", "stare") with hpunch gen "Yes, only fifty! Because you are being unreasonable." ("base", xpos="far_left", ypos="head") her "But you made it sound like it was something important to you!" ("disgust", "narrow", "worried", "mid_soft") gen "And you believe that I'd just throw a hundred points at you because of that?" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/cho/events/panties.rpy b/game/scripts/characters/cho/events/panties.rpy index 418e28be..97ffc618 100644 --- a/game/scripts/characters/cho/events/panties.rpy +++ b/game/scripts/characters/cho/events/panties.rpy @@ -30,7 +30,7 @@ label cho_panties_response_T2: gen "Anything wrong?" ("base", xpos="far_left", ypos="head") cho "They are covered in semen." ("soft", "narrow", "base", "R") gen "What was that?" ("base", xpos="far_left", ypos="head") - cho "Semen, Sir!" ("scream", "narrow", "angry", "mid", trans=hpunch) # Scream + cho "Semen, Sir!" ("scream", "narrow", "angry", "mid") with hpunch # Scream cho "" ("annoyed", "narrow", "angry", "mid") gen "You are correct!{w} They are indeed covered in a thick load of filthy, nasty reeking semen!" ("angry", xpos="far_left", ypos="head") gen "Who could have done this?!" ("grin", xpos="far_left", ypos="head") @@ -43,7 +43,7 @@ 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 "{shudder}*Argh*!{/shudder}" ("angry", "narrow", "angry", "mid", trans=hpunch) + cho "{shudder}*Argh*!{/shudder}" ("angry", "narrow", "angry", "mid") with 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") diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 14511e75..86c548de 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -966,12 +966,12 @@ label hufflepuff_match: her "Oh..." ("normal", "wide", "worried", "shocked") her "So, should I announce it now?" ("open", "happyCl", "worried", "mid") sna "Obviously--" ("snape_12", ypos="head") - cho "{size=+10}YES!{/size}" ("scream", "closed", "angry", "mid", trans=vpunch) + cho "{size=+10}YES!{/size}" ("scream", "closed", "angry", "mid") with vpunch her "" ("normal", "base", "annoyed", "L") - cho "{size=+6}WHAT ARE YOU EVEN WAITING FOR?{/size}" ("clench", "narrow", "angry", "L", trans=hpunch) - her "Don't scream at me like that, {b}bitch!{/b}" ("scream", "base", "angry", "mid", trans=hpunch) + cho "{size=+6}WHAT ARE YOU EVEN WAITING FOR?{/size}" ("clench", "narrow", "angry", "L") with hpunch + her "Don't scream at me like that, {b}bitch!{/b}" ("scream", "base", "angry", "mid") with hpunch her "" ("normal", "base", "angry", "mid") - cho "{size=+6}WHAT DID YOU JUST CALL ME?!!!{/size}" ("scream", "wide", "angry", "L", trans=vpunch) + cho "{size=+6}WHAT DID YOU JUST CALL ME?!!!{/size}" ("scream", "wide", "angry", "L") with vpunch cho "" ("clench", "wide", "angry", "L") her "Everyone, Ravenclaw wins!" ("grin", "happy", "base", "mid_soft") cho "" ("annoyed", "narrow", "angry", "L") @@ -1090,7 +1090,7 @@ label hufflepuff_match_return: call cho_walk("desk", "base", action="enter") play sound "sounds/punch01.ogg" - cho "We beat Hufflepuff!!!" ("silly", "happyCl", "base", "mid", xpos="mid", ypos="base", trans=hpunch) + cho "We beat Hufflepuff!!!" ("silly", "happyCl", "base", "mid", xpos="mid", ypos="base") with hpunch play sound "sounds/MaleGasp.ogg" gen "{size=+10}IT WASN'T ME!{/size}" ("angry", xpos="far_left", ypos="head") gen "..........." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 15977479..7319dfb3 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -91,7 +91,7 @@ label cho_quid_E1: gen "*He-he-he*...{w} Now you've said it!" ("grin", xpos="far_left", ypos="head") cho "Could we please just talk about your plan, [name_genie_cho]?" ("open", "narrow", "angry", "R") gen "Patience, [name_cho_genie]." ("base", xpos="far_left", ypos="head") - cho "{shudder}Tell me!{/shudder}" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "{shudder}Tell me!{/shudder}" ("scream", "closed", "angry", "mid") with hpunch cho "" ("annoyed", "narrow", "angry", "mid") gen "We'll hit him where he least expects it!" ("base", xpos="far_left", ypos="head") @@ -102,7 +102,7 @@ label cho_quid_E1: gen "If we entice him during the game he'll lose focus..." ("base", xpos="far_left", ypos="head") cho "Entice...{w=0.4} what are you--" ("clench", "base", "base", "mid") - cho "Sir, this is just ridiculous!" ("scream", "closed", "angry", "mid", trans=hpunch) + cho "Sir, this is just ridiculous!" ("scream", "closed", "angry", "mid") with hpunch cho "I thought a highly regarded wizard of your stature would know at least something that could help us at Quidditch." ("open", "narrow", "angry", "mid") cho "I didn't hold it against you that you seemingly know very little about the sport." ("open", "base", "angry", "R") gen "Which I proved you wrong, but who cares..." ("base", xpos="far_left", ypos="head") @@ -303,7 +303,7 @@ label cho_quid_E3: stop music fadeout 1 - cho "[name_genie_cho], there's been a disaster!" ("scream", "closed", "angry", "mid", xpos="mid", ypos="base", trans=hpunch) + cho "[name_genie_cho], there's been a disaster!" ("scream", "closed", "angry", "mid", xpos="mid", ypos="base") with hpunch play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed @@ -377,7 +377,7 @@ label cho_quid_E3: cho "(I can already picture it...{w=0.8} the whole school laughing...)" ("silly", "base", "raised", "up") gen "Miss Chang?" ("base", xpos="far_left", ypos="head") cho "Oh, thank you for handling it professor!" ("open", "base", "base", "mid") - cho "Boy, you took a load off my mind..." ("silly", "happyCl", "base", "mid", trans=hpunch) + cho "Boy, you took a load off my mind..." ("silly", "happyCl", "base", "mid") with hpunch gen "(...)" ("base", xpos="far_left", ypos="head") cho "I'll be heading back to class, if you don't mind." ("soft", "closed", "base", "mid") @@ -404,7 +404,7 @@ label cho_quid_E4: her "Wait...{w=0.3} What did you say?" ("open", "squint", "base", "mid") gen "I was going to ask you if you'd commentate this year's Quidditch games..." ("base", xpos="far_left", ypos="head") her "You want me... to commentate this year's Inter-House Quidditch cup?" ("open", "wide", "base", "mid") - her "I'd be honoured, sir!" ("scream", "closed", "base", "mid", trans=hpunch) + her "I'd be honoured, sir!" ("scream", "closed", "base", "mid") with hpunch her "Quidditch has always been one of my passions, to be able to commentate it..." ("open", "base", "angry", "mid") her "Not to mention getting to make all the announcements..." ("smile", "base", "base", "R") her "The speeches..." ("grin", "happy", "base", "mid") @@ -415,12 +415,12 @@ label cho_quid_E4: else: her "Everybody will be focused on me..." ("soft", "narrow", "annoyed", "up") - her "{shudder}I accept!{/shudder}" ("scream", "closed", "angry", "mid", trans=hpunch) + her "{shudder}I accept!{/shudder}" ("scream", "closed", "angry", "mid") with hpunch gen "I thought you just said you didn't--" ("angry", xpos="far_left", ypos="head") her "Cho will be so {shake}mad!{/shake}" ("crooked_smile", "happy", "base", "mid") gen "I see..." ("base", xpos="far_left", ypos="head") gen "Congratulations then, [name_hermione_genie]! You got the job." ("grin", xpos="far_left", ypos="head") - her "{shudder}Ah!!!{/shudder} I better start learning--{w=0.4} I mean, preparing my opening speech!" ("open", "wide", "base", "mid", trans=hpunch) + her "{shudder}Ah!!!{/shudder} I better start learning--{w=0.4} I mean, preparing my opening speech!" ("open", "wide", "base", "mid") with hpunch call her_walk(action="leave", speed=1.5) @@ -500,7 +500,7 @@ label cho_quid_E6: call her_walk("desk", "base") her "" ("annoyed", "narrow", "angry", "mid", xpos="mid", ypos="base") # annoyed pause .5 - her "I can't believe her..." ("clench", "closed", "angry", "mid", trans=hpunch) # angry + her "I can't believe her..." ("clench", "closed", "angry", "mid") with hpunch # angry gen "Good day to you too..." ("base", xpos="far_left", ypos="head") play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed diff --git a/game/scripts/characters/cho/events/quidditch/quiz.rpy b/game/scripts/characters/cho/events/quidditch/quiz.rpy index 0f0d8990..7349a613 100644 --- a/game/scripts/characters/cho/events/quidditch/quiz.rpy +++ b/game/scripts/characters/cho/events/quidditch/quiz.rpy @@ -51,7 +51,7 @@ label cho_quiz: cho "Well, how do I know that you actually know anything about the game?" ("open", "base", "base", "mid") cho "I mean...{w} I never really saw you showing too much interest before..." ("soft", "narrow", "base", "mid") gen "About what?" ("base", xpos="far_left", ypos="head") - cho "Quidditch!" ("angry", "closed", "angry", "mid", trans=hpunch) + cho "Quidditch!" ("angry", "closed", "angry", "mid") with hpunch gen "Ah, yes... Quidditch.{w} It's like the Wizards' version of Basketball, right?" ("grin", xpos="far_left", ypos="head") cho "Basketball?!" ("clench", "base", "raised", "mid") cho "Is that the muggle sport nobody cares about?" ("soft", "narrow", "raised", "L") diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index 5f098715..e5c799f6 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -690,7 +690,7 @@ label slytherin_match: sna "I'm surprised she didn't swallow that one... with how wide she was blabbing her mouth." ("snape_42", ypos="head") sna "To think that liquid luck--" ("snape_45") - ton @ cheeks blush hair neutral "{shudder}What?{/shudder}" ("scream", "shocked", "base", "stare", ypos="head", flip=True, trans=vpunch) + ton @ cheeks blush hair neutral "{shudder}What?{/shudder}" ("scream", "shocked", "base", "stare", ypos="head", flip=True) with vpunch gen "What the fuck is liquid luck?" ("angry", xpos="far_left", ypos="head") ton @ cheeks blush hair angry "You gave those brutes a luck potion?!" ("mad", "base", "angry", "L") sna "Well..." ("snape_14") @@ -1156,7 +1156,7 @@ label slytherin_match: call quidditch_stands(crowd_react=["emo8", "emo7", "emo8"]) with d3 - her @ cheeks blush "{size=+8}Goooaaal!!!{/size}" ("scream", "narrow", "angry", "up", trans=hpunch) + her @ cheeks blush "{size=+8}Goooaaal!!!{/size}" ("scream", "narrow", "angry", "up") with hpunch hide hermione_main with d3 pause 0.5 @@ -1530,7 +1530,7 @@ label slytherin_match_return: gen "{shake}Chang{/shake}?" ("angry", xpos="far_left", ypos="head") cho "I did it! We won the--" ("smile", "closed", "base", "mid", xpos="base", ypos="base", flip=False, trans=d3) her "" ("upset", "base", "base", "L", ypos="base", flip=True, trans=d3) - cho "{shudder}!!!{/shudder}" ("annoyed", "wide", "base", "L", trans=hpunch) #Shocked face + cho "{shudder}!!!{/shudder}" ("annoyed", "wide", "base", "L") with hpunch #Shocked face play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed her "Oh, hello there, Miss Chang..." ("grin", "narrow", "angry", "L") diff --git a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy index 0f92ac0e..56492835 100644 --- a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy +++ b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy @@ -90,8 +90,8 @@ label cc_pr_manipulate_boys_start: "\"Make out with them...\"": cho @ cheeks heavy_blush "Make out with?{w=0.6} Those Slytherins--" ("soft", "wide", "worried", "mid") - cho @ cheeks blush "{shake}*Guargh*{/shake}" ("open_tongue", "happyCl", "angry", "mid", trans=hpunch) - cho @ cheeks blush "{shudder}*Cough*{/shudder}{w=0.6} {shake}*Guargh*!{/shake} {w=0.8} {shudder}*Cough*{/shudder}" ("open_wide_tongue", "happyCl", "worried", "mid", trans=hpunch) + cho @ cheeks blush "{shake}*Guargh*{/shake}" ("open_tongue", "happyCl", "angry", "mid") with hpunch + cho @ cheeks blush "{shudder}*Cough*{/shudder}{w=0.6} {shake}*Guargh*!{/shake} {w=0.8} {shudder}*Cough*{/shudder}" ("open_wide_tongue", "happyCl", "worried", "mid") with hpunch nar "You hear Cho make some inadvertent gag noises..." gen "Is everything okay, girl?" ("base", xpos="far_left", ypos="head") cho @ cheeks blush "No!{w=0.3} It's not okay!" ("angry", "wide", "worried", "mid") @@ -346,7 +346,7 @@ label cc_pr_manipulate_boys_T1_E2: gen "Intriguing!{w=0.3} Who else did you manage to snag?" ("grin", xpos="far_left", ypos="head") cho @ cheeks blush "Professor Slughorn, Sir." ("mad", "base", "worried", "mid") gen "Who?" ("base", xpos="far_left", ypos="head") - cho @ cheeks blush "{size=+4}Professor Slughorn!{/size}" ("scream", "closed", "angry", "mid", trans=hpunch) + cho @ cheeks blush "{size=+4}Professor Slughorn!{/size}" ("scream", "closed", "angry", "mid") with hpunch cho "He -- once again -- had to stand in for professor Snape, who couldn't make it in time for his lecture." ("open", "narrow", "angry", "R") gen "Snape is missing his classes? For how long has this been happening?" ("base", xpos="far_left", ypos="head") cho "Probably every other week or so." ("annoyed", "narrow", "raised", "R") diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy index 4fa56a05..968c7b4a 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy @@ -1639,7 +1639,7 @@ label hg_pf_strip_T4_masturbate: her "So, what you're saying, is that I danced for you..." ("soft", "happy", "base", "stare") her "I degraded myself for your amusement..." ("soft", "happy", "base", "R") her "I even let you cum on me..." ("open", "base", "base", "R") - her "And I get, {shudder}nothing?!{/shudder}" ("clench", "base", "angry", "mid", emote="angry", trans=hpunch) + her "And I get, {shudder}nothing?!{/shudder}" ("clench", "base", "angry", "mid", emote="angry") with hpunch gen "You've got a shiny and glistening complexion out of it..." ("base", xpos="far_left", ypos="head") her "Oh, this is a new low... Even for you, [name_genie_hermione]!" ("soft", "base", "angry", "mid") gen "Dismissed." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy index 7b3745be..9f00e510 100644 --- a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy +++ b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy @@ -721,7 +721,7 @@ label hg_pf_handjob_1: her @ tears soft ".................." ("disgust", "narrow", "worried", "down", ypos="base") gen "Well, I think that's about it for today [name_hermione_genie], so why don't--" ("base", xpos="far_left", ypos="head") - her "[name_genie_hermione]! What have you done?!" ("scream", "happyCl", "worried", "mid", trans=hpunch) + her "[name_genie_hermione]! What have you done?!" ("scream", "happyCl", "worried", "mid") with hpunch gen "What?" ("base", xpos="far_left", ypos="head") play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME. diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy index 18650240..37c8128b 100644 --- a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy +++ b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy @@ -611,7 +611,7 @@ label hg_pf_titjob_1: play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME. show her_titjob_personal h15 as cg - her "{shudder}*Ptui*...{/shudder}" ("open_wide_tongue_cum", "base", "angry", "mid", trans=hpunch) + her "{shudder}*Ptui*...{/shudder}" ("open_wide_tongue_cum", "base", "angry", "mid") with hpunch $ hermione.set_cum(face="light") diff --git a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy index 604ddf44..2a7d1ef6 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy @@ -484,12 +484,12 @@ label hg_pf_grope_ass_T3_mad: her @ cheeks blush "Stop that at once!" ("angry", "happyCl", "worried", "mid", ypos="head", flip=False) nar "Hermione gives you an unexpectedly strong shove..." - call her_chibi_scene("behind_desk_front", trans=hpunch) + call her_chibi_scene("behind_desk_front") with hpunch her @ cheeks blush "This is not what we agreed on, [name_genie_hermione]..." ("angry", "happyCl", "worried", "mid") gen "More points is it?" ("base", xpos="far_left", ypos="head") her @ cheeks blush "More..." ("angry", "happyCl", "worried", "mid") - her @ cheeks blush "{shudder}Points?!{/shudder}" ("scream", "happyCl", "worried", "mid", trans=hpunch) + her @ cheeks blush "{shudder}Points?!{/shudder}" ("scream", "happyCl", "worried", "mid") with hpunch gen "That's not it?" ("angry", xpos="far_left", ypos="head") her @ cheeks blush "No, it's definitely not because of the points!" ("scream", "happyCl", "worried", "mid") gen "I see..." ("base", xpos="far_left", ypos="head") @@ -509,7 +509,7 @@ label hg_pf_grope_ass_T3_mad: gen "There, it is done..." ("base", xpos="far_left", ypos="head") gen "Not about the points, you say... You make me--" ("base", xpos="far_left", ypos="head") her @ cheeks blush "{shake}Shut up!{/shake}" ("scream", "happyCl", "worried", "mid", ypos="head", flip=False) - her @ cheeks blush "{size=+7}The terms should've been stated before commencing the--{/size}" ("scream", "happyCl", "worried", "mid", trans=hpunch) + her @ cheeks blush "{size=+7}The terms should've been stated before commencing the--{/size}" ("scream", "happyCl", "worried", "mid") with hpunch gen "Commencing--" ("base", xpos="far_left", ypos="head") gen "Oh, snap out of it [name_hermione_genie]... You got paid didn't you?" ("base", xpos="far_left", ypos="head") her @ cheeks blush "..." ("mad", "happyCl", "worried", "mid") diff --git a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy index d6623ae9..c78660f5 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy @@ -10,7 +10,7 @@ label hg_pf_grope_breasts_T2: her "!!!" ("normal", "wide", "worried", "shocked") nar "Hermione takes a hesitant step back..." - her @ cheeks blush "{shudder}!!!?{/shudder}" ("mad", "wide", "base", "stare", ypos="head", flip=False, trans=hpunch) + her @ cheeks blush "{shudder}!!!?{/shudder}" ("mad", "wide", "base", "stare", ypos="head", flip=False) with hpunch call ctc nar "Hermione tries to pull away from you, but you hold her firmly by her breasts..." diff --git a/game/scripts/characters/hermione/events/forest.rpy b/game/scripts/characters/hermione/events/forest.rpy index 0aee0215..4b23c7f9 100644 --- a/game/scripts/characters/hermione/events/forest.rpy +++ b/game/scripts/characters/hermione/events/forest.rpy @@ -57,7 +57,7 @@ label forest_BJ_1: #BJ in the forest interrupted by moaning myrtle gen "Well, seeing that we're all alone out here..." ("base", xpos="far_left", ypos="base") her "Oh...{w=0.4} I--{w=0.2} *Ehm*...{w=0.4} I suppose we are..." ("open", "wide", "base", "R") gen "How about you take care of this dick?" ("base", xpos="far_left", ypos="base") - her "Oh, thank goodness...{w=0.4} I thought you were going to murder me for a second..." ("base", "happyCl", "base", "mid", trans=hpunch) + her "Oh, thank goodness...{w=0.4} I thought you were going to murder me for a second..." ("base", "happyCl", "base", "mid") with hpunch gen "What? How could you even think of such a thing!" ("base", xpos="far_left", ypos="base") her "Sorry [name_genie_hermione]... I don't know why I said that!" ("angry", "narrow", "base", "mid") her "I should just learn to shut my mouth sometimes..." ("base", "narrow", "base", "mid") @@ -165,7 +165,7 @@ label forest_BJ_2: gen "More late night gardening?" ("base", xpos="far_left", ypos="base") show genie zorder 16 with None pause.1 - her "{size=+10}[name_genie_hermione]!{/size}" ("shock", "wide", "base", "stare", xpos="base", ypos="base", trans=hpunch) + her "{size=+10}[name_genie_hermione]!{/size}" ("shock", "wide", "base", "stare", xpos="base", ypos="base") with hpunch her "Don't startle me like that!" ("annoyed", "base", "base", "R") her "And yes, I've been collecting some mushroom samples." ("soft", "base", "base", "mid") gen "Fascinating..." ("base", xpos="far_left", ypos="base") diff --git a/game/scripts/characters/hermione/events/items/butt_plugs.rpy b/game/scripts/characters/hermione/events/items/butt_plugs.rpy index 4398c938..00bbef34 100644 --- a/game/scripts/characters/hermione/events/items/butt_plugs.rpy +++ b/game/scripts/characters/hermione/events/items/butt_plugs.rpy @@ -378,7 +378,7 @@ label hg_butt_plugs: her "(There's no way this thing will fit.)" ("disgust", "narrow", "base", "down") nar "Hermione slowly places the lubed up butt plug to her anus." her "I'm telling you, [name_genie_hermione], this isn't going to--" ("open", "closed", "base", "mid") - her @ cheeks blush "{size=+10}!!!{/size}" ("soft", "wide", "base", "stare",trans=hpunch) + her @ cheeks blush "{size=+10}!!!{/size}" ("soft", "wide", "base", "stare") with hpunch her "{size=+10}It's moving!{/size}" ("disgust", "happyCl", "worried", "mid") gen "Really?" ("base", xpos="far_left", ypos="head") her "{size=+5}*Ugh*...{/size}" ("disgust", "happyCl", "worried", "mid") diff --git a/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy b/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy index e32eda94..19898e31 100644 --- a/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy +++ b/game/scripts/characters/hermione/events/potions/polyjuice_luna.rpy @@ -455,7 +455,7 @@ label her_potion_luna_give: pause 1 - lun @ cheeks blush "No!" ("clench", "wide", "base", "mid", trans=hpunch) + lun @ cheeks blush "No!" ("clench", "wide", "base", "mid") with hpunch call gen_chibi("jerk_off_behind_desk_pause") gen "[name_hermione_genie]?" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/tutoring.rpy b/game/scripts/characters/hermione/events/tutoring.rpy index d523c073..b4026701 100644 --- a/game/scripts/characters/hermione/events/tutoring.rpy +++ b/game/scripts/characters/hermione/events/tutoring.rpy @@ -1441,7 +1441,7 @@ label hg_tutor_E12: her @ cheeks blush tears soft "Cumm-- {heart} {heart}" ("silly", "base", "worried", "mid") her @ cheeks blush "Agaaain-- *Aaah* {heart}" ("open_wide_tongue", "narrow", "base", "up") gen "Sorry my little anal whore but I'm starting to get tired." ("angry", xpos="far_left", ypos="head") - her @ cheeks blush tears messy "Don't you dare stop now!" ("scream", "base", "angry", "mid", trans=hpunch) + her @ cheeks blush tears messy "Don't you dare stop now!" ("scream", "base", "angry", "mid") with hpunch her @ cheeks blush tears messy "Just a little more pleassse {heart}" ("grin", "narrow", "base", "dead") her @ cheeks blush tears messy "Because I will..." ("grin", "narrow", "base", "dead") her @ cheeks blush "Come again!!" ("open_wide_tongue", "narrow", "base", "up") diff --git a/game/scripts/characters/tonks/events/clothing.rpy b/game/scripts/characters/tonks/events/clothing.rpy index 925f34d4..d38e14b8 100644 --- a/game/scripts/characters/tonks/events/clothing.rpy +++ b/game/scripts/characters/tonks/events/clothing.rpy @@ -125,7 +125,7 @@ label tonks_summon_setup: gen "Very well then..." ("base", xpos="far_left", ypos="head") gen "Minus ten points from Hufflepuff!" ("base", xpos="far_left", ypos="head") $ states.env.hufflepuff -=10 - ton @ cheeks heavy_blush hair upset "What? But [name_genie_tonks]! I'm not even a student--" ("disgust", "base", "base", "mid", trans=hpunch) + ton @ cheeks heavy_blush hair upset "What? But [name_genie_tonks]! I'm not even a student--" ("disgust", "base", "base", "mid") with hpunch gen "Also--" ("base", xpos="far_left", ypos="head") menu: diff --git a/game/scripts/characters/tonks/events/clothing_old.txt b/game/scripts/characters/tonks/events/clothing_old.txt index 8c765b6b..29d75aa5 100644 --- a/game/scripts/characters/tonks/events/clothing_old.txt +++ b/game/scripts/characters/tonks/events/clothing_old.txt @@ -139,7 +139,7 @@ label tonks_summon_setup: gen "Very well then." ("base", xpos="far_left", ypos="head") gen "Minus ten points from Hufflepuff!" ("base", xpos="far_left", ypos="head") $ states.env.hufflepuff -=10 - ton "What? But [ton_genie_name]! I'm not even a student--" ("open", "wide", "shocked", "mid", trans=hpunch) + ton "What? But [ton_genie_name]! I'm not even a student--" ("open", "wide", "shocked", "mid") with hpunch else: gen "Then that's another minus ten points from Hufflepuff!" ("base", xpos="far_left", ypos="head") ton "Again? But please, sir!" diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy index 6806a298..2241e20c 100644 --- a/game/scripts/characters/tonks/events/hangout.rpy +++ b/game/scripts/characters/tonks/events/hangout.rpy @@ -131,7 +131,7 @@ label nt_he_firewhisky_intro: ton "Sorry, I guess I talk a lot once I get going..." ("mad", "base", "shocked", "R") ton "Bottoms up." ("horny", "base", "base", "down") play sound "sounds/gulp.ogg" - ton "{shudder}*Gulp*{/shudder}{w=0.6}{nw}" ("base", "closed", "worried", "mid", trans=hpunch) + ton "{shudder}*Gulp*{/shudder}{w=0.6}{nw}" ("base", "closed", "worried", "mid") with hpunch ton "{shake}*Cough* *Cough*{/shake}" ("open", "happyCl", "shocked", "stare") ton "Yeah, that was a mistake." ("mad", "base", "base", "down") gen "I don't drink whisky that often, but even I know not to down it in one..." ("base", xpos="far_left", ypos="head") @@ -158,7 +158,7 @@ label nt_he_firewhisky_E1: ton "Oh, don't you worry, [name_genie_tonks]." ("silly", "happyCl", "base", "mid") ton "I could down this entire bottle without anybody being able to notice a thing." ("horny", "base", "base", "L") gen "You're one glass in and swaying like a buoy..." ("base", xpos="far_left", ypos="head") - ton "{shudder}*Hick*{/shudder} Oh well..." ("open", "base", "base", "ahegao", trans=hpunch) + ton "{shudder}*Hick*{/shudder} Oh well..." ("open", "base", "base", "ahegao") with hpunch ton "No risk, no fun!" ("horny", "base", "base", "mid") else: gen "Long day?" ("base", xpos="far_left", ypos="head") @@ -199,7 +199,7 @@ label nt_he_firewhisky_E4: ton "*Gulp*{w=0.8}{nw}" ("scream", "closed", "worried", "mid") play sound "sounds/gulp.ogg" ton "*Gulp*{w=0.8}{nw}" ("scream", "closed", "worried", "mid") - ton "*Aaaaaaaahhhh!!!*..." ("silly", "closed", "base", "ahegao", trans=vpunch) + ton "*Aaaaaaaahhhh!!!*..." ("silly", "closed", "base", "ahegao") with vpunch gen "....................." ("base", xpos="far_left", ypos="head") jump tonks_hangout_continue diff --git a/game/scripts/characters/tonks/events/intro.rpy b/game/scripts/characters/tonks/events/intro.rpy index 4431744a..d53b9990 100644 --- a/game/scripts/characters/tonks/events/intro.rpy +++ b/game/scripts/characters/tonks/events/intro.rpy @@ -386,7 +386,7 @@ label ss_he_tonks_E1: sna "Albus{w=0.2} Percival{w=0.2} Wulfric{w=0.2} Brian{w=0.2} Dumbledore!" ("snape_34") gen "..........................." ("base", xpos="far_left", ypos="head") gen "I thought I traded places with just one person..." ("base", xpos="far_left", ypos="head") - sna "That {b}is{/b} one person!" ("snape_30", trans=hpunch) + sna "That {b}is{/b} one person!" ("snape_30") with hpunch sna "It's our headmaster's full name. And it's your name now!{w} You best make sure to remember it." ("snape_34") gen "Yeah...{w=0.5} I'm not even going to try..." ("base", xpos="far_left", ypos="head") sna "Let's just hope this whole Ministry situation will solve itself..." ("snape_31") @@ -629,7 +629,7 @@ label tonks_intro_E3: stop music fadeout 1.5 play sound "sounds/scratch.ogg" - ton "Unless..." ("upset", "narrow", "annoyed", "downR", trans=hpunch) + ton "Unless..." ("upset", "narrow", "annoyed", "downR") with hpunch gen "Unless?" ("angry", xpos="far_left", ypos="head") play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed @@ -723,7 +723,7 @@ label ss_he_tonks_E2: gen "..................." ("base", xpos="far_left", ypos="head") sna "What a fool I was to believe that she'd be gone by now..." ("snape_31") sna "But of course not!" ("snape_32") - sna "{size=+5}Instead they made that mischievous {shake}cunt{/shake} a teacher!{/size}" ("snape_33", trans=hpunch) # Screaming + sna "{size=+5}Instead they made that mischievous {shake}cunt{/shake} a teacher!{/size}" ("snape_33") with hpunch # Screaming gen "Actually, that was--" ("base", xpos="far_left", ypos="head") sna "The whole universe has turned against me!" ("snape_43") sna "That bloody Ministry! Curse them!" ("snape_35") @@ -752,7 +752,7 @@ label ss_he_tonks_E2: sna "Not a single word! *A-Ha-ha-ha*..." ("snape_28") gen "Fair enough..." ("base", xpos="far_left", ypos="head") sna "*Ha-ha-ha*--" ("snape_42") - sna "*cough* {w=0.4}*cough* {w=0.4}*cough*..." ("snape_17", trans=hpunch) + sna "*cough* {w=0.4}*cough* {w=0.4}*cough*..." ("snape_17") with hpunch gen "..............." ("base", xpos="far_left", ypos="head") sna "..................." ("snape_31") @@ -863,7 +863,7 @@ label ss_he_tonks_E3: sna "And a very competent and skilled teacher, to guide those hopeless souls through their lessons..." ("snape_40") sna "Now, If you were to assign me for that, and give Tonks my old subject to teach..." ("snape_20") gen "Yeah, about that...{w=0.4} I think I might have given that role to her..." ("base", xpos="far_left", ypos="head") - sna "{shake}You did what?!{/shake}" ("snape_33", trans=hpunch) + sna "{shake}You did what?!{/shake}" ("snape_33") with hpunch gen "\"Defence against... something-something\"..." ("base", xpos="far_left", ypos="head") sna "You should have given me the \"defence against the dark arts\" position!" ("snape_34") sna "And she could've had something else... like \"muggle studies\", or something." ("snape_16") diff --git a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy index 88252d01..dbcfa96b 100644 --- a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy +++ b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy @@ -180,7 +180,7 @@ label nt_pr_teach_T1_E2: # Tier 1 - Event 2 - Racenclaw boy gen "Well done, [name_tonks_genie]... We'll talk next time." ("base", xpos="far_left", ypos="head") ton "Yes, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid") - $ states.env.ravenclaw += 10 + $ states.env.ravenclaw += 10 if states.ton.public_level < 4: # Points til 4. $ states.ton.public_level += 1 @@ -317,7 +317,7 @@ label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl ton "But she was very happy about the points." ("base", "base", "angry", "mid") gen "Well done, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head") ton "Yes, [name_genie_tonks]. Good night." ("silly", "happyCl", "base", "mid") - + $ states.env.slytherin += 20 if states.ton.public_level < 4: # Points til 4. @@ -413,7 +413,7 @@ label nt_pr_teach_T2_E1: # Tier 2 - Event 1 - Hufflepuff girl ton "And I didn't use my wand to clean it..." ("horny", "base", "angry", "mid") gen "Very good, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head") ton "Thank you, [name_genie_tonks]. Until next time..." ("base", "base", "base", "mid") - + $ states.env.hufflepuff += 40 if states.ton.public_level < 9: # Points til 9. @@ -510,7 +510,7 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy ton "Every time he shot out some cum for me I gave him five points..." ("horny", "base", "angry", "mid") gen "I bet he earned quite a lot today. Well done, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head") ton "That he did, [name_genie_tonks]... See you next time..." ("base", "base", "base", "mid") - + $ states.env.ravenclaw += 20 if states.ton.public_level < 9: # Points til 9. @@ -621,7 +621,7 @@ label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy ton "I did my best to punish him... thoroughly..." ("horny", "base", "angry", "mid") gen "Very good, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head") ton "*Mhmm*... Until next time, [name_genie_tonks]..." ("base", "happyCl", "base", "mid") - + $ states.env.slytherin += 20 if states.ton.public_level < 9: # Points til 9. @@ -652,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! {shake}Petrficus Totalus!{/shake}" ("scream", "shocked", "angry", "mid", trans=vpunch) + ton "Boom! {shake}Petrficus Totalus!{/shake}" ("scream", "shocked", "angry", "mid") with 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") @@ -696,7 +696,7 @@ label nt_pr_teach_T2_E4: # Tier 2 - Event 4 - Slytherin girl ton "She's really starting to get into it!" ("base", "base", "angry", "mid") gen "Good work, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head") ton "Thank you... Have a good night, [name_genie_tonks]..." ("base", "base", "base", "mid") - + $ states.env.slytherin += 20 if states.ton.public_level < 9: # Points til 9. diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy index 918dc640..8cd96aba 100644 --- a/game/scripts/events/ending.rpy +++ b/game/scripts/events/ending.rpy @@ -2861,7 +2861,7 @@ Farewell, my little [word_03].{/size} dum5 "{shudder}*GHT*!!!{/shudder}" her "I am willing to do anything to get those points, sir!" - her "And I mean {shake}ANYTHING!!!{/shake}" ("scream", "base", "angry", "mid",emote="angry", trans=hpunch) + her "And I mean {shake}ANYTHING!!!{/shake}" ("scream", "base", "angry", "mid",emote="angry") with hpunch call her_walk("desk", "base", reduce=0.8) call blkfade diff --git a/game/scripts/inventory/potions/addictive_potion.txt b/game/scripts/inventory/potions/addictive_potion.txt index 481e4336..e7b336fd 100644 --- a/game/scripts/inventory/potions/addictive_potion.txt +++ b/game/scripts/inventory/potions/addictive_potion.txt @@ -123,7 +123,7 @@ label hg_pp_cumaddict_intro: call her_walk(action="enter", xpos="mid", ypos="base") pause.2 - her "What the hell did you do to me?" ("scream", "happyCl", "worried", "mid", xpos="mid", ypos="base", trans=hpunch) + her "What the hell did you do to me?" ("scream", "happyCl", "worried", "mid", xpos="mid", ypos="base") with hpunch gen "Whatever are you talking about, [hermione_name]?" ("base", xpos="far_left", ypos="head") her "Ughh, it doesn't matter, just let me suck it." ("annoyed", "base", "worried", "R") gen "Why on earth would you want to do that? You're a top student, that doesn't sound appropriate." ("base", xpos="far_left", ypos="head") @@ -416,7 +416,7 @@ label hg_pp_cumaddict_E1: #Repetitive version where she doesn't faint after the call her_walk(action="enter", xpos="mid", ypos="base") pause.2 - her "Take off your pants! No questions!" ("scream", "happyCl", "worried", "mid", xpos="mid", ypos="base", trans=hpunch) + her "Take off your pants! No questions!" ("scream", "happyCl", "worried", "mid", xpos="mid", ypos="base") with hpunch gen "Hold on a minute, what are you--" ("base", xpos="far_left", ypos="head") her "Shut it, just let me suck it." ("annoyed", "base", "worried", "R") gen "...." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/inventory/potions/milking_potion.txt b/game/scripts/inventory/potions/milking_potion.txt index 60649b44..4ea0281a 100644 --- a/game/scripts/inventory/potions/milking_potion.txt +++ b/game/scripts/inventory/potions/milking_potion.txt @@ -348,7 +348,7 @@ label potion_scene_11_2: else: $ hermione_breasts = "characters/hermione/body/breasts/breasts_expanded.webp" - her "" ("shock", "wide", "base", "stare",cheeks="blush",trans=hpunch) + her "" ("shock", "wide", "base", "stare",cheeks="blush") with hpunch pause.5 her "!!!" ("angry", "happyCl", "worried", "mid",cheeks="blush") @@ -868,7 +868,7 @@ label potion_scene_11_3: $ hermione_futa = True - her "" ("shock", "narrow", "base", "down",trans=hpunch) + her "" ("shock", "narrow", "base", "down") with hpunch pause.8 her "You damn {size=+10}pervert!{/size}" ("shock", "happyCl", "worried", "mid",cheeks="blush") diff --git a/game/scripts/inventory/potions/polyjuice_potion.txt b/game/scripts/inventory/potions/polyjuice_potion.txt index d5211986..48642afb 100644 --- a/game/scripts/inventory/potions/polyjuice_potion.txt +++ b/game/scripts/inventory/potions/polyjuice_potion.txt @@ -119,7 +119,7 @@ label potion_scene_1_1_2: $ her_cat_polyjuice_return = False call her_walk(action="enter", xpos="mid", ypos="base") - her "How could you do this to me [genie_name]?" ("angry", "base", "angry", "mid", xpos="mid", ypos="base", trans=hpunch) + her "How could you do this to me [genie_name]?" ("angry", "base", "angry", "mid", xpos="mid", ypos="base") with hpunch her "Try and turn me into a cat!" her "In the middle of class!" ("annoyed", "base", "worried", "R") gen "I didn't try and turn you into a cat [hermione_name]." ("base", xpos="far_left", ypos="head") @@ -312,7 +312,7 @@ label potion_scene_1_1_2_alt: gen "And how did that make you feel?" ("base", xpos="far_left", ypos="head") her "I'm not sure..." else: - her "How could you do this to me [genie_name]?" ("angry", "base", "angry", "mid", xpos="mid", ypos="base", trans=hpunch) + her "How could you do this to me [genie_name]?" ("angry", "base", "angry", "mid", xpos="mid", ypos="base") with hpunch her "Try and turn me into a cat!" her "In the middle of class!" ("annoyed", "base", "worried", "R") gen "I didn't try and turn you into a cat [hermione_name]." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/minigames/mirror/events/whose_points.rpy b/game/scripts/minigames/mirror/events/whose_points.rpy index 10d7f9df..45243748 100644 --- a/game/scripts/minigames/mirror/events/whose_points.rpy +++ b/game/scripts/minigames/mirror/events/whose_points.rpy @@ -121,7 +121,7 @@ label whose_points: gen "Go on..." ("base", xpos="far_left", ypos="head") ast "Madam Hooch! Get your gross hands off my quidditch robes, you creep!" ("clench", "narrow", "angry", "mid") gen "Again, I don't think you understand the game..." ("base", xpos="far_left", ypos="head") - ast "Give me the points!" ("scream", "narrow", "angry", "mid", trans=hpunch) + ast "Give me the points!" ("scream", "narrow", "angry", "mid") with hpunch gen "Disqualified!" ("base", xpos="far_left", ypos="head") ast "Wait, you can't do that!" ("clench", "base", "base", "mid") gen "It's my game, I make the rules." ("grin", xpos="far_left", ypos="head")