From 5d768697531d76b513a8927df4fde1875faad06b Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Tue, 23 May 2023 21:19:27 +0200 Subject: [PATCH] Cho clothing * Added Sheer Nightie outfit. * Added Sporty Bikini outfit. --- .../clothes/bra/sporty_bikini_top_1/0.webp | 3 + .../bra/sporty_bikini_top_1/outline.webp | 3 + .../clothes/bra/sporty_bikini_top_1/skin.webp | 3 + .../clothes/panties/sheer_panties_1/0.webp | 3 + .../panties/sheer_panties_1/outline.webp | 3 + .../panties/sporty_bikini_bottom_1/0.webp | 3 + .../sporty_bikini_bottom_1/outline.webp | 3 + .../panties/sporty_bikini_bottom_1/skin.webp | 3 + .../clothes/top/sheer_nightie_1/0.webp | 3 + .../clothes/top/sheer_nightie_1/1.webp | 3 + .../clothes/top/sheer_nightie_1/outline.webp | 3 + .../clothes/top/sheer_nightie_1/skin.webp | 3 + game/scripts/characters/cho/wardrobe.rpy | 18 ++++ .../characters/cho/wardrobe_reactions.rpy | 99 +++++++++++++++++++ game/scripts/shops/dress/chitchats.rpy | 24 +++++ 15 files changed, 177 insertions(+) create mode 100644 game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/0.webp create mode 100644 game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/outline.webp create mode 100644 game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/skin.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sheer_panties_1/0.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sheer_panties_1/outline.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/0.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/outline.webp create mode 100644 game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/skin.webp create mode 100644 game/characters/cho/poses/default/clothes/top/sheer_nightie_1/0.webp create mode 100644 game/characters/cho/poses/default/clothes/top/sheer_nightie_1/1.webp create mode 100644 game/characters/cho/poses/default/clothes/top/sheer_nightie_1/outline.webp create mode 100644 game/characters/cho/poses/default/clothes/top/sheer_nightie_1/skin.webp diff --git a/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/0.webp b/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/0.webp new file mode 100644 index 00000000..a29fdc2d --- /dev/null +++ b/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59cef8e32968b2ea1a7ce9250f9e9be9b30cd16fde9554a2aefb215cc72bdfa8 +size 8496 diff --git a/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/outline.webp b/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/outline.webp new file mode 100644 index 00000000..d8241a60 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9ff75f4beb1c82beef2784fab269d99098d5b961f9cb02960cf4c2fdc50a359 +size 11680 diff --git a/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/skin.webp b/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/skin.webp new file mode 100644 index 00000000..a1dba57b --- /dev/null +++ b/game/characters/cho/poses/default/clothes/bra/sporty_bikini_top_1/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3710203648b63f036ca9b53f10e297fa81896314084f4e1c614f495f4f0274b0 +size 5146 diff --git a/game/characters/cho/poses/default/clothes/panties/sheer_panties_1/0.webp b/game/characters/cho/poses/default/clothes/panties/sheer_panties_1/0.webp new file mode 100644 index 00000000..95821f59 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sheer_panties_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f22d746129ce498d450711b0cae219c59ea3eead2eb155539e3e2c5ff33ae9e +size 2822 diff --git a/game/characters/cho/poses/default/clothes/panties/sheer_panties_1/outline.webp b/game/characters/cho/poses/default/clothes/panties/sheer_panties_1/outline.webp new file mode 100644 index 00000000..bc6a78a5 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sheer_panties_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fa27a7f2d8b1742a5b7b0ca305dc55652afb81127d88af2fd4a2c8a3be5e2dd +size 3120 diff --git a/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/0.webp b/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/0.webp new file mode 100644 index 00000000..c4c60da7 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:669acfe23639916efce665eb05dfe3d0ba1872f8ab7f1a85a6589ffefa41341d +size 4116 diff --git a/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/outline.webp b/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/outline.webp new file mode 100644 index 00000000..3b254553 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ddbf78873b9727d37cea1a6a6a5515b6518e0a450bf9425b76180ff46987893 +size 6006 diff --git a/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/skin.webp b/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/skin.webp new file mode 100644 index 00000000..fed8cf00 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/panties/sporty_bikini_bottom_1/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb2ac5de167fd67b3ffaff21c764a9d91f077a38a8cbadac6c7a419f28991107 +size 2192 diff --git a/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/0.webp b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/0.webp new file mode 100644 index 00000000..ad30e9a9 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edad08d50b1f6451a6e9d507256f1e8734271916c6a463353d938c58ef4bf4ae +size 6392 diff --git a/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/1.webp b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/1.webp new file mode 100644 index 00000000..ec17ebc0 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eef09f1cc9db79a1d3f070a5f49df7cb2d405945e719aa63eb4da84e68c82861 +size 1216 diff --git a/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/outline.webp b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/outline.webp new file mode 100644 index 00000000..eba7f4bd --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/outline.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba4585dbe278d06dc94483bbcbdcb1b59714b34d3c844ab1b734bbb0a50b0729 +size 6292 diff --git a/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/skin.webp b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/skin.webp new file mode 100644 index 00000000..08ee3547 --- /dev/null +++ b/game/characters/cho/poses/default/clothes/top/sheer_nightie_1/skin.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:465f3fe282db91066c179a1120e74650e8891d12b245cc7341d7925944d14cc2 +size 1204 diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy index 00ac0209..322276bd 100644 --- a/game/scripts/characters/cho/wardrobe.rpy +++ b/game/scripts/characters/cho/wardrobe.rpy @@ -200,6 +200,24 @@ default cho_top_virgin_killer = DollCloth("cho", ("upper body", "one-piece suits default cho_outfit_virgin_killer = DollOutfit([cho_hair_base, cho_top_virgin_killer], price=200, name="Virgin Killer", desc="Disclaimer: Does not actually kill virgins.") +########################## +## Sheer Nightie Outfit ## +########################## + +default cho_nightie_sheer1 = DollCloth("cho", ("upper body", "shirts"), "top", "sheer_nightie_1", ["#CBE5F8BF", "#000000FF"], level=13) +default cho_panties_sheer1 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "sheer_panties_1", ["#CBE5F8BF"], level=16) + +default cho_outfit_sheer_nightie = DollOutfit([cho_hair_base, cho_nightie_sheer1, cho_panties_sheer1], price=400, name="Sheer Nightie Set", desc="Like a regular nightie, except you can see through it.") + +########################## +## Sporty Bikini Outfit ## +########################## + +default cho_bra_bikini_sporty1 = DollCloth("cho", ("upper undergarment", "bikini bras"), "bra", "sporty_bikini_top_1", ["#484A6CFF"], level=8) +default cho_panties_bikini_sporty1 = DollCloth("cho", ("lower undergarment", "bikini panties"), "panties", "sporty_bikini_bottom_1", ["#484A6CFF"], level=12) + +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.") + ################ ## Pubic Hair ## ################ diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy index 6c70279a..02f9f9e1 100644 --- a/game/scripts/characters/cho/wardrobe_reactions.rpy +++ b/game/scripts/characters/cho/wardrobe_reactions.rpy @@ -655,6 +655,7 @@ label cho_reaction_equip_outfit(item): cho @ cheeks blush "So... You really don't know what it says." ("soft", "narrow", "base", "mid") gen "Not the faintest idea." ("base", xpos="far_left", ypos="head") cho @ cheeks blush "Well... I suppose that's a good thing..." ("soft", "narrow", "base", "R") + ################## ## Police Woman ## ################## @@ -712,6 +713,35 @@ label cho_reaction_equip_outfit(item): cho @ cheeks blush "*Hmm*... If you say so..." ("base", "narrow", "base", "down") cho @ cheeks blush "Alright, just give me a moment to put it on." ("base", "base", "base", "mid") + ########################## + ## Sheer Nightie Outfit ## + ########################## + elif item == cho_outfit_sheer_nightie: #Req 16 (panties) + gen "I've not this nightie for you to wear." ("base", xpos="far_left", ypos="head") + cho "A nightie?" ("soft", "base", "base", "mid") + gen "That's right." ("base", xpos="far_left", ypos="head") + gen "This one, right here." ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "...{w=0.4} It's see-through." ("horny", "narrow", "base", "down") + gen "I know... Quite the lifehack isn't it?" ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "A lifehack?" ("horny", "base", "raised", "mid") + gen "Well, if you were completely naked, then that would be indecent..." ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "Oh... I see..." ("smile", "narrow", "base", "down") + cho @ cheeks blush "Well, I better wear it then... For the sake of decency..." ("smile", "wink", "base", "mid") + + ########################## + ## Sporty Bikini Outfit ## + ########################## + elif item == cho_outfit_sporty_bikini: #Req 12 (panties) + gen "I've got this sporty bikini for you to wear." ("base", xpos="far_left", ypos="head") + cho "A sporty bikini?" ("soft", "base", "base", "mid") + gen "Yeah! You're into that sort of thing, aren't you?" ("base", xpos="far_left", ypos="head") + cho "I suppose I do look good in a bikini..." ("base", "narrow", "base", "down") + gen "I was talking about sports, but sure!" ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "Oh..." ("angry", "narrow", "base", "mid") + cho @ cheeks blush "Well, I suppose I could wear it when exercising." ("base", "base", "base", "mid") + gen "I was thinking you could wear it now." ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "... Alright then." ("smile", "base", "base", "mid") + # TODO: Blacklist fallbacks have to be added. return @@ -1122,6 +1152,75 @@ label cho_reaction_equip_outfit_fail(item): gen "Well, I guess I'll have to try to return it... Damn!" ("base", xpos="far_left", ypos="head") cho @ cheeks blush "" ("angry", "narrow", "base", "mid") + ########################## + ## Sheer Nightie Outfit ## + ########################## + elif item == cho_outfit_sheer_nightie: #Req 16 (panties) + gen "I've not this nightie for you to wear." ("base", xpos="far_left", ypos="head") + cho "A nightie?" ("soft", "base", "base", "mid") + gen "That's right." ("base", xpos="far_left", ypos="head") + if states.cho.level < 4: + cho "Why on earth would I put on a nightie if I'm not going to bed?" ("disgust", "base", "base", "mid") + gen "It's like breakfast for dinner, sometimes you've just got to do something to keep things different." ("base", xpos="far_left", ypos="head") + cho "Breakfast for dinner?!" ("angry", "wide", "base", "stare") + cho "Are you crazy?" ("mad", "wide", "base", "mid") + gen "I mean, it might be a bit quirky, but--" ("base", xpos="far_left", ypos="head") + cho "Doing something like that would completely mess up my metabolism!" ("mad", "narrow", "base", "mid") + cho "My daily routine!" ("mad", "happyCl", "base", "mid") + gen "I see... You're one of those people." ("base", xpos="far_left", ypos="head") + elif states.cho.level < 10: + cho "Isn't that a little bit weird?" ("open", "narrow", "raised", "mid") + gen "Really? And here I thought nighties were common..." ("base", xpos="far_left", ypos="head") + cho "They are, if you're about to go to bed!" ("angry", "wink", "base", "mid") + gen "...{w=0.4} *Yawn*." ("base", xpos="far_left", ypos="head") + cho "..." ("disgust", "narrow", "base", "mid") + gen "No?" ("base", xpos="far_left", ypos="head") + cho "No." ("disgust", "narrow", "base", "mid") + else: # < 15 + gen "This one, in particular." ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "But, [name_genie_cho]!" ("angry", "base", "base", "down") + cho @ cheeks blush "These are see-through!" ("angry", "narrow", "base", "down") + gen "So?" ("base", xpos="far_left", ypos="head") + cho @ cheeks heavy_blush "How would wearing these be any different to just standing here in the nude?" ("angry", "narrow", "base", "mid") + gen "Would you rather do that instead?" ("base", xpos="far_left", ypos="head") + cho @ cheeks heavy_blush "..." ("angry", "narrow", "base", "downR") #blush + gen "Alright fine, never mind then..." ("base", xpos="far_left", ypos="head") + + ########################## + ## Sporty Bikini Outfit ## + ########################## + elif item == cho_outfit_sporty_bikini: #Req 12 (panties) + gen "I've got this sporty bikini for you to wear." ("base", xpos="far_left", ypos="head") + if states.cho.level < 4: + cho "A what?!" ("angry", "wide", "base", "stare") + gen "A bikini, that's sporty..." ("base", xpos="far_left", ypos="head") + gen "You're into that sort of thing, are you not?" ("base", xpos="far_left", ypos="head") + cho "Bikinis?!" ("angry", "wide", "base", "mid") + cho "Why would you think a bikini is an appropriate gift?" ("angry", "wink", "angry", "mid") + gen "Well, it said \"sporty\" in the name, so I thought you'd like it." ("base", xpos="far_left", ypos="head") + cho "*Ugh*..." ("disgust", "narrow", "angry", "mid") + elif states.cho.level < 10: + cho "A Bikini?" ("angry", "base", "base", "mid") + gen "Yes, a sporty one!" ("base", xpos="far_left", ypos="head") + cho "Well, that's a bit of a weird gift, but I suppose it could be useful..." ("soft", "narrow", "base", "R") + gen "That's what I figured." ("base", xpos="far_left", ypos="head") + gen "Here you are." ("base", xpos="far_left", ypos="head") + cho "!!!" ("angry", "wide", "base", "down") + cho "[name_genie_cho], what is up with these bikini bottoms!" ("angry", "narrow", "base", "mid") + gen "Pretty cool, right?" ("base", xpos="far_left", ypos="head") + gen "Now, if you could just put them--" ("base", xpos="far_left", ypos="head") + cho @ cheeks blush "I think I'll pass." ("angry", "closed", "base", "mid") + gen "And here I thought you were the sporty type..." ("base", xpos="far_left", ypos="head") + else: # < 12 + cho "Alright... Let me see it..." ("soft", "narrow", "base", "mid") + gen "Here you are." ("base", xpos="far_left", ypos="head") + cho "*Hmm*... The top looks nice... Although the bikini bottoms are a bit revealing, don't you think?" ("soft", "narrow", "raised", "down") + gen "Are they? They don't seem that revealing to me." ("base", xpos="far_left", ypos="head") + cho "Just look at the back!" ("angry", "narrow", "base", "mid") + gen "The back?" ("base", xpos="far_left", ypos="head") + 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") 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 8543e731..f10f901d 100644 --- a/game/scripts/shops/dress/chitchats.rpy +++ b/game/scripts/shops/dress/chitchats.rpy @@ -418,6 +418,30 @@ label purchase_outfit(item): maf "I doubt that would be a good idea... You pay me by the hour, after all." gen "... Alright then." ("base", xpos="far_left", ypos="head") maf "I shall have your jumper ready as soon as possible." + elif item == cho_outfit_sheer_nightie: + gen "I'm looking to procure a nightie." ("base", xpos="far_left", ypos="head") + maf "A nightie, sir? Don't you mean a nightgown?" + gen "A nightie." ("base", xpos="far_left", ypos="head") + maf "..." + gen "It's not for me." ("base", xpos="far_left", ypos="head") + maf "Oh, I see..." + maf "So, it's for a lady friend?" + gen "That's right." ("base", xpos="far_left", ypos="head") + maf "A nightie for a lady friend... Alright then, I'll see what I can do." + + elif item == cho_outfit_sporty_bikini: + gen "Would you be able to make me a sporty bikini set, madam?" ("base", xpos="far_left", ypos="head") + maf "Most certainly." + gen "I'll need it to withstand copious amounts of stretching." ("base", xpos="far_left", ypos="head") + maf "Naturally..." + gen "And they need to be tight-fitting..." ("base", xpos="far_left", ypos="head") + maf "Yes, that's a given..." + gen "And could you make them in dark blue?" ("base", xpos="far_left", ypos="head") + maf "Yes, of course sir..." + gen "And have a--" ("base", xpos="far_left", ypos="head") + 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." # # Astoria Greengrass