game/scripts/01cds.rpy

@@ -81,27 +81,24 @@ python early hide:
         def execute(self):
             print(f"{self}")
             who, action = self
-            chibi = DollChibi.instance[who]
-            getattr(chibi, action)
+            func = eval(f"{who}_chibi.{action}")
 
             # print(f"Execution: {who} {action}")
 
         def lint(self):
             who, action = self
-
-            if who not in DollChibi.instances:
+            try:
+                chibi = eval(f"{who}_chibi")
+            except Exception:
                 renpy.error(f"Character chibi not defined: {who}")
-
-            chibi = DollChibi.instances[who]
-
             if not hasattr(chibi, action):
                 renpy.error(f"Chibi action not defined: {who} {action}")
 
         def predict(self):
             who, action = self
 
-            chibi = DollChibi.instances[who]
-            doll = getattr(store, who)
+            chibi = eval(f"{who}_chibi")
+            doll = eval(f"{who}")
 
             layers = (
                 l[0] for pose in chibi.poses.keys()

game/scripts/doll/chibi.rpy

@@ -1,9 +1,6 @@
 init 5 python:
     class DollChibi(renpy.Displayable):
 
-        # class attribute
-        instances = {}
-
         def __init__(self, name, layer="screens", zorder=12, zoom=0.28, **properties):
 
             super().__init__(**properties)
@@ -38,8 +35,6 @@ init 5 python:
             self.atl_pause = False
             self.atl_at_list = []
 
-            self.instances[name] = self
-
         def register(self, pose, frames, size):
             self.poses[pose] = (frames, size)