get clones of target

PenguinMod · Dec 1, 2024 · 343ae96 · 343ae96
1 parent 0e524ab
commit 343ae96
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/extensions/jwArray/index.js b/src/extensions/jwArray/index.js
@@ -190,7 +190,7 @@ class Extension {
                 "---",
                 {
                     opcode: 'get',
-                    text: 'get [ARRAY] at [INDEX]',
+                    text: 'get [INDEX] in [ARRAY]',
                     blockType: BlockType.REPORTER,
                     arguments: {
                         ARRAY: jwArray.Argument,
@@ -211,7 +211,7 @@ class Extension {
                 "---",
                 {
                     opcode: 'set',
-                    text: 'set [ARRAY] at [INDEX] to [VALUE]',
+                    text: 'set [INDEX] in [ARRAY] to [VALUE]',
                     arguments: {
                         ARRAY: jwArray.Argument,
                         INDEX: {

diff --git a/src/extensions/jwTargets/index.js b/src/extensions/jwTargets/index.js
@@ -22,6 +22,12 @@ class TargetType {
         this.targetId = targetId
     }
 
+    static toTarget(x) {
+        if (x instanceof TargetType) return x
+        if (typeof x == "string") return new TargetType(x)
+        return new TargetType("")
+    }
+
     jwArrayHandler() {
         return 'Target'
     }
@@ -33,7 +39,7 @@ class TargetType {
 
     toReporterContent() {
         try {
-            let target = vm.runtime.getTargetById(this.targetId)
+            let target = this.target
             let name = target.sprite.name
             let isClone = !target.isOriginal
             let costumeURI = target.getCostumes()[target.currentCostume].asset.encodeDataURI()
@@ -56,6 +62,10 @@ class TargetType {
             return span("Unknown")
         }
     }
+
+    get target() {
+        return vm.runtime.getTargetById(this.targetId)
+    }
 }
 
 const Target = {
@@ -106,6 +116,15 @@ class Extension {
                     ...Target.Block
                 },
                 '---',
+                {
+                    opcode: 'clones',
+                    text: 'clones of [TARGET]',
+                    arguments: {
+                        TARGET: Target.Argument
+                    },
+                    ...jwArray.Block
+                },
+                '---',
                 {
                     blockType: BlockType.XML,
                     xml: `<block type="control_run_as_sprite" />`
@@ -121,6 +140,14 @@ class Extension {
     stage() {
         return new Target.Type(vm.runtime._stageTarget.id)
     }
+
+    clones({TARGET}) {
+        TARGET = Target.Type.toTarget(TARGET)
+        if (TARGET.target) {
+            return jwArray.Type(TARGET.target.sprite.clones.filter(v => !v.isOriginal))
+        }
+        return jwArray.Type()
+    }
 }
 
 module.exports = Extension