Fix select-self leaving out important options

Author: rgantzos

features/select-self/script.js

@@ -1,79 +1,98 @@
 export default async function ({ feature, console }) {
+  let MENU_TYPES = [
+    "motion_glideto_menu",
+    "motion_goto_menu",
+    "motion_pointtowards_menu",
+    "sensing_touchingobjectmenu",
+    "sensing_of_object_menu",
+    "sensing_distancetomenu",
+  ];
+  let ORIGINAL_DATA = {
+    motion_glideto_menu: [
+      ["random position", "_random_"],
+      ["mouse-pointer", "_mouse_"],
+    ],
+    motion_goto_menu: [
+      ["random position", "_random_"],
+      ["mouse-pointer", "_mouse_"],
+    ],
+    motion_pointtowards_menu: [["random position", "_random_"]],
+    sensing_touchingobjectmenu: [
+      ["mouse-pointer", "_mouse_"],
+      ["edge", "_edge_"],
+    ],
+    sensing_of_object_menu: [["Stage", "_stage_"]],
+    sensing_distancetomenu: [["mouse-pointer", "_mouse_"]],
+  };
+
+  let blocks = [];
+
+  ScratchTools.waitForElements(
+    "g.blocklyDraggable > g[data-shapes='argument round']",
+    function (block) {
+      if (!Blockly) return;
+
+      block = Blockly.getMainWorkspace().getBlockById(block.dataset.id);
+      if (!block) return;
+
+      if (MENU_TYPES.includes(block.type)) {
+        let menu = block.inputList[0].fieldRow[0].menuGenerator_;
+
+        if (!blocks.includes(block.id)) {
+          blocks.push(block.id);
+        }
 
-    let MENU_TYPES = ["motion_glideto_menu", "motion_goto_menu", "motion_pointtowards_menu", "sensing_touchingobjectmenu", "sensing_of_object_menu"]
-
-    let blocks = []
+        updateMenu(block.id);
+      }
+    }
+  );
 
-    ScratchTools.waitForElements(
-        "g.blocklyDraggable > g[data-shapes='argument round']",
-        function (block) {
-            if (!Blockly) return;
+  feature.traps.vm.on("targetsUpdate", function (el) {
+    for (var i in blocks) {
+      updateMenu(blocks[i]);
+    }
+  });
 
-            block = Blockly.getMainWorkspace().getBlockById(block.dataset.id);
-            if (!block) return;
+  feature.addEventListener("disabled", function () {
+    for (var i in blocks) {
+      updateMenu(blocks[i]);
+    }
+  });
 
-            if (MENU_TYPES.includes(block.type)) {
-                let menu = block.inputList[0].fieldRow[0].menuGenerator_;
+  feature.addEventListener("enabled", function () {
+    for (var i in blocks) {
+      updateMenu(blocks[i]);
+    }
+  });
 
-                if (!blocks.includes(block.id)) {
-                    blocks.push(block.id)
-                }
+  function updateMenu(blockId) {
+    let SPRITES = [];
 
-                updateMenu(block.id)
-            }
-        }
+    let targets = feature.traps.vm.runtime.targets.filter(
+      (target) => !target.isStage && target.isOriginal
     );
 
-    feature.traps.vm.on("targetsUpdate", function (el) {
-        for (var i in blocks) {
-            updateMenu(blocks[i])
-        }
-    })
+    for (var i in targets) {
+      SPRITES.push(targets[i].sprite.name);
+    }
 
-    feature.addEventListener("disabled", function () {
-        for (var i in blocks) {
-            updateMenu(blocks[i])
-        }
-    })
+    let block = Blockly.getMainWorkspace().getBlockById(blockId);
 
-    feature.addEventListener("enabled", function () {
-        for (var i in blocks) {
-            updateMenu(blocks[i])
-        }
-    })
+    if (!block) return;
 
-    function updateMenu(blockId) {
-        let SPRITES = []
+    block.inputList[0].fieldRow[0].menuGenerator_ = function () {
+      let data = ORIGINAL_DATA[block.type];
 
-        let targets = feature.traps.vm.runtime.targets.filter((target) => !target.isStage && target.isOriginal)
-
-        for (var i in targets) {
-            SPRITES.push(targets[i].sprite.name)
+      for (var i in SPRITES) {
+        if (
+          feature.self.enabled ||
+          feature.traps.vm.runtime._editingTarget?.sprite?.name !== SPRITES[i]
+        ) {
+          data.push([SPRITES[i], SPRITES[i]]);
         }
+      }
 
-        let block = Blockly.getMainWorkspace().getBlockById(blockId);
-
-        if (!block) return;
-
-        block.inputList[0].fieldRow[0].menuGenerator_ = function () {
-            let data = [
-                [
-                    "random position",
-                    "_random_"
-                ],
-                [
-                    "mouse-pointer",
-                    "_mouse_"
-                ]
-            ]
-
-            for (var i in SPRITES) {
-                if (feature.self.enabled || feature.traps.vm.runtime._editingTarget?.sprite?.name !== SPRITES[i]) {
-                    data.push([SPRITES[i], SPRITES[i]])
-                }
-            }
-
-            return data
-        }
-    }
-}
+      return data;
+    };
+  }
+}