From 58b46390072050ad25772f7ea6de133176fcc7a0 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Tue, 7 Feb 2023 17:47:29 +0100 Subject: [PATCH] Wardobe file organization - Part 2 * Renamed clothing pieces for consistency. --- .../cho/events/requests/manipulate_boys.rpy | 2 +- game/scripts/characters/cho/wardrobe.rpy | 50 ++++++------ game/scripts/characters/susan/wardrobe.rpy | 4 +- game/scripts/characters/tonks/wardrobe.rpy | 78 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy index f591ad12..f9bb4a98 100644 --- a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy +++ b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy @@ -1427,7 +1427,7 @@ label cc_pr_manipulate_boys_twins_branch: show screen blkfade with fade $ cho.equip(cho_outfit_smurfette) - $ cho.equip(cho_hair_ponytail1) # Override hair + $ cho.equip(cho_hair_base) # Override hair $ renpy.sound.play("sounds/cloth_sound3.ogg") cho "" ("upset", "base", "angry", "down", cheeks="blush") pause .8 diff --git a/game/scripts/characters/cho/wardrobe.rpy b/game/scripts/characters/cho/wardrobe.rpy index 89d890a0..62650cf6 100644 --- a/game/scripts/characters/cho/wardrobe.rpy +++ b/game/scripts/characters/cho/wardrobe.rpy @@ -8,7 +8,7 @@ default cho = Doll(name="cho") ## Hair ## ########## -default cho_hair_ponytail1 = DollCloth("cho", ("head", "hair"), "hair", "ponytail", [[52, 59, 80, 255], [70, 90, 147, 255]], unlocked=True) +default cho_hair_base = DollCloth("cho", ("head", "hair"), "hair", "ponytail", [[52, 59, 80, 255], [70, 90, 147, 255]], unlocked=True) ####################### ## Schoolgirl Outfit ## @@ -35,8 +35,8 @@ default cho_robe_school_1 = DollCloth("cho", ("upper body", "robes"), "robe", "r default cho_robe_school_2 = DollCloth("cho", ("upper body", "robes"), "robe", "robe_school_2", color=[[96, 96, 96, 255], [206, 206, 209, 255], [89, 116, 194, 255]], level=4, unlocked=True) default cho_robe_school_3 = DollCloth("cho", ("upper body", "robes"), "robe", "robe_school_3", color=[[96, 96, 96, 255], [206, 206, 209, 255], [89, 116, 194, 255]], level=8, unlocked=True) -default cho_outfit_last = DollOutfit([cho_hair_ponytail1], hidden=True) -default cho_outfit_default = DollOutfit([cho_hair_ponytail1, cho_top_school1, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_house], unlocked=True) +default cho_outfit_last = DollOutfit([cho_hair_base], hidden=True) +default cho_outfit_default = DollOutfit([cho_hair_base, cho_top_school1, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_house], unlocked=True) ######################## ## Cheerleader Outfit ## @@ -50,7 +50,7 @@ default cho_panties_sport2 = DollCloth("cho", ("lower undergarment", "panties"), default cho_bra_sports1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", "sport_bra_1", [[156, 204, 249, 255]], unlocked=True) default cho_makeup_blush = DollCloth("cho", ("makeup", "blush"), "makeup", "blush", [[238, 113, 196, 255]], level=2) -default cho_outfit_cheerleader = DollOutfit([cho_hair_ponytail1, cho_earring_snitch, cho_stockings_quid1, cho_panties_sport2, cho_bra_sports1, cho_bottom_quid1, cho_top_quid1, cho_makeup_blush], price=500, name="Ravenclaw Cheerleader Uniform", desc="Ravenclaw! Ravenclaw!") +default cho_outfit_cheerleader = DollOutfit([cho_hair_base, cho_earring_snitch, cho_stockings_quid1, cho_panties_sport2, cho_bra_sports1, cho_bottom_quid1, cho_top_quid1, cho_makeup_blush], price=500, name="Ravenclaw Cheerleader Uniform", desc="Ravenclaw! Ravenclaw!") ################## ## Misty Outfit ## @@ -60,7 +60,7 @@ default cho_top_shirt1 = DollCloth("cho", ("upper body", "shirts"), "top", "top_ default cho_bottom_shorts3 = DollCloth("cho", ("lower body", "shorts"), "bottom", "pants_short_3", [[47, 150, 136, 255], [175, 220, 191, 255], [247, 152, 38, 255]], level=10) default cho_accessory_suspenders = DollCloth("cho", ("misc", "accessory"), "accessory", "suspenders", [[137, 22, 17, 255], [229, 140, 33, 255]], zorder=213) -default cho_outfit_misty = DollOutfit([cho_hair_ponytail1, cho_accessory_suspenders, cho_top_shirt1, cho_bottom_shorts3, cho_panties_sport2], price=500, name="Misty Costume", desc="For trainers that want to be the very best! To train them is your cause!") +default cho_outfit_misty = DollOutfit([cho_hair_base, cho_accessory_suspenders, cho_top_shirt1, cho_bottom_shorts3, cho_panties_sport2], price=500, name="Misty Costume", desc="For trainers that want to be the very best! To train them is your cause!") ##################### ## Clubslut Outfit ## @@ -69,7 +69,7 @@ default cho_outfit_misty = DollOutfit([cho_hair_ponytail1, cho_accessory_suspend default cho_bottom_skirt2 = DollCloth("cho", ("lower body", "skirts"), "bottom", "skirt_short_2", [[93, 119, 173, 255]], level=16) default cho_bra_bikini1 = DollCloth("cho", ("upper undergarment", "bikini bras"), "bra", "bikini_top_1", [[3, 237, 234, 255]], level=10) -default cho_outfit_party = DollOutfit([cho_hair_ponytail1, cho_bottom_skirt2, cho_bra_bikini1], price=500, name="Clubslut Outfit", desc="Release your inner slut with this unique club outfit!") +default cho_outfit_party = DollOutfit([cho_hair_base, cho_bottom_skirt2, cho_bra_bikini1], price=500, name="Clubslut Outfit", desc="Release your inner slut with this unique club outfit!") ################### ## Sailor Outfit ## @@ -80,7 +80,7 @@ default cho_top_sailor1 = DollCloth("cho", ("upper body", "shirts"), "top", "top default cho_stockings_sailor1 = DollCloth("cho", ("legwear", "stockings"), "stockings", "sailor", [[232, 232, 233, 255]]) default cho_panties_bikini2 = DollCloth("cho", ("lower undergarment", "bikini panties"), "panties", "bikini_bottom_2", [[213, 161, 13, 255]], level=18) -default cho_outfit_sailor = DollOutfit([cho_hair_ponytail1, cho_top_sailor1, cho_bottom_skirt1, cho_stockings_sailor1, cho_panties_bikini2], price=500, name="Sailor Outfit", desc="A slutty sailor outfit, perfect for the average cannon swabber.") +default cho_outfit_sailor = DollOutfit([cho_hair_base, cho_top_sailor1, cho_bottom_skirt1, cho_stockings_sailor1, cho_panties_bikini2], price=500, name="Sailor Outfit", desc="A slutty sailor outfit, perfect for the average cannon swabber.") ############################ ## Japanese School Outfit ## @@ -90,7 +90,7 @@ default cho_top_j_school1 = DollCloth("cho", ("upper body", "shirts"), "top", "t default cho_bottom_j_skirt1 = DollCloth("cho", ("lower body", "skirts"), "bottom", "j_school_skirt_1", [[161, 161, 164, 255]], level=4) default cho_stockings_j_kneehigh1 = DollCloth("cho", ("legwear", "socks"), "stockings", "kneehigh", [[253, 254, 250, 255]], level=0) -default cho_outfit_j_school = DollOutfit([cho_hair_ponytail1, cho_top_j_school1, cho_bottom_j_skirt1, cho_stockings_j_kneehigh1, cho_panties_basic1, cho_bra_basic1], price=300, name="Japanese School Uniform", desc="A school girl uniform inspired by the land of culture.") +default cho_outfit_j_school = DollOutfit([cho_hair_base, cho_top_j_school1, cho_bottom_j_skirt1, cho_stockings_j_kneehigh1, cho_panties_basic1, cho_bra_basic1], price=300, name="Japanese School Uniform", desc="A school girl uniform inspired by the land of culture.") ################### ## Bikini Outfit ## @@ -99,7 +99,7 @@ default cho_outfit_j_school = DollOutfit([cho_hair_ponytail1, cho_top_j_school1, default cho_bra_bikini2 = DollCloth("cho", ("upper undergarment", "bikini bras"), "bra", "bikini_top_2", [[89, 116, 194, 255]], level=14) #Red: [138, 22, 17, 255] default cho_panties_bikini1 = DollCloth("cho", ("lower undergarment", "bikini panties"), "panties", "bikini_bottom_1", [[213, 161, 13, 255]], level=14) -default cho_outfit_bikini = DollOutfit([cho_hair_ponytail1, cho_bra_bikini2, cho_panties_bikini1], price=500, name="Micro Bikini Set", desc="The regular size bikinis are out of stock...") +default cho_outfit_bikini = DollOutfit([cho_hair_base, cho_bra_bikini2, cho_panties_bikini1], price=500, name="Micro Bikini Set", desc="The regular size bikinis are out of stock...") ########################## ## Lace Lingerie Outfit ## @@ -112,7 +112,7 @@ default cho_bra_lace1 = DollCloth("cho", ("upper undergarment", "bras"), "bra", default cho_panties_lace1 = DollCloth("cho", ("lower undergarment", "panties"), "panties", "lace_panties_1", [[100, 100, 255, 255], [220, 220, 221, 255], [89, 116, 194, 255]], level=12) default cho_earring_feather = DollCloth("cho", ("head", "earrings"), "earrings", "feather", [[232, 232, 232, 255], [70, 90, 147, 255], [136, 91, 34, 255]]) -default cho_outfit_lacelingerie = DollOutfit([cho_hair_ponytail1, cho_neckwear_lace1, cho_garterbelt_lace1, cho_panties_lace1, cho_bra_lace1, cho_stockings_lace1, cho_earring_feather], price=500, name="Lace Lingerie Set", desc="This lingerie set turns even the toughest tomboy into a cute and sexy princess!") +default cho_outfit_lacelingerie = DollOutfit([cho_hair_base, cho_neckwear_lace1, cho_garterbelt_lace1, cho_panties_lace1, cho_bra_lace1, cho_stockings_lace1, cho_earring_feather], price=500, name="Lace Lingerie Set", desc="This lingerie set turns even the toughest tomboy into a cute and sexy princess!") ################## ## Dress Outfit ## @@ -120,7 +120,7 @@ default cho_outfit_lacelingerie = DollOutfit([cho_hair_ponytail1, cho_neckwear_l default cho_top_dress1 = DollCloth("cho", ("upper body", "dresses"), "top", "dress_1", [[231, 29, 41, 255], [242, 162, 73, 255]], level=12, blacklist=["bottom"]) -default cho_outfit_dress1 = DollOutfit([cho_hair_ponytail1, cho_top_dress1, cho_panties_basic1, cho_bra_basic1], price=500, name="Traditional Chinese Dress", desc="A traditional dress inspired by Chinese culture.") +default cho_outfit_dress1 = DollOutfit([cho_hair_base, cho_top_dress1, cho_panties_basic1, cho_bra_basic1], price=500, name="Traditional Chinese Dress", desc="A traditional dress inspired by Chinese culture.") #################### ## Trainee Outfit ## @@ -131,7 +131,7 @@ default cho_bottom_shorts1 = DollCloth("cho", ("lower body", "shorts"), "bottom" default cho_stockings_pantyhose = DollCloth("cho", ("legwear", "pantyhose"), "stockings", "pantyhose", [[190, 146, 129, 255]]) default cho_earring_basic = DollCloth("cho", ("head", "earrings"), "earrings", "basic", [[220, 220, 221, 255]]) -default cho_outfit_trainee = DollOutfit([cho_hair_ponytail1, cho_bra_basic1, cho_panties_basic1, cho_bottom_shorts1, cho_top_tank2, cho_stockings_pantyhose, cho_earring_basic], price=500, name="Sporty Outfit", desc="Great for reducing fat.") +default cho_outfit_trainee = DollOutfit([cho_hair_base, cho_bra_basic1, cho_panties_basic1, cho_bottom_shorts1, cho_top_tank2, cho_stockings_pantyhose, cho_earring_basic], price=500, name="Sporty Outfit", desc="Great for reducing fat.") ###################### ## Toonsquad Outfit ## @@ -142,7 +142,7 @@ default cho_top_toon_shirt = DollCloth("cho", ("upper body", "shirts"), "top", " default cho_bottom_toon_shorts = DollCloth("cho", ("lower body", "shorts"), "bottom", "toon_shorts", [[43, 81, 151, 255], [255, 255, 255, 255]], level=4) default cho_stockings_toon_socks = DollCloth("cho", ("legwear", "socks"), "stockings", "toon_socks", [[43, 81, 151, 255], [255, 255, 255, 255]], level=4) -default cho_outfit_toon = DollOutfit([cho_hair_ponytail1, cho_headgear_toon_band, cho_top_toon_shirt, cho_bottom_toon_shorts, cho_stockings_toon_socks, cho_bra_basic1, cho_panties_basic1], price=500, name="Toonsquad Outfit", desc="\"Don't ever call me a doll!\" - Some Sexy Bunny") +default cho_outfit_toon = DollOutfit([cho_hair_base, cho_headgear_toon_band, cho_top_toon_shirt, cho_bottom_toon_shorts, cho_stockings_toon_socks, cho_bra_basic1, cho_panties_basic1], price=500, name="Toonsquad Outfit", desc="\"Don't ever call me a doll!\" - Some Sexy Bunny") #################### ## Chun-Li Outfit ## @@ -155,7 +155,7 @@ default cho_headgear_chun_li_puffies = DollClothDynamic("cho", ("head", "headgea default cho_tattoo_chun_li_dragon = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo", "chun_li_dragon", [[237, 34, 79, 255], [255, 226, 121, 255]]) default cho_tattoo_chun_li_mule = DollCloth("cho", ("piercings & tattoos", "tattoos"), "tattoo", "chun_li_mule", [[0, 0, 0, 255]]) -default cho_outfit_chun_li = DollOutfit([cho_hair_ponytail1, cho_top_chun_li, cho_accessory_chun_li_wrap, cho_accessory_chun_li_shoulders, cho_headgear_chun_li_puffies, cho_bra_basic1, cho_panties_basic1, cho_tattoo_chun_li_dragon, cho_tattoo_chun_li_mule], price=500, name="Chun-Li Outfit", desc="For the strongest woman in the world!") +default cho_outfit_chun_li = DollOutfit([cho_hair_base, cho_top_chun_li, cho_accessory_chun_li_wrap, cho_accessory_chun_li_shoulders, cho_headgear_chun_li_puffies, cho_bra_basic1, cho_panties_basic1, cho_tattoo_chun_li_dragon, cho_tattoo_chun_li_mule], price=500, name="Chun-Li Outfit", desc="For the strongest woman in the world!") ################## ## Police Woman ## #unlocked in not_so_great_escape mirror story @@ -166,7 +166,7 @@ default cho_bottom_police_skirt = DollCloth("cho", ("lower body", "skirts"), "bo default cho_glasses_aviators = DollCloth("cho", ("head", "glasses"), "glasses", "aviators", [[183, 199, 216, 255], [243, 217, 84, 255]], level=6) default cho_headgear_police_cap = DollClothDynamic("cho", ("head", "headgear"), "headgear", "police_cap", [[126, 126, 192, 255], [235, 209, 101, 255], [183, 199, 216, 255], [235, 209, 101, 255]], level=6, tracking="?hair") -default cho_outfit_police = DollOutfit([cho_hair_ponytail1, cho_top_police1, cho_bottom_police_skirt, cho_bra_basic1, cho_panties_basic1, cho_glasses_aviators, cho_headgear_police_cap]) +default cho_outfit_police = DollOutfit([cho_hair_base, cho_top_police1, cho_bottom_police_skirt, cho_bra_basic1, cho_panties_basic1, cho_glasses_aviators, cho_headgear_police_cap]) ###################### ## Reindeer Costume ## #unlocked in genies_christmas_wish mirror story @@ -177,7 +177,7 @@ default cho_hat_antlers = DollClothDynamic("cho", ("head", "headgear"), "headgea default cho_neckwear_reindeer_collar = DollCloth("cho", ("head", "neckwear"), "neckwear", "reindeer_collar", [[126, 68, 34, 255], [196, 171, 95, 255]], level=15) default cho_accessory_mistletoe = DollCloth("cho", ("misc", "accessory"), "accessory", "mistletoe", [[27, 92, 201, 255]], zorder=193, level=7) -default cho_outfit_reindeer = DollOutfit([cho_hair_ponytail1, cho_top_bunny2, cho_accessory_mistletoe, cho_hat_antlers, cho_neckwear_reindeer_collar]) +default cho_outfit_reindeer = DollOutfit([cho_hair_base, cho_top_bunny2, cho_accessory_mistletoe, cho_hat_antlers, cho_neckwear_reindeer_collar]) ################### ## Bunny Costume ## @@ -187,7 +187,7 @@ default cho_top_bunny1 = DollCloth("cho", ("upper body", "one-piece suits"), "to default cho_stockings_bunny1 = DollCloth("cho", ("legwear", "pantyhose"), "stockings", "bunny_stockings_1", [[81, 81, 81, 255]], level=5) default cho_hat_bunny1 = DollClothDynamic("cho", ("head", "headgear"), "headgear", "bunny_hat_1", [[43, 42, 50, 255], [87, 83, 112, 255]], level=15, tracking="?hair") -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.") +default cho_outfit_bunny = DollOutfit([cho_hair_base, 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 Outfit ## @@ -195,7 +195,7 @@ default cho_outfit_bunny = DollOutfit([cho_hair_ponytail1, cho_top_bunny1, cho_s 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=183, 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.") +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.") ################ ## Pubic Hair ## @@ -243,11 +243,11 @@ default choq_accessory_protectors2 = DollCloth("cho", ("misc", "accessory"), "ac default choq_accessory_snitch_in_hand = DollCloth("cho", ("hidden", "accessory"), "accessory", "snitch_in_hand", None, zorder=-1) # Add choq_accessory_protectors2 once drawn for normal pose -default cho_outfit_quidditch = DollOutfit([cho_hair_ponytail1, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_cloth_robequidditch1, choq_bra_sports1, choq_panties_sport1], hidden=True) +default cho_outfit_quidditch = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_cloth_robequidditch1, choq_bra_sports1, choq_panties_sport1], hidden=True) -default cho_outfit_quidditch_hufflepuff = DollOutfit([cho_hair_ponytail1, choq_cloth_topsweater1, choq_cloth_schoolskirt2, choq_cloth_robequidditch1, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport1], hidden=True) -default cho_outfit_quidditch_slytherin = DollOutfit([cho_hair_ponytail1, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_accessory_protectors2, choq_bra_sports1, choq_panties_sport1], hidden=True) -default cho_outfit_quidditch_gryffindor = DollOutfit([cho_hair_ponytail1, choq_cloth_topsweater1, choq_cloth_schoolskirt3, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport1], hidden=True) +default cho_outfit_quidditch_hufflepuff = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_schoolskirt2, choq_cloth_robequidditch1, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport1], hidden=True) +default cho_outfit_quidditch_slytherin = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_pantslong2, choq_accessory_protectors2, choq_bra_sports1, choq_panties_sport1], hidden=True) +default cho_outfit_quidditch_gryffindor = DollOutfit([cho_hair_base, choq_cloth_topsweater1, choq_cloth_schoolskirt3, choq_accessory_protectors, choq_bra_sports1, choq_panties_sport1], hidden=True) ############ ## Events ## @@ -265,9 +265,9 @@ default smurfette_hair = DollCloth("cho", ("head", "hair"), "hair", "smurfette", default smurfette_hat = DollClothDynamic("cho", ("head", "headgear"), "headgear", "smurfette", [[251, 251, 251, 255]], level=4, tracking="?hair") default smurfette_top = DollCloth("cho", ("upper body", "dresses"), "top", "smurfette", [[251, 251, 251, 255],[251, 251, 251, 255]], level=4, blacklist=["bottom"]) -default cho_outfit_slyt = DollOutfit([cho_hair_ponytail1, cho_top_school1_slyt, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_slyt], hidden=True) -default cho_outfit_gryf = DollOutfit([cho_hair_ponytail1, cho_top_school1_gryf, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_gryf], hidden=True) -default cho_outfit_huff = DollOutfit([cho_hair_ponytail1, cho_top_school1_huff, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_huff], hidden=True) +default cho_outfit_slyt = DollOutfit([cho_hair_base, cho_top_school1_slyt, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_slyt], hidden=True) +default cho_outfit_gryf = DollOutfit([cho_hair_base, cho_top_school1_gryf, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_gryf], hidden=True) +default cho_outfit_huff = DollOutfit([cho_hair_base, cho_top_school1_huff, cho_bottom_school1, cho_bra_basic1, cho_panties_basic1, cho_stockings_huff], hidden=True) default cho_outfit_smurfette = DollOutfit([smurfette_hair, smurfette_hat, smurfette_top], price=0, name="Smurfette Costume", desc="I'm coming for you, Gargamel.{heart}") ########## diff --git a/game/scripts/characters/susan/wardrobe.rpy b/game/scripts/characters/susan/wardrobe.rpy index 39573492..fdf0243a 100644 --- a/game/scripts/characters/susan/wardrobe.rpy +++ b/game/scripts/characters/susan/wardrobe.rpy @@ -56,12 +56,12 @@ default sus_outfit_muggle_casual1 = DollOutfit([sus_hair_base, sus_top_muggle_ca ## Priestess Outfit ## ###################### -default sus_headdress_priestess = DollClothDynamic("susan", ("head", "headgear"), "headgear", "priestess_headdress", [[39, 56, 67, 255], [228, 235, 240, 255]], tracking="?hair") +default sus_headgear_priestess = DollClothDynamic("susan", ("head", "headgear"), "headgear", "priestess_headdress", [[39, 56, 67, 255], [228, 235, 240, 255]], tracking="?hair") default sus_top_priestess = DollCloth("susan", ("upper body", "dresses"), "top", "priestess_dress", [[39, 56, 67, 255], [228, 235, 240, 255]]) default sus_lace_stockings1 = DollCloth("susan", ("legwear", "stockings"), "stockings", "lace_stockings_1", [[0, 0, 0, 255]]) default sus_hat_necklace =DollCloth("susan", ("head", "neckwear"), "neckwear", "hat_necklace", [[240, 190, 120, 255]], zorder=213) -default sus_outfit_priestess = DollOutfit([sus_hair_base, sus_headdress_priestess, sus_top_priestess, sus_lace_stockings1, sus_hat_necklace, sus_bra_base1, sus_panties_base1,], price=400, name="Priestess Outfit", desc="This outfit radiates innocence.") +default sus_outfit_priestess = DollOutfit([sus_hair_base, sus_headgear_priestess, sus_top_priestess, sus_lace_stockings1, sus_hat_necklace, sus_bra_base1, sus_panties_base1,], price=400, name="Priestess Outfit", desc="This outfit radiates innocence.") ################## ## Latex Outfit ## diff --git a/game/scripts/characters/tonks/wardrobe.rpy b/game/scripts/characters/tonks/wardrobe.rpy index ce24507d..76d644b6 100644 --- a/game/scripts/characters/tonks/wardrobe.rpy +++ b/game/scripts/characters/tonks/wardrobe.rpy @@ -8,8 +8,8 @@ default tonks = Doll(name="tonks") ## Hair ## ########## -default ton_hair_base = DollCloth("tonks", ("head", "hair"), "hair", "base", [[255, 146, 185, 255], [254, 218, 238, 255]], unlocked=True) -default ton_hair_base_new = DollCloth("tonks", ("head", "hair"), "hair", "new", [[255, 146, 185, 255], [254, 218, 238, 255]], unlocked=True) +default ton_hair_short = DollCloth("tonks", ("head", "hair"), "hair", "base", [[255, 146, 185, 255], [254, 218, 238, 255]], unlocked=True) +default ton_hair_base = DollCloth("tonks", ("head", "hair"), "hair", "new", [[255, 146, 185, 255], [254, 218, 238, 255]], unlocked=True) ################## ## Auror Outfit ## @@ -28,8 +28,8 @@ default ton_stockings_auror = DollCloth("tonks", ("legwear", "stockings"), "stoc default ton_robe_auror = DollCloth("tonks", ("upper body", "robes"), "robe", "auror_coat",[[40, 40, 41, 255], [244, 230, 236, 255]], unlocked=True) -default ton_outfit_default = DollOutfit([ton_hair_base_new, ton_neckwear_beads, ton_gloves_auror, ton_top_auror, ton_robe_auror, ton_bottoms_leggings, ton_stockings_auror], unlocked=True) -default ton_outfit_last = DollOutfit([ton_hair_base_new], hidden=True) +default ton_outfit_default = DollOutfit([ton_hair_base, ton_neckwear_beads, ton_gloves_auror, ton_top_auror, ton_robe_auror, ton_bottoms_leggings, ton_stockings_auror], unlocked=True) +default ton_outfit_last = DollOutfit([ton_hair_base], hidden=True) ####################### ## Schoolgirl Outfit ## @@ -41,7 +41,7 @@ default ton_bottom_school2 = DollCloth("tonks", ("lower body", "skirts"), "botto default ton_bottom_school3 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_3", [[103, 90, 108, 255], [232, 177, 13, 255]], level=40) default ton_bottom_school4 = DollCloth("tonks", ("lower body", "skirts"), "bottom", "school_skirt_4", [[103, 90, 108, 255], [232, 177, 13, 255]], level=60) -default ton_outfit_school = DollOutfit([ton_hair_base_new, ton_top_tied, ton_bottom_school2], price=350, name="Oldschool School Uniform", desc="A very tight school outfit back from 1995!") +default ton_outfit_school = DollOutfit([ton_hair_base, ton_top_tied, ton_bottom_school2], price=350, name="Oldschool School Uniform", desc="A very tight school outfit back from 1995!") ################### ## Casual Outfit ## @@ -50,7 +50,7 @@ default ton_outfit_school = DollOutfit([ton_hair_base_new, ton_top_tied, ton_bot default ton_top_crop_casual = DollCloth("tonks", ("upper body", "shirts"), "top", "crop_top",[[200, 8, 45, 255]]) default ton_bottoms_leggings_casual = DollCloth("tonks", ("lower body", "leggings"), "bottom", "latex_leggings",[[32, 32, 32, 255], [25, 24, 24, 255]]) -default ton_outfit_casual = DollOutfit([ton_hair_base_new, ton_top_crop_casual, ton_bottoms_leggings_casual], price=350, name="Sexy Casual Outfit", desc="Leggings make squeaky sounds when rubbed together.") +default ton_outfit_casual = DollOutfit([ton_hair_base, ton_top_crop_casual, ton_bottoms_leggings_casual], price=350, name="Sexy Casual Outfit", desc="Leggings make squeaky sounds when rubbed together.") #################### ## Nightie Outfit ## @@ -58,7 +58,7 @@ default ton_outfit_casual = DollOutfit([ton_hair_base_new, ton_top_crop_casual, default ton_top_nightie_1 = DollCloth("tonks", ("upper body", "shirts"), "top", "nightie_1", [[153, 38, 96, 255]]) -default ton_outfit_nightie = DollOutfit([ton_hair_base_new, ton_top_nightie_1], price=350, name="Nightie", desc="Doesn't leave much for the imagination.") +default ton_outfit_nightie = DollOutfit([ton_hair_base, ton_top_nightie_1], price=350, name="Nightie", desc="Doesn't leave much for the imagination.") ################## ## Bunny Outfit ## @@ -69,15 +69,15 @@ default ton_stockings_bunny1 = DollCloth("tonks", ("legwear", "pantyhose"), "sto default ton_hat_bunny1 = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "bunny", [[48, 48, 48, 255], [232, 232, 232, 255]], level=20, tracking="?hair") default ton_neckwear_bunny1 = DollCloth("tonks", ("head", "neckwear"), "neckwear", "bunny_bowtie_1", [[232, 232, 232, 255], [48, 48, 48, 255]], level=10) -default ton_outfit_bunny = DollOutfit([ton_hair_base_new, ton_top_bunny1, ton_stockings_bunny1, ton_hat_bunny1, ton_neckwear_bunny1], price=350, name="Sexy Bunny Outfit", desc="Vewy sexy :3") +default ton_outfit_bunny = DollOutfit([ton_hair_base, ton_top_bunny1, ton_stockings_bunny1, ton_hat_bunny1, ton_neckwear_bunny1], price=350, name="Sexy Bunny Outfit", desc="Vewy sexy :3") ########################## ## Dressing Gown Outfit ## ########################## -default ton_dressing_gown = DollCloth("tonks", ("upper body", "robes"), "robe", "dressing_gown", [[13, 0, 76, 255], [31, 41, 171, 255]]) +default ton_robe_dressing_gown = DollCloth("tonks", ("upper body", "robes"), "robe", "dressing_gown", [[13, 0, 76, 255], [31, 41, 171, 255]]) -default ton_outfit_dressing_gown = DollOutfit([ton_hair_base_new, ton_dressing_gown]) +default ton_outfit_dressing_gown = DollOutfit([ton_hair_base, ton_robe_dressing_gown]) ######################## ## Silky Dress Outfit ## @@ -86,7 +86,7 @@ default ton_outfit_dressing_gown = DollOutfit([ton_hair_base_new, ton_dressing_g default ton_top_silk_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "silk_dress", [[240, 237, 250, 255], [234, 234, 234, 255]], blacklist=["bra", "bottom"]) default ton_robe_silk = DollCloth("tonks", ("upper body", "robes"), "robe", "silk_robe", [[240, 237, 250, 255]]) -default ton_outfit_silky = DollOutfit([ton_hair_base_new, ton_top_silk_dress, ton_robe_silk], price=350, name="Silky Dress", desc="{size=-4}Disclaimer: Madam Mafkin isn't responsible for damaged nipples.{/size}") +default ton_outfit_silky = DollOutfit([ton_hair_base, ton_top_silk_dress, ton_robe_silk], price=350, name="Silky Dress", desc="{size=-4}Disclaimer: Madam Mafkin isn't responsible for damaged nipples.{/size}") ################################# ## Very Revealing Dress Outfit ## @@ -95,7 +95,7 @@ default ton_outfit_silky = DollOutfit([ton_hair_base_new, ton_top_silk_dress, to default ton_top_skimpy_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "skimpy_dress", [[147, 1, 1, 255]], blacklist=["bottom"], level=40) default ton_stockings_long2 = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_basic_2",[[0, 0, 0, 255], [16, 16, 16, 255]]) -default ton_outfit_skimpy_dress = DollOutfit([ton_hair_base_new, ton_top_skimpy_dress, ton_stockings_long2], price=300, name="Very Revealing Dress", desc="This dress shows quite a bit of cleavage... All of it in fact.") +default ton_outfit_skimpy_dress = DollOutfit([ton_hair_base, ton_top_skimpy_dress, ton_stockings_long2], price=300, name="Very Revealing Dress", desc="This dress shows quite a bit of cleavage... All of it in fact.") ####################### ## Club Dress Outfit ## @@ -104,7 +104,7 @@ default ton_outfit_skimpy_dress = DollOutfit([ton_hair_base_new, ton_top_skimpy_ default ton_top_skimpy_dress2 = DollCloth("tonks", ("upper body", "dresses"), "top", "skimpy_dress_2", [[108, 0, 105, 255]], blacklist=["bottom"], level=20) default ton_stockings_long_meshed = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_meshed",[[0, 0, 0, 255], [0, 0, 0, 255]]) # Referee Outfit - SOON -default ton_outfit_club_dress = DollOutfit([ton_hair_base_new, ton_top_skimpy_dress2, ton_stockings_long_meshed], price=300, name="Club Dress", desc="A sultry muggle dress like this will turn heads at any wizard pub.") +default ton_outfit_club_dress = DollOutfit([ton_hair_base, ton_top_skimpy_dress2, ton_stockings_long_meshed], price=300, name="Club Dress", desc="A sultry muggle dress like this will turn heads at any wizard pub.") ##################### ## Succubus Outfit ## @@ -121,7 +121,7 @@ default ton_panties_succubus = DollCloth("tonks", ("lower undergarment", "bikini default ton_accessory1_succubus = DollCloth("tonks", ("misc", "accessory"), "accessory", "succubus_wings", [[62, 51, 57, 255], [181, 86, 84, 255], [136, 134, 134, 255]], zorder=-500) default ton_accessory2_succubus = DollCloth("tonks", ("misc", "accessory"), "accessory", "succubus_tail", [[62, 51, 57, 255], [181, 86, 84, 255]], zorder=-11) -default ton_outfit_succubus = DollOutfit([ton_hair_base_new, ton_hat_succubus, ton_neckwear_succubus, ton_gloves_succubus, ton_top_succubus, ton_panties_succubus, ton_accessory1_succubus, ton_accessory2_succubus], addons=[ton_top_succubus2], name="Succubus Costume", desc="Hot as hell.") +default ton_outfit_succubus = DollOutfit([ton_hair_base, ton_hat_succubus, ton_neckwear_succubus, ton_gloves_succubus, ton_top_succubus, ton_panties_succubus, ton_accessory1_succubus, ton_accessory2_succubus], addons=[ton_top_succubus2], name="Succubus Costume", desc="Hot as hell.") ##################### ## Cavegirl Outfit ## @@ -131,7 +131,7 @@ default ton_earring_pearls = DollCloth("tonks", ("head", "earrings"), "earrings" default ton_neckwear_pearls = DollCloth("tonks", ("head", "neckwear"), "neckwear", "pearls_1", [[223, 240, 255, 255]], zorder=213) default ton_top_cavegirl = DollCloth("tonks", ("upper body", "dresses"), "top", "cavegirl_dress", [[223, 240, 255, 255]]) -default ton_outfit_cavegirl = DollOutfit([ton_hair_base_new, ton_top_cavegirl, ton_earring_pearls, ton_neckwear_pearls], price=200, name="Cavegirl Dress", desc="A stone age inspired dress that brings you back to the age of rocking knockers.") +default ton_outfit_cavegirl = DollOutfit([ton_hair_base, ton_top_cavegirl, ton_earring_pearls, ton_neckwear_pearls], price=200, name="Cavegirl Dress", desc="A stone age inspired dress that brings you back to the age of rocking knockers.") ##################### ## Pullover Outfit ## @@ -140,7 +140,7 @@ default ton_outfit_cavegirl = DollOutfit([ton_hair_base_new, ton_top_cavegirl, t default ton_top_pullover = DollCloth("tonks", ("upper body", "shirts"), "top", "pullover",[[253, 240, 230, 250]]) default ton_stockings_long_ribbed = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_ribbed",[[253, 240, 230, 255], [255, 79, 186, 255]]) -default ton_outfit_pullover = DollOutfit([ton_hair_base_new, ton_top_pullover, ton_stockings_long_ribbed], price=200, name="Pullover Outfit", desc="An outfit so defined it will make anyone pull over when they spot it.") +default ton_outfit_pullover = DollOutfit([ton_hair_base, ton_top_pullover, ton_stockings_long_ribbed], price=200, name="Pullover Outfit", desc="An outfit so defined it will make anyone pull over when they spot it.") ################### ## Lady D Outfit ## @@ -154,7 +154,7 @@ default ton_accessory_flower = DollCloth("tonks", ("misc", "accessory"), "access default ton_gloves_leather = DollCloth("tonks", ("upper body", "gloves"), "gloves", "leather_gloves", [[79, 73, 64, 255]]) default ton_top_classy_dress = DollCloth("tonks", ("upper body", "dresses"), "top", "classy_dress",[[203, 201, 184, 255]], blacklist=["bra"]) -default ton_outfit_lady_D = DollOutfit([ton_hair_base_new, ton_hat_classy, ton_neckwear_pearls2, ton_earring_pearls2, ton_accessory_flower, ton_gloves_leather, ton_top_classy_dress], price=400, name="Lady D Costume", desc="This outfit was once worn by a very tall and scary lady.") +default ton_outfit_lady_D = DollOutfit([ton_hair_base, ton_hat_classy, ton_neckwear_pearls2, ton_earring_pearls2, ton_accessory_flower, ton_gloves_leather, ton_top_classy_dress], price=400, name="Lady D Costume", desc="This outfit was once worn by a very tall and scary lady.") ################## ## Police Woman ## #Unlocked in not_so_great_escape mirror story @@ -169,7 +169,7 @@ default ton_top_police3 = DollCloth("tonks", ("upper body", "shirts"), "top", "p default ton_bottom_police = DollCloth("tonks", ("lower body", "shorts"), "bottom", "police",[[72, 101, 183, 255], [126, 126, 192, 255]]) default ton_accessory_police = DollCloth("tonks", ("misc", "accessory"), "accessory", "police_badge", [[238, 209, 101, 255]], zorder=213) -default ton_outfit_police = DollOutfit([ton_hair_base_new, ton_headgear_police, ton_accessory_police, ton_glasses_police, ton_top_police1, ton_bottom_police], addons=[ton_top_police2, ton_top_police3]) +default ton_outfit_police = DollOutfit([ton_hair_base, ton_headgear_police, ton_accessory_police, ton_glasses_police, ton_top_police1, ton_bottom_police], addons=[ton_top_police2, ton_top_police3]) ############################ ## Wrestling Coach Outfit ## #Unlocked in a_white_christmas mirror story @@ -180,21 +180,21 @@ default ton_top_sweatshirt = DollCloth("tonks", ("upper body", "shirts"), "top", default ton_bottom_sweatpants = DollCloth("tonks", ("lower body", "trousers"), "bottom", "sweatpants", [[163, 53, 48, 255], [243, 240, 216, 255]]) default ton_accessory_neck_towel = DollCloth("tonks", ("misc", "accessory"), "accessory", "neck_towel", [[255, 252, 216, 255]], zorder=213) -default ton_outfit_wrestling_coach = DollOutfit([ton_hair_base_new, ton_neckwear_whistle, ton_top_sweatshirt, ton_bottom_sweatpants, ton_accessory_neck_towel]) +default ton_outfit_wrestling_coach = DollOutfit([ton_hair_base, ton_neckwear_whistle, ton_top_sweatshirt, ton_bottom_sweatpants, ton_accessory_neck_towel]) ##################### ## Mechanic Outfit ## ##################### -default ton_mechanic_hair = DollCloth("tonks", ("head", "hair"), "hair", "mechanic_hair", [[255, 146, 185, 255], [254, 218, 238, 255]]) -default ton_mechanic_vest = DollCloth("tonks", ("upper body", "other"), "top", "mechanic_vest", [[255, 132, 11, 255], [255, 242, 74, 255], [151, 169, 171, 255]], blacklist=["bra", "piercing"]) -default ton_mechanic_shorts = DollCloth("tonks", ("lower body", "shorts"), "bottom", "mechanic_shorts", [[104, 145, 206, 255], [122, 67, 53, 255], [151, 169, 171, 255], [182, 203, 233, 255]]) -default ton_mechanic_gloves = DollCloth("tonks", ("upper body", "gloves"), "gloves", "mechanic_gloves", [[48, 48, 48, 255]]) -default ton_mechanic_cap = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "mechanic_cap", [[255, 132, 11, 255], [255, 242, 74, 255]], tracking="?hair") -default ton_mechanic_bikini = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "mechanic_bikini", [[255, 132, 11, 255]]) -default ton_mechanic_thigh_socks = DollCloth("tonks", ("legwear", "socks"), "stockings", "mechanic_thigh_socks",[[48, 48, 48, 255]]) +default ton_hair_mechanic = DollCloth("tonks", ("head", "hair"), "hair", "mechanic_hair", [[255, 146, 185, 255], [254, 218, 238, 255]]) +default ton_top_vest_mechanic = DollCloth("tonks", ("upper body", "other"), "top", "mechanic_vest", [[255, 132, 11, 255], [255, 242, 74, 255], [151, 169, 171, 255]], blacklist=["bra", "piercing"]) +default ton_shorts_mechanic = DollCloth("tonks", ("lower body", "shorts"), "bottom", "mechanic_shorts", [[104, 145, 206, 255], [122, 67, 53, 255], [151, 169, 171, 255], [182, 203, 233, 255]]) +default ton_gloves_mechanic = DollCloth("tonks", ("upper body", "gloves"), "gloves", "mechanic_gloves", [[48, 48, 48, 255]]) +default ton_headgear_cap_mechanic = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "mechanic_cap", [[255, 132, 11, 255], [255, 242, 74, 255]], tracking="?hair") +default ton_panties_mechanic = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "mechanic_bikini", [[255, 132, 11, 255]]) +default ton_socks_mechanic = DollCloth("tonks", ("legwear", "socks"), "stockings", "mechanic_thigh_socks",[[48, 48, 48, 255]]) -default ton_outfit_mechanic = DollOutfit([ton_mechanic_hair, ton_mechanic_vest, ton_mechanic_shorts, ton_mechanic_gloves, ton_mechanic_cap, ton_mechanic_bikini, ton_mechanic_thigh_socks], price=450, name="Mechanic Outfit", desc="If your exhaust pipe needs cleaning, this is the perfect outfit for the occassion!") +default ton_outfit_mechanic = DollOutfit([ton_hair_mechanic, ton_top_vest_mechanic, ton_shorts_mechanic, ton_gloves_mechanic, ton_headgear_cap_mechanic, ton_panties_mechanic, ton_socks_mechanic], price=450, name="Mechanic Outfit", desc="If your exhaust pipe needs cleaning, this is the perfect outfit for the occassion!") ##################### ## Tuxedo (Office) ## @@ -205,7 +205,7 @@ default ton_top_office = DollCloth("tonks", ("upper body", "shirts"), "top", "of default ton_bottoms_office = DollCloth("tonks", ("lower body", "trousers"), "bottom", "office",[[53, 56, 67, 255]]) default ton_accessory_office = DollCloth("tonks", ("misc", "accessory"), "accessory", "office_pin", [[231, 231, 231, 255], [255, 242, 74, 255], [216, 66, 44, 255]], zorder=225) -default ton_outfit_office = DollOutfit([ton_hair_base_new, ton_robe_office, ton_top_office, ton_bottoms_office, ton_accessory_office], price=450, name="SECS Outfit", desc="A smart suit for a clever girl.") +default ton_outfit_office = DollOutfit([ton_hair_base, ton_robe_office, ton_top_office, ton_bottoms_office, ton_accessory_office], price=450, name="SECS Outfit", desc="A smart suit for a clever girl.") ######################### ## Flag Bikini Outfits ## @@ -221,10 +221,10 @@ default ton_panties_bikini_1_jock = DollCloth("tonks", ("lower undergarment", "b default ton_panties_bikini_1_striped = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "bikini_panties_1_striped", [[255, 255, 255, 255], [139, 0, 0, 255]]) default ton_panties_bikini_1_UK = DollCloth("tonks", ("lower undergarment", "bikini panties"), "panties", "bikini_panties_1_UK", [[255, 255, 255, 255], [200, 16, 46, 255], [1, 33, 105, 255]]) -default ton_outfit_bikini_1 = DollOutfit([ton_hair_base_new, ton_bra_bikini_1, ton_panties_bikini_1], price=250, name="Simple Bikini Set", desc="It ain't much, but it at least covers the important bits.") -default ton_outfit_bikini_2 = DollOutfit([ton_hair_base_new, ton_bra_bikini_1_striped, ton_panties_bikini_1_striped], price=250, name="Striped Bikini Set", desc="It ain't much, but it at least covers the important bits. Did I mention the stripes?") -default ton_outfit_bikini_3 = DollOutfit([ton_hair_base_new, ton_bra_bikini_1_UK, ton_panties_bikini_1_UK], price=250, name="\"For The Queen!\" Bikini Set", desc="This is the way.") -default ton_outfit_bikini_4 = DollOutfit([ton_hair_base_new, ton_bra_bikini_1_USA, ton_panties_bikini_1_jock], price=250, name="American Bikini Set", desc="Fuck yeah!") +default ton_outfit_bikini_1 = DollOutfit([ton_hair_base, ton_bra_bikini_1, ton_panties_bikini_1], price=250, name="Simple Bikini Set", desc="It ain't much, but it at least covers the important bits.") +default ton_outfit_bikini_2 = DollOutfit([ton_hair_base, ton_bra_bikini_1_striped, ton_panties_bikini_1_striped], price=250, name="Striped Bikini Set", desc="It ain't much, but it at least covers the important bits. Did I mention the stripes?") +default ton_outfit_bikini_3 = DollOutfit([ton_hair_base, ton_bra_bikini_1_UK, ton_panties_bikini_1_UK], price=250, name="\"For The Queen!\" Bikini Set", desc="This is the way.") +default ton_outfit_bikini_4 = DollOutfit([ton_hair_base, ton_bra_bikini_1_USA, ton_panties_bikini_1_jock], price=250, name="American Bikini Set", desc="Fuck yeah!") ############################# ## Skimpy Swimsuit Outfits ## @@ -234,9 +234,9 @@ default ton_swimsuit_1 = DollCloth("tonks", ("upper body", "one-piece suits"), " default ton_swimsuit_1_striped = DollCloth("tonks", ("upper body", "one-piece suits"), "top", "swimsuit_1_striped", [[255, 245, 231, 255], [168, 0, 0, 255]], zorder=183, level=40) default ton_swimsuit_1_USA = DollCloth("tonks", ("upper body", "one-piece suits"), "top", "swimsuit_1_USA", [[255, 255, 255, 255], [168, 0, 0, 255], [12, 64, 216, 255], [255, 255, 255, 255]], zorder=183, level=40) -default ton_outfit_swimsuit_1 = DollOutfit([ton_hair_base_new, ton_swimsuit_1], price=260, name="Skimpy Swimsuit", desc="Disclaimer: Translucent swimsuits should not be worn in merman inhabited waters under any circumstance.") -default ton_outfit_swimsuit_2 = DollOutfit([ton_hair_base_new, ton_swimsuit_1_striped], price=260, name="Striped Skimpy Swimsuit", desc="A Translucent swimsuit with vertical stripes to make you look even thinner! Or maybe it's the other way around...") -default ton_outfit_swimsuit_3 = DollOutfit([ton_hair_base_new, ton_swimsuit_1_USA], price=260, name="Freedom Swimsuit", desc="May attract eagles.") +default ton_outfit_swimsuit_1 = DollOutfit([ton_hair_base, ton_swimsuit_1], price=260, name="Skimpy Swimsuit", desc="Disclaimer: Translucent swimsuits should not be worn in merman inhabited waters under any circumstance.") +default ton_outfit_swimsuit_2 = DollOutfit([ton_hair_base, ton_swimsuit_1_striped], price=260, name="Striped Skimpy Swimsuit", desc="A Translucent swimsuit with vertical stripes to make you look even thinner! Or maybe it's the other way around...") +default ton_outfit_swimsuit_3 = DollOutfit([ton_hair_base, ton_swimsuit_1_USA], price=260, name="Freedom Swimsuit", desc="May attract eagles.") ################## ## Santa Outfit ## #unlocked in genies_christmas_wish mirror story @@ -246,7 +246,7 @@ default ton_bra_santa = DollCloth("tonks", ("upper undergarment", "bras"), "bra" default ton_top_santa = DollCloth("tonks", ("upper body", "shirts"), "top", "santa_top", [[161, 55, 48, 255], [255, 255, 255, 255]]) default ton_panties_santa = DollCloth("tonks", ("lower undergarment", "panties"), "panties", "santa_panties", [[161, 55, 48, 255]]) -default ton_outfit_santa = DollOutfit([ton_hair_base_new, ton_panties_santa, ton_top_santa, ton_bra_santa]) +default ton_outfit_santa = DollOutfit([ton_hair_base, ton_panties_santa, ton_top_santa, ton_bra_santa]) ################# ~*~Ä~*~*~*~*~ ################# ## Xmas Stuff ### /%\ ___$__ ### Elf Outfit ## @@ -275,9 +275,9 @@ default ton_stockings_xmas = DollCloth("tonks", ("legwear", "stockings"), "stock default ton_stockings_long_striped = DollCloth("tonks", ("legwear", "stockings"), "stockings", "long_striped",[[255, 233, 246, 255], [180, 18, 36, 255]]) default ton_garterbelt_long_basic = DollCloth("tonks", ("legwear", "garterbelts"), "garterbelt", "long_basic_1", [[255, 255, 255, 255]]) -default ton_outfit_elf = DollOutfit([ton_hair_base_new, ton_makeup_elf_ears, ton_earring_bells, ton_hat_elf, ton_neckwear_bell1, ton_top_elf, ton_accessory_belt1, ton_accessory_bells, ton_garterbelt_long_basic, ton_stockings_long_striped]) -default ton_outfit_ribbon = DollOutfit([ton_hair_base_new, ton_neckwear_choker1, ton_bra_ribbon, ton_panties_ribbon]) -default ton_outfit_xmas = DollOutfit([ton_hair_base_new, ton_hat_antlers, ton_earring_bells, ton_neckwear_bell1, ton_bra_pasties2, ton_bottom_xmas, ton_gloves_xmas, ton_stockings_xmas], addons=[ton_piercing_nipple_bells, ton_bra_pasties2]) +default ton_outfit_elf = DollOutfit([ton_hair_base, ton_makeup_elf_ears, ton_earring_bells, ton_hat_elf, ton_neckwear_bell1, ton_top_elf, ton_accessory_belt1, ton_accessory_bells, ton_garterbelt_long_basic, ton_stockings_long_striped]) +default ton_outfit_ribbon = DollOutfit([ton_hair_base, ton_neckwear_choker1, ton_bra_ribbon, ton_panties_ribbon]) +default ton_outfit_xmas = DollOutfit([ton_hair_base, ton_hat_antlers, ton_earring_bells, ton_neckwear_bell1, ton_bra_pasties2, ton_bottom_xmas, ton_gloves_xmas, ton_stockings_xmas], addons=[ton_piercing_nipple_bells, ton_bra_pasties2]) ############################# ## Stockings & Garterbelts ##