From a343610eb3c842d90209107030d146d6ae0acdf7 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Wed, 26 Jul 2023 18:54:30 +0100 Subject: [PATCH] Bug fixes * Fixed layering issue when more than one layer contains a zorder modifier --- game/scripts/doll/bodypart.rpy | 2 +- game/scripts/doll/clothes.rpy | 4 ++-- game/scripts/doll/clothes_dynamic.rpy | 2 +- game/scripts/doll/cum.rpy | 2 +- game/scripts/doll/face.rpy | 2 +- game/scripts/doll/makeup.rpy | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/game/scripts/doll/bodypart.rpy b/game/scripts/doll/bodypart.rpy index f9d6b151..72fe706b 100644 --- a/game/scripts/doll/bodypart.rpy +++ b/game/scripts/doll/bodypart.rpy @@ -55,7 +55,7 @@ init 1 python: zorder_mod = modifiers.get(lmodifier) zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) - layers.setdefault("_".join([ltype, lmodifier]), [f, zorder]) + layers.setdefault("_".join([ltype, lmodifier, str(zorder)]), [f, zorder]) else: layers.setdefault(ltype, [f, zorder]) diff --git a/game/scripts/doll/clothes.rpy b/game/scripts/doll/clothes.rpy index 58453dd6..10fffc12 100644 --- a/game/scripts/doll/clothes.rpy +++ b/game/scripts/doll/clothes.rpy @@ -126,7 +126,7 @@ init python: zorder_mod = modifiers.get(lmodifier) zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) - layers.setdefault("_".join([ltype, lmodifier]), [f, zorder]) + layers.setdefault("_".join([ltype, lmodifier, str(zorder)]), [f, zorder]) else: layers.setdefault(ltype, [f, zorder]) @@ -152,7 +152,7 @@ init python: sprites = [] for identifier, (file, zorder) in layers.items(): - if ((n := identifier.rsplit("_", 1)[0]).isdigit()): + if ((n := identifier.split("_", 1)[0]).isdigit()): processor = processors["colored"] else: processor = processors.get(identifier, processors["default"]) diff --git a/game/scripts/doll/clothes_dynamic.rpy b/game/scripts/doll/clothes_dynamic.rpy index 2226ea53..dad5497d 100644 --- a/game/scripts/doll/clothes_dynamic.rpy +++ b/game/scripts/doll/clothes_dynamic.rpy @@ -136,7 +136,7 @@ init python: zorder_mod = modifiers.get(lmodifier) zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) - layers.setdefault("_".join([ltype, lmodifier]), [f, zorder]) + layers.setdefault("_".join([ltype, lmodifier, str(zorder)]), [f, zorder]) else: layers.setdefault(ltype, [f, zorder]) diff --git a/game/scripts/doll/cum.rpy b/game/scripts/doll/cum.rpy index 50b9ea5b..bb0eae7c 100644 --- a/game/scripts/doll/cum.rpy +++ b/game/scripts/doll/cum.rpy @@ -106,7 +106,7 @@ init python: zorder_mod = modifiers.get(lmodifier) zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) - layers.setdefault(" ".join([part, name, ltype, lmodifier]), [f, zorder]) + layers.setdefault(" ".join([part, name, ltype, lmodifier, str(zorder)]), [f, zorder]) else: layers.setdefault(" ".join([part, name, ltype]), [f, zorder]) diff --git a/game/scripts/doll/face.rpy b/game/scripts/doll/face.rpy index c319acb3..2bafc5c7 100644 --- a/game/scripts/doll/face.rpy +++ b/game/scripts/doll/face.rpy @@ -66,7 +66,7 @@ init python: zorder_mod = modifiers.get(lmodifier) zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) - layers.setdefault(" ".join([part, name, ltype, lmodifier]), [f, zorder]) + layers.setdefault(" ".join([part, name, ltype, lmodifier, str(zorder)]), [f, zorder]) else: layers.setdefault(" ".join([part, name, ltype]), [f, zorder]) diff --git a/game/scripts/doll/makeup.rpy b/game/scripts/doll/makeup.rpy index b93fd86e..83beb706 100644 --- a/game/scripts/doll/makeup.rpy +++ b/game/scripts/doll/makeup.rpy @@ -54,7 +54,7 @@ init python: zorder_mod = modifiers.get(lmodifier) zorder = (zorder + int(zorder_mod)) if lmodifier != "zorder" else int(tails[-1]) - layers.setdefault("_".join([ltype, lmodifier]), [f, zorder]) + layers.setdefault("_".join([ltype, lmodifier, str(zorder)]), [f, zorder]) else: layers.setdefault(ltype, [f, zorder])