Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Bug fix

Browse Source 
* Fixed sorting of numbered doll layers starting with double digits
This commit is contained in:
LoafyLemon 2023-10-18 12:48:35 +01:00
parent 7e768adddf
commit 6fbf369d3e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/scripts/doll/clothes.rpy
View File

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

8
game/scripts/utility/common_functions.rpy
View File

@ -224,4 +224,10 @@ init python early:
return len(self._callable()) return len(self._callable())
def execute_callbacks(callbacks): 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(match.group(1))
return float('inf') # Return a large number for non-numeric keys