game/scripts/01cds.rpy

@@ -79,7 +79,7 @@ python early hide:
             return (who, action)
 
         def execute(self):
-            print(self)
+            print(f"{self}")
             who, action = self
             chibi = DollChibi.instance[who]
             getattr(chibi, action)
@@ -101,7 +101,7 @@ python early hide:
             who, action = self
 
             chibi = DollChibi.instances[who]
-            doll = states.dolls[who]
+            doll = getattr(store, who)
 
             layers = (
                 l[0] for pose in chibi.poses.keys()

game/scripts/doll/main.rpy

@@ -1,5 +1,3 @@
-define renpy.store.states.dolls = {}
-
 init python:
     class Doll(DollMethods):
         # 0 - 50 = Skin/Body Layers
@@ -79,11 +77,15 @@ init python:
 
             self.build_image()
 
-            renpy.store.states.dolls[name] = self
+            # Add doll name to global doll states store
+            try:
+                renpy.store.states.dolls.add(name)
+            except AttributeError:
+                renpy.store.states.dolls = {name}
 
         def generate_hash(self):
             clothes_hash = str([x[0]._hash for x in self.states.values() if istype(x[0], (DollCloth, DollClothDynamic, DollMakeup)) and x[2]])
-            salt = str([self.name, self.pose, str(self.body._hash), str(self.face._hash), str(self.cum._hash), clothes_hash])
+            salt = str( [self.name, self.pose, str(self.body._hash), str(self.face._hash), str(self.cum._hash), clothes_hash] )
             return hash(salt)
 
         def show(self, force=False, ignore_skipping=False):