Normal size, sprites for each target

Author: Secret-chest

block.py

@@ -18,3 +18,7 @@ def __init__(self):
         self.shadow = False  # if the block is a reporter or boolean block
         self.topLevel = False  # if the block is a hat block
         self.blockRan = False
+        self.waiting = False
+        self.executionTime = 0
+        self.timeDelay = 0
+        self.target = None

main.py

@@ -21,7 +21,9 @@
 projectToLoad = "wait_gotoxy.sb3"  # change this to load a different project
 targets, currentBgFile, project = s2p_unpacker.sb3_unpack(projectToLoad)
 for t in targets:
-    allSprites.add(TargetSprite(t))
+    sprite = TargetSprite(t)
+    t.sprite = sprite
+    allSprites.add(sprite)
 wn = tk.Tk()  # Start tkinter for popups
 wn.withdraw()  # Hide main tkinter window
 # when needed
@@ -31,7 +33,7 @@
 # Set player size
 HEIGHT = 360
 WIDTH = 480
-projectName = projectToLoad[:-4] # Set the project name
+projectName = projectToLoad[:-4]  # Set the project name
 icon = pygame.image.load("icon.png")
 display = pygame.display.set_mode([WIDTH, HEIGHT])
 pygame.display.set_caption(projectName + " - Scratch2Python" )
@@ -40,7 +42,15 @@
 # currentBgFile = project.read(target["costumes"][target["currentCostume"]]["md5ext"])
 projectRunning = True
 
+clock = pygame.time.Clock()
 display.fill((255, 255, 255))
+toExecute = []
+
+for s in allSprites:
+    for _, block in s.target.blocks.items():
+        if block.opcode == "event_whenflagclicked":
+            scratch.execute(block, s)
+
 scratch.setBackground(currentBg, display)
 while projectRunning:
     for event in pygame.event.get():
@@ -68,35 +78,24 @@
     display.fill((255, 255, 255))
     scratch.setBackground(currentBg, display)
     # Move all sprites to current position and direction, run blocks
-    for s in allSprites:
-        for _, block in s.target.blocks.items():
-            if not block.blockRan:
-                print("DEBUG: Running opcode", block.opcode)
-                print("DEBUG: Running ID", block.blockID)
-                if block.next:
-                    print("DEBUG: Next ID", block.next)
-                    nextBlock = s.target.blocks[block.next]
-                    print("DEBUG: Next opcode", nextBlock.opcode)
-                else:
-                    print("DEBUG: Last block")
-                scratch.execute(block, s)
-                block.blockRan = True
-    # for target in targets:
-    #     scratch.render(scratch.loadSvg(target.costumes[target.currentCostume].file), target.x * 2, target.y * 2, target.direction, display)
-    #     for _, block in target.blocks.items():
-    #         if not block.blockRan:
-    #             print("DEBUG: Running opcode", block.opcode)
-    #             print("DEBUG: Running ID", block.blockID)
-    #             if block.next:
-    #                 print("DEBUG: Next ID", block.next)
-    #                 nextBlock = target.blocks[block.next]
-    #                 print("DEBUG: Next opcode", nextBlock.opcode)
-    #             else:
-    #                 print("DEBUG: Last block")
-    #             scratch.execute(block, target)
-    #             block.blockRan = True
+    nextBlocks = []
+    for block in toExecute:
+        if block.waiting:
+            block.executionTime += clock.get_time()
+            if block.executionTime >= block.timeDelay:
+                block.waiting = False
+                block.executionTime, block.timeDelay = 0, 0
+                print("DEBUG: Wait period ended")
+        if not block.blockRan:
+            print("DEBUG: Running opcode", block.opcode)
+            print("DEBUG: Running ID", block.blockID)
+            nextBlock = scratch.execute(block, block.target.sprite)
+            if nextBlock:
+                nextBlocks.append(nextBlock)
+    toExecute = nextBlocks
     allSprites.draw(display)
     allSprites.update()
     pygame.display.flip()
     wn.update()
