From c03a75eb4bc0b64f13bf6d8bef77adcfd21c8135 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Tue, 7 Mar 2023 19:05:42 +0100 Subject: [PATCH] Fixes * Adjusted z.order on some wardrobe items. * Fixed Susan school robe 3 back layer. * Added missing and removed unnecessary arm fix layers. --- .../police_skirt}/armfix.webp | 0 .../clothes/panties/bikini_bottom_2/armfix.webp | 3 --- .../default/clothes/robe/robe_school_3/1_back.webp | 4 ++-- .../default/clothes/robe/robe_school_3/2.webp | 3 --- .../base => garterbelt/long_basic_1}/armfix.webp | 0 .../poses/default/clothes/top/police3/armfix.webp | 3 --- game/scripts/characters/hermione/wardrobe.rpy | 14 +++++++------- game/scripts/characters/luna/wardrobe.rpy | 6 +++--- 8 files changed, 12 insertions(+), 21 deletions(-) rename game/characters/cho/poses/default/clothes/{panties/bikini_bottom_1 => bottom/police_skirt}/armfix.webp (100%) delete mode 100644 game/characters/cho/poses/default/clothes/panties/bikini_bottom_2/armfix.webp delete mode 100644 game/characters/susan/poses/default/clothes/robe/robe_school_3/2.webp rename game/characters/tonks/poses/default/clothes/{panties/base => garterbelt/long_basic_1}/armfix.webp (100%) delete mode 100644 game/characters/tonks/poses/default/clothes/top/police3/armfix.webp diff --git a/game/characters/cho/poses/default/clothes/panties/bikini_bottom_1/armfix.webp b/game/characters/cho/poses/default/clothes/bottom/police_skirt/armfix.webp similarity index 100% rename from game/characters/cho/poses/default/clothes/panties/bikini_bottom_1/armfix.webp rename to game/characters/cho/poses/default/clothes/bottom/police_skirt/armfix.webp diff --git a/game/characters/cho/poses/default/clothes/panties/bikini_bottom_2/armfix.webp b/game/characters/cho/poses/default/clothes/panties/bikini_bottom_2/armfix.webp deleted file mode 100644 index ea2266ad..00000000 --- a/game/characters/cho/poses/default/clothes/panties/bikini_bottom_2/armfix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:183ea04b987eaab585275c67a398a49dd972a736c0acc22042b334f74449d96b -size 6334 diff --git a/game/characters/susan/poses/default/clothes/robe/robe_school_3/1_back.webp b/game/characters/susan/poses/default/clothes/robe/robe_school_3/1_back.webp index 4812ee9d..ca83a68d 100644 --- a/game/characters/susan/poses/default/clothes/robe/robe_school_3/1_back.webp +++ b/game/characters/susan/poses/default/clothes/robe/robe_school_3/1_back.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecf21d490c7e84f314559bc5f881a7b0e73868e73d74e55e180c97eaf21c32fe -size 650 +oid sha256:454926bdf275b596d95071c17d056d84298ba2532b4069fe3eb4d4d644d33816 +size 660 diff --git a/game/characters/susan/poses/default/clothes/robe/robe_school_3/2.webp b/game/characters/susan/poses/default/clothes/robe/robe_school_3/2.webp deleted file mode 100644 index ca83a68d..00000000 --- a/game/characters/susan/poses/default/clothes/robe/robe_school_3/2.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:454926bdf275b596d95071c17d056d84298ba2532b4069fe3eb4d4d644d33816 -size 660 diff --git a/game/characters/tonks/poses/default/clothes/panties/base/armfix.webp b/game/characters/tonks/poses/default/clothes/garterbelt/long_basic_1/armfix.webp similarity index 100% rename from game/characters/tonks/poses/default/clothes/panties/base/armfix.webp rename to game/characters/tonks/poses/default/clothes/garterbelt/long_basic_1/armfix.webp diff --git a/game/characters/tonks/poses/default/clothes/top/police3/armfix.webp b/game/characters/tonks/poses/default/clothes/top/police3/armfix.webp deleted file mode 100644 index 33e7caa2..00000000 --- a/game/characters/tonks/poses/default/clothes/top/police3/armfix.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be2020ed2d3e26bc5851b6759bdff814a3545d71dff3c3fe8e3131a668d7056f -size 9642 diff --git a/game/scripts/characters/hermione/wardrobe.rpy b/game/scripts/characters/hermione/wardrobe.rpy index a290f76f..c0a34df6 100644 --- a/game/scripts/characters/hermione/wardrobe.rpy +++ b/game/scripts/characters/hermione/wardrobe.rpy @@ -246,7 +246,7 @@ default her_outfit_teddy = DollOutfit([her_hair_base, her_top_teddy], price=350, ################# default her_top_tifa = DollCloth("hermione", ("upper body", "shirts"), "top", "tifa_top", ["#e8e8e8ff"], level=10) -default her_accessory_tifa_belt = DollCloth("hermione", ("misc", "accessory"), "accessory", "tifa_belt", ["#323232ff", "#9a9a9aff"], level=4) +default her_accessory_tifa_belt = DollCloth("hermione", ("misc", "accessory"), "accessory", "tifa_belt", ["#323232ff", "#9a9a9aff"], zorder=192, level=4) default her_accessory_tifa_suspenders = DollCloth("hermione", ("misc", "accessory"), "accessory", "tifa_suspenders", ["#563d43ff", "#9a9a9aff"], zorder=213, level=4) default her_gloves_tifa = DollCloth("hermione", ("upper body", "gloves"), "gloves", "tifa_gloves", ["#483f46ff", "#e46b62ff", "#7d787fff", "#bda79eff"], level=4) default her_bottom_tifa = DollCloth("hermione", ("lower body", "skirts"), "bottom", "tifa_skirt", ["#483f46ff"], level=10) @@ -258,7 +258,7 @@ default her_outfit_tifa = DollOutfit([her_hair_base, her_top_tifa, her_accessory ####################### default her_top_msmarv = DollCloth("hermione", ("upper body", "one-piece suits"), "top", "msmarv_suit", ["#404663ff", "#7b88b5ff", "#ffec86ff"], zorder=183, blacklist=["panties", "bra"], level=10) -default her_accessory_msmarv_ribbon = DollCloth("hermione", ("misc", "accessory"), "accessory", "msmarv_ribbon", ["#ce2916ff"], level=4) +default her_accessory_msmarv_ribbon = DollCloth("hermione", ("misc", "accessory"), "accessory", "msmarv_ribbon", ["#ce2916ff"], zorder=212, level=4) default her_gloves_msmarv = DollCloth("hermione", ("upper body", "gloves"), "gloves", "msmarv_gloves", ["#404663ff", "#7b88b5ff"], level=4) default her_stockings_msmarv = DollCloth("hermione", ("legwear", "stockings"), "stockings", "msmarv_stockings", ["#404663ff", "#7b88b5ff"], level=10) @@ -283,7 +283,7 @@ default her_outfit_hslut = DollOutfit([her_hair_base, her_top_hslut, her_gloves_ ## Lora Craft Outfit ## ####################### -default her_accessory_croft_belt = DollCloth("hermione", ("misc", "accessory"), "accessory", "croft_belt", ["#6f5642ff", "#747b72ff", "#fcc004ff"], level=4) +default her_accessory_croft_belt = DollCloth("hermione", ("misc", "accessory"), "accessory", "croft_belt", ["#6f5642ff", "#747b72ff", "#fcc004ff"], zorder=212, level=4) default her_accessory_croft_suspenders = DollCloth("hermione", ("misc", "accessory"), "accessory", "croft_suspenders", ["#6f5642ff", "#747b72ff"], zorder=213, level=4) default her_top_croft = DollCloth("hermione", ("upper body", "shirts"), "top", "croft_top", ["#a3c998ff"], level=10) @@ -406,7 +406,7 @@ default her_outfit_wrestling = DollOutfit([her_hair_base, her_robe_wrestling, he ## Blueballing Bad Outfit ## #Unlocked in blueballing_bad mirror story ############################ -default her_accessory_bb_tie = DollCloth("hermione", ("misc", "accessory"), "accessory", "bb_tie", ["#b1339fff", "#f62800ff", "#fff700ff"], zorder=6) +default her_accessory_bb_tie = DollCloth("hermione", ("misc", "accessory"), "accessory", "bb_tie", ["#b1339fff", "#f62800ff", "#fff700ff"], zorder=152) default her_tattoo_bb_tattoo = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo", "bb_tattoo", ["#000000ff", "#fff700ff", "#f62800ff"]) default her_outfit_bb = DollOutfit([her_hair_base, her_accessory_bb_tie, her_tattoo_bb_tattoo]) @@ -415,7 +415,7 @@ default her_outfit_bb = DollOutfit([her_hair_base, her_accessory_bb_tie, her_tat ## Accessories ## ################# -default her_accessory_house_emblem = DollCloth("hermione", ("misc", "accessory"), "accessory", "house_emblem", ["#a74d2aff", "#edb30eff"], zorder=193, unlocked=True) +default her_accessory_house_emblem = DollCloth("hermione", ("misc", "accessory"), "accessory", "house_emblem", ["#a74d2aff", "#edb30eff"], zorder=212, unlocked=True) default her_accessory_reading_glasses = DollCloth("hermione", ("head", "glasses"), "glasses", "reading_glasses", ["#f0f0f1ff"], unlocked=True) default her_accessory_vintage_glasses = DollCloth("hermione", ("head", "glasses"), "glasses", "vintage_glasses", ["#ffffff32", "#242424ff", "#747474ff"], unlocked=True) @@ -515,8 +515,8 @@ default herq_panties_on_head = DollClothDynamic("hermione", ("head", "headgear") # Vibrator default her_panties_base_vibrators = DollCloth("hermione", ("lower undergarment", "panties"), "panties", "basic_panties_vibrators", ["#e8e8e8ff", "#ca3c01ff"]) default her_bra_base_vibrators = DollCloth("hermione", ("upper undergarment", "bras"), "bra", "basic_bra_vibrators", ["#e8e8e8ff", "#ca3c01ff"]) -default her_nipple_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory", "nipple_vibrators", ["#ea8e61ff", "#fcd987ff", "#ff7660ff"], zorder=5) -default her_clit_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory", "clit_vibrators", ["#ea8e61ff", "#fcd987ff", "#ff7660ff"], zorder=5) +default her_nipple_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory", "nipple_vibrators", ["#ea8e61ff", "#fcd987ff", "#ff7660ff"], zorder=152) +default her_clit_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory", "clit_vibrators", ["#ea8e61ff", "#fcd987ff", "#ff7660ff"], zorder=152) default her_outfit_vibrators = DollOutfit([her_hair_base, her_panties_base_vibrators, her_bra_base_vibrators, her_nipple_vibrators, her_clit_vibrators], hidden=True) default her_outfit_vibrators_nude = DollOutfit([her_hair_base, her_nipple_vibrators, her_clit_vibrators], hidden=True) diff --git a/game/scripts/characters/luna/wardrobe.rpy b/game/scripts/characters/luna/wardrobe.rpy index e6584e2f..8278541c 100644 --- a/game/scripts/characters/luna/wardrobe.rpy +++ b/game/scripts/characters/luna/wardrobe.rpy @@ -21,7 +21,7 @@ default lun_hair_wand = DollCloth("luna", ("head", "hair"), "hair", "wand", ["#e default lun_glasses_hearts = DollCloth("luna", ("head", "glasses"), "glasses", "sunglasses_2", ["#f078ffff", "#009effff"], unlocked=True) default lun_glasses_spectrespecs = DollCloth("luna", ("head", "glasses"), "glasses", "spectrespecs", ["#e36682ff", "#3d6e8cff"], unlocked=True) default lun_accessory_pin_radish = DollCloth("luna", ("misc", "accessory"), "accessory", "pin_radish", ["#b61710ff", "#e8bebcff"], zorder=213, unlocked=True) -default lun_accessory_hair_bug = DollCloth("luna", ("misc", "accessory"), "accessory", "hair_bug", ["#ffffffff"], unlocked = True, zorder=213) +default lun_accessory_hair_bug = DollCloth("luna", ("misc", "accessory"), "accessory", "hair_bug", ["#ffffffff"], unlocked = True, zorder=252) default lun_top_school1 = DollCloth("luna", ("upper body", "shirts"), "top", "top_school_1", ["#b7b7b8ff", "#6d6979ff", "#5974c2ff", "#d8a30aff"], unlocked=True) default lun_top_school2 = DollCloth("luna", ("upper body", "shirts"), "top", "top_school_2", ["#b7b7b8ff", "#6d6979ff", "#5974c2ff", "#d8a30aff"], unlocked=True) @@ -180,7 +180,7 @@ default lun_outfit_nightie2 = DollOutfit([lun_hair_base, lun_top_nightie2], pric default lun_stockings_police = DollCloth("luna", ("legwear", "stockings"), "stockings", "police_thigh_highs", ["#2b2b55ff", "#8e8eb3ff"]) default lun_bottom_police_skirt = DollCloth("luna", ("lower body", "skirts"), "bottom", "police_skirt", ["#2e47abff"], level=5) default lun_top_police_shirt = DollCloth("luna", ("upper body", "shirts"), "top", "police_shirt", ["#2e47abff", "#bbbbd2ff"], level=5) -default lun_accessory_police_belt = DollCloth("luna", ("misc", "accessory"), "accessory", "police_belt", ["#26265bff", "#bbbbd2ff"]) +default lun_accessory_police_belt = DollCloth("luna", ("misc", "accessory"), "accessory", "police_belt", ["#26265bff", "#bbbbd2ff"], zorder=212) default lun_accessory_police_badge = DollCloth("luna", ("misc", "accessory"), "accessory", "police_badge", ["#192655ff", "#fcf16dff"], zorder=213) default lun_accessory_police_cuffs = DollCloth("luna", ("misc", "accessory"), "accessory", "police_cuffs", ["#bbbbd2ff"], zorder=225) @@ -225,7 +225,7 @@ default lun_panties_base2 = DollCloth("luna", ("lower undergarment", "panties"), default lun_neckwear_cork = DollCloth("luna", ("head", "neckwear"), "neckwear", "cork", ["#E98E2AFF", "#CECECEFF"], unlocked = True, zorder=213) default lun_accessory_wand_mouth = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_mouth", ["#ffffffff"], unlocked = True, zorder=213) -default lun_accessory_wand_hand = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_hand", ["#ffffffff"], unlocked = True, zorder=213) +default lun_accessory_wand_hand = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_hand", ["#ffffffff"], unlocked = True, zorder=222) default lun_accessory_wand_breasts = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_breasts", ["#ffffffff"], unlocked = True, zorder=213) default lun_accessory_wand_pussy = DollCloth("luna", ("misc", "accessory"), "accessory", "wand_pussy", ["#ffffffff"], unlocked = True, zorder=183)