From dbd55745f60ca15c3de671473369ba1bed4e4e47 Mon Sep 17 00:00:00 2001
From: LilyMakesThings <vgmhut@gmail.com>
Date: Wed, 9 Oct 2024 02:41:29 +0100
Subject: [PATCH] zoom blocks

---
 blocks_vertical/camera.js | 75 +++++++++++++++++++++++++++++++++++++++
 media/rotate-left.svg     |  2 +-
 media/rotate-right.svg    |  2 +-
 msg/messages.js           |  5 ++-
 4 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/blocks_vertical/camera.js b/blocks_vertical/camera.js
index ef2c0c153a..fedb832947 100644
--- a/blocks_vertical/camera.js
+++ b/blocks_vertical/camera.js
@@ -236,3 +236,78 @@ Blockly.Blocks['camera_yposition'] = {
     });
   }
 };
+
+Blockly.Blocks['camera_setzoom'] = {
+  /**
+   * Block to set the camera's zoom.
+   * @this Blockly.Block
+   */
+  init: function() {
+    this.jsonInit({
+      "message0": Blockly.Msg.CAMERA_SETZOOM,
+      "args0": [
+        {
+          "type": "field_image",
+          "src": Blockly.mainWorkspace.options.pathToMedia + "camera.svg",
+          "width": 24,
+          "height": 24
+        },
+        {
+          "type": "input_value",
+          "name": "ZOOM"
+        }
+      ],
+      "category": Blockly.Categories.camera,
+      "extensions": ["colours_camera", "shape_statement"]
+    });
+  }
+};
+
+Blockly.Blocks['camera_changezoom'] = {
+  /**
+   * Block to change the camera's zoom.
+   * @this Blockly.Block
+   */
+  init: function() {
+    this.jsonInit({
+      "message0": Blockly.Msg.CAMERA_CHANGEZOOM,
+      "args0": [
+        {
+          "type": "field_image",
+          "src": Blockly.mainWorkspace.options.pathToMedia + "camera.svg",
+          "width": 24,
+          "height": 24
+        },
+        {
+          "type": "input_value",
+          "name": "ZOOM"
+        }
+      ],
+      "category": Blockly.Categories.camera,
+      "extensions": ["colours_camera", "shape_statement"]
+    });
+  }
+};
+
+Blockly.Blocks['camera_zoom'] = {
+  /**
+   * Block to report camera's zoom.
+   * @this Blockly.Block
+   */
+  init: function() {
+    this.jsonInit({
+      "message0": Blockly.Msg.CAMERA_ZOOM,
+      "args0": [
+        {
+          "type": "field_image",
+          "src": Blockly.mainWorkspace.options.pathToMedia + "camera.svg",
+          "width": 24,
+          "height": 24
+        }
+      ],
+      "category": Blockly.Categories.camera,
+      "checkboxInFlyout": true,
+      "extensions": ["colours_camera", "output_number"]
+    });
+  }
+};
diff --git a/media/rotate-left.svg b/media/rotate-left.svg
index 42f59191ac..2760118ceb 100644
--- a/media/rotate-left.svg
+++ b/media/rotate-left.svg
@@ -1 +1 @@
-<svg id="rotate-clockwise" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#3d79cc;}.cls-2{fill:#fff;}</style></defs><title>rotate-clockwise</title><path class="cls-1" d="M20.34,18.21a10.24,10.24,0,0,1-8.1,4.22,2.26,2.26,0,0,1-.16-4.52h0a5.58,5.58,0,0,0,4.25-2.53,5.06,5.06,0,0,0,.54-4.62A4.25,4.25,0,0,0,15.55,9a4.31,4.31,0,0,0-2-.8A4.82,4.82,0,0,0,10.4,9l1.12,1.41A1.59,1.59,0,0,1,10.36,13H2.67a1.56,1.56,0,0,1-1.26-.63A1.54,1.54,0,0,1,1.13,11L2.85,3.57A1.59,1.59,0,0,1,4.38,2.4,1.57,1.57,0,0,1,5.62,3L6.7,4.35a10.66,10.66,0,0,1,7.72-1.68A9.88,9.88,0,0,1,19,4.81,9.61,9.61,0,0,1,21.83,9,10.08,10.08,0,0,1,20.34,18.21Z"/><path class="cls-2" d="M19.56,17.65a9.29,9.29,0,0,1-7.35,3.83,1.31,1.31,0,0,1-.08-2.62,6.53,6.53,0,0,0,5-2.92,6.05,6.05,0,0,0,.67-5.51,5.32,5.32,0,0,0-1.64-2.16,5.21,5.21,0,0,0-2.48-1A5.86,5.86,0,0,0,9,8.84L10.74,11a.59.59,0,0,1-.43,1H2.7a.6.6,0,0,1-.6-.75L3.81,3.83a.59.59,0,0,1,1-.21l1.67,2.1a9.71,9.71,0,0,1,7.75-2.07,8.84,8.84,0,0,1,4.12,1.92,8.68,8.68,0,0,1,2.54,3.72A9.14,9.14,0,0,1,19.56,17.65Z"/></svg>
\ No newline at end of file
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21.26982" height="20.03145" viewBox="0,0,21.26982,20.03145"><g transform="translate(-229.07434,-170.39999)"><g stroke="none" stroke-miterlimit="10"><path d="M248.34,186.21c-1.88841,2.59955 -4.88746,4.16203 -8.1,4.22c-1.24816,0.04418 -2.29582,-0.93184 -2.34,-2.18c-0.04418,-1.24816 0.93184,-2.29582 2.18,-2.34v0c1.73347,-0.13512 3.30488,-1.07058 4.25,-2.53c0.91911,-1.3611 1.12044,-3.08362 0.54,-4.62c-0.2779,-0.69235 -0.73315,-1.29936 -1.32,-1.76c-0.58821,-0.43165 -1.27637,-0.70691 -2,-0.8c-1.11095,-0.10604 -2.22428,0.17671 -3.15,0.8l1.12,1.41c0.37783,0.4657 0.46149,1.10437 0.21637,1.65167c-0.24513,0.54731 -0.77734,0.91014 -1.37637,0.93833h-7.69c-0.4963,0.00239 -0.96413,-0.23152 -1.26,-0.63c-0.30723,-0.38553 -0.41132,-0.89484 -0.28,-1.37l1.72,-7.43c0.18889,-0.68967 0.81493,-1.16841 1.53,-1.17c0.48369,-0.00169 0.94116,0.21967 1.24,0.6l1.08,1.35c2.26316,-1.52815 5.02647,-2.12949 7.72,-1.68c1.68642,0.30408 3.26475,1.04155 4.58,2.14c1.30043,1.11902 2.27758,2.56576 2.83,4.19c1.03948,3.12893 0.48303,6.56844 -1.49,9.21z" fill-opacity="0.2" fill="#000000"/><path d="M247.56,185.65c-1.7132,2.35936 -4.43471,3.77751 -7.35,3.83c-0.72349,0.02209 -1.32791,-0.54651 -1.35,-1.27c-0.02209,-0.72349 0.54651,-1.32791 1.27,-1.35c2.03069,-0.14082 3.87955,-1.22056 5,-2.92c1.10239,-1.61981 1.35208,-3.6732 0.67,-5.51c-0.35088,-0.84959 -0.91591,-1.59377 -1.64,-2.16c-0.72559,-0.54341 -1.58041,-0.8881 -2.48,-1c-1.71507,-0.1913 -3.42727,0.38309 -4.68,1.57l1.74,2.16c0.1653,0.17103 0.21174,0.42459 0.11778,0.64309c-0.09396,0.21851 -0.30994,0.35923 -0.54778,0.35691h-7.61c-0.1889,0.00603 -0.36959,-0.0773 -0.48765,-0.22488c-0.11806,-0.14758 -0.15969,-0.34216 -0.11235,-0.52512l1.71,-7.42c0.06565,-0.20027 0.23314,-0.35031 0.43939,-0.39362c0.20625,-0.04331 0.41995,0.02668 0.56061,0.18362l1.67,2.1c2.16427,-1.7747 4.98907,-2.5292 7.75,-2.07c1.51721,0.26995 2.9375,0.93183 4.12,1.92c1.15927,0.99488 2.03544,2.27809 2.54,3.72c0.95161,2.83639 0.45484,5.95895 -1.33,8.36z" fill="#ffffff"/></g></g></svg><!--rotationCenter:10.925663985065:9.6000096177481-->
\ No newline at end of file
diff --git a/media/rotate-right.svg b/media/rotate-right.svg
index c3f4647045..7632ca11cd 100644
--- a/media/rotate-right.svg
+++ b/media/rotate-right.svg
@@ -1 +1 @@
-<svg id="rotate-counter-clockwise" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#3d79cc;}.cls-2{fill:#fff;}</style></defs><title>rotate-counter-clockwise</title><path class="cls-1" d="M22.68,12.2a1.6,1.6,0,0,1-1.27.63H13.72a1.59,1.59,0,0,1-1.16-2.58l1.12-1.41a4.82,4.82,0,0,0-3.14-.77,4.31,4.31,0,0,0-2,.8,4.25,4.25,0,0,0-1.34,1.73,5.06,5.06,0,0,0,.54,4.62A5.58,5.58,0,0,0,12,17.74h0a2.26,2.26,0,0,1-.16,4.52A10.25,10.25,0,0,1,3.74,18,10.14,10.14,0,0,1,2.25,8.78,9.7,9.7,0,0,1,5.08,4.64,9.92,9.92,0,0,1,9.66,2.5a10.66,10.66,0,0,1,7.72,1.68l1.08-1.35a1.57,1.57,0,0,1,1.24-.6,1.6,1.6,0,0,1,1.54,1.21l1.7,7.37A1.57,1.57,0,0,1,22.68,12.2Z"/><path class="cls-2" d="M21.38,11.83H13.77a.59.59,0,0,1-.43-1l1.75-2.19a5.9,5.9,0,0,0-4.7-1.58,5.07,5.07,0,0,0-4.11,3.17A6,6,0,0,0,7,15.77a6.51,6.51,0,0,0,5,2.92,1.31,1.31,0,0,1-.08,2.62,9.3,9.3,0,0,1-7.35-3.82A9.16,9.16,0,0,1,3.17,9.12,8.51,8.51,0,0,1,5.71,5.4,8.76,8.76,0,0,1,9.82,3.48a9.71,9.71,0,0,1,7.75,2.07l1.67-2.1a.59.59,0,0,1,1,.21L22,11.08A.59.59,0,0,1,21.38,11.83Z"/></svg>
\ No newline at end of file
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="21.26181" height="20.03145" viewBox="0,0,21.26181,20.03145"><g transform="translate(-229.74033,-170.22999)"><g stroke="none" stroke-miterlimit="10"><path d="M250.68,180.2c-0.30212,0.39632 -0.77166,0.62924 -1.27,0.63h-7.69c-0.59527,-0.03092 -1.12325,-0.39219 -1.36769,-0.93585c-0.24443,-0.54365 -0.16426,-1.17836 0.20769,-1.64415l1.12,-1.41c-0.92681,-0.61051 -2.0359,-0.88248 -3.14,-0.77c-0.72363,0.09309 -1.41179,0.36835 -2,0.8c-0.59001,0.44982 -1.05199,1.04626 -1.34,1.73c-0.58044,1.53638 -0.37911,3.2589 0.54,4.62c0.9494,1.45828 2.52475,2.39018 4.26,2.52v0c1.24816,0.04418 2.22418,1.09184 2.18,2.34c-0.04418,1.24816 -1.09184,2.22418 -2.34,2.18c-3.21925,-0.06889 -6.21901,-1.64654 -8.1,-4.26c-1.96672,-2.64805 -2.52252,-6.08725 -1.49,-9.22c0.56413,-1.60421 1.54008,-3.03192 2.83,-4.14c1.31624,-1.09689 2.89414,-1.83416 4.58,-2.14c2.69353,-0.44949 5.45684,0.15185 7.72,1.68l1.08,-1.35c0.29884,-0.38033 0.75631,-0.60169 1.24,-0.6c0.72906,0.00536 1.36231,0.5029 1.54,1.21l1.7,7.37c0.13871,0.47835 0.04224,0.99413 -0.26,1.39z" fill-opacity="0.2" fill="#000000"/><path d="M249.38,179.83h-7.61c-0.23784,0.00232 -0.45382,-0.1384 -0.54778,-0.35691c-0.09396,-0.21851 -0.04752,-0.47207 0.11778,-0.64309l1.75,-2.19c-1.25858,-1.19138 -2.97732,-1.76917 -4.7,-1.58c-1.84803,0.22211 -3.42576,1.439 -4.11,3.17c-0.68679,1.85258 -0.41751,3.92452 0.72,5.54c1.11826,1.70175 2.96838,2.78222 5,2.92c0.72349,0.02209 1.29209,0.62651 1.27,1.35c-0.02209,0.72349 -0.62651,1.29209 -1.35,1.27c-2.91312,-0.0517 -5.63364,-1.46563 -7.35,-3.82c-1.80886,-2.39253 -2.33182,-5.51906 -1.4,-8.37c0.49717,-1.44563 1.37457,-2.73065 2.54,-3.72c1.17765,-0.98978 2.59518,-1.65198 4.11,-1.92c2.76093,-0.4592 5.58573,0.2953 7.75,2.07l1.67,-2.1c0.14066,-0.15694 0.35436,-0.22693 0.56061,-0.18362c0.20625,0.04331 0.37374,0.19335 0.43939,0.39362l1.76,7.42c0.05353,0.187 0.01145,0.38837 -0.11248,0.53828c-0.12393,0.14992 -0.31379,0.22912 -0.50752,0.21172z" fill="#ffffff"/></g></g></svg><!--rotationCenter:10.259671190533766:9.770009617748087-->
\ No newline at end of file
diff --git a/msg/messages.js b/msg/messages.js
index 5dd8d2a0a4..0ce7d2ddae 100644
--- a/msg/messages.js
+++ b/msg/messages.js
@@ -232,7 +232,7 @@ Blockly.Msg.OPERATORS_MATHOP_10EXP = '10 ^';
 // String blocks
 Blockly.Msg.STRING_REVERSE = 'reverse %1'; // usb
 Blockly.Msg.STRING_REPEAT = 'repeat %1 %2 times'; // usb
-Blockly.Msg.STRING_REPLACE = 'replace %1 in %2 with %3'; // usb
+Blockly.Msg.STRING_REPLACE = 'replace %1 with %2 in %3'; // usb
 Blockly.Msg.STRING_ITEMSPLIT = 'item %1 of %2 split by %3'; // usb
 Blockly.Msg.STRING_TERNARY = 'if %1 then %2 else %3'; // usb
 Blockly.Msg.STRING_CONVERT = 'convert %1 to %2'; // usb
@@ -315,6 +315,9 @@ Blockly.Msg.CAMERA_SETY = 'set %1 y to %2';
 Blockly.Msg.CAMERA_CHANGEY = 'change %1 y by %2';
 Blockly.Msg.CAMERA_XPOSITION = '%1 x position';
 Blockly.Msg.CAMERA_YPOSITION = '%1 y position';
+Blockly.Msg.CAMERA_SETZOOM = 'set %1 zoom to %2';
+Blockly.Msg.CAMERA_CHANGEZOOM = 'change %1 zoom by %2';
+Blockly.Msg.CAMERA_ZOOM = '%1 zoom';
 
 // Sound blocks
 Blockly.Msg.SOUND_PLAY = 'start sound %1';