Compare commits


2 Commits

Author SHA1 Message Date
LoafyLemon 6fbf369d3e Bug fix
* Fixed sorting of numbered doll layers starting with double digits
2023-10-18 12:48:35 +01:00
LoafyLemon 7e768adddf Bug fix
Fixed flipped parameters in Bodyparts class init code, causing issues with mods
2023-09-08 20:40:46 +01:00
3 changed files with 10 additions and 4 deletions

View File

@ -9,7 +9,7 @@ init 1 python:
def __init__(self, name, categories, type, id, zorder=None, unlocked=False, level=0, blacklist=[], parent=None, modpath=None):
super().__init__(name, categories, type, id, None, zorder, unlocked, level, blacklist, parent, modpath)
super().__init__(name, categories, type, id, None, zorder, unlocked, level, blacklist, modpath, parent)
def __repr__(self):
return f"DollBodypart(name={}, categories={self.categories}, type={self.type}, id={}, color={self.color}, zorder={self.zorder}, unlocked={self.unlocked}, level={self.level}, blacklist={self.blacklist}, parent={self.parent}, modpath={self.modpath or None})"

View File

@ -69,7 +69,7 @@ init python:
salt = str( [, self.char.pose, self.type,, str(self.color), str(self.char.body._hash)] )
return hash(salt)
@functools.cache # <- TODO: Reevaluate if this function should allow multiple caches (aside from different subpaths)
def get_layers(self, hash, subpath=""):
path = posixpath.join(self.modpath, "characters",, "poses", self.char.pose, subpath, "clothes", self.type,
@ -130,7 +130,7 @@ init python:
layers.setdefault(ltype, [f, zorder])
return layers
return dict(sorted(layers.items(), key=lambda x: (extract_number(x[0]), x[0])))
def build_image(self, hash, subpath="", matrix=None, maxsize=(1010, 1200)):

View File

@ -224,4 +224,10 @@ init python early:
return len(self._callable())
def execute_callbacks(callbacks):
for callback in callbacks: callback()
for callback in callbacks: callback()
def extract_number(key):
match = re.match(r'^(\d+)', key)
if match:
return int(
return float('inf') # Return a large number for non-numeric keys