Improved pen fill detection

adroitwhiz · Mar 18, 2019 · 66abc9c · 66abc9c
1 parent 4b78119
commit 66abc9c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/sb3tosb2.py b/sb3tosb2.py
@@ -1808,7 +1808,7 @@ def convertTarget(self, target, index, maxLen):
                 penUp = ['putPenUp']
 
             def scriptAddFill(script, down, up):
-                if type(script) != list:
+                if type(script) != list or len(script) < 1:
                     return
                 if type(script[0]) == str:
                     if script[0] in ['penSize:', 'changePenSizeBy:']:
@@ -1820,6 +1820,8 @@ def scriptAddFill(script, down, up):
                         except:
                             return
                     else:
+                        for block in script[1:]: # Convert subscripts in repeats, ifs, etc.
+                            scriptAddFill(block, down, up)
                         return script
                 else:
                     top = None
@@ -1837,11 +1839,11 @@ def scriptAddFill(script, down, up):
                         elif value[0:len(up)+1] == up and top != None and self.bigSize:
                             script[top:i+1] = [
                                 ['penSize:', 200],
-                                ['gotoX:y:', -250, -100],
+                                ['gotoX:y:', -350, -100],
                                 down,
                                 ['xpos:', 250],
                                 up,
-                                ['gotoX:y:', -250, 100],
+                                ['gotoX:y:', -350, 100],
                                 down,
                                 ['xpos:', 250],
                                 up,