From 8ba28f5e1428096ca2d9aba29c06445a107587e2 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Fri, 12 May 2023 13:48:17 +0200 Subject: [PATCH] Face parameter removal (Tonks) * Removed face parameter for Tonks and reposed events that relied on it. --- .../hermione/events/favors/grope_her.rpy | 2 +- .../events/requests/detention_with_tonks.rpy | 26 ++-- .../events/requests/hands-on_lessons.rpy | 10 +- .../tonks/events/requests/oral_practice.rpy | 11 +- game/scripts/characters/tonks/gifts.rpy | 138 +++++++++--------- .../characters/tonks/wardrobe_reactions.rpy | 61 ++++---- 6 files changed, 129 insertions(+), 119 deletions(-) diff --git a/game/scripts/characters/hermione/events/favors/grope_her.rpy b/game/scripts/characters/hermione/events/favors/grope_her.rpy index cbb8fa32..e24dd10b 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her.rpy @@ -43,7 +43,7 @@ label hg_pf_grope: if states.her.tier <= 3: her @ cheeks blush "................" ("annoyed", "narrow", "angry", "R") else: - her @ cheeks blush "................" (face="horny") + her @ cheeks blush "................" ("soft", "narrow", "base", "R") # Points 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 1b808d98..5fa88b49 100644 --- a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy +++ b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy @@ -59,26 +59,26 @@ label nt_pr_teach_start: else: # Repeat gen "Ready to help the boys earn some points?" ("base", xpos="far_left", ypos="head") - ton "And reward them for showing me their dicks?" (face="horny") + ton "And reward them for showing me their dicks?" ("horny", "base", "base", "mid") gen "Yes. Return to me after class..." ("base", xpos="far_left", ypos="head") - ton "*Mhmm*... Don't worry if I'm a little late though..." (face="horny") + ton "*Mhmm*... Don't worry if I'm a little late though..." ("horny", "narrow", "base", "R") elif states.ton.tier >= 2: if nt_pr_teach.points == 0: # Tell her to be even lewder for the next level of favors. gen "Would you like to give some boys detention again?" ("base", xpos="far_left", ypos="head") - ton "And what would you suggest I do with them?" (face="horny") - ton "Make them show me their dicks?" (face="horny") - ton "Or can we move on to something a little more... progressive?" (face="horny") + ton "And what would you suggest I do with them?" ("horny", "narrow", "base", "mid") + ton "Make them show me their dicks?" ("horny", "narrow", "base", "R") + ton "Or can we move on to something a little more... progressive?" ("base", "narrow", "base", "mid") gen "If that's what you want..." ("base", xpos="far_left", ypos="head") - ton "*Hmm*...{w=0.4} Yes...{w=0.3} I wouldn't mind seeing the {b}hard cocks{/b} of some of my favourites." (face="horny") + ton "*Hmm*...{w=0.4} Yes...{w=0.3} I wouldn't mind seeing the {b}hard cocks{/b} of some of my favourites." ("horny", "narrow", "base", "R") ton "Might even have them jerk off for me... I would love to see that!" ("horny", "base", "base", "ahegao") gen "And make sure they remember it." ("base", xpos="far_left", ypos="head") ton "Yes, [name_genie_tonks]. Don't wait for me..." ("base", "base", "base", "mid") else: # Repeat gen "Ready to give some boys detention again?" ("base", xpos="far_left", ypos="head") - ton "Yes. I'm very much in the mood for some {b}hard cocks{/b}!" (face="horny") + ton "Yes. I'm very much in the mood for some {b}hard cocks{/b}!" ("horny", "narrow", "base", "mid") gen "Go on then... Teach them a lesson..." ("grin", xpos="far_left", ypos="head") ton "I shall see you later, [name_genie_tonks]..." ("base", "base", "base", "mid") @@ -170,7 +170,7 @@ label nt_pr_teach_T1_E1: #Tier 1 - Event 1 - Slytherin boy label nt_pr_teach_T1_E2: # Tier 1 - Event 2 - Racenclaw boy call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 3: # First time. pass @@ -238,7 +238,7 @@ label nt_pr_teach_T1_E2: # Tier 1 - Event 2 - Racenclaw boy label nt_pr_teach_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys. Guess who... call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 3: # First time. pass @@ -307,7 +307,7 @@ label nt_pr_teach_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys. Guess who... label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 3: # First time. pass @@ -502,7 +502,7 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy $ tonks.set_cum(pussy="light") call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hello, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hello, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if nt_pr_teach.points <= 4 and states.ton.public_level <= 8: # First time. pass @@ -607,7 +607,7 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy call ton_walk(action="enter", xpos="mid", ypos="base") - ton "[name_genie_tonks]..." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "[name_genie_tonks]..." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if nt_pr_teach.points <= 4 and states.ton.public_level <= 8: # First time. pass @@ -681,7 +681,7 @@ label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy label nt_pr_teach_T2_E4: # Tier 2 - Event 4 - Slytherin girl call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if nt_pr_teach.points <= 4 and states.ton.public_level <= 8: # First time. pass diff --git a/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy b/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy index 9a539161..230d072b 100644 --- a/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy +++ b/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy @@ -39,7 +39,7 @@ label nt_pr_grope_start: else: gen "Think you're up for messing around with your students again?" ("base", xpos="far_left", ypos="head") gen "Let them cop a feel?" ("base", xpos="far_left", ypos="head") - ton "Consider it done, [name_genie_tonks]." (face="horny") + ton "Consider it done, [name_genie_tonks]." ("horny", "narrow", "base", "R") gen "I'll see you after class..." ("base", xpos="far_left", ypos="head") elif states.ton.tier >= 3: @@ -69,7 +69,7 @@ label nt_pr_grope_start: label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time. pass @@ -144,7 +144,7 @@ label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy label nt_pr_grope_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time. pass @@ -229,7 +229,7 @@ label nt_pr_grope_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy label nt_pr_grope_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time. pass @@ -292,7 +292,7 @@ label nt_pr_grope_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys label nt_pr_grope_T1_E4: # Tier 1 - Event 4 - Slytherin girl call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time. pass diff --git a/game/scripts/characters/tonks/events/requests/oral_practice.rpy b/game/scripts/characters/tonks/events/requests/oral_practice.rpy index cb95ec61..cd62048c 100644 --- a/game/scripts/characters/tonks/events/requests/oral_practice.rpy +++ b/game/scripts/characters/tonks/events/requests/oral_practice.rpy @@ -73,7 +73,7 @@ label nt_pr_kiss_start: label nt_pr_kiss_T1_intro_E1: # Tier 1 - Event 1 - Slytherin boy #Gentle kissing call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time. pass @@ -146,7 +146,7 @@ label nt_pr_kiss_T1_intro_E1: # Tier 1 - Event 1 - Slytherin boy label nt_pr_kiss_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time. pass @@ -219,7 +219,7 @@ label nt_pr_kiss_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls #Tonks pays two best friends to make out call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time. pass @@ -289,7 +289,7 @@ label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls label nt_pr_kiss_T1_E4: #Level 1 Event 4 #Tender make-out session with a Slytherin lesbian call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time. pass @@ -366,7 +366,8 @@ label nt_pr_kiss_T1_E4: #Level 1 Event 4 label nt_pr_kiss_T2_E1: # Tier 2 Event 1 # Not in use. call ton_walk(action="enter", xpos="mid", ypos="base") - ton "Hi, [name_genie_tonks]." (face="horny", xpos="mid", ypos="base", trans=fade) + ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) + gen "How did your extracurricular activities pan out today?" ("base", xpos="far_left", ypos="head") ton "Honestly? I don't think I've ever been as turned on in my life..." ("base", "base", "base", "mid") ton "Fuck... It was incredible... the power I felt over him... it was intoxicating..." ("base", "base", "base", "mid") diff --git a/game/scripts/characters/tonks/gifts.rpy b/game/scripts/characters/tonks/gifts.rpy index e14cb6c8..be5afc9b 100644 --- a/game/scripts/characters/tonks/gifts.rpy +++ b/game/scripts/characters/tonks/gifts.rpy @@ -8,155 +8,163 @@ label give_ton_gift(gift_item): $ states.ton.gifted = True if gift_item == lollipop_ITEM: - ton "A lollipop?" (face="neutral", xpos="mid", ypos="base", trans=d5) + ton "A lollipop?" ("open", "narrow", "base", "down") call give_gift("You give the lollipop to Tonks...", gift_item) - ton "I know the perfect student to give this to." (face="happy") + ton "I know the perfect student to give this to." ("base", "narrow", "base", "R") call ton_friendship(1) elif gift_item == chocolate_ITEM: - ton "*Mhmm*, Chocolate!" (pupils="down", face="happy", xpos="mid", ypos="base", trans=d5) + ton "*Mhmm*, Chocolate!" ("horny", "narrow", "base", "down") call give_gift("You give the chocolate to Tonks...", gift_item) - ton "It's known that chocolate is a very effective mood enhancer after a Dementor attack." (mouth="open", face="happy") - ton "Although it's less known that it's because chocolate is considered to be a great aphrodisiac..." (face="horny") - ton "I'll keep this for one of my private lessons." (face="happy") + ton "It's known that chocolate is a very effective mood enhancer after a Dementor attack." ("open", "closed", "base", "mid") + ton "Although it's less known that it's because chocolate is considered to be a great aphrodisiac..." ("base", "narrow", "base", "mid") + ton "I'll keep this for one of my private lessons." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == plush_owl_ITEM: - ton "An Owl?" (face="neutral", xpos="mid", ypos="base", trans=d5) - ton "Oh, it's a toy... Haven't seen one of these in a while." (face="disgusted") + ton "An Owl?" ("open", "narrow", "base", "down") + ton "Oh, it's a toy... Haven't seen one of these in a while." ("soft", "narrow", "base", "mid") call give_gift("You give the stuffed owl to Tonks...",gift_item) - ton "Okay, for nostalgia's sake then..." (face="neutral") + ton "Okay, for nostalgia's sake then..." ("open", "closed", "base", "mid") call ton_friendship(0) elif gift_item == butterbeer_ITEM: - ton "Butterbeer?" (face="disgusted", xpos="mid", ypos="base", trans=d5) - ton "Don't you have anything stronger?" (mouth="open", face="annoyed") + ton "Butterbeer?" ("open", "narrow", "base", "down") + ton "Don't you have anything stronger?" ("upset", "narrow", "base", "mid") call give_gift("You give the bottle to Tonks...", gift_item) - ton "Just joking, I'll save it for when I've got company." (face="happy") + ton "Just joking, I'll save it for when I've got company." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == science_mag_ITEM: - ton "Jinxes and sphinxes? These could help with some of my lessons." (mouth="open", face="neutral", xpos="mid", ypos="base", trans=d5) + ton "Jinxes and sphinxes? These could help with some of my lessons." ("open", "narrow", "base", "down") call give_gift("You give an assortment of educational magazines to Tonks...", gift_item) - ton "Thank you, [name_genie_tonks]." (face="neutral") - call ton_friendship(0) + ton "Thank you, [name_genie_tonks]." ("base", "base", "base", "mid") + call ton_friendship(1) elif gift_item == girls_mag_ITEM: - ton "Some girl magazines? I could definitely put these in my classroom." (mouth="open", face="neutral", xpos="mid", ypos="base", trans=d5) + ton "Some girl magazines? I could definitely put these in my classroom." ("open", "narrow", "base", "down") call give_gift("You give an assortment of rather girly magazines to Tonks...", gift_item) - ton "The girls do love staying after hours to socialise." (face="happy") + ton "The girls do love staying after hours to socialise." ("base", "wink", "base", "mid") + ton "" ("base", "base", "base", "mid") call ton_friendship(0) elif gift_item == adult_mag_ITEM: - ton "Adult magazines?" (face="disgusted", xpos="mid", ypos="base", trans=d5) - ton "Won't be the first time I've slipped one of these inside the stack of magazines in my classroom." (face="horny") + ton "Adult magazines?" ("open", "narrow", "base", "down") + ton "Won't be the first time I've slipped one of these inside the stack of magazines in my classroom." ("base", "wink", "base", "mid") call give_gift("You give an assortment of adult magazines to Tonks...", gift_item) - ton "Thank you, [name_genie_tonks]." (face="happy") + ton "Thank you, [name_genie_tonks]." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == porn_mag_ITEM: - ton "Porn magazines?" (face="disgusted", xpos="mid", ypos="base", trans=d5) - ton "I already know most positions in this book already of course..." (face="happy") + ton "Porn magazines?" ("open", "narrow", "base", "down") + ton "I already know most positions in this book already of course..." ("base", "base", "base", "mid") call give_gift("You give an assortment of pornographic magazines to Tonks...", gift_item) - ton "Although..." (face="horny") - ton "I'll gladly accept them anyway... Thank you, [name_genie_tonks]." (face="happy") + ton "Although..." ("horny", "narrow", "base", "down") + ton "I'll gladly accept them anyway... Thank you, [name_genie_tonks]." ("base", "wink", "base", "mid") + ton "" ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == krum_poster_ITEM: - ton "That's that Krum boy is it?" (face="horny", xpos="mid", ypos="base", trans=d5) + ton "That's that Krum boy, isn't it?" ("open", "narrow", "base", "down") call give_gift("You give the poster to Tonks...", gift_item) - ton "Nice figure... Yes, this would certainly set a good mood in my classroom... Or my office." (pupils="down", face="happy") - ton "Thank you, [name_genie_tonks]." (face="happy") + ton "Nice figure... Yes, this would certainly set a good mood in my classroom... Or my office." ("base", "narrow", "base", "down") + ton "Thank you, [name_genie_tonks]." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == sexy_lingerie_ITEM: - ton "I see you're a man with a sense of style." (mouth="open", pupils="down", face="happy", xpos="mid", ypos="base", trans=d5) + ton "I see you're a man with a sense of style." ("open", "narrow", "base", "down") call give_gift("You give the sexy lingerie to Tonks...", gift_item) - ton "If it were up to me, then a pair of these would be an obligatory part of the female school uniform..." (face="happy") + ton "If it were up to me, then a pair of these would be an obligatory part of the female school uniform..." ("horny", "wink", "base", "mid") + ton "" ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == sexy_stockings_ITEM : - ton "Nice... I have a pair just like these." (mouth="open", pupils="down", face="happy", xpos="mid", ypos="base", trans=d5) - ton "Although another pair without holes in them won't hurt..." (face="happy") + ton "Nice... I have a pair just like these." ("open", "narrow", "base", "down") + ton "Although another pair without holes in them won't hurt..." ("horny", "wink", "base", "mid") call give_gift("You give the sexy stockings to Tonks...", gift_item) + ton "" ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == pink_condoms_ITEM: - ton "Some condoms?" (face="neutral", xpos="mid", ypos="base", trans=d5) + ton "Some condoms?" ("open", "narrow", "base", "down") call give_gift("You give some condoms to Tonks...", gift_item) - ton "Safe sex is important..." (face="neutral") - ton "I don't remember taking sex ed when I was in school... No wonder the students have no idea what they're doing..." (face="horny") + ton "Safe sex is important..." ("horny", "wink", "base", "mid") + ton "*Hmm*... Now that I think about it, I don't remember taking sex ed when I was in school..." ("annoyed", "base", "base", "mid") call ton_friendship(1) elif gift_item == vibrator_ITEM: - ton "A vibra--ting back massager?" (face="disgusted", xpos="mid", ypos="base", trans=d5) - ton "*Mmm*... Mine seemingly went missing from my desk..." (face="annoyed") - ton "It's a bit small, but this should do until it turns up again." (face="annoyed") + ton "A vibra--ting back massager?" ("open", "narrow", "base", "down") + ton "*Mmm*... Mine seemingly went missing from my desk..." ("annoyed", "narrow", "base", "mid") + ton "It's a bit small, but this should do until it turns up again." ("horny", "wink", "base", "mid") call give_gift("You give the vibrator to Tonks...", gift_item) - ton "Thank you, [name_genie_tonks]." (face="neutral") + ton "Thank you, [name_genie_tonks]." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == anal_lube_ITEM: - ton "Now that's a big jar of Anal lube you have there." (face="disgusted", xpos="mid", ypos="base", trans=d5) + ton "Now that's a big jar of Anal lube you have there." ("open", "narrow", "base", "down") call give_gift("You give the jar of lube to Tonks...", gift_item) - ton "Looks like this might be enough to cover the whole body..." (mouth="open", face="happy") - ton "Thank you, [name_genie_tonks]." (face="neutral") + ton "Looks like this might be enough to cover the entire body..." ("soft", "narrow", "base", "mid") + ton "Thank you, [name_genie_tonks]." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == ballgag_and_cuffs_ITEM: - ton "Ball gag and cuffs?" (pupils="down", face="happy", xpos="mid", ypos="base", trans=d5) + ton "Ball gag and cuffs?" ("open", "narrow", "base", "down") call give_gift("You give the ball gag and cuffs to Tonks...", gift_item) - ton "These are pretty cute. Should come in handy during my.... private lessons." (face="horny") + ton "These are pretty cute. Should come in handy during my.... private lessons." ("horny", "wink", "base", "mid") + ton "Thank you, [name_genie_tonks]." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == anal_plugs_ITEM: - ton "Some anal plugs?" (face="disgusted", xpos="mid", ypos="base", trans=d5) - ton "Wow... This is what they use these days?" (face="happy") - ton "Very colourful..." (face="happy") + ton "Some anal plugs?" ("open", "narrow", "base", "down") + ton "Wow... This is what they use these days?" ("soft", "narrow", "base", "down") + ton "Very colourful..." ("base", "narrow", "base", "down") call give_gift("You give the assortment of anal plugs to Tonks...", gift_item) - ton "I think I might hide some inside my classroom for the students to find..." (face="horny") + ton "Thank you, [name_genie_tonks]." ("horny", "base", "base", "mid") call ton_friendship(1) elif gift_item == testral_strapon_ITEM: - ton "Is that a strap-on?" ("open", "wide", "shocked", "stare", xpos="mid",ypos="base",trans=d5) + ton "Is that a strap-on?" ("open", "narrow", "base", "down") call give_gift("You give the thestral strap-on to Tonks...", gift_item) - ton "This will be a perfect addition to my collection..." (face="angry") - ton "Thank you, [name_genie_tonks]." (face="happy") + ton "This will be a perfect addition to my collection..." ("horny", "base", "angry", "mid") + ton "Thank you, [name_genie_tonks]." ("base", "happyCl", "base", "mid") + ton "" ("base", "base", "base", "mid") call ton_friendship(2) elif gift_item == broom_2000_ITEM: - ton "I don't remember the brooms looking like this when I took flying lessons..." (face="angry", xpos="mid", ypos="base", trans=d5) + ton "I don't remember the brooms looking like this when I took flying lessons..." ("open", "narrow", "base", "down") call give_gift("You give the broom to Tonks...", gift_item) - ton "Seems like a good way to stay put on the broom though... Unless you lose focus." (mouth="open", face="happy") + ton "Seems like a good way to stay put on the broom though... Unless you lose focus." ("horny", "base", "base", "mid") + ton "Thank you, [name_genie_tonks]." ("base", "narrow", "base", "mid") + ton "" ("base", "base", "base", "mid") call ton_friendship(3) elif gift_item == sexdoll_ITEM: - ton "A sex doll?" (face="horny", xpos="mid", ypos="base", trans=d5) - ton "Not too useful for me, but I might put it in one of our secret gift exchanges." (mouth="open", face="horny") + ton "A sex doll?" ("open", "narrow", "base", "down") + ton "Not too useful for me, but I might put it in one of our secret gift exchanges." ("horny", "narrow", "base", "R") call give_gift("You give the sex doll to Tonks...", gift_item) - ton "They'll gossip for weeks, wondering who it's from." (face="horny") + ton "They'll gossip for weeks, wondering who it's from." ("grin", "base", "base", "mid") call ton_friendship(1) elif gift_item == anal_beads_ITEM: - ton "Anal beads?" (face="disgusted", xpos="mid", ypos="base", trans=d5) - ton "It's a bit short, but I'll take it..." (face="happy") + ton "Anal beads?" ("open", "narrow", "base", "down") + ton "It's a bit short, but I'll take it..." ("horny", "narrow", "base", "down") call give_gift("You give the anal beads to Tonks...", gift_item) - ton "Thanks..." (face="horny") + ton "Thank you, [name_genie_tonks]..." ("base", "base", "base", "mid") call ton_friendship(1) elif gift_item == wine_ITEM: + ton "A bottle of wine?" ("open", "narrow", "base", "down") if not firewhisky_ITEM.unlocked: - ton "A bottle of wine?" (face="neutral", xpos="mid", ypos="base", trans=d5) - ton "I was hoping for something with a bit more \'punch\'." (mouth="open", pupils="R", face="neutral") + ton "I was hoping for something with a bit more \'punch\'." ("annoyed", "narrow", "base", "mid") call ton_friendship(0) else: - ton "I've told you before... Wine doesn't particularly agree with me." (mouth="open", pupils="R", face="neutral", xpos="mid", ypos="base", trans=d5) - call ton_friendship(-1) + ton "I've told you before... Wine doesn't particularly agree with me." ("annoyed", "narrow", "base", "mid") + call ton_friendship(0) elif gift_item == firewhisky_ITEM: - ton "Firewhisky?" (face="happy", xpos="mid", ypos="base", trans=d5) - ton "*Mmm*... My favourite..." (face="horny") - ton "But let's save it for later, shall we?" (face="horny") + ton "Firewhisky?" ("open", "narrow", "base", "down") + ton "*Mmm*... My favourite..." ("horny", "narrow", "base", "down") + ton "But let's save it for later, shall we?" ("base", "narrow", "base", "mid") call ton_friendship(0) ton "" (xpos="base",ypos="base") diff --git a/game/scripts/characters/tonks/wardrobe_reactions.rpy b/game/scripts/characters/tonks/wardrobe_reactions.rpy index d2534697..0e6ffa9a 100644 --- a/game/scripts/characters/tonks/wardrobe_reactions.rpy +++ b/game/scripts/characters/tonks/wardrobe_reactions.rpy @@ -89,40 +89,40 @@ label ton_reaction_touch_fail(what): $ mouse_slap() random: - ton "Stop that." (face="annoyed") - ton "Do you know how long it takes to model my hair like that?" (face="neutral") - ton "There are two things a man shouldn't touch, her wallet and her hair." (face="angry") - ton "Don't get any funny ideas." (face="horny") + ton "Stop that." ("angry", "narrow", "shocked", "mid") + ton "Do you know how long it takes to model my hair like that?" ("annoyed", "narrow", "base", "mid") + ton "There are two things a man shouldn't touch, her wallet and her hair." ("open", "narrow", "angry", "mid") + ton "Don't get any funny ideas." ("soft", "narrow", "base", "mid") block: - ton "Hey, don't do that!" (face="annoyed") - ton "Let me pet you instead." (face="neutral") + ton "Hey, don't do that!" ("open", "narrow", "base", "mid") + ton "Let me pet you instead." ("base", "narrow", "angry", "mid") $ mouse_headpat() pause 0.35 $ mouse_headpat() pause 0.35 $ mouse_headpat() - ton "Good boy!" (face="happy") + ton "Good boy!" ("horny", "narrow", "base", "mid") elif what == "breasts": $ mouse_slap() random: - ton "That's not how a headmaster should treat their subordinates." (face="annoyed") - ton "It's inappropriate, let's keep it civil, okay?" (face="annoyed") - ton "Someone fancy themselves a bit of a bad boy?" (face="annoyed", mouth="base") - ton "Hey, those are my fun bags... Don't be naughty." (face="annoyed", mouth="horny") - ton "Hey now, someone's getting a bit ahead of themselves." (face="annoyed") - ton "Those aren't for you to play with..." (face="annoyed") + ton "That's not how a headmaster should treat their subordinates." ("annoyed", "narrow", "base", "mid") + ton "Let's keep it civil, okay?" ("open", "narrow", "angry", "mid") + ton "Someone fancy themselves a bit of a bad boy?" ("base", "narrow", "angry", "mid") + ton "Hey, those are my fun bags... Don't be naughty." ("soft", "narrow", "angry", "mid") + ton "Hey now, someone's getting a bit ahead of themselves." ("annoyed", "narrow", "base", "mid") + ton "Those aren't for you to play with..." ("open", "narrow", "base", "mid") elif what == "vagina": $ mouse_slap() random: - ton "You have to earn it first." (face="annoyed") - ton "If you'd like to keep these hands intact, I suggest you stop it right now, [name_genie_tonks]." (face="annoyed") - ton "Hey, who said you had permission to approach the chamber of secrets?" (face="annoyed", eyebrows="angry", mouth="grin") - ton "That place is reserved for good boys and girls..." (face="annoyed", eyebrows="angry", mouth="grin") - ton "That forest is forbidden entry for first years... Let's get to know each other a bit better first..." (face="annoyed", eyebrows="angry", mouth="grin") + ton "You have to earn it first." ("annoyed", "narrow", "angry", "mid") + ton "If you'd like to keep these hands intact, I suggest you stop it right now, [name_genie_tonks]." ("soft", "narrow", "angry", "mid") + ton "Hey, who said you had permission to approach the chamber of secrets?" ("grin", "narrow", "angry", "mid") + ton "That place is reserved for good boys and girls..." ("annoyed", "narrow", "angry", "mid") + ton "That forest is forbidden entry for newbies... Let's get to know each other a bit better first..." ("soft", "narrow", "base", "mid") return @@ -140,9 +140,9 @@ label ton_reaction_equip_fail(item): # random: - ton "Not yet big boy, perhaps once this scheme of ours comes more into fruition..." (face="annoyed", eyebrows="angry", mouth="grin") - ton "It does look nice, but you need to deserve it..." (face="annoyed", eyebrows="angry", mouth="grin") - ton "*Hmm*... What would you think of me if I wore this?... Later, perhaps." (face="annoyed", eyebrows="raised", mouth="horny") + ton "Not yet, big boy..." ("soft", "narrow", "angry", "mid") + ton "It does look nice, but you need to deserve it..." ("grin", "narrow", "angry", "mid") + ton "*Hmm*... What would you think of me if I wore this?... Later, perhaps." ("soft", "narrow", "base", "mid") return @@ -165,18 +165,19 @@ label ton_reaction_unequip_fail(item): # ton "P-please, I don't want to..." if item.type == "top": - ton "Someone's being naughty... I might have to give you a spanking for that." (face="annoyed", eyebrows="angry", mouth="grin") - ton "Just kidding! Sure, have a quick look, [name_genie_tonks]." (face="annoyed", eyebrows="raised", mouth="horny") + ton "Someone's being naughty... I might have to give you a spanking for that." ("grin", "narrow", "angry", "mid") + ton "Just kidding! Sure, have a quick look, [name_genie_tonks]." ("grin", "narrow", "raised", "mid") $ char_active.strip("top", "robe") - ton "" (face="happy") + ton "" ("base", "base", "base", "mid") pause 1.0 - ton "" (face="happy") + ton "" ("base", "closed", "base", "down") pause 1.0 - ton "" (face="happy") + ton "" ("grin", "narrow", "base", "mid") $ char_active.wear("top", "robe") gen "What gives?!" ("angry", xpos="far_left", ypos="head") - ton "Time's up." (face="annoyed", eyebrows="angry", mouth="grin") + ton "Time's up." ("base", "wink", "base", "mid") gen "......" ("base", xpos="far_left", ypos="head") + ton "" ("base", "base", "base", "mid") elif item.type == "bottom": @@ -679,12 +680,12 @@ label ton_reaction_equip_outfit_fail(item): #gen "(Wait, did she say it doesn't show it off enough?)" ("base", xpos="far_left", ypos="head") # - ton "It looks lovely, but you'd have to prove yourself a bit more before I put that on..." (face="annoyed", eyebrows="angry", mouth="grin") + ton "It looks lovely, but you'd have to prove yourself a bit more before I put that on..." ("grin", "narrow", "annoyed", "mid") return label ton_reaction_blacklist(item): - ton "*oooh* that's racy!" + ton "*Oooh* that's racy!" if "top" in item.blacklist and tonks.is_worn("top"): ton "I'd need to take off my top." @@ -694,7 +695,7 @@ label ton_reaction_blacklist(item): if "bra" in item.blacklist and tonks.is_worn("bra"): ton "My girls would definitely appreciate me letting them breathe." - gen "Your tits you mean." ("grin", xpos="far_left", ypos="head") + gen "Your tits, you mean." ("grin", xpos="far_left", ypos="head") ton "Now, now, don't get needy, my dear headmaster." if "panties" in item.blacklist and tonks.is_worn("panties"):