From ffc24fa9f8cd1a5da7345b82328982fa65a2ddc9 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Thu, 22 Dec 2022 23:38:17 +0000 Subject: [PATCH] Revert "Virgin Killer outfit" --- .../cho/clothes/top/virgin_killer_top/0.webp | 3 -- .../cho/clothes/top/virgin_killer_top/1.webp | 3 -- .../top/virgin_killer_top/outline.webp | 3 -- .../clothes/top/virgin_killer_top/skin.webp | 3 -- game/scripts/characters/cho/wardrobe.rpy | 8 ---- .../characters/cho/wardrobe_reactions.rpy | 38 ------------------- game/scripts/shops/dress/chitchats.rpy | 9 ----- 7 files changed, 67 deletions(-) delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/0.webp delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/1.webp delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/outline.webp delete mode 100644 game/characters/cho/clothes/top/virgin_killer_top/skin.webp diff --git a/game/characters/cho/clothes/top/virgin_killer_top/0.webp b/game/characters/cho/clothes/top/virgin_killer_top/0.webp deleted file mode 100644 index 3830ea8b..00000000 --- a/game/characters/cho/clothes/top/virgin_killer_top/0.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ca95008f05054bb696b8beb0d4ce15030147f24d3a8c0f7277bed40b1b02e1a -size 44372 diff --git a/game/characters/cho/clothes/top/virgin_killer_top/1.webp b/game/characters/cho/clothes/top/virgin_killer_top/1.webp deleted file mode 100644 index 63f36002..00000000 --- a/game/characters/cho/clothes/top/virgin_killer_top/1.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58565edd687ce8ca9488ac5fe35c9df4daeda1c7df0befc4b134f4afd09d2d62 -size 2864 diff --git a/game/characters/cho/clothes/top/virgin_killer_top/outline.webp b/game/characters/cho/clothes/top/virgin_killer_top/outline.webp deleted file mode 100644 index 310d33c2..00000000 --- a/game/characters/cho/clothes/top/virgin_killer_top/outline.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cf889c43eb301c18e50bf921b2890a9df4d87cae41a364e34a577a31fcd8e3c -size 20488 diff --git a/game/characters/cho/clothes/top/virgin_killer_top/skin.webp b/game/characters/cho/clothes/top/virgin_killer_top/skin.webp deleted file mode 100644 index 55928d87..00000000 --- a/game/characters/cho/clothes/top/virgin_killer_top/skin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7954e27ad9ef8ae73236acb86dc52a47beee27d14e23fd1c642a138d0c882c0e -size 8684 diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy index a98549aa..e03824b0 100644 --- a/game/scripts/characters/cho/wardrobe.rpy +++ b/game/scripts/characters/cho/wardrobe.rpy @@ -227,14 +227,6 @@ default cho_hat_bunny1 = DollCloth("cho", ("head", "headgear"), "headgear", "bun default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1, cho_stockings_bunny1, cho_hat_bunny1], price=250, name="Sexy Bunny Costume", desc="A costume to turn you into the bunny equivalent of a neko.") -################### -## Virgin Killer ## -################### - -default cho_top_virgin_killer = DollCloth("cho", ("upper body", "one-piece suits"), "top", "virgin_killer_top", [[222, 64, 71, 255], [222, 64, 71, 255]], blacklist=["panties", "bra"], zorder=7, level=15) - -default cho_outfit_virgin_killer = DollOutfit([cho_hair_ponytail1, cho_top_virgin_killer], price=200, name="Virgin Killer", desc="Disclaimer: Does not actually kill virgins.") - ########### ## Other ## ########### diff --git a/game/scripts/characters/cho/wardrobe_reactions.rpy b/game/scripts/characters/cho/wardrobe_reactions.rpy index c0163521..5c9071f0 100644 --- a/game/scripts/characters/cho/wardrobe_reactions.rpy +++ b/game/scripts/characters/cho/wardrobe_reactions.rpy @@ -558,21 +558,6 @@ label cho_reaction_equip_outfit(item): cho "I'm fine, let me just put it on..." ("soft", "narrow", "base", "down", cheeks="blush") cho "" ("soft", "narrow", "base", "mid", cheeks="blush") - ################### - ## Virgin Killer ## - ################### - elif item == cho_outfit_virgin_killer: #req 14 (no bra, no panties) - gen "I've got this jumper I'd like you to put on." ("base", xpos="far_left", ypos="head") - cho "A jumper?" ("soft", "base", "base", "mid") - gen "Yup, is that surprising?." ("base", xpos="far_left", ypos="head") - cho "*Hmm*... I suppose I would've imagined something more--" ("open", "base", "base", "R") - gen "Here you go." ("base", xpos="far_left", ypos="head") - cho "Oh... It's one of those." ("open", "narrow", "base", "down", cheeks="blush") - gen "Do you like it?" ("base", xpos="far_left", ypos="head") - gen "I thought it would enhance your features." ("base", xpos="far_left", ypos="head") - cho "*Hmm*... If you say so..." ("base", "narrow", "base", "down", cheeks="blush") - cho "Alright, just give me a moment to put it on." ("base", "base", "base", "mid", cheeks="blush") - # TODO: Blacklist fallbacks have to be added. return @@ -960,29 +945,6 @@ label cho_reaction_equip_outfit_fail(item): gen "This isn't at all what I asked for!" ("angry", xpos="far_left", ypos="head") gen "I'm going to have to give that seamstress a piece of my mind!" ("angry", xpos="far_left", ypos="head") cho "..." ("disgust", "narrow", "base", "mid") - - ################### - ## Virgin Killer ## - ################### - elif item == cho_outfit_virgin_killer: #req 14 (no bra, no panties) - gen "Ever heard of a virgin killer?" ("base", xpos="far_left", ypos="head") - cho "Can't say that I have, is it some kind of drink?" ("soft", "base", "base", "mid") - gen "Good guess, but no. It's a type of jumper." ("base", xpos="far_left", ypos="head") - cho "I see... Why are you telling me this?" ("open", "narrow", "raised", "mid") - gen "Well, I've heard that they're the rage these days, so I got you one." ("base", xpos="far_left", ypos="head") - cho "Oh, well, that's very kind of you." ("base", "base", "base", "mid") - gen "Here you go." ("base", xpos="far_left", ypos="head") - cho "..." ("disgust", "narrow", "base", "down") - cho "*Ehm*... Did you actually look at this before you decided to give it to me?" ("open", "narrow", "base", "down", cheeks="blush") - gen "Not really, why?" ("base", xpos="far_left", ypos="head") - cho "Well, it's a bit revealing." ("upset", "narrow", "base", "mid", cheeks="blush") - gen "What?! Really?" ("base", xpos="far_left", ypos="head") - gen "But I spent so much money on it!" ("base", xpos="far_left", ypos="head") - gen "Are you sure it's that bad?" ("base", xpos="far_left", ypos="head") - cho "Yeah, it's pretty bad alright." ("angry", "narrow", "base", "down", cheeks="blush") - gen "Well, I guess I'll have to try to return it... Damn!" ("base", xpos="far_left", ypos="head") - cho "" ("angry", "narrow", "base", "mid", cheeks="blush") - else: $ random_number = renpy.random.randint(1, 5) if random_number == 1: diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy index 6ff3a9f2..4ccc44d0 100644 --- a/game/scripts/shops/dress/chitchats.rpy +++ b/game/scripts/shops/dress/chitchats.rpy @@ -410,15 +410,6 @@ label purchase_outfit(item): gen "I want one of those sexy bunny outfits, the one you might see in a magazine." ("base", xpos="far_left", ypos="head") maf "I see." maf "Alright then, I'll see what I can do." - elif item == cho_outfit_virgin_killer: - gen "Virgin killer?" ("base", xpos="far_left", ypos="head") - maf "Not so much these days, but you should've seen me in my--" - maf "Oh, you're referring to the jumper." - gen "Of course, although now I'm more intrigued about--" ("base", xpos="far_left", ypos="head") - 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." - # # Astoria Greengrass