+    clock.tick(30)
 pygame.quit()

s2p_unpacker.py

@@ -29,30 +29,31 @@ def sb3_unpack(sb3):
     for target_obj in project_json['targets']:
         if target_obj["isStage"]:
             current_bg_file = project.read(target_obj["costumes"][target_obj["currentCostume"]]["assetId"] + "." + target_obj["costumes"][target_obj["currentCostume"]]["dataFormat"])
-        else:
-            t = target.Target()
+        t = target.Target()
+        if "x" in target_obj:
             t.x = target_obj["x"]
             t.y = target_obj["y"]
             t.direction = target_obj["direction"]
-            t.currentCostume = target_obj["currentCostume"]
-            for costume_obj in target_obj["costumes"]:
-                c = costume.Costume()
-                if "md5ext" in costume_obj:
-                    c.md5ext = costume_obj["md5ext"]
-                c.file = project.read(costume_obj["assetId"] + "." + costume_obj["dataFormat"])
-                t.costumes.append(c)
-            for block_id, block_obj in target_obj["blocks"].items():
-                b = block.Block()
-                b.blockID = block_id
-                b.opcode = block_obj["opcode"]
-                b.next = block_obj["next"]
-                b.parent = block_obj["parent"]
-                b.shadow = block_obj["shadow"]
-                b.topLevel = block_obj["topLevel"]
-                b.inputs = block_obj["inputs"]
-                b.fields = block_obj["inputs"]
-                b.blockRan = False
-                t.blocks[block_id] = b
-            targets.append(t)
+        t.currentCostume = target_obj["currentCostume"]
+        for costume_obj in target_obj["costumes"]:
+            c = costume.Costume()
+            if "md5ext" in costume_obj:
+                c.md5ext = costume_obj["md5ext"]
+            c.file = project.read(costume_obj["assetId"] + "." + costume_obj["dataFormat"])
+            t.costumes.append(c)
+        for block_id, block_obj in target_obj["blocks"].items():
+            b = block.Block()
+            b.blockID = block_id
+            b.opcode = block_obj["opcode"]
+            b.next = block_obj["next"]
+            b.parent = block_obj["parent"]
+            b.shadow = block_obj["shadow"]
+            b.topLevel = block_obj["topLevel"]
+            b.inputs = block_obj["inputs"]
+            b.fields = block_obj["inputs"]
+            b.blockRan = False
+            b.target = t
+            t.blocks[block_id] = b
+        targets.append(t)
     return targets, current_bg_file, project
 

scratch.py

@@ -35,14 +35,27 @@ def startProject():
 
 # Run the given block object
 def execute(block, s):
-    # TODO: Multi-threading
     opcode = block.opcode
     id = block.blockID
     blockRan = block.blockRan
     inputs = block.inputs
     fields = block.fields
+    nextBlock = None
     if opcode == "motion_gotoxy":
         s.setXy(int(inputs["X"][1][1]), int(inputs["Y"][1][1]))
-    # if opcode == "control_wait":
-    #     timeDelay = int(round(float(inputs["DURATION"][1][1]) * 1000))
-    #     pygame.time.delay(timeDelay)
+    if opcode == "control_wait":
+        block.timeDelay = int(round(float(inputs["DURATION"][1][1]) * 1000))
+        block.waiting = True
+        block.executionTime = 0
+        print("DEBUG: Waiting for", block.timeDelay, "ms")
+        return block
+    if opcode == "event_whenflagclicked":
+        pass
+    if block.next:
+        print("DEBUG: Next ID", block.next)
+        nextBlock = s.target.blocks[block.next]
+        print("DEBUG: Next opcode", nextBlock.opcode)
+    else:
+        print("DEBUG: Script finished")
+    block.blockRan = True
+    return nextBlock

target.py

@@ -25,3 +25,4 @@ def __init__(self):
         self.direction = 90
         self.draggable = False
         self.rotationStyle = "all around"  # all around, left-right or do not rotate
+        self.sprite = None