From 7f9bbda2f5a856243182390dff0339d69ce1b9f8 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Thu, 11 May 2023 18:59:55 +0200 Subject: [PATCH] Face parameter removal (Cho) * Removed face parameter for Cho and reposed events that relied on it. * Minor fix. --- .../cho/events/favors/talk_to_me.rpy | 4 +- .../events/quidditch/hufflepuff_practice.rpy | 2 +- .../cho/events/quidditch/training.rpy | 2 +- .../cho/events/requests/manipulate_boys.rpy | 24 +- .../cho/events/requests/manipulate_girls.rpy | 2 +- game/scripts/characters/cho/events/summon.rpy | 4 +- game/scripts/characters/cho/gifts.rpy | 503 +++++++++--------- game/scripts/characters/cho/summon.rpy | 4 +- game/scripts/characters/cho/talk.rpy | 4 +- .../events/favors/dance_for_me_snape.rpy | 2 +- .../inventory/potions/addictive_potion.txt | 2 +- .../minigames/mirror/events/suck_and_run.rpy | 2 +- 12 files changed, 276 insertions(+), 279 deletions(-) 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 00d1ea0d..abeb804b 100644 --- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy @@ -49,7 +49,7 @@ label cc_pf_talk_T1_intro_E1: call cho_walk("desk", "base") play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed - cho "" (face="happy", xpos="mid", ypos="base", trans=d3) + cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=d3) call ctc cho "What would you like to talk about?" ("soft", "base", "base", "mid") @@ -1049,7 +1049,7 @@ label cc_pf_talk_T2_intro_E2: label cc_pf_talk_T2_E3: play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed - cho "" ("annoyed", face="neutral", xpos="mid", ypos="base", trans=fade) + cho "" ("soft", "base", "base", "mid", xpos="mid", ypos="base", trans=fade) pause .5 gen "[name_cho_genie], how is school life?" ("grin", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy index 2d9f3c72..66bf04c5 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy @@ -150,7 +150,7 @@ label cc_ht_talk: call reset_menu_position hide screen blkfade - cho "" (face="happy", xpos="base", ypos="base", trans=fade) + cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade) jump cho_requests elif not cc_pf_talk.is_tier_complete(): # Has NOT completed "Talk to me" favour yet. diff --git a/game/scripts/characters/cho/events/quidditch/training.rpy b/game/scripts/characters/cho/events/quidditch/training.rpy index 561a2a0c..707c74cb 100644 --- a/game/scripts/characters/cho/events/quidditch/training.rpy +++ b/game/scripts/characters/cho/events/quidditch/training.rpy @@ -387,7 +387,7 @@ label cho_training: call reset_menu_position hide screen blkfade - cho "" (face="happy", xpos="base", ypos="base", trans=fade) + cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade) jump cho_requests ### Quidditch Tactics ### diff --git a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy index e54ed6b5..3c92b87a 100644 --- a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy +++ b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy @@ -62,7 +62,7 @@ label cc_pr_manipulate_boys_start: # Repeated else: gen "Ready to mess with Hufflepuff again?" ("base", xpos="far_left", ypos="head") - cho "I guess so..." (mouth="soft", face="happy") + cho "I guess so..." ("soft", "base", "base", "mid") gen "Great! I'll see you later today for your report, [name_cho_genie]!" ("grin", xpos="far_left", ypos="head") cho "Yes, [name_genie_cho]!" ("base", "base", "base", "mid") @@ -132,7 +132,7 @@ label cc_pr_manipulate_boys_start: else: gen "Time to brighten up some Slytherin's day again..." ("base", xpos="far_left", ypos="head") gen "Go and get their players on {i}your{/i} side!" ("grin", xpos="far_left", ypos="head") - cho "I will try my best, [name_genie_cho]!" (mouth="smile", face="happy") + cho "I will try my best, [name_genie_cho]!" ("smile", "narrow", "base", "mid") gen "Report to me later as usual, [name_cho_genie]!" ("grin", xpos="far_left", ypos="head") cho "Yes, Sir!" ("base", "base", "base", "mid") @@ -262,7 +262,7 @@ label cc_pr_manipulate_boys_T1_intro_E1: # Cho enters. call cho_walk(action="enter", xpos="desk", ypos="base") - cho "" (face="happy", xpos="mid", ypos="base", trans=fade) + cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "How did it go?" ("base", xpos="far_left", ypos="head") cho "It went...{w=0.3} well?" ("soft", "base", "raised", "R") cho "Maybe a little too well... He tried to kiss me!" ("annoyed", "base", "raised", "mid") @@ -299,7 +299,7 @@ label cc_pr_manipulate_boys_T1_E1: # Cho enters. call cho_walk(action="enter", xpos="desk", ypos="base") - cho "" (face="happy", xpos="mid", ypos="base", trans=fade) + cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "What's my favourite Quidditch player been up to today?" ("base", xpos="far_left", ypos="head") cho "I think you'll be happy, [name_genie_cho]!" ("base", "narrow", "base", "mid") gen "I like the sound of that! Tell me what happened." ("grin", xpos="far_left", ypos="head") @@ -336,7 +336,7 @@ label cc_pr_manipulate_boys_T1_E2: # Cho enters. call cho_walk(action="enter", xpos="desk", ypos="base") - cho "" (face="annoyed", xpos="mid", ypos="base", trans=fade) + cho "" ("annoyed", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "[name_cho_genie]! Do you have some good news for me?" ("angry", xpos="far_left", ypos="head") cho "I'm afraid not this time, Sir." ("soft", "narrow", "worried", "mid") gen "Why not? Tell me what happened..." ("base", xpos="far_left", ypos="head") @@ -389,9 +389,9 @@ label cc_pr_manipulate_boys_T1_E3: # Cho enters. call cho_walk(action="enter", xpos="desk", ypos="base") - cho "" (face="happy", xpos="mid", ypos="base", trans=fade) + cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "So? How did it go?" ("base", xpos="far_left", ypos="head") - cho "Very well, Sir!" (mouth="smile", face="happy") + cho "Very well, Sir!" ("smile", "base", "base", "mid") gen "Yeah? Tell me about it!" ("grin", xpos="far_left", ypos="head") cho "I ran into Cedric on my way to the library...{w} Literally!" ("soft", "wide", "base", "mid") cho "I bumped into him and hit my head pretty hard..." ("soft", "narrow", "worried", "mid") @@ -406,13 +406,13 @@ label cc_pr_manipulate_boys_T1_E3: cho @ cheeks blush "It just... happened..." ("clench", "narrow", "worried", "downR") gen "Well done, girl!" ("base", xpos="far_left", ypos="head") cho "It was really nice, though." ("soft", "narrow", "base", "mid") - cho "He still is a really good kisser!" ( face="horny") + cho "He still is a really good kisser!" ("horny", "narrow", "base", "R") cho "Compared to most of the others I had..." ("base", "narrow", "base", "mid") gen "!!!" ("angry", xpos="far_left", ypos="head") cho "Anyhow, I should get going." ("open", "base", "base", "R") cho "It's getting late..." ("soft", "base", "worried", "mid") gen "Of course. You are dismissed." ("base", xpos="far_left", ypos="head") - cho "Good night, [name_genie_cho]." ( face="happy") + cho "Good night, [name_genie_cho]." ("smile", "narrow", "base", "mid") # Cho leaves. call cho_walk(action="leave") @@ -732,7 +732,7 @@ label cc_pr_manipulate_boys_T3_twins: stop music fadeout 1.0 gen "Back so soon--" ("base", xpos="far_left", ypos="head") - cho "" (face="angry", xpos="mid", ypos="base", trans=fade) + cho "" ("annoyed", "narrow", "angry", "mid", xpos="mid", ypos="base", trans=fade) menu: "\"*Ha-ha-ha-ha*\"": @@ -819,7 +819,7 @@ label cc_pr_manipulate_boys_T3_ron: # Cho enters. call cho_walk(action="enter", xpos="desk", ypos="base") - cho "" (face="happy", xpos="mid", ypos="base", trans=fade) + cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "Mission success?" ("base", xpos="far_left", ypos="head") gen "Did you manage to sneak up on Rob?" ("base", xpos="far_left", ypos="head") @@ -879,7 +879,7 @@ label cc_pr_manipulate_boys_T3_harry: # Cho enters. call cho_walk(action="enter", xpos="desk", ypos="base") - cho "" (face="happy", xpos="mid", ypos="base", trans=fade) + cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "Welcome back...{w=0.3} Mission success?" ("base", xpos="far_left", ypos="head") cho "Yes!" ("crooked_smile", "base", "base", "mid") diff --git a/game/scripts/characters/cho/events/requests/manipulate_girls.rpy b/game/scripts/characters/cho/events/requests/manipulate_girls.rpy index 28b7a920..d0d55cea 100644 --- a/game/scripts/characters/cho/events/requests/manipulate_girls.rpy +++ b/game/scripts/characters/cho/events/requests/manipulate_girls.rpy @@ -318,7 +318,7 @@ label cc_pr_manipulate_girls_T3_katie_part2: # Cho enters. call cho_walk(action="enter", xpos="desk", ypos="base") - cho "" (face="angry", xpos="mid", ypos="base", trans=fade) + cho "" ("annoyed", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "Welcome back, any progress?" ("base", xpos="far_left", ypos="head") cho @ cheeks blush "If your goal was to get my ass red raw again then sure, plenty of progress..." ("angry", "narrow", "base", "R") diff --git a/game/scripts/characters/cho/events/summon.rpy b/game/scripts/characters/cho/events/summon.rpy index 6cc42c20..8d9131b2 100644 --- a/game/scripts/characters/cho/events/summon.rpy +++ b/game/scripts/characters/cho/events/summon.rpy @@ -71,9 +71,9 @@ label cho_summon_setup: stop music fadeout 3.0 if states.cho.mood == 0: - cho "Goodbye, [name_genie_cho]." (face="happy") + cho "Goodbye, [name_genie_cho]." ("base", "narrow", "base", "mid") else: - cho "Goodbye, [name_genie_cho]." (face="annoyed") + cho "Goodbye, [name_genie_cho]." ("annoyed", "narrow", "base", "mid") play sound "sounds/door.ogg" diff --git a/game/scripts/characters/cho/gifts.rpy b/game/scripts/characters/cho/gifts.rpy index da5e624e..29c092bf 100644 --- a/game/scripts/characters/cho/gifts.rpy +++ b/game/scripts/characters/cho/gifts.rpy @@ -10,153 +10,153 @@ label give_cho_gift(gift_item): if gift_item == lollipop_ITEM: if states.cho.tier <= 1: cho "Sweets?" ("soft", "base", "base", "mid") - cho "My team captain hasn't let me buy any to keep my blood sugar balanced... Whatever that means." ("open", "base", "base", "mid") + cho "My team captain hasn't let me buy any to keep my blood sugar balanced... Whatever that means." ("open", "narrow", "base", "R") call give_gift("You give the sweets to Cho...",gift_item) cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-2) elif states.cho.tier == 2: - cho "Sweets?" ("base", "base", "base", "mid") + cho "Sweets?" ("soft", "base", "base", "mid") call give_gift("You give the sweets to Cho...",gift_item) - cho "Thank you, [name_genie_cho] I do think I deserve one, since we won our first match." ("smile", "base", "base", "L") + cho "Thank you, [name_genie_cho]... Yes, I do think I deserve one, since we won our first match." ("smile", "narrow", "base", "mid") call cho_mood(-2) elif states.cho.tier == 3: - cho "Sweets?" ("base", "base", "base", "mid") - cho "But we're up against Gryffindor soon, I don't want to get addicted to sugar..." ("base", "base", "base", "mid") + cho "Sweets?" ("soft", "base", "base", "mid") + cho "But we're up against Gryffindor soon, I don't want to get addicted to sugar..." ("soft", "base", "base", "R") call give_gift("You give the sweets to Cho...",gift_item) - cho "Thank you, [name_genie_cho]." ("smile", "base", "base", "L") + cho "Thank you, [name_genie_cho]." ("open", "base", "base", "mid") call cho_mood(-1) else: - cho "Sweets?" ("base", "base", "base", "mid") + cho "Sweets?" ("soft", "base", "base", "mid") call give_gift("You give the sweets to Cho...",gift_item) - cho "I'll keep it for later... I like licking it in front of my teammates to tease them a bit." ("open", "base", "raised", "mid") - cho "*Mmmh*, but in the future... I'm more of a savoury kind of girl when it comes to sucking on things..." ("horny", "wink", "base", "mid") - cho "But thanks, [name_genie_cho]." ("smile", "base", "base", "L") + cho "I'll keep it for later... I like licking it in front of my teammates to tease them a bit." ("smile", "narrow", "base", "R") + cho @ cheeks blush "But in the future... I'm more of a savoury kind of girl..." ("base", "narrow", "base", "R") + cho @ cheeks blush "If you follow my trail..." ("smile", "wink", "base", "mid") call cho_mood(-1) elif gift_item == chocolate_ITEM: if states.cho.tier <= 1: - cho "Chocolate?" ("base", "base", "base", "mid") - cho "I probably shouldn't... Although." ("base", "base", "base", "mid") + cho "Chocolate?" ("soft", "base", "base", "mid") + cho "I probably shouldn't... Although." ("upset", "narrow", "base", "down") call give_gift("You give the chocolate to Cho...",gift_item) - cho "I'll take it, [name_genie_cho]!" ("base", "base", "base", "mid") + cho "I'll take it, [name_genie_cho]!" ("smile", "base", "base", "mid") call cho_mood(-2) elif states.cho.tier == 2: - cho "Chocolate... Now that would be a treat..." ("base", "base", "base", "mid") + cho "Chocolate... Now that would be a treat..." ("open", "base", "base", "down") call give_gift("You give the chocolate to Cho...",gift_item) - cho "What the heck, I deserve it." ("smile", "base", "base", "L") - cho "Thank you, [name_genie_cho]." ("open", "base", "base", "L") + cho "What the heck, I deserve it." ("base", "narrow", "base", "mid") + cho "Thank you, [name_genie_cho]." ("smile", "base", "base", "mid") call cho_mood(-2) elif states.cho.tier == 3: - cho "Chocolate?" ("base", "base", "base", "mid") - cho "But we're up against Gryffindor soon, I don't want to get addicted to sugar..." ("base", "base", "base", "mid") + cho "Chocolate?" ("soft", "base", "base", "down") + cho "But we're up against Gryffindor soon, I don't want to get addicted to sugar..." ("upset", "base", "base", "mid") call give_gift("You give the chocolate to Cho...",gift_item) - cho "Thanks." ("base", "base", "base", "L") + cho "Thanks." ("open", "base", "base", "mid") call cho_mood(-1) else: - cho "Chocolate?" ("base", "base", "base", "mid") + cho "Chocolate?" ("soft", "base", "base", "down") call give_gift("You give the chocolate to Cho...",gift_item) - cho "Yes!" ("smile", "base", "base", "L") - cho "I've been trying to stay away from it, but since the season is over, I can have as much as I'd like..." ("open", "wide", "base", "L") - cho "Within reason." ("base", "base", "base", "L") + cho "Yes!" ("grin", "happyCl", "base", "down") + cho "I've been trying to stay away from it, but since the season is over, I can have as much as I'd like..." ("grin", "narrow", "base", "mid") + cho "Within reason... of course." ("smile", "narrow", "base", "downR") call cho_mood(-2) elif gift_item == plush_owl_ITEM: if states.cho.tier <= 1: - cho "A toy?" ("base", "base", "base", "mid") + cho "A toy?" ("annoyed", "base", "base", "mid") call give_gift("You give the stuffed owl to Cho...",gift_item) - cho "My team would probably laugh if they saw me with this..." ("base", "base", "base", "mid") - cho "I guess it's kinda cute..." (face="annoyed") + cho "My team would probably laugh if they saw me with this..." ("disgust", "narrow", "base", "mid") + cho "I'm sorry, but I can't accept this..." ("soft", "narrow", "base", "mid") call cho_mood(0) elif states.cho.tier == 2: - cho "A toy?" ("base", "base", "base", "mid") + cho "A toy?" ("soft", "base", "base", "down") call give_gift("You give the stuffed owl to Cho...",gift_item) - cho "That's very nice of you [name_genie_cho] but I'd probably be made fun of owning this..." ("annoyed", "base", "base", "mid") - cho "I guess I could give it to someone." ("open", "base", "base", "down") + cho "That's very nice of you [name_genie_cho], but I'd probably be made fun of for owning this..." ("annoyed", "base", "base", "mid") + cho "I guess I could give it to someone." ("open", "base", "base", "R") call cho_mood(0) elif states.cho.tier == 3: - cho "A toy?" ("base", "base", "base", "mid") + cho "A toy?" ("soft", "narrow", "base", "down") call give_gift("You give the stuffed owl to Cho...",gift_item) - cho "I'm not a child [name_genie_cho]..." ("annoyed", "base", "base", "mid") - cho "Thank you I guess..." ("open", "base", "base", "down") + cho "I'm not a child, [name_genie_cho]..." ("annoyed", "base", "base", "mid") + cho "Thank you I guess..." ("open", "narrow", "base", "R") call cho_mood(0) else: - cho "A toy?" ("base", "base", "base", "mid") + cho "A toy?" ("soft", "narrow", "base", "down") call give_gift("You give the stuffed owl to Cho...",gift_item) cho "Not the kind of Toy I'd like..." ("horny", "narrow", "raised", "mid") - cho "Thank you I suppose." ("annoyed", "base", "base", "mid") + cho "Thank you I suppose." ("open", "narrow", "base", "mid") call cho_mood(0) elif gift_item == butterbeer_ITEM: if states.cho.tier <= 1: - cho "Butterbeer?" ("base", "base", "base", "mid") - cho "Isn't this supposed to be alcoholic? I'm not supposed to drink during the season..." ("base", "base", "base", "mid") + cho "Butterbeer?" ("angry", "base", "base", "mid") + cho "Isn't this supposed to be alcoholic? I'm not supposed to drink during the season..." ("upset", "base", "base", "mid") call cho_mood(1) elif states.cho.tier == 2: - cho "Butterbeer?" ("base", "base", "base", "mid") - cho "Yes, I'll take it... Turns out my teammates had been lying about the alcohol content to mess with me." ("open", "narrow", "base", "mid") - cho "I guess I'll finally find out what I've been missing out on!" ("soft", "base", "raised", "L") + cho "Butterbeer?" ("open", "base", "base", "down") + cho "Yes, I'll take it... Turns out my teammates had been lying about the alcohol content to mess with me." ("base", "narrow", "base", "mid") + cho "I can't believe they made me miss out on this, for such a long time." ("open", "narrow", "base", "R") call give_gift("You give the Butterbeer to Cho...",gift_item) cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-2) elif states.cho.tier == 3: - cho "Butterbeer?" ("base", "base", "base", "mid") - cho "It's a bit tame, isn't it? I chugged a lot of it after our last win and can't say I felt a buzz even." ("open", "narrow", "base", "L") + cho "Butterbeer?" ("open", "base", "base", "down") + cho "It's a bit tame, isn't it? I chugged a lot of it after our last win and can't say I felt a buzz even." ("soft", "narrow", "raised", "mid") call give_gift("You give the Butterbeer to Cho...",gift_item) - cho "Thank you, I suppose, [name_genie_cho]." ("base", "base", "base", "mid") + cho "Thank you, I suppose, [name_genie_cho]." ("soft", "base", "base", "R") call cho_mood(0) else: - cho "Butterbeer?" ("base", "base", "base", "mid") + cho "Butterbeer?" ("soft", "narrow", "raised", "down") cho "Don't you have any firewhisky?" ("annoyed", "base", "base", "mid") call give_gift("You give the Butterbeer to Cho...",gift_item) - cho "Thank you, I suppose, [name_genie_cho]." ("base", "base", "base", "mid") + cho "Thanks, I suppose..." ("open", "narrow", "base", "down") call cho_mood(0) elif gift_item == science_mag_ITEM: if states.cho.tier <= 1: - cho "Oh, I heard that they put out a new formula for broom polish in this issue." ("base", "base", "base", "mid") + cho "Oh, I heard that they put out a new formula for broom polish in this issue." ("smile", "base", "base", "mid") call give_gift("You give an assortment of educational magazines to Cho...",gift_item) cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) elif states.cho.tier == 2: - cho "*Hmm*... Broom aerodynamics and how to utilise your opponent's slipstream..." ("base", "base", "base", "mid") + cho "*Hmm*... Broom aerodynamics and how to utilise your opponent's slipstream..." ("open", "narrow", "raised", "down") cho "Interesting..." ("smile", "base", "base", "mid") call give_gift("You give an assortment of educational magazines to Cho...",gift_item) cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) elif states.cho.tier == 3: - cho "Five steps to modify your brooms legally..." ("base", "base", "base", "mid") + cho "Five steps to modify your brooms legally..." ("soft", "base", "base", "down") cho "Sounds useful." ("smile", "base", "base", "mid") call give_gift("You give an assortment of educational magazines to Cho...",gift_item) cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) else: - cho "Experts guide, How to maintain and store your Quidditch gear." ("base", "base", "base", "mid") - cho "Isn't that what a broom closet is for?" ("base", "base", "base", "mid") + cho "An expert's guide, on how to maintain and store your Quidditch gear." ("base", "narrow", "base", "down") + cho "Isn't that what a broom closet is for?" ("soft", "wink", "base", "mid") call give_gift("You give an assortment of educational magazines to Cho...",gift_item) - cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") + cho "I suppose you learn something new every day... Thank you [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) elif gift_item == girls_mag_ITEM: if states.cho.tier <= 1: - cho "Girls magazines, what do you think I am... A gi--" ("base", "base", "base", "mid") - cho "I'm good, thank you..." ("base", "base", "base", "mid") + cho "Girls magazines, what do you think I am... A gi--" ("angry", "base", "base", "mid") + cho "I'm good, thank you..." ("soft", "narrow", "base", "R") call cho_mood(0) elif states.cho.tier == 2: - cho "Girls magazines?" ("base", "base", "base", "mid") + cho "Girls magazines?" ("soft", "narrow", "base", "down") call give_gift("You give an assortment of rather girly magazines to Cho...",gift_item) - cho "I don't usually read these types of magazines, the boys used to make fun of me for it." ("base", "base", "base", "mid") - cho "But they can't get into the girls' dorm." ("base", "base", "base", "mid") + cho "I don't usually read these types of magazines, the boys used to make fun of me for it." ("annoyed", "narrow", "base", "R") + cho "But they can't get into the girls' dorm." ("base", "narrow", "base", "R") cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) elif states.cho.tier == 3: - cho "Girls magazines?" ("base", "base", "base", "mid") + cho "Girls magazines?" ("soft", "base", "base", "down") call give_gift("You give an assortment of rather girly magazines to Cho...",gift_item) - cho "They do have some interesting stuff on skincare I suppose..." ("annoyed", "closed", "base", "mid") - cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") + cho "They do have some interesting stuff on skincare I suppose..." ("annoyed", "narrow", "base", "R") + cho "Thank you, [name_genie_cho]." ("open", "base", "base", "R") call cho_mood(-1) else: - cho "Girls magazines?" ("base", "base", "base", "mid") - cho "I did enjoy last month's issue about cultural appropriation with traditional clothing..." ("smile", "base", "base", "mid") + cho "Girls magazines?" ("soft", "narrow", "base", "down") + cho "I suppose I found the article in last month's issue about cultural appropriation interesting..." ("open", "narrow", "base", "downR") call give_gift("You give an assortment of rather girly magazines to Cho...",gift_item) cho "Don't tell the boys I said that." ("soft", "closed", "base", "mid") cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") @@ -165,30 +165,30 @@ label give_cho_gift(gift_item): elif gift_item == adult_mag_ITEM: if states.cho.tier <= 1: cho "Adult magazines?" ("angry", "wide", "raised", "mid") - cho "This is highly inappropriate [name_genie_cho]!" ("scream", "narrow", "raised", "mid") + cho "This is highly inappropriate, [name_genie_cho]!" ("angry", "narrow", "raised", "mid") cho "Is this the kind of thing you usually give to people?" ("angry", "base", "base", "L") call cho_mood(1) elif states.cho.tier == 2: - cho "Adult magazines?" ("base", "base", "base", "mid") + cho "Adult magazines?" ("soft", "narrow", "base", "down") call give_gift("You give an assortment of adult magazines to Cho...",gift_item) - cho "These people do have nice, posture..." ("base", "base", "base", "mid") - cho "I... I guess they could be useful." ("base", "base", "base", "mid") - cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks blush "These people do have nice posture..." ("open", "narrow", "base", "down") + cho @ cheeks blush "I... I guess they could be useful." ("open", "base", "base", "R") + cho @ cheeks blush "Thank you, [name_genie_cho]." ("open", "closed", "base", "mid") call cho_mood(-1) elif states.cho.tier == 3: - cho "Adult magazines?" ("base", "base", "base", "mid") + cho "Adult magazines?" ("soft", "narrow", "base", "down") call give_gift("You give an assortment of adult magazines to Cho...",gift_item) - cho "They're all so fit in these magazines, totally my type." ("open", "wide", "raised", "down") - cho "Does this one model in the nude?" ("horny", "base", "base", "L") + cho "They're all so fit in these magazines... Totally my type." ("smile", "narrow", "base", "down") + cho "Does this one model in the nude?" ("horny", "base", "base", "down") cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) else: - cho "Adult magazines?" ("base", "base", "base", "mid") + cho @ cheeks blush "Adult magazines?" ("soft", "narrow", "base", "down") call give_gift("You give an assortment of adult magazines to Cho...",gift_item) - cho "Wow, look at that guy's abs..." ("horny", "base", "base", "down") - cho "And that girls..." ("soft", "base", "raised", "down") - cho "I'll take it." ("open", "narrow", "base", "mid") - cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks blush "Wow, look at that guy's abs..." ("horny", "base", "base", "down") + cho @ cheeks blush "And that girl's... What do you call it?" ("soft", "base", "raised", "down") + cho @ cheeks blush "Cum-gutters?" ("horny", "narrow", "raised", "down") + cho @ cheeks blush "Thank you, [name_genie_cho]." ("horny", "narrow", "base", "mid") call cho_mood(-2) elif gift_item == porn_mag_ITEM: @@ -196,92 +196,88 @@ label give_cho_gift(gift_item): cho "What is this!?!" ("angry", "wide", "raised", "mid") cho "Porn magazines?" ("open", "wide", "angry", "mid") cho "Sir, why would you even think of giving me something like this?" ("scream", "narrow", "angry", "L") - cho "" ("angry", "base", "angry", "down") call cho_mood(3) elif states.cho.tier == 2: - cho "What is this?" ("base", "base", "base", "mid") - cho "Porn magazines? Sir, that's too much even for you..." ("annoyed", "narrow", "base", "down") - cho "Is that a snitch in her sna-- No... just no..." ("open", "wide", "raised", "down") - cho "" ("angry", "base", "angry", "down") + cho @ cheeks blush "What is this?" ("angry", "wide", "base", "down") + cho @ cheeks blush "Porn magazines? Sir, that's too much..." ("angry", "narrow", "base", "down") + cho @ cheeks heavy_blush "Is that a snitch in her sna--" ("open", "wide", "raised", "down") call cho_mood(2) elif states.cho.tier == 3: - cho "What's this?" ("base", "base", "base", "mid") + cho @ cheeks blush "What's this?" ("soft", "narrow", "base", "down") call give_gift("You give an assortment of porn magazines to Cho...",gift_item) - cho "What's with these positions? Is that a broom handle up her..." ("base", "base", "base", "mid") - cho "Oh my..." ("base", "base", "base", "mid") + cho @ cheeks blush "What's with these positions? Is that a broom handle up her--" ("angry", "base", "base", "down") + cho @ cheeks blush "Oh my..." ("angry", "base", "base", "down") call cho_mood(0) else: - cho "Porn magazines?" ("base", "base", "base", "mid") - cho "Ooh, are those two doing it on a broom? That's impressive..." ("open", "wide", "raised", "down") - cho "[name_genie_cho], this is naughty. Even for you..." ("horny", "wink", "base", "L") - cho "I've got my eyes on you." ("base", "narrow", "raised", "L") + cho @ cheeks blush "Porn magazines?" ("soft", "narrow", "base", "down") + cho @ cheeks blush "Ooh, are those two doing it on a broom? That's impressive..." ("open", "base", "raised", "down") + cho @ cheeks blush "[name_genie_cho], this is naughty... Even for you." ("smile", "narrow", "base", "downR") + cho @ cheeks blush "I've got my eyes on you." ("base", "narrow", "raised", "mid") call give_gift("You give an assortment of porn magazines to Cho...",gift_item) - cho "Thank you." ("smile", "base", "base", "mid") + cho @ cheeks heavy_blush "..." ("horny", "narrow", "base", "mid") call cho_mood(-3) elif gift_item == krum_poster_ITEM: if states.cho.tier <= 1: - cho "A Viktor Krum poster?" ("base", "base", "base", "mid") - cho "Professor, he doesn't have his shirt on!" ("scream", "wide", "base", "down") - cho "That's...{w=0.3} highly inappropriate..." ("open", "narrow", "base", "downR") + cho "A Viktor Krum poster?" ("angry", "base", "base", "mid") + cho "Professor, he doesn't have his shirt on!" ("angry", "wink", "base", "mid") + cho @ cheeks blush "That's...{w=0.3} highly inappropriate..." ("angry", "closed", "base", "downR") cho "I can't...{w=0.3} I can't accept this." ("upset", "closed", "base", "mid") - cho "" ("upset", "base", "base", "mid") call cho_mood(0) elif states.cho.tier == 2: - cho "A Viktor Krum poster?" ("base", "base", "base", "mid") - cho "He really is quite muscular isn't he..." ("open", "narrow", "base", "down") - cho "I'll use it..." ("smile", "base", "base", "mid") + cho @ cheeks blush "A Viktor Krum poster?" ("soft", "narrow", "base", "down") + cho @ cheeks blush "He really is quite muscular isn't he..." ("disgust", "narrow", "base", "down") + cho @ cheeks blush "I'll use it..." ("smile", "narrow", "base", "down") call give_gift("You give the poster to Cho...",gift_item) - cho "As a motivational poster that is!" ("open", "wide", "raised", "L") - cho "Thank you [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks blush "As a motivational poster that is!" ("angry", "narrow", "raised", "downR") + cho @ cheeks blush "Thank you [name_genie_cho]." ("open", "narrow", "base", "R") call cho_mood(-2) elif states.cho.tier == 3: - cho "A Viktor Krum poster?" ("base", "base", "base", "mid") - cho "Wasn't his nudes leaked in Wizard Hunks weekly?" ("open", "narrow", "base", "mid") - cho "..." ("angry", "wide", "raised", "down") - cho "Not that I'd read such a thing." ("upset", "base", "base", "downR") + cho "A Viktor Krum poster?" ("soft", "base", "base", "down") + cho "Wasn't his nudes leaked in Wizard Hunks weekly?" ("open", "base", "raised", "down") + cho "..." ("angry", "wide", "raised", "mid") + cho "Not that I'd read such a thing." ("angry", "wide", "base", "downR") call give_gift("You give the poster to Cho...",gift_item) - cho "Thank you [name_genie_cho]." ("base", "base", "base", "mid") + cho "Thank you [name_genie_cho]." ("angry", "base", "base", "downR") call cho_mood(-3) else: - cho "A Viktor Krum poster?" ("base", "base", "base", "mid") - cho "I'll take that if you don't mind." ("base", "base", "base", "mid") + cho @ cheeks blush "A Viktor Krum poster?" ("soft", "narrow", "raised", "down") + cho @ cheeks blush "But, isn't this almost the same as if he were to be watching me for real?" ("horny", "narrow", "base", "down") call give_gift("You give the poster to Cho...",gift_item) - cho "(...)" ("base", "base", "base", "mid") - cho "I love it, [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks blush "..." ("horny", "narrow", "base", "down") + cho @ cheeks blush "I love it, [name_genie_cho]." ("smile", "narrow", "base", "mid") call cho_mood(-5) elif gift_item == sexy_lingerie_ITEM: if states.cho.tier <= 1: - cho "Lingerie?" ("annoyed", "narrow", "raised", "down") + cho "Lingerie?" ("open", "narrow", "raised", "down") cho "Sir, are you expecting me to wear this?" ("open", "wide", "raised", "mid") - cho "Are you insane?!" ("scream", "wide", "raised", "L") + cho "Are you insane?!" ("disgust", "narrow", "angry", "mid") cho "No, thank you..." ("open", "base", "angry", "down") - cho "" ("annoyed", "base", "base", "mid") call cho_mood(2) elif states.cho.tier == 2: cho "Lingerie?" ("annoyed", "narrow", "base", "down") - cho "Why would I want this? I have plenty of clothes I like already..." ("open", "wide", "raised", "down") - cho "I'll pass on that one, thanks." ("base", "base", "base", "mid") + cho "Why would I want this? I have plenty of clothes I like already..." ("soft", "narrow", "raised", "mid") + cho "I'll pass on that one, thanks." ("open", "base", "base", "R") call cho_mood(0) elif states.cho.tier == 3: - cho "Lingerie?" ("base", "base", "base", "mid") - cho "Seems pretty flexible. I might be able to use these when stretching." ("base", "base", "base", "mid") + cho "Lingerie?" ("soft", "narrow", "base", "down") + cho "Seems pretty flexible. I might be able to use these when stretching." ("base", "narrow", "base", "down") call give_gift("You give the lingerie to Cho...",gift_item) - cho "Thank you [name_genie_cho]." ("base", "base", "base", "mid") + cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-2) else: - cho "Lingerie?" ("base", "base", "base", "mid") - cho "Sexy... Did you pick them out yourself?" ("horny", "wide", "base", "down") - cho "You've got good taste... I tore mine last year during the ball..." ("base", "base", "raised", "mid") - cho "Well, they got torn at one point at least..." ("smile", "narrow", "base", "down") + cho @ cheeks blush "Lingerie?" ("soft", "narrow", "raised", "down") + cho @ cheeks blush "very sexy... Did you pick them out yourself?" ("base", "wink", "base", "mid") + cho @ cheeks blush "You've got good taste... I tore mine during the ball last year..." ("smile", "narrow", "base", "R") + cho @ cheeks blush "That's what I get for thinking they'd fit, even after doing so many squats, I suppose..." ("smile", "narrow", "base", "mid") call give_gift("You give the lingerie to Cho...",gift_item) - cho "Thank you [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks blush "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-3) elif gift_item == sexy_stockings_ITEM : if states.cho.tier <= 1: - cho "Stockings?" ("annoyed", "narrow", "raised", "down") + cho "Stockings?" ("soft", "narrow", "raised", "down") cho "Surely that must be against some kind of dress code..." ("open", "wide", "raised", "mid") cho "I'll pass..." ("open", "base", "angry", "down") cho "" ("annoyed", "base", "base", "mid") @@ -293,269 +289,270 @@ label give_cho_gift(gift_item): cho "Thank you [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) elif states.cho.tier == 3: - cho "Stockings?" ("annoyed", "narrow", "base", "down") - cho "I can almost see right through these..." ("base", "base", "base", "mid") + cho @ cheeks blush "Stockings?" ("soft", "narrow", "base", "down") + cho @ cheeks blush "I can almost see right through these..." ("soft", "narrow", "base", "down") call give_gift("You give the lingerie to Cho...",gift_item) - cho "Thank you [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks blush "Thank you, [name_genie_cho]." ("open", "narrow", "base", "downR") call cho_mood(-2) else: - cho "Stockings?" ("annoyed", "narrow", "base", "down") - cho "But my legs get too itchy in these, I'd rather go without any leggings..." ("open", "narrow", "base", "mid") + cho "Stockings?" ("soft", "narrow", "base", "down") + cho "But my legs get too itchy in these, I'd rather go without any leggings..." ("disgust", "narrow", "base", "mid") call cho_mood(0) elif gift_item == pink_condoms_ITEM: if states.cho.tier <= 1: - cho "Condoms?" ("base", "base", "base", "mid") - cho "Yes, why don't I use these and have sex with the teachers... That's what you want, right?" ("scream", "narrow", "raised", "L") + cho "Condoms?" ("angry", "narrow", "base", "down") + cho "Yes, why don't I use these and have sex with the teachers... That's what you want, right?" ("disgust", "narrow", "raised", "R") cho "I think you're confusing me with those Slytherin skanks who impale themselves on the daily." ("angry", "narrow", "base", "mid") cho "So, you can have these back and give it to them..." ("soft", "narrow", "angry", "mid") call cho_mood(2) elif states.cho.tier == 2: - cho "Condoms?" ("base", "base", "base", "mid") - cho "I'm not the kind of girl to walk around and bang anyone who cross my path..." ("soft", "base", "base", "down") - cho "Thanks but no, thanks..." ("open", "base", "base", "mid") + cho "Condoms?" ("angry", "base", "base", "down") + cho "I'm not the kind of girl to walk around and bang anyone who cross my path..." ("open", "closed", "angry", "mid") + cho "Thanks but no, thanks..." ("disgust", "narrow", "base", "R") call cho_mood(1) elif states.cho.tier == 3: - cho "Condoms?" ("base", "base", "base", "mid") - cho "Are you expecting me to use these? I know safe sex is important and all, but I know what you're insinuating." ("angry", "narrow", "raised", "L") - cho "Keep them..." ("soft", "base", "base", "down") - cho "" ("annoyed", "base", "base", "mid") + cho @ cheeks blush "Condoms?" ("soft", "narrow", "base", "down") + cho @ cheeks blush "Are you expecting that I'll need these?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "*Ehm*..." ("upset", "closed", "base", "down") call cho_mood(0) else: - cho "Condoms?" ("base", "base", "base", "mid") + cho "Condoms?" ("soft", "narrow", "base", "down") call give_gift("You give a pack of condoms to Cho...", gift_item) - cho "I do surround myself with mostly boys, so having these at hand could be useful..." ("base", "base", "base", "mid") - cho "Thank you for your concerns, [name_genie_cho]..." ("base", "base", "base", "mid") + cho @ cheeks blush "I thought you said we didn't need these?" ("soft", "narrow", "raised", "mid") + cho @ cheeks blush "Although, perhaps we could find some use for them..." ("smile", "narrow", "base", "downR") call cho_mood(-2) elif gift_item == vibrator_ITEM: if states.cho.tier <= 1: - cho "A vibrator?" ("base", "base", "base", "mid") - cho "Sir, are you out of your mind?" ("scream", "wide", "raised", "L") - cho "I'm your student for crying out loud, giving gifts in general is a bit weird, but sex toys..." ("angry", "wide", "base", "mid") - cho "Seriously?!" ("scream", "wide", "raised", "L") + cho "A vibrator?" ("mad", "base", "base", "down") + cho "Sir, are you out of your mind?" ("disgust", "wide", "raised", "mid") + cho "I'm your student for crying out loud... Giving gifts in general is a bit weird, but sex toys..." ("angry", "wide", "base", "mid") + cho @ cheeks blush "Seriously?!" ("mad", "narrow", "base", "mid") call cho_mood(3) elif states.cho.tier == 2: - cho "A vibrator?" ("base", "base", "base", "mid") - cho "Why would you give me this?" ("angry", "base", "base", "down") - cho "Give it to Granger... I'm sure she'd love to accept a sex toy from her headmaster." ("smile", "narrow", "angry", "mid") + cho @ cheeks blush "A vibrator?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "Why would you give me this?" ("disgust", "narrow", "base", "mid") + cho @ cheeks blush "Give it to Granger... I'm sure she'd love to accept a sex toy from her headmaster." ("disgust", "narrow", "angry", "mid") call cho_mood(2) elif states.cho.tier == 3: - cho "A vibrator?" ("base", "base", "base", "mid") - cho "Sir, I don't think this would be appropriate to bring to my dorm..." ("soft", "narrow", "base", "down") - cho "The girls... They'd hear it... Not that I want it or anything!" ("quiver", "wide", "base", "downR") + cho @ cheeks blush "A vibrator?" ("soft", "narrow", "base", "down") + cho @ cheeks blush "Sir, I don't think this would be appropriate to bring to my dorm..." ("upset", "narrow", "base", "mid") + cho @ cheeks blush "The girls... They'd hear it... Not that I want it or anything!" ("horny", "narrow", "base", "R") call cho_mood(0) else: - cho "A Vibrator?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "A Vibrator?" ("open", "narrow", "base", "down") call give_gift("You give the vibrator to Cho...", gift_item) - cho "*Hmm*... It does promote a healthy lifestyle..." ("base", "base", "base", "mid") - cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "*Hmm*... It does promote a healthy lifestyle..." ("base", "narrow", "base", "down") + cho @ cheeks heavy_blush "Thank you, [name_genie_cho]." ("smile", "base", "base", "mid") call cho_mood(-3) elif gift_item == anal_lube_ITEM: if states.cho.tier <= 1: - cho "Lubricant?" ("base", "base", "base", "mid") - cho "What the hell, why do you think this is an appropriate gift? What's wrong with you..." ("angry", "wide", "raised", "L") + cho "Lubricant?" ("mad", "base", "base", "down") + cho "What the hell, why do you think this is an appropriate gift? What's wrong with you..." ("angry", "wide", "raised", "mid") call cho_mood(4) elif states.cho.tier == 2: - cho "Lubricant?" ("base", "base", "base", "mid") - cho "*Eww*... Why are you giving me this? When would I ever have the need for lube?" ("angry", "wide", "raised", "down") - cho "Give it to one of those Slytherin skanks, they probably go through a gallon every week." ("base", "narrow", "raised", "mid") + cho @ cheeks blush "Lubricant?" ("angry", "base", "base", "down") + cho "*Eww*... Why are you giving me this? When would I ever have the need for lube?" ("angry", "narrow", "base", "down") + cho "Give it to one of those Slytherin skanks, they probably go through a gallon every week." ("disgust", "closed", "angry", "mid") call cho_mood(3) elif states.cho.tier == 3: - cho "Anal lube?" ("base", "base", "base", "mid") - cho "Why would I need something like this? The broom goes under my butt, not in my butt..." ("soft", "wide", "raised", "L") - call cho_mood(0) + cho @ cheeks blush "Lubricant?" ("angry", "narrow", "base", "down") + if states.cho.ev.quidditch.e12_complete: + cho @ cheeks blush "Yes, I suppose this could be useful..." ("soft", "narrow", "raised", "mid") + call cho_mood(-3) + else: + cho @ cheeks blush "Why would I need something like this?" ("soft", "narrow", "raised", "mid") + call cho_mood(0) else: - cho "Anal Lubricant?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "Anal Lubricant?" ("soft", "base", "base", "down") call give_gift("You give the jar of anal lube to Cho...", gift_item) - cho "You should've given me this yesterday, [name_genie_cho]." ("base", "base", "base", "mid") - cho "I haven't been able to sit on a broom properly, since my last flying session..." ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "You should've given me this yesterday, [name_genie_cho]." ("smile", "wink", "base", "mid") + cho @ cheeks heavy_blush "I haven't been able to sit on a broom properly, not since my last flying session..." ("horny", "closed", "base", "mid") call cho_mood(-5) elif gift_item == ballgag_and_cuffs_ITEM: if states.cho.tier <= 1: - cho "A ball gag... and cuffs?" ("base", "base", "base", "mid") + cho "A ball gag... and cuffs?" ("soft", "narrow", "raised", "down") cho "Wait, is this a sex thing?" ("soft", "wide", "raised", "mid") - cho "Professor, that's disgusting... Why would you give me this?" ("angry", "wide", "raised", "mid") + cho "Professor, that's disgusting... Why would you give me this?" ("angry", "wide", "angry", "mid") call cho_mood(4) elif states.cho.tier == 2: - cho "A ball gag and cuffs?" ("base", "base", "base", "mid") - cho "Sir, this is a highly inappropriate gift to give to a student!" ("scream", "narrow", "raised", "mid") - cho "Why would you give me these? Are they supposed to help me with Quidditch?" ("angry", "base", "base", "mid") + cho @ cheeks blush "A ball gag and cuffs?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "Sir, this is a highly inappropriate gift to give to a student!" ("mad", "narrow", "base", "mid") + cho @ cheeks blush "Why would you give me these? Are they supposed to help me with Quidditch?" ("disgust", "narrow", "base", "mid") call cho_mood(3) elif states.cho.tier == 3: - cho "A ball gag and cuffs?" ("base", "base", "base", "mid") - cho "I prefer not to lock myself up... I'm a free spirit." ("soft", "base", "raised", "L") - cho "Thanks... But no, thanks." ("open", "base", "base", "mid") + cho @ cheeks blush "A ball gag and cuffs?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "I prefer not to lock myself up... I'm a free spirit." ("annoyed", "narrow", "base", "R") + cho @ cheeks blush "Thanks... But no, thanks." ("soft", "base", "base", "R") call cho_mood(0) else: - cho "A ball gag and cuffs?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "A ball gag and cuffs?" ("soft", "narrow", "base", "down") call give_gift("You give the ball gag and cuffs to Cho...", gift_item) - cho "How progressive... Do they require a safe-word to open?" ("base", "base", "base", "mid") - cho "Wait, how would a safe-word work when you have a ball in your mouth..." ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "How progressive... Do they require a safe-word to open?" ("horny", "narrow", "base", "down") + cho @ cheeks heavy_blush "Wait, how would a safe-word work when you have a ball in your mouth..." ("disgust", "narrow", "base", "down") call cho_mood(-3) elif gift_item == anal_plugs_ITEM: if states.cho.tier <= 1: - cho "Anal plugs?" ("base", "base", "base", "mid") - cho "That's disgusting... Why would you think it'd a good idea to give these to me?" ("angry", "wide", "raised", "L") - cho "That one even has a tail on it..." ("angry", "narrow", "raised", "mid") + cho "Anal plugs?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "That's disgusting... Why would you think it'd be a good idea to give these to me?" ("disgust", "base", "angry", "down") + cho @ cheeks heavy_blush "That one even has a tail on it..." ("disgust", "narrow", "raised", "down") call cho_mood(4) elif states.cho.tier == 2: - cho "Anal plugs?" ("base", "base", "base", "mid") - cho "Why do you have these? They're not used, are they?" ("angry", "wide", "raised", "L") - cho "*Eww*... Just, no." ("open", "narrow", "raised", "mid") + cho @ cheeks blush "Anal plugs?" ("disgust", "narrow", "base", "down") + cho "Why do you have these? They're not used, are they?" ("angry", "narrow", "raised", "mid") + cho @ cheeks blush "*Eww*... Just, no." ("disgust", "closed", "angry", "mid") cho "" ("annoyed", "base", "base", "mid") call cho_mood(3) elif states.cho.tier == 3: - cho "Anal plugs?" ("base", "base", "base", "mid") - cho "Sir, are you expecting me to wear this?" ("angry", "base", "base", "L") - cho "During Quidditch?" ("angry", "wide", "raised", "L") - cho "No, no, no, noooo." ("open", "narrow", "raised", "mid") - cho "NO!" ("scream", "wide", "raised", "mid") - cho "" ("annoyed", "base", "base", "mid") + cho @ cheeks blush "Anal plugs?" ("angry", "base", "base", "down") + cho "Sir, are you expecting me to wear this?" ("angry", "base", "base", "mid") + cho "During Quidditch?" ("angry", "wide", "raised", "mid") + cho "No, no, no, noooo." ("open", "happyCl", "raised", "mid") + cho "NO!" ("angry", "closed", "angry", "mid") call cho_mood(2) else: - cho "Anal plugs?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "Anal plugs?" ("soft", "narrow", "base", "down") call give_gift("You give a set of anal plugs to Cho...", gift_item) - cho "But these would stick out from underneath my robes..." ("base", "base", "base", "mid") - cho "Perhaps people would just think it's just a tail or something..." ("base", "base", "base", "mid") - cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "I suppose I could use one and plug both holes when I'm riding [states.cho.ev.quidditch.broom_name]..." ("base", "narrow", "base", "down") + cho @ cheeks heavy_blush "Then all that is left is a ball gag..." ("smile", "base", "base", "mid") + cho @ cheeks heavy_blush "I'm joking, of course..." ("smile", "narrow", "base", "R") call cho_mood(-2) elif gift_item == testral_strapon_ITEM: if states.cho.tier <= 1: - cho "Is that a strap-on?" ("open", "wide", "worried", "down") - cho "It's huge!" ("scream", "wide", "raised", "L") - cho "I mean, why are you showing me this?" ("annoyed", "narrow", "base", "mid") - cho "Get it away from me." ("soft", "narrow", "base", "mid") + cho "Is that a strap-on?" ("angry", "wide", "base", "down") + cho "It's huge!" ("mad", "narrow", "raised", "down") + cho @ cheeks blush "I mean, why are you showing me this?" ("angry", "narrow", "raised", "R") + cho @ cheeks blush "Get it away from me." ("angry", "narrow", "base", "mid") call cho_mood(3) elif states.cho.tier == 2: cho "A strap-on?" ("open", "wide", "worried", "down") - cho "Seriously? Why are you giving me this..." ("angry", "wide", "base", "down") - cho "That's disgusting..." ("open", "narrow", "base", "mid") + cho "Why are you giving me this?" ("angry", "wide", "base", "mid") + cho "That's disgusting..." ("disgust", "narrow", "base", "mid") call cho_mood(2) elif states.cho.tier == 3: - cho "A strap-on?" ("open", "wide", "worried", "down") - cho "But it's so big..." ("horny", "wide", "raised", "mid") - cho "I... I don't want it..." ("open", "narrow", "base", "down") - cho "" ("base", "base", "base", "mid") + cho @ cheeks blush "A strap-on?" ("open", "wide", "base", "down") + cho @ cheeks blush "But it's so big..." ("horny", "wide", "raised", "mid") + cho @ cheeks heavy_blush "I... I don't want it..." ("open", "closed", "base", "down") call cho_mood(0) else: - cho "A strap-on?" ("open", "wide", "worried", "down") + cho @ cheeks heavy_blush "A strap-on?" ("open", "narrow", "base", "down") call give_gift("You give the thestral strap-on to Cho...", gift_item) - cho "How would that even fit inside anyone?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "I've always-- *Ahem*..." ("soft", "narrow", "base", "down") + cho @ cheeks heavy_blush "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) elif gift_item == broom_2000_ITEM: $ states.cho.ev.quidditch.given_thestral = True if states.cho.tier <= 1: - cho "A broom! Finally, something better than my old--" ("base", "base", "base", "mid") - cho "Hold on, is that a double ended dildo sticking out of it?!?" ("angry", "wide", "base", "mid") - cho "What's wrong with you?" ("scream", "wide", "base", "L") + cho "A broom! Finally, something better than my old--" ("smile", "base", "base", "down") + cho "Hold on, is that a double ended dildo sticking out of it?!?" ("angry", "wide", "base", "down") + cho "What's wrong with you?" ("scream", "happyCl", "base", "mid") cho "Get that away from my--{w=0.4} From me!" ("angry", "narrow", "base", "mid") call cho_mood(4) elif states.cho.tier == 2: - cho "Is that a broom with dildos stuck to it?" ("open", "wide", "worried", "down") + cho "Is that a broom with dildos stuck to it?" ("disgust", "wide", "base", "down") cho "Professor, seriously... Why... Just why." ("angry", "narrow", "base", "mid") call cho_mood(2) elif states.cho.tier == 3: - cho "A broom?" ("open", "wide", "worried", "down") - cho "A sex broom! Where did you even get this..." ("open", "wide", "raised", "mid") - cho "No...{w=0.3} I don't--{w=0.3} I don't want that." ("horny", "narrow", "base", "mid") + cho "A broom?" ("smile", "base", "base", "down") + cho @ cheeks blush "A sex broom! Where did you even get this..." ("open", "wide", "base", "down") + cho @ cheeks blush "No...{w=0.3} I don't--{w=0.3} I don't want that." ("horny", "narrow", "base", "mid") call cho_mood(0) else: - cho "Is that a Lady Speed Stick-2000, with a built-in vibrator and pulse function?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "Is that a Lady Speed Stick-2000, with a built-in vibrator and pulse function?" ("angry", "wide", "base", "down") call give_gift("You give the broom to Cho...", gift_item) - cho "I mean..." ("base", "base", "base", "mid") - cho "Thank you, [name_genie_cho]..." ("base", "base", "base", "mid") - cho "I can't wait to try it out..." ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "I mean..." ("angry", "wide", "base", "mid") + cho @ cheeks heavy_blush "Thank you, [name_genie_cho]..." ("angry", "base", "base", "stare") + cho @ cheeks heavy_blush "I can't wait to learn more about it..." ("angry", "closed", "base", "mid") call cho_mood(-6) elif gift_item == sexdoll_ITEM: if states.cho.tier <= 1: - cho "A sex doll? What the heck... Why do you have this?" ("base", "base", "base", "mid") - cho "And more importantly..." ("smile", "closed", "base", "mid") - cho "{size=+4}Why are you giving it to me?{/size}" ("scream", "wide", "base", "L") - cho "You disgust me..." ("open", "narrow", "angry", "mid") + cho @ cheeks blush "A sex doll? What the heck... Why do you have this?" ("angry", "base", "base", "down") + cho @ cheeks blush "And more importantly..." ("angry", "closed", "base", "mid") + cho @ cheeks blush "{size=+4}Why are you giving it to me?{/size}" ("disgust", "wide", "angry", "mid") + cho @ cheeks blush "You disgust me..." ("upset", "closed", "angry", "mid") call cho_mood(4) elif states.cho.tier == 2: - cho "A sex doll?" ("base", "base", "base", "mid") - cho "Why would you give this to me? Wait, did you use this?" ("angry", "wide", "base", "L") - cho "Get it away from me..." ("open", "wide", "raised", "L") + cho @ cheeks blush "A sex doll?" ("disgust", "narrow", "base", "down") + cho @ cheeks blush "Why would you give this to me? Wait, did you use this?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "Get it away from me..." ("upset", "happyCl", "angry", "L") call cho_mood(3) elif states.cho.tier == 3: - cho "A sex doll?" ("base", "base", "base", "mid") - cho "Why would I need this... It's a girl doll." ("annoyed", "wide", "base", "L") - cho "I mean, why would I need a sex doll in general... I'm not into this sort of thing!" ("open", "wide", "raised", "mid") + cho @ cheeks blush "A sex doll?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "Why would I need this... It's a girl doll." ("disgust", "narrow", "base", "mid") + cho @ cheeks blush "I mean, why would I need a sex doll in general... I'm not into this sort of thing!" ("angry", "closed", "base", "mid") call cho_mood(1) else: - cho "A sex doll?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "A sex doll?" ("soft", "narrow", "raised", "down") call give_gift("You give the sex doll to Cho...", gift_item) - cho "It says Joanne on it..." ("base", "base", "base", "mid") - cho "I'll leave it in the boys' changing room... Should make a good reward after practice." ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "It says Joanne on it..." ("base", "narrow", "base", "down") + cho @ cheeks heavy_blush "I'll leave it in the boys' changing room... Should make a good reward after practice." ("base", "wink", "base", "mid") call cho_mood(-7) elif gift_item == anal_beads_ITEM: if states.cho.tier <= 1: - cho "Anal beads?" ("base", "base", "base", "mid") - cho "Yeah, that's not going anywhere near their intended target..." ("angry", "wide", "raised", "L") + cho "Anal beads?" ("angry", "wide", "base", "down") + cho @ cheeks blush "Yeah, that's not going anywhere near their intended target..." ("disgust", "base", "angry", "downR") call cho_mood(4) elif states.cho.tier == 2: - cho "Anal beads?" ("base", "base", "base", "mid") - cho "How... Where did you..." ("angry", "wide", "raised", "L") - cho "Gross!" ("open", "narrow", "raised", "mid") + cho @ cheeks blush "Anal beads?" ("soft", "narrow", "worried", "down") + cho @ cheeks blush "How... Where did you..." ("angry", "narrow", "raised", "down") + cho @ cheeks blush "Gross!" ("open", "happyCl", "angry", "mid") cho "" ("annoyed", "base", "base", "mid") call cho_mood(3) elif states.cho.tier == 3: - cho "Anal beads?" ("base", "base", "base", "mid") - cho "Sir, how would ever be able to sit on a broom after using these?" ("angry", "base", "base", "L") - cho "Not that I would ever use them!" ("angry", "wide", "raised", "L") - cho "Get those away from me!" ("open", "narrow", "raised", "mid") - cho "" ("annoyed", "base", "base", "mid") + cho @ cheeks blush "Anal beads?" ("angry", "narrow", "base", "down") + cho @ cheeks blush "Sir, how would ever be able to sit on a broom after using these?" ("disgust", "narrow", "angry", "mid") + cho @ cheeks blush "Not that I would ever use them!" ("angry", "narrow", "raised", "R") + cho @ cheeks blush "*Ahem*..." ("open", "narrow", "raised", "downR") call cho_mood(2) else: - cho "Anal beads?" ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "Anal beads?" ("soft", "narrow", "base", "down") call give_gift("You give the anal beads to Cho...", gift_item) - cho "Surely my butt would hurt after using these..." ("base", "base", "base", "mid") - cho "Although I do have a cushioning charm on my broom for a reason..." ("base", "base", "base", "mid") - cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") + cho @ cheeks heavy_blush "Surely my butt would hurt after using these..." ("upset", "base", "base", "down") + cho @ cheeks heavy_blush "Although I do have a cushioning charm on my broom for a reason..." ("horny", "narrow", "base", "down") + cho @ cheeks heavy_blush "Thank you, [name_genie_cho]." ("smile", "narrow", "base", "mid") call cho_mood(-2) elif gift_item == wine_ITEM: if states.cho.tier <= 2: - cho "A bottle of wine?" ("base", "base", "base", "mid") - cho "[name_genie_cho], I cannot drink alcohol, it would ruin my career..." ("open", "narrow", "angry", "mid") + cho "A bottle of wine?" ("soft", "narrow", "raised", "down") + cho "[name_genie_cho], I cannot drink alcohol, it would ruin my career..." ("angry", "narrow", "base", "mid") call cho_mood(4) elif states.cho.tier <= 3: - cho "A bottle of wine?" ("base", "base", "base", "mid") - cho "Thank you, [name_genie_cho] but I can't take it." ("base", "base", "base", "mid") - cho "{size=-4}Maybe to celebrate after I win the Quidditch Cup...{/size}" ("base", "base", "base", "mid") + cho "A bottle of wine?" ("soft", "narrow", "raised", "down") + cho "Thank you, [name_genie_cho] but I can't take it." ("open", "closed", "base", "mid") + cho "{size=-4}Although I probably would, if I were to win the Quidditch Cup...{/size}" ("base", "narrow", "base", "R") call cho_mood(0) else: - cho "A bottle of wine?" ("base", "base", "base", "mid") - cho "Well, I suppose I've deserved to let loose a bit." ("base", "base", "base", "mid") + cho "A bottle of wine?" ("soft", "narrow", "raised", "down") + cho "Well, I suppose I've deserved to let loose a bit." ("smile", "base", "base", "mid") call give_gift("You give the sweets to Cho...",gift_item) - cho "Thank you [name_genie_cho]" ("base", "base", "base", "mid") + cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) elif gift_item == firewhisky_ITEM: if states.cho.tier <= 2: - cho "Firewhisky?" ("base", "base", "base", "mid") - cho "Why are you giving it to me?" ("annoyed", "wide", "base", "L") - call cho_mood(0) + cho "Firewhisky?" ("soft", "narrow", "raised", "down") + cho "Why would you give me that?" ("angry", "narrow", "base", "mid") + call cho_mood(4) elif states.cho.tier <= 3: - cho "Firewhisky?" ("base", "base", "base", "mid") - cho "Thank you, [name_genie_cho] but I can't take it." ("base", "base", "base", "mid") - cho "{size=-4}Maybe to celebrate after I win the Quidditch Cup...{/size}" ("base", "base", "base", "mid") + cho "Firewhisky?" ("soft", "narrow", "base", "down") + cho "Thank you, [name_genie_cho] but I can't take it." ("open", "closed", "base", "mid") + cho "{size=-4}Although I probably would, if I were to win the Quidditch Cup...{/size}" ("base", "base", "base", "mid") call cho_mood(0) else: - cho "Firewhisky?" ("base", "base", "base", "mid") - cho "Well, I suppose I've deserved to let loose a bit." ("base", "base", "base", "mid") + cho "Firewhisky?" ("soft", "narrow", "raised", "down") + cho "Well, I suppose I've deserved to let loose a bit." ("smile", "base", "base", "mid") call give_gift("You give the sweets to Cho...",gift_item) - cho "Thank you [name_genie_cho]" ("base", "base", "base", "mid") + cho "Thank you, [name_genie_cho]." ("base", "base", "base", "mid") call cho_mood(-1) cho "" (xpos="base", ypos="base") diff --git a/game/scripts/characters/cho/summon.rpy b/game/scripts/characters/cho/summon.rpy index ce589a20..86d59f34 100644 --- a/game/scripts/characters/cho/summon.rpy +++ b/game/scripts/characters/cho/summon.rpy @@ -83,7 +83,7 @@ label summon_cho: # Talk "-Talk-" (icon="interface/icons/small/talk.webp"): if states.cho.mood > 0: - cho "I have nothing to say to you, [name_genie_cho]..." (face="annoyed") + cho "I have nothing to say to you, [name_genie_cho]..." ("annoyed", "base", "base", "mid") jump cho_requests call cho_chitchat @@ -94,7 +94,7 @@ label summon_cho: if states.cho.mood > 0: gen "Ready to get back to training?" ("base", xpos="far_left", ypos="head") if states.cho.mood >= 5: - cho "No.{w=0.5} And I don't want to hear of it right now, Sir." (face="angry") + cho "No.{w=0.5} And I don't want to hear of it right now, Sir." ("open", "narrow", "angry", "mid") else: cho "I'm sorry, [name_genie_cho]. But I don't feel like training today." ("soft", "base", "worried", "down") nar "Cho is still upset with you." diff --git a/game/scripts/characters/cho/talk.rpy b/game/scripts/characters/cho/talk.rpy index 74fec375..37cbe6c4 100644 --- a/game/scripts/characters/cho/talk.rpy +++ b/game/scripts/characters/cho/talk.rpy @@ -93,7 +93,7 @@ label genie_cho_change: cho @ cheeks blush "..." ("base", "narrow", "base", "downR") cho @ cheeks heavy_blush "Yes daddy..." ("base", "narrow", "base", "down") else: #custom/fallback - cho "Very well..." (face="neutral") + cho "Very well..." ("open", "narrow", "base", "mid") jump cho_talk label name_cho_genie: @@ -165,6 +165,6 @@ label name_cho_genie: cho @ cheeks blush "..." ("angry", "narrow", "base", "downR") cho @ cheeks blush "Okay... I suppose you could call me that..." ("angry", "narrow", "base", "down") else: #custom/fallback - cho "Very well..." (face="neutral") + cho "Very well..." ("open", "narrow", "base", "mid") jump cho_talk diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy index 0ddfd275..1134f8ac 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy @@ -873,7 +873,7 @@ label hg_pf_strip_T4_snape_results: her "If I hadn't ended it, he probably would've gone all the way..." ("base", "base", "base", "mid") gen "I suppose we'll never know..." ("base", xpos="far_left", ypos="head") her "..." ("base", "base", "base", "mid") #annoyed - else + else: her "Well... I learned that you two masturbating over me has become a frequent occurrence..." ("base", "base", "base", "mid") gen "At least now you know just how far he's willing to go." ("base", xpos="far_left", ypos="head") her "(Like I didn't know that already...)" ("base", "base", "base", "mid") diff --git a/game/scripts/inventory/potions/addictive_potion.txt b/game/scripts/inventory/potions/addictive_potion.txt index c53f320f..550d59a7 100644 --- a/game/scripts/inventory/potions/addictive_potion.txt +++ b/game/scripts/inventory/potions/addictive_potion.txt @@ -599,7 +599,7 @@ label potion_scene_3_3_1: if hermione.is_worn("bottom"): her "It really suuuuucks that I have to wear anything at all in this boring nunnery..." ("annoyed", "narrow", "annoyed", "up") her "(Why can't I wear something shorter. A skirt, but...)" - her "(A reeealy short one!!!{heart}{heart}{heart})",face="horny" + her "(A reeealy short one!!!{heart}{heart}{heart})" ("annoyed", "narrow", "annoyed", "up") call set_her_action("lift_bottom") pause.5 diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy index 3b3eb714..e39fcd82 100644 --- a/game/scripts/minigames/mirror/events/suck_and_run.rpy +++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy @@ -223,7 +223,7 @@ label suck_and_run: gen "Tonks?!" ("open", xpos="far_left", ypos="head") play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed - ton "*Slurp* *Slurp* *Gulp*!" (face="horny", mouth="open_wide_tongue", xpos="far_right", ypos=200, trans=d3) # Explicit positions to avoid hiding the doll + ton "*Slurp* *Slurp* *Gulp*!" ("open_wide_tongue", "narrow", "shocked", "stare", xpos="far_right", ypos=200, trans=d3) # Explicit positions to avoid hiding the doll call ton_chibi_scene("bj_desk") gen "am I still dreaming?" ("angry", xpos="far_left", ypos="head")