A lot of human fixes

extensions/CST1229/images.js

@@ -6,6 +6,9 @@
 
 (function (Scratch) {
   "use strict";
+
+  const Cast = Scratch.Cast;
+
   const QueryImage = {
     WIDTH: "width",
     HEIGHT: "height",
@@ -214,7 +217,7 @@
     }
 
     async getImage({ IMAGEURL }) {
-      IMAGEURL = Scratch.Cast.toString(IMAGEURL);
+      IMAGEURL = Cast.toString(IMAGEURL);
       try {
         const resp = await Scratch.fetch(IMAGEURL);
         const type = resp.headers.get("Content-Type");
@@ -273,8 +276,8 @@
         img.updateVisible(false);
         img.skin = this.render._allSkins[IMG];
 
-        img.updatePosition([Number(X) || 0, Number(Y) || 0]);
-        img.updateScale([Number(XSCALE) || 0, Number(YSCALE) || 0]);
+        img.updatePosition([Cast.toNumber(X), Cast.toNumber(Y)]);
+        img.updateScale([Cast.toNumber(XSCALE), Cast.toNumber(YSCALE)]);
         this.render.penStamp(this.render._penSkinId, drawableID);
       } catch (e) {
         console.error("Error drawing image:", e);
@@ -288,7 +291,7 @@
 
     deleteImage({ IMG }) {
       try {
-        IMG = Scratch.Cast.toNumber(IMG);
+        IMG = Cast.toNumber(IMG);
         if (!this.render._allSkins[IMG] || !this.createdImages.has(IMG)) return;
 
         const targetsToReset = [];
@@ -332,7 +335,7 @@
     }
 
     switchToImage({ IMG }, util) {
-      IMG = Scratch.Cast.toNumber(IMG);
+      IMG = Cast.toNumber(IMG);
       if (!this.render._allSkins[IMG] || !this.validImages.has(IMG)) return;
 
       const drawableID = util.target.drawableID;
@@ -354,7 +357,7 @@
     queryImage({ QUERY, IMG }) {
       if (!this.render._allSkins[IMG] || !this.validImages.has(IMG)) return "";
 
-      IMG = Scratch.Cast.toNumber(IMG);
+      IMG = Cast.toNumber(IMG);
 
       let returnValue = 0;
       let drawableID = null;

extensions/Lily/LooksPlus.js

@@ -379,10 +379,13 @@
       if (!target) {
         return;
       }
+
       const drawableID = target.drawableID;
       const layerOrder = target.getLayerOrder();
-      const newLayer = args.LAYER - layerOrder;
-      renderer.setDrawableOrder(drawableID, newLayer, "sprite", true);
+      const newLayer = Scratch.Cast.toNumber(args.LAYER) - layerOrder;
+      if (!isNaN(newLayer) && Number.isFinite(newLayer)) {
+        renderer.setDrawableOrder(drawableID, newLayer, "sprite", true);
+      }
     }
 
     spriteLayerNumber(args, util) {
@@ -474,7 +477,7 @@
             costume.skinId,
             Scratch.Cast.toString(content)
           );
           renderer._allSkins[costume.skinId].differsFromAsset = true;
         } catch (e) {
           console.error(e);
         }
@@ -503,7 +506,7 @@
         return;
       }
 
       if (!renderer._allSkins[costume.skinId].differsFromAsset) {
         return;
       }
 
@@ -515,7 +518,7 @@
           rotationCenterX,
           rotationCenterY,
         ]);
         renderer._allSkins[costume.skinId].differsFromAsset = false;
       } catch (e) {
         console.error(e);
       }

extensions/Lily/MoreEvents.js

@@ -176,10 +176,10 @@
   class MoreEvents {
     constructor() {
       // Stop Sign Clicked contributed by @CST1229
       runtime.shouldExecuteStopClicked = true;
       runtime.on("BEFORE_EXECUTE", () => {
         runTimer++;
         runtime.shouldExecuteStopClicked = false;
 
         runtime.startHats("lmsMoreEvents_forever");
         runtime.startHats("lmsMoreEvents_whileTrueFalse");
@@ -192,17 +192,17 @@
       });
       runtime.on("PROJECT_STOP_ALL", () => {
         runTimer = 0;
         if (runtime.shouldExecuteStopClicked)
           queueMicrotask(() =>
             runtime.startHats("lmsMoreEvents_whenStopClicked")
           );
       });
       runtime.on("AFTER_EXECUTE", () => {
         runtime.shouldExecuteStopClicked = true;
       });
       const originalGreenFlag = vm.greenFlag;
       vm.greenFlag = function () {
         runtime.shouldExecuteStopClicked = false;
         originalGreenFlag.call(this);
       };
     }
@@ -551,11 +551,12 @@
     }
 
     whenValueChanged(args, util) {
-      const blockId = util.thread.peekStack();
-      if (!lastValues[blockId])
-        lastValues[blockId] = Scratch.Cast.toString(args.INPUT);
-      if (lastValues[blockId] !== Scratch.Cast.toString(args.INPUT)) {
-        lastValues[blockId] = Scratch.Cast.toString(args.INPUT);
+      const cacheId = util.thread.getId();
+      if (!lastValues[cacheId]) {
+        lastValues[cacheId] = Scratch.Cast.toString(args.INPUT);
+      }
+      if (lastValues[cacheId] !== Scratch.Cast.toString(args.INPUT)) {
+        lastValues[cacheId] = Scratch.Cast.toString(args.INPUT);
         return true;
       }
       return false;

extensions/Lily/TempVariables2.js

@@ -260,7 +260,7 @@
       if (!Object.prototype.hasOwnProperty.call(util.stackFrame, "index")) {
         util.stackFrame.index = 0;
       }
-      if (util.stackFrame.index < Number(args.NUM)) {
+      if (util.stackFrame.index < Scratch.Cast.toNumber(args.NUM)) {
         util.stackFrame.index++;
         vars[args.VAR] = util.stackFrame.index;
         return true;
@@ -313,6 +313,6 @@
   // The expose format follows TurboWarp's convention of `ext_${extensionId}`.
   // Expose the extension on runtime for others to use.
   const extension = new TempVars();
   Scratch.vm.runtime.ext_lmsTempVars2 = extension;
   Scratch.extensions.register(extension);
 })(Scratch);

extensions/NOname-awa/math-and-string.js

@@ -951,7 +951,8 @@
           repeat_i_inc >= 0 ? repeat_i <= args.n : repeat_i >= args.n;
           repeat_i += repeat_i_inc
         ) {
-          repeat_j = String(repeat_j) + String(args.text);
+          repeat_j =
+            Scratch.Cast.toString(repeat_j) + Scratch.Cast.toString(args.text);
         }
         return repeat_j;
       }

extensions/Skyhigh173/bigint.js

@@ -17,6 +17,8 @@
       return x;
     }
     if (typeof x === "string") {
+      x = x.toLowerCase();
+
       // Try to parse things like '8n'
       if (x.charAt(x.length - 1) === "n") {
         try {
@@ -25,13 +27,35 @@
           // ignore
         }
       }
+
+      if (x.includes("e") && !x.includes("x")) {
+        // read scientific notation
+        const [mantissa, exponentStr] = x.split("e");
+        const exponent = parseInt(exponentStr, 10);
+
+        if (!isNaN(exponent) && exponent >= 0) {
+          const [integerPart, fractionalPart = ""] = mantissa.split(".");
+          if (exponent >= fractionalPart.length) {
+            // Pad with trailing zeros
+            x =
+              integerPart +
+              fractionalPart +
+              "0".repeat(exponent - fractionalPart.length);
+          } else {
+            // Shift decimal point right
+            x = integerPart + fractionalPart.slice(0, exponent);
+          }
+        }
+      }
+
       // Must remove decimal using string operations. Math.trunc will convert to float
       // which ruins the point of using bigints.
       const decimalIndex = x.indexOf(".");
-      const withoutDecimal =
+      const xWithoutDecimal =
         decimalIndex === -1 ? x : x.substring(0, decimalIndex);
+
       try {
-        return BigInt(withoutDecimal);
+        return BigInt(xWithoutDecimal);
       } catch (e) {
         return 0n;
       }
@@ -406,7 +430,10 @@
     }
     mod({ a, b }) {
       if (Number(b) == 0) return "NaN";
-      return (bi(a) % bi(b)).toString();
+
+      const modulo = bi(b);
+      if (modulo === 0n) return "NaN";
+      return (bi(a) % modulo).toString();
     }
 
     and({ a, b }) {

extensions/Skyhigh173/json.js

@@ -878,7 +878,7 @@
 
     json_array_from({ json }) {
       try {
-        return JSON.stringify(Array.from(String(json)));
+        return JSON.stringify(Array.from(Scratch.Cast.toString(json)));
       } catch {
         return "";
       }
@@ -981,7 +981,7 @@
     }
 
     json_array_create({ text, d }) {
-      return JSON.stringify(String(text).split(d));
+      return JSON.stringify(Scratch.Cast.toString(text).split(d));
     }
 
     json_array_join({ json, d }) {

extensions/TheShovel/profanity.js

@@ -267,7 +267,7 @@
     checkProfanity({ TEXT, REPLACEMENT }) {
       // Use a function as the second argument so that replacing with "$&" does not allow
       // bypass.
-      return String(TEXT).replace(regex, () => REPLACEMENT);
+      return Scratch.Cast.toString(TEXT).replace(regex, () => REPLACEMENT);
     }
   }