true-fantom/math: add x < y < z blocks (#1430)

Co-authored-by: Muffin <[email protected]>
TurboWarp · May 9, 2024 · 02578ec · 02578ec
1 parent cc9f503
commit 02578ec
Showing 1 changed file with 47 additions and 0 deletions.
diff --git a/extensions/true-fantom/math.js b/extensions/true-fantom/math.js
@@ -267,6 +267,47 @@
             extensions: ["colours_operators"],
           },
           "---",
+          {
+            opcode: "between_or_equal",
+            blockType: Scratch.BlockType.BOOLEAN,
+            text: "[A] ≤ [B] ≤ [C]",
+            arguments: {
+              A: {
+                type: Scratch.ArgumentType.NUMBER,
+                defaultValue: "0",
+              },
+              B: {
+                type: Scratch.ArgumentType.NUMBER,
+                defaultValue: "50",
+              },
+              C: {
+                type: Scratch.ArgumentType.NUMBER,
+                defaultValue: "100",
+              },
+            },
+            extensions: ["colours_operators"],
+          },
+          {
+            opcode: "between",
+            blockType: Scratch.BlockType.BOOLEAN,
+            text: "[A] < [B] < [C]",
+            arguments: {
+              A: {
+                type: Scratch.ArgumentType.NUMBER,
+                defaultValue: "0",
+              },
+              B: {
+                type: Scratch.ArgumentType.NUMBER,
+                defaultValue: "50",
+              },
+              C: {
+                type: Scratch.ArgumentType.NUMBER,
+                defaultValue: "100",
+              },
+            },
+            extensions: ["colours_operators"],
+          },
+          "---",
           {
             opcode: "nand_block",
             blockType: Scratch.BlockType.BOOLEAN,
@@ -569,6 +610,12 @@
     xnor_block({ A, B }) {
       return cast.toBoolean(A) === cast.toBoolean(B);
     }
+    between_or_equal({ A, B, C }) {
+      return cast.compare(A, B) <= 0 && cast.compare(B, C) <= 0;
+    }
+    between({ A, B, C }) {
+      return cast.compare(A, B) < 0 && cast.compare(B, C) < 0;
+    }
     exactly_cont_block({ A, B }) {
       return cast.toString(A).includes(cast.toString(B));
     }