From e8a617ac7beb10fdc03546e383167087445ad8d6 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Fri, 20 Jan 2023 20:21:39 +0000 Subject: [PATCH] Bug fixes * Fixed Tonks' elf year skin zorder * Fixed icon cropping for makeup --- .../elf_ears/{skin_zorder_5.webp => skin_zorder_253.webp} | 0 game/scripts/characters/tonks/wardrobe.rpy | 2 +- game/scripts/doll/clothes.rpy | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) rename game/characters/tonks/clothes/makeup/elf_ears/{skin_zorder_5.webp => skin_zorder_253.webp} (100%) diff --git a/game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_5.webp b/game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_253.webp similarity index 100% rename from game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_5.webp rename to game/characters/tonks/clothes/makeup/elf_ears/skin_zorder_253.webp diff --git a/game/scripts/characters/tonks/wardrobe.rpy b/game/scripts/characters/tonks/wardrobe.rpy index 75ee921e..9a3cf1b9 100644 --- a/game/scripts/characters/tonks/wardrobe.rpy +++ b/game/scripts/characters/tonks/wardrobe.rpy @@ -172,7 +172,7 @@ default ton_outfit_pullover = DollOutfit([ton_hair_base_new, ton_top_pullover, t ################# /% \ |=I~I=| ################# # Accessories -default ton_makeup_elf_ears = DollCloth("tonks", ("head", "makeup"), "makeup", "elf_ears", None, zorder=5) +default ton_makeup_elf_ears = DollCloth("tonks", ("head", "makeup"), "makeup", "elf_ears", None) default ton_hat_antlers = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "antlers", [[234, 187, 170, 255]], tracking="?hair") default ton_hat_elf = DollClothDynamic("tonks", ("head", "headgear"), "headgear", "elf", [[2, 116, 71, 255], [255, 239, 248, 255]], tracking="?hair") default ton_neckwear_choker1 = DollCloth("tonks", ("head", "neckwear"), "neckwear", "choker_1", [[255, 43, 149, 255]]) diff --git a/game/scripts/doll/clothes.rpy b/game/scripts/doll/clothes.rpy index 738bd98b..75132f0b 100644 --- a/game/scripts/doll/clothes.rpy +++ b/game/scripts/doll/clothes.rpy @@ -159,9 +159,11 @@ init python: def build_icon(self, hash): matrix = SaturationMatrix(0.0) sprites = [i for i in self.build_image(hash, matrix=matrix) if not i[0] == "mask"] + bounds = self.get_layers(hash).get("outline", [sprites[0][1]])[0] + sprites.extend(self.char.body.build_image(self.char.body._hash, matrix=matrix)) sprites.sort(key=itemgetter(2)) - bounds = self.get_layers(hash).get("outline", [sprites[0][1]])[0] + wmax, hmax = self.sizes wmin = hmin = 96