Add "if ... then" block support

Author: Secret-chest

block.py

@@ -88,8 +88,8 @@ def evaluateBlockValue(self, eventContainer=eventContainer.EventContainer):
             return newY
         elif self.opcode == "sensing_keypressed":  # key pressed?
             return KEY_MAPPING[self.getMenuValue("key_option")] in eventContainer.keys
-        elif self.opcode == "operators_not":  # not <>
-            return not self.evaluateBlockValue(self.getBlockInputValue("operand"))
+        elif self.opcode == "operator_not":  # not <>
+            return not self.target.blocks[self.getBlockInputValue("operand")].evaluateBlockValue(eventContainer)
 
     # Returns block input value
     def getBlockInputValue(self, inputId):

config.py

@@ -47,7 +47,6 @@
 # pygame X.Y.Z (SDL X.Y.Z, Python 3.Y.Z)
 # Hello from the pygame community. https://www.pygame.org/contribute.html"
 # message.
-
 pygameWelcomeMessage: bool = True
 
 # Enable Scratch Addons debugger logs

projects/NotKeyPressed.sb3

@@ -367,18 +367,16 @@ def execute(block, s, events=eventContainer.EventContainer()):
             return nextBlock
 
     elif opcode == "control_if":  # if <> then {...}
-        print("entered if", block.blockID)
         if block.target.blocks[inputs["CONDITION"][1]].evaluateBlockValue(events):
             # If there are blocks, get them
             if inputs["SUBSTACK"][1]:
-                print("Running if substack")
                 # No blocks will be flagged as ran inside a forever loop
                 for b in block.substack:
                     s.target.blocks[b].blockRan = False
                 nextBlock = s.target.blocks[inputs["SUBSTACK"][1]]
                 nb = s.target.blocks[inputs["SUBSTACK"][1]]
                 block.substack.add(nb.blockID)
-                while nb.next and nb.next != block.blockID:
+                while nb.next and nb.next not in block.substack:
                     nb.blockRan = False
                     nb.waiting = False
                     nb.timeDelay = 0
@@ -387,13 +385,10 @@ def execute(block, s, events=eventContainer.EventContainer()):
                     block.substack.add(nb.blockID)
                 nb.next = block.next
                 block.blockRan = True
-                print(nextBlock.blockID)
                 return nextBlock
-            print("No substack")
             block.blockRan = True
             # TODO why does it hang???
         else:
-            print("condition is false, leaving")
             block.blockRan = True
             return s.target.blocks[block.next]
 
@@ -460,9 +455,9 @@ def execute(block, s, events=eventContainer.EventContainer()):
             if block.proccode == "​​log​​ %s":  # Scratch Addons log ()
                 print("[", datetime.now().strftime("%H:%M:%S:%f"), "]", _("project-log"),  block.getCustomInputValue(0), file=sys.stderr)
             elif block.proccode == "​​warn​​ %s":  # Scratch Addons warn ()
-                print(_("project-warn"), block.getCustomInputValue(0), file=sys.stderr)
+                print("[", datetime.now().strftime("%H:%M:%S:%f"), "]", _("project-warn"), block.getCustomInputValue(0), file=sys.stderr)
             elif block.proccode == "​​error​​ %s":  # Scratch Addons error ()
-                print(_("project-error"), block.getCustomInputValue(0), file=sys.stderr)
+                print("[", datetime.now().strftime("%H:%M:%S:%f"), "]", _("project-error"), block.getCustomInputValue(0), file=sys.stderr)
 
     else:
         print(_("unknown-opcode"), opcode)