Lily/LooksPlus: fix "this sprite" in clones (#618)

TurboWarp · Jun 20, 2023 · f76fab4 · f76fab4
1 parent fc48645
commit f76fab4
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/extensions/Lily/LooksPlus.js b/extensions/Lily/LooksPlus.js
@@ -11,6 +11,19 @@
     return true;
   };
 
+  /**
+   * @param {VM.BlockUtility} util
+   * @param {unknown} targetName
+   */
+  const getSpriteTargetByName = (util, targetName) => {
+    const nameString = Scratch.Cast.toString(targetName);
+    const target = util.target;
+    if (target.getName() === nameString) {
+      return target;
+    }
+    return util.runtime.getSpriteTargetByName(nameString);
+  };
+
   class LooksPlus {
     getInfo() {
       return {
@@ -313,29 +326,29 @@
     }
 
     showSprite(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (target) {
         target.setVisible(true);
       }
     }
 
     hideSprite(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (target) {
         target.setVisible(false);
       }
     }
 
     spriteVisible(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (!target) {
         return false;
       }
       return Scratch.Cast.toBoolean(target.visible);
     }
 
     setLayerTo(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (!target) {
         return;
       }
@@ -346,15 +359,15 @@
     }
 
     spriteLayerNumber(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (!target) {
         return 0;
       }
       return target.getLayerOrder();
     }
 
     effectValue(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (!target) {
         return 0;
       }
@@ -395,7 +408,7 @@
     }
 
     targetCostumeNumber(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (!target) {
         return 0;
       }
@@ -464,7 +477,7 @@
     }
 
     costumeContent(args, util) {
-      const target = Scratch.vm.runtime.getSpriteTargetByName(args.TARGET);
+      const target = getSpriteTargetByName(util, args.TARGET);
       if (!target) {
         console.error('Target does not exist');
         return '';