game/scripts/01cds.rpy

@@ -73,23 +73,16 @@ python early hide:
     class chibi:
         @staticmethod
         def parse(l):
-            who = l.name()
+            who = l.simple_expression()
-            action = l.name()
+            action = l.simple_expression()
-            arguments = l.arguments() # may be None
-            l.expect_eol()
 
-            return (who, action, arguments)
+            return (who, action)
 
         def execute(self):
             print(self)
-            who, action, arguments = self
+            who, action = self
-            chibi = DollChibi.instances[who]
+            chibi = DollChibi.instance[who]
-            method = getattr(chibi, action)
+            getattr(chibi, action)
-            if arguments is None:
-                args, kwargs = (), {}
-            else:
-                args, kwargs = arguments.evaluate()
-            method(*args, **kwargs)
 
             # print(f"Execution: {who} {action}")
 

game/scripts/doll/chibi.rpy

@@ -374,12 +374,12 @@ default hooch_chibi = DollChibi(name="hooch", doll=hooch)
 #     "Rollback block"
 #     $ renpy.block_rollback()
 
-#     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], repeat=3, pause=False)
 #     "repeat 3"
-#     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True, pause=False)
+#     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], repeat=3)
 #     "loop"
-#     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True, pause=False)
+#     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True)
 #     "doll synchronisation"
+#     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True, pause=False)
 #     ton @ hair default "Default" ("base", "base", "base", "mid")
 #     ton @ hair angry "Angry" ("angry", "narrow", "angry", "mid")
 #     ton @ hair scared "Scared" ("scream", "wide", "worried", "mid")
@@ -395,18 +395,18 @@ default hooch_chibi = DollChibi(name="hooch", doll=hooch)
 #     "Rollback block"
 #     $ renpy.block_rollback()
 
-#     chibi tonks place (pos=(300,300))
 #     "pos 1"
-#     chibi tonks place (pos=(400,300))
+#     chibi tonks place (pos=(300,300))
 #     "pos 2"
-#     chibi tonks place (pos=(400,400))
+#     chibi tonks place (pos=(400,300))
 #     "pos 3"
-#     chibi tonks place (pos=(200,400))
+#     chibi tonks place (pos=(400,400))
 #     "pos 4"
-#     chibi tonks place (pos=(600,400))
+#     chibi tonks place (pos=(200,400))
 #     "pos 5"
+#     chibi tonks place (pos=(600,400))
+#     "End"
 #     hide tonks_chibi
 #     hide tonks_main
-#     "End"
 
 #     jump main_room_menu