From cb389e7ca97f1295a8796c6b40f5c73a3cb8b565 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Tue, 27 Jun 2023 18:31:23 +0200 Subject: [PATCH] Cho Clothing * Added Club Dress. --- .../default/clothes/bra/padding_bra_1/0.webp | 3 + .../clothes/bra/padding_bra_1/outline.webp | 3 + .../clothes/panties/sheer_panties_2/0.webp | 3 + .../clothes/panties/sheer_panties_2/1.webp | 3 + .../panties/sheer_panties_2/outline.webp | 3 + .../default/clothes/top/dress_club/0.webp | 3 + .../clothes/top/dress_club/armfix.webp | 3 + .../clothes/top/dress_club/outline.webp | 3 + game/scripts/characters/cho/wardrobe.rpy | 10 ++++ .../characters/cho/wardrobe_reactions.rpy | 60 +++++++++++++++++++ game/scripts/shops/dress/chitchats.rpy | 18 +++++- 11 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 game/characters/cho/poses/default/clothes/bra/padding_bra_1/0.webp create mode 100644 game/characters/cho/poses/default/clothes/bra/padding_bra_1/outline.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sheer_panties_2/0.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sheer_panties_2/1.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sheer_panties_2/outline.webp create mode 100644 game/characters/cho/poses/default/clothes/top/dress_club/0.webp create mode 100644 game/characters/cho/poses/default/clothes/top/dress_club/armfix.webp create mode 100644 game/characters/cho/poses/default/clothes/top/dress_club/outline.webp diff --git a/game/characters/cho/poses/default/clothes/bra/padding_bra_1/0.webp b/game/characters/cho/poses/default/clothes/bra/padding_bra_1/0.webp new file mode 100644 index 00000000..f04cd342 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/bra/padding_bra_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6e8e2b5ccf7bb2792b488b390da8bc96908d82a9a501af11abdd72a77b40882 +size 2470 diff --git a/game/characters/cho/poses/default/clothes/bra/padding_bra_1/outline.webp b/game/characters/cho/poses/default/clothes/bra/padding_bra_1/outline.webp new file mode 100644 index 00000000..73d71549 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/bra/padding_bra_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92c75d021ae3b9f01434931b282911a2a8afea97a1cc4402976cb14463230af9 +size 3110 diff --git a/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/0.webp b/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/0.webp new file mode 100644 index 00000000..a71d1f43 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24d89ea143b42eb8054657aa9e3d561c1d0acbe2147291bd38c7f268aba3cec4 +size 2726 diff --git a/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/1.webp b/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/1.webp new file mode 100644 index 00000000..a2d65e52 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d95fff0104bb0c44bb465bf0ace22225b94883bf0066d41beab38b5134a6849 +size 4064 diff --git a/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/outline.webp b/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/outline.webp new file mode 100644 index 00000000..867db073 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sheer_panties_2/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69274e22251f5bca0db9950588dd4411b78f1a52ccf695cbacd6900b6fdde865 +size 6924 diff --git a/game/characters/cho/poses/default/clothes/top/dress_club/0.webp b/game/characters/cho/poses/default/clothes/top/dress_club/0.webp new file mode 100644 index 00000000..1296360c --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/dress_club/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33c8b605d5180bdc76fd99468b5c5edc7c26850534030684380ae7ed715a7f18 +size 13004 diff --git a/game/characters/cho/poses/default/clothes/top/dress_club/armfix.webp b/game/characters/cho/poses/default/clothes/top/dress_club/armfix.webp new file mode 100644 index 00000000..ea2266ad --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/dress_club/armfix.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b +size 6334 diff --git a/game/characters/cho/poses/default/clothes/top/dress_club/outline.webp b/game/characters/cho/poses/default/clothes/top/dress_club/outline.webp new file mode 100644 index 00000000..75c670b0 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/dress_club/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ec57c7e76eaf5ab39169ddb3e9b358995449fa29bfcfc20c773d6ed0d4f6995 +size 16498 diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy index 1ada49ed..aed28d78 100644 --- a/game/scripts/characters/cho/wardrobe.rpy +++ b/game/scripts/characters/cho/wardrobe.rpy @@ -219,6 +219,16 @@ default cho_panties_bikini_sporty1 = DollCloth("cho", ("lower undergarment", "bi default cho_outfit_sporty_bikini = DollOutfit([cho_hair_base, cho_bra_bikini_sporty1, cho_panties_bikini_sporty1], price=400, name="Sporty Bikini Set", desc="A sporty bikini for the more athletic kind of witch.") +####################### +## Club Dress Outfit ## +####################### + +default cho_top_dress_club = DollCloth("cho", ("upper body", "dresses"), "top", "dress_club", ["#212638ff"], level=12) +default cho_bra_padding_1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", "padding_bra_1", ["#212638FF"], level=12) +default cho_panties_sheer_2 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "sheer_panties_2", ["#212638FF", "#2D2D4BFF" ], level=16) + +default cho_outfit_club_dress = DollOutfit([cho_hair_base, cho_top_dress_club, cho_bra_padding_1, cho_panties_sheer_2], price=450, name="Club Dress Set", desc="The perfect dress set for an outgoing witch.") + ################ ## Pubic Hair ## ################ diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy index 02f9f9e1..7b21fa32 100644 --- a/game/scripts/characters/cho/wardrobe_reactions.rpy +++ b/game/scripts/characters/cho/wardrobe_reactions.rpy @@ -742,6 +742,23 @@ label cho_reaction_equip_outfit(item): gen "I was thinking you could wear it now." ("base", xpos="far_left", ypos="head") cho @ cheeks blush "... Alright then." ("smile", "base", "base", "mid") + ####################### + ## Club Dress Outfit ## + ####################### + elif item == cho_outfit_club_dress: #Req 16 (panties) + gen "I've got this dress for you to wear." ("base", xpos="far_left", ypos="head") + cho "*Hmm*... A dress, you say?" ("base", "narrow", "base", "mid") + gen "Yep, it's this one, right here." ("base", xpos="far_left", ypos="head") + cho "Very nice..." ("smile", "narrow", "base", "down") + gen "Yes, I thought you might like it." ("base", xpos="far_left", ypos="head") + cho "Really? Seems like you know me better than I thought..." ("smile", "narrow", "base", "mid") + gen "You see... When you're moving about, this dress will slide up your body quite easily." ("base", xpos="far_left", ypos="head") + gen "So, if you ever wanted to give someone a peek, you could just blame it on the dress." ("base", xpos="far_left", ypos="head") + cho "I need to make excuses to flaunt my physique now?" ("upset", "narrow", "base", "mid") + gen "That's not what I--" ("base", xpos="far_left", ypos="head") + cho "*Giggles*" ("base", "base", "base", "mid") + cho "Don't worry [name_genie_cho]...{w=0.4} I'm just messing with you." ("smile", "base", "base", "mid") + # TODO: Blacklist fallbacks have to be added. return @@ -1221,6 +1238,49 @@ label cho_reaction_equip_outfit_fail(item): cho "Yes, the back!" ("angry", "narrow", "base", "mid") gen "Seems fine to me... I doubt I'll ever see them from the back, anyway." ("base", xpos="far_left", ypos="head") cho "..." ("disgust", "narrow", "base", "mid") + + ####################### + ## Club Dress Outfit ## + ####################### + elif item == cho_outfit_club_dress: #Req 16 (panties) + if states.cho.level < 4: + gen "I've got a dress for you to wear." ("base", xpos="far_left", ypos="head") + cho "A dress?" ("soft", "narrow", "base", "mid") + gen "That's right..." ("base", xpos="far_left", ypos="head") + gen "It's this one right here." ("base", xpos="far_left", ypos="head") + cho "... Are you serious?" ("angry", "base", "base", "down") + gen "What do you mean? Don't you like my gift?" ("base", xpos="far_left", ypos="head") + cho "This would barely go down past my..." ("angry", "base", "base", "mid") + gen "Yes?" ("base", xpos="far_left", ypos="head") + cho "*Ahem*... Thank you [name_genie_cho]... But I'll have to refuse." ("angry", "closed", "base", "mid") + gen "..." ("base", xpos="far_left", ypos="head") + elif states.cho.level < 10: + gen "I've got a dress for you to wear." ("base", xpos="far_left", ypos="head") + cho "A dress?" ("soft", "narrow", "base", "mid") + gen "That's right..." ("base", xpos="far_left", ypos="head") + gen "It's this one right here." ("base", xpos="far_left", ypos="head") + cho "Whoa... Looks very tight..." ("angry", "base", "base", "down") + gen "Some would say aerodynamic..." ("base", xpos="far_left", ypos="head") + cho "You want me to wear this during Quidditch?!" ("angry", "wide", "base", "mid") + gen "That's not what I--" ("base", xpos="far_left", ypos="head") + cho "I refuse!" ("angry", "closed", "angry", "mid") + gen "..." ("base", xpos="far_left", ypos="head") + else: # < 16 + gen "I've got this dress for you to wear." ("base", xpos="far_left", ypos="head") + cho "A dress?" ("open", "base", "base", "mid") + gen "Yes, it's this one right here..." ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "It's--" ("soft", "narrow", "base", "down") + gen "Nice, isn't it?" ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "I suppose... Although, what's up with those panties?" ("soft", "narrow", "base", "down") + gen "What about them?" ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "They're pretty much see-through." ("disgust", "narrow", "base", "down") + gen "Oh... I suppose they are..." ("base", xpos="far_left", ypos="head") + gen "So... You'll wear them, right?" ("base", xpos="far_left", ypos="head") + if states.cho.level < 13: + cho @ cheeks heavy_blush "*Hmm*...{w=0.4} I think I'll pass..." ("open", "closed", "base", "mid") + else: + cho @ cheeks heavy_blush "*Hmm*...{w=0.4} Maybe some other time..." ("open", "closed", "base", "mid") + else: random: cho "I am not wearing that..." ("clench", "closed", "base", "mid") diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy index 5280e2bb..53a6486f 100644 --- a/game/scripts/shops/dress/chitchats.rpy +++ b/game/scripts/shops/dress/chitchats.rpy @@ -444,7 +444,23 @@ label purchase_outfit(item): maf "Yes, yes, anything you like, sir." gen "I was going to say, have a lovely day." ("base", xpos="far_left", ypos="head") maf "Oh, of course sir, you as well." - + elif item == cho_outfit_club_dress: + gen "I'm looking to procure a dress, if it's not too much trouble." ("base", xpos="far_left", ypos="head") + maf "A dress you say... Now that is one of my specialities!" + gen "It is?" ("base", xpos="far_left", ypos="head") + maf "Well, technically everything is my speciality." + maf "So, are you looking for something formal?" + maf "For dancing?" + maf "A summer dress perhaps?" + gen "I was thinking more similar to something you'd wear at a nightclub." ("base", xpos="far_left", ypos="head") + maf "Oh, I see..." + gen "Is that a problem?" ("base", xpos="far_left", ypos="head") + maf "Of course not... I am just contemplating what type of design I should go with..." + maf "Alright... I believe I got it." + gen "Already?" ("base", xpos="far_left", ypos="head") + maf "Of course!" + maf "I shall have the dress done shortly." + gen "Excellent." ("base", xpos="far_left", ypos="head") # # Astoria Greengrass #