From 85df32a9a42c6ea8c85adbd10791786beaf84af8 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 13 Jun 2022 19:25:01 +0200 Subject: [PATCH] Fix * Fixed Susan outfit chats being put in the wrong section. * Added genie nicknames in Wardrobe chats --- .../characters/susan/wardrobe_reactions.rpy | 113 +++++++++--------- 1 file changed, 59 insertions(+), 54 deletions(-) diff --git a/game/scripts/characters/susan/wardrobe_reactions.rpy b/game/scripts/characters/susan/wardrobe_reactions.rpy index 57cea497..757449a1 100644 --- a/game/scripts/characters/susan/wardrobe_reactions.rpy +++ b/game/scripts/characters/susan/wardrobe_reactions.rpy @@ -86,25 +86,76 @@ label sus_reaction_touch_fail(what): elif what == "breasts": $ mouse_slap() - sus "Please don't bully me sir..." ("open", "happyCl", "worried", "mid") + sus "Please don't bully me [sus_genie_name]..." ("open", "happyCl", "worried", "mid") elif what == "vagina": $ mouse_slap() sus "No! Please don't make me do this in front of everyone again..." ("scream", "happyCl", "base", "mid") gen "Do what?" ("base", xpos="far_left", ypos="head") - sus "N--{w=0.2} nothing, sir, forgive me." ("open", "narrow", "base", "wide") + sus "N--{w=0.2} nothing [sus_genie_name], forgive me." ("open", "narrow", "base", "wide") gen "(...)" ("base", xpos="far_left", ypos="head") return label sus_reaction_equip(item): + ### Add specific clothing reactions here. + # if item == : + # sus "This looks awesome! I'll wear this with pride!" + + # TODO: Blacklist fallbacks have to be added. + return + +label sus_reaction_equip_fail(item): + ### Add specific clothing reactions here. + # if item == : + # sus "I won't wear because!" + # else: + # + + sus "I--{w=0.2} I..." ("open", "narrow", "worried", "mid") + gen "You don't like it?" ("base", xpos="far_left", ypos="head") + sus "It's not like t-that, I just..." ("open", "happyCl", "base", "mid") + gen "Not comfortable wearing it?" ("base", xpos="far_left", ypos="head") + sus "*Uh-huh*" ("base", "eager", "worried", "mid") + gen "Okay, maybe later then." ("base", xpos="far_left", ypos="head") + + return + +label sus_reaction_unequip(item): + ### Example + # if item.type == "panties": + # if sus_whoring > 15: + # sus "You want to see my snatch?" + # sus "You got it [genie_name]!" + # + return + +label sus_reaction_unequip_fail(item): + if item.type == "panties": + sus "I'm N--{w=0.2} not comfortable with that, [sus_genie_name]..." ("open", "happyCl", "base", "mid") + + elif item.type == "bra": + sus "P--{w=0.2} please, I can't be W--{w=0.2} wearing this [sus_genie_name].." ("open", "closed", "worried", "mid") + + elif item.type == "top": + sus "I don't know if this is a good idea..." ("open", "narrow", "worried", "mid") + gen "You have nothing to be ashamed of." ("base", xpos="far_left", ypos="head") + sus "S--{w=0.2} Sorry, I can't..." ("open", "closed", "worried", "mid") + + elif item.type == "bottom": + sus "I can't..." ("open", "happyCl", "base", "mid") + gen "It's okay, we'll work on your confidence first." ("base", xpos="far_left", ypos="head") + sus "Thank you..." ("base", "eager", "worried", "mid") + return + +label sus_reaction_equip_outfit(item): ########################## ## Muggle Casual Outfit ## ########################## if item == sus_outfit_muggle_casual1: gen "Could you put on your normal clothing for me." ("base", xpos="far_left", ypos="head") - sus "What do you... *Ehm*... Which clothing, sir?" ("open", "narrow", "worried", "mid") + sus "What do you... *Ehm*... Which clothing, [sus_genie_name]?" ("open", "narrow", "worried", "mid") gen "The boring sweater one, and the jeans." ("base", xpos="far_left", ypos="head") sus "My muggle clothing?" ("base", "eager", "worried", "mid") gen "Sure!" ("base", xpos="far_left", ypos="head") @@ -115,12 +166,15 @@ label sus_reaction_equip(item): ######################## elif item == sus_outfit_lace1: gen "Could you put on these lingerie for me please?" ("base", xpos="far_left", ypos="head") - sus "Okay... One moment sir." ("base", "eager", "base", "mid") + sus "Okay... One moment [sus_genie_name]." ("base", "eager", "base", "mid") + else: + gen "Could you put this on for me?" ("base", xpos="far_left", ypos="head") + sus "Of course [sus_genie_name]..." # TODO: Blacklist fallbacks have to be added. return -label sus_reaction_equip_fail(item): +label sus_reaction_equip_outfit_fail(item): ######################## ## Lingerie Outfit 1 ## ######################## @@ -140,55 +194,6 @@ label sus_reaction_equip_fail(item): return -label sus_reaction_unequip(item): - ### Example - # if item.type == "panties": - # if sus_whoring > 15: - # sus "You want to see my snatch?" - # sus "You got it [genie_name]!" - # - return - -label sus_reaction_unequip_fail(item): - if item.type == "panties": - sus "I'm N--{w=0.2} not comfortable with that, sir..." ("open", "happyCl", "base", "mid") - - elif item.type == "bra": - sus "P--{w=0.2} please, I can't be W--{w=0.2} wearing this sir.." ("open", "closed", "worried", "mid") - - elif item.type == "top": - sus "I don't know if this is a good idea..." ("open", "narrow", "worried", "mid") - gen "You have nothing to be ashamed of." ("base", xpos="far_left", ypos="head") - sus "S--{w=0.2} Sorry, I can't..." ("open", "closed", "worried", "mid") - - elif item.type == "bottom": - sus "I can't..." ("open", "happyCl", "base", "mid") - gen "It's okay, we'll work on your confidence first." ("base", xpos="far_left", ypos="head") - sus "Thank you..." ("base", "eager", "worried", "mid") - return - -label sus_reaction_equip_outfit(item): - ### Add specific Outfit reactions here. - # if item == : - # sus "This looks awesome! I'll wear this with pride!" - - # TODO: Blacklist fallbacks have to be added. - return - -label sus_reaction_equip_outfit_fail(item): - ### Add specific Outfit reactions here. - # if item == : - # sus "I won't wear because!" - # else: - # - - sus "Oh wow... It's... *Ehm*..." ("open", "narrow", "worried", "mid") - gen "You like it? How about you wear it?" ("base", xpos="far_left", ypos="head") - sus "I couldn't, I..." ("open", "happyCl", "base", "mid") - gen "(Perhaps I'm being a little too forward for something that.)" ("base", xpos="far_left", ypos="head") - - return - label sus_reaction_blacklist(item): sus "B--{w=0.2} but..." ("base", "base", "base", "mid") gen "But what?" ("base", xpos="far_left", ypos="head")