Update 2

Author: Secret-chest

assets/cd21514d0531fdffb22204e0ec5ed84a.svg

@@ -1 +1 @@
-{"targets":[{"isStage":true,"name":"Stage","variables":{},"lists":{},"broadcasts":{},"blocks":{},"comments":{},"currentCostume":0,"costumes":[{"name":"backdrop1","dataFormat":"svg","assetId":"cd21514d0531fdffb22204e0ec5ed84a","md5ext":"cd21514d0531fdffb22204e0ec5ed84a.svg","rotationCenterX":240,"rotationCenterY":180}],"sounds":[],"volume":100,"layerOrder":0,"tempo":60,"videoTransparency":50,"videoState":"on","textToSpeechLanguage":"ro"},{"isStage":false,"name":"Cat 2","variables":{},"lists":{},"broadcasts":{},"blocks":{"?^q)qSDL?G9M_{|/iKKo":{"opcode":"event_whenflagclicked","next":"{$QhU(~Y{qa/r`=G{mGX","parent":null,"inputs":{},"fields":{},"shadow":false,"topLevel":true,"x":300,"y":340},"{$QhU(~Y{qa/r`=G{mGX":{"opcode":"control_repeat","next":"n?!h.4XtS|xZ{E!@:LIA","parent":"?^q)qSDL?G9M_{|/iKKo","inputs":{"TIMES":[1,[6,"24"]],"SUBSTACK":[2,"hqsMZs4WIfY8fR:Z$[V0"]},"fields":{},"shadow":false,"topLevel":false},"hqsMZs4WIfY8fR:Z$[V0":{"opcode":"motion_turnright","next":null,"parent":"{$QhU(~Y{qa/r`=G{mGX","inputs":{"DEGREES":[1,[4,"15"]]},"fields":{},"shadow":false,"topLevel":false},"n?!h.4XtS|xZ{E!@:LIA":{"opcode":"control_repeat","next":null,"parent":"{$QhU(~Y{qa/r`=G{mGX","inputs":{"TIMES":[1,[6,"24"]],"SUBSTACK":[2,"(n:YlSsRp5g^wzTXf%;G"]},"fields":{},"shadow":false,"topLevel":false},"(n:YlSsRp5g^wzTXf%;G":{"opcode":"motion_turnleft","next":null,"parent":"n?!h.4XtS|xZ{E!@:LIA","inputs":{"DEGREES":[1,[4,"15"]]},"fields":{},"shadow":false,"topLevel":false}},"comments":{},"currentCostume":0,"costumes":[{"name":"cat 2","bitmapResolution":1,"dataFormat":"svg","assetId":"a5be96044eb1c9e916de6d1c5818d89d","md5ext":"a5be96044eb1c9e916de6d1c5818d89d.svg","rotationCenterX":128.79883728212386,"rotationCenterY":36.22184985320345}],"sounds":[{"name":"meow2","assetId":"cf51a0c4088942d95bcc20af13202710","dataFormat":"wav","format":"","rate":44100,"sampleCount":26048,"md5ext":"cf51a0c4088942d95bcc20af13202710.wav"}],"volume":100,"layerOrder":1,"visible":true,"x":0,"y":0,"size":100,"direction":90,"draggable":false,"rotationStyle":"all around"}],"monitors":[],"extensions":[],"meta":{"semver":"3.0.0","vm":"1.2.54","agent":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"}}
+{"targets":[{"isStage":true,"name":"Stage","variables":{},"lists":{},"broadcasts":{},"blocks":{},"comments":{},"currentCostume":0,"costumes":[{"name":"xy-grid","bitmapResolution":1,"dataFormat":"svg","assetId":"4851f7b71585efa5d42cb3a0b2d5fadf","rotationCenterX":239.99996948242188,"rotationCenterY":180.00003051757812}],"sounds":[],"volume":100,"layerOrder":0,"tempo":60,"videoTransparency":50,"videoState":"on","textToSpeechLanguage":"ro"},{"isStage":false,"name":"Cat 2","variables":{},"lists":{},"broadcasts":{},"blocks":{"?^q)qSDL?G9M_{|/iKKo":{"opcode":"event_whenflagclicked","next":"{$QhU(~Y{qa/r`=G{mGX","parent":null,"inputs":{},"fields":{},"shadow":false,"topLevel":true,"x":300,"y":340},"{$QhU(~Y{qa/r`=G{mGX":{"opcode":"control_repeat","next":null,"parent":"?^q)qSDL?G9M_{|/iKKo","inputs":{"TIMES":[1,[6,"12"]],"SUBSTACK":[2,"hqsMZs4WIfY8fR:Z$[V0"]},"fields":{},"shadow":false,"topLevel":false},"hqsMZs4WIfY8fR:Z$[V0":{"opcode":"motion_turnright","next":null,"parent":"{$QhU(~Y{qa/r`=G{mGX","inputs":{"DEGREES":[1,[4,"15"]]},"fields":{},"shadow":false,"topLevel":false}},"comments":{},"currentCostume":0,"costumes":[{"name":"cat 2","bitmapResolution":1,"dataFormat":"svg","assetId":"b19faf9c49fb425c52756c2b229f08cb","md5ext":"b19faf9c49fb425c52756c2b229f08cb.svg","rotationCenterX":128.79883,"rotationCenterY":36.221843067841604}],"sounds":[{"name":"meow2","assetId":"cf51a0c4088942d95bcc20af13202710","dataFormat":"wav","format":"","rate":44100,"sampleCount":26048,"md5ext":"cf51a0c4088942d95bcc20af13202710.wav"}],"volume":100,"layerOrder":1,"visible":true,"x":0,"y":0,"size":100,"direction":90,"draggable":false,"rotationStyle":"all around"}],"monitors":[],"extensions":[],"meta":{"semver":"3.0.0","vm":"1.5.48","agent":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36"}}

assets/project.json

@@ -24,7 +24,7 @@
 
 # Project file name
 # If in test mode, set the Scratch project file to load.
-projectFileName: str = "projects/Rotation2.sb3"
+projectFileName: str = "projects/Rotation2-medium.sb3"
 
 # Download cache size
 # Number of recent downloaded projects stored. 0 means infinity.

background.png

@@ -75,6 +75,7 @@
 from targetSprite import TargetSprite
 import eventContainer
 import select
+from scratch import display, setProject, mainWindow
 
 sys.stdout = sys.__stdout__
 
@@ -119,35 +120,12 @@ def buttonbox(self):
         self.bind("<Escape>", lambda event: self.cancelPressed())
 
 
-# Start tkinter for showing some popups, and hide main window
-mainWindow = tk.Tk()
-mainWindow.withdraw()
-
 # Clean the cache if limit is exceeded
 downloads = sorted(Path("./download/").iterdir(), key=os.path.getmtime)
 downloadsToDelete = downloads[config.cachedDownloads:]
 for f in downloadsToDelete:
     os.remove(f)
 
-# Get project file name based on options and arguments
-if len(sys.argv) > 1:
-    setProject = sys.argv[1]
-else:
-    if config.testMode:
-        if not config.projectFileName.endswith(".sb3"):
-            if "http" not in config.projectFileName\
-               or "https" not in config.projectFileName:
-                setProject = downloader.downloadByID(config.projectFileName, "./download")
-            else:
-                setProject = downloader.downloadByURL(config.projectFileName, "./download")
-        else:
-            setProject = config.projectFileName
-    else:
-        fileTypes = [(_("sb3-desc"), ".sb3"), (_("all-files-desc"), ".*")]
-        setProject = filedialog.askopenfilename(parent=mainWindow,
-                                                initialdir=os.getcwd(),
-                                                title=_("choose-project-title"),
-                                                filetypes=fileTypes)
 
 # Get project data and create sprites
 targets, project = sb3Unpacker.sb3Unpack(setProject)
@@ -174,15 +152,6 @@ def buttonbox(self):
 HEIGHT = config.projectScreenHeight
 WIDTH = config.projectScreenWidth
 
-# Get project name and set icon
-projectName = Path(setProject).stem
-icon = pygame.image.load("icon.svg")
-
-# Create project player and window
-display = pygame.display.set_mode([WIDTH, HEIGHT])
-pygame.display.set_caption(_("window-title", projectName=projectName, s2pVersionString="Scratch2Python " + __version__))
-pygame.display.set_icon(icon)
-
 # Extract if requested
 if config.extractOnProjectRun:
     print(_("extracting-project"))

config.py

@@ -15,6 +15,14 @@
 import time
 from datetime import datetime
 import eventContainer
+from pathlib import Path
+import tkinter as tk
+import downloader
+from tkinter import filedialog
+import tkinter.simpledialog
+
+__version__ = "v0.8.0"
+__author__ = "Secret-chest"
 
 i18n.set("locale", config.language)
 i18n.set("filename_format", "{locale}.{format}")
@@ -32,9 +40,42 @@ class SpriteNotFoundError(Exception):
     sys.stdout = open(os.devnull, "w")
 
 
+# Start tkinter for showing some popups, and hide main window
+mainWindow = tk.Tk()
+mainWindow.withdraw()
+
+
+# Get project file name based on options and arguments
+if len(sys.argv) > 1:
+    setProject = sys.argv[1]
+else:
+    if config.testMode:
+        if not config.projectFileName.endswith(".sb3"):
+            if "http" not in config.projectFileName\
+               or "https" not in config.projectFileName:
+                setProject = downloader.downloadByID(config.projectFileName, "./download")
+            else:
+                setProject = downloader.downloadByURL(config.projectFileName, "./download")
+        else:
+            setProject = config.projectFileName
+    else:
+        fileTypes = [(_("sb3-desc"), ".sb3"), (_("all-files-desc"), ".*")]
+        setProject = filedialog.askopenfilename(parent=mainWindow,
+                                                initialdir=os.getcwd(),
+                                                title=_("choose-project-title"),
+                                                filetypes=fileTypes)
+
+
 HEIGHT = config.projectScreenHeight
 WIDTH = config.projectScreenWidth
 
+# Create project player and window
+projectName = Path(setProject).stem
+icon = pygame.image.load("icon.svg")
+display = pygame.display.set_mode([WIDTH, HEIGHT])
+pygame.display.set_caption(_("window-title", projectName=projectName, s2pVersionString="Scratch2Python " + __version__))
+pygame.display.set_icon(icon)
+
 # Key maps to convert the key option in blocks to Pygame constants
 KEY_MAPPING = {
     "up arrow": pygame.K_UP,

main.py

@@ -84,12 +84,16 @@ def setXy(self, x, y):
         # Set X and Y
         self.x = x
         self.y = y
-        print(_("debug-prefix"), _("new-sprite-position", x=x, y=y, name=self.name), file=sys.stderr)
+        print("aici")
+        # print(_("debug-prefix"), _("new-sprite-position", x=x, y=y, name=self.name), file=sys.stderr)
+        #rect = self.sprite.get_rect(topleft=(self.x - self.target.costumes[self.target.currentCostume].rotationCenterX, self.y - self.target.costumes[self.target.currentCostume].rotationCenterY))
         offset = pygame.Vector2(self.target.costumes[self.target.currentCostume].rotationCenterX, self.target.costumes[self.target.currentCostume].rotationCenterY)
-        offset = offset.rotate(90 + self.direction)
-        print(offset)
+        offset.rotate_ip(90 + self.direction)
+        self.image = pygame.transform.rotozoom(self.sprite, 90 - self.direction, 1)
+        # offset = pygame.Vector2(0, 0)
         self.rect.x = scratch.WIDTH // 2 + self.x + offset.x
         self.rect.y = scratch.HEIGHT // 2 - self.y + offset.y
+        print(self.rect.x, self.rect.y, "/", self.x, self.y, "/", offset.x, offset.y)
 
     # Relatively set self position
     def setXyDelta(self, dx, dy):
@@ -101,9 +105,7 @@ def setXyDelta(self, dx, dy):
     def setRot(self, rot):
         self.direction = rot
         print(_("debug-prefix"), _("new-sprite-rotation", rot=rot, name=self.name), file=sys.stderr)
-        image_rect = self.sprite.get_rect(topleft=(self.rect.x - self.target.costumes[self.target.currentCostume].rotationCenterX, self.rect.y - self.target.costumes[self.target.currentCostume].rotationCenterX))
 
-        self.image = pygame.transform.rotozoom(self.sprite, 90 - self.direction, 1)
         self.setXy(self.x, self.y)
 
     # Relatively set self rotation (turn)