Skip to content

Add greater & less than or equal to blocks #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rosics-code wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add greater & less than or equal to blocks #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10306a5
Add ltoet and gtoet operators for comparisons
rosics-code May 3, 2026
3e5f9f9
Add new operator blocks for comparison in toolbox XML
rosics-code May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions packages/scratch-gui/src/lib/make-toolbox-xml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,18 @@ const operators = function (isInitialSetup, isStage, targetId, colors) {
</shadow>
</value>
</block>
<block type="operator_gtoet">
<value name="OPERAND1">
<shadow type="text">
<field name="TEXT"/>
</shadow>
</value>
<value name="OPERAND2">
<shadow type="text">
<field name="TEXT">50</field>
</shadow>
</value>
</block>
<block type="operator_lt">
<value name="OPERAND1">
<shadow type="text">
Expand All @@ -647,6 +659,18 @@ const operators = function (isInitialSetup, isStage, targetId, colors) {
</shadow>
</value>
</block>
<block type="operator_ltoet">
<value name="OPERAND1">
<shadow type="text">
<field name="TEXT"/>
</shadow>
</value>
<value name="OPERAND2">
<shadow type="text">
<field name="TEXT">50</field>
</shadow>
</value>
</block>
<block type="operator_equals">
<value name="OPERAND1">
<shadow type="text">
Expand Down
10 changes: 10 additions & 0 deletions packages/scratch-vm/src/blocks/scratch3_operators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ class Scratch3OperatorsBlocks {
operator_multiply: this.multiply,
operator_divide: this.divide,
operator_lt: this.lt,
operator_ltoet: this.ltoet,
operator_equals: this.equals,
operator_gt: this.gt,
operator_gtoet: this.gtoet,
operator_and: this.and,
operator_or: this.or,
operator_not: this.not,
Expand Down Expand Up @@ -57,6 +59,10 @@ class Scratch3OperatorsBlocks {
return Cast.compare(args.OPERAND1, args.OPERAND2) < 0;
}

ltoet (args) {
return Cast.compare(args.OPERAND1, args.OPERAND2) <= 0;
}

equals (args) {
return Cast.compare(args.OPERAND1, args.OPERAND2) === 0;
}
Expand All @@ -65,6 +71,10 @@ class Scratch3OperatorsBlocks {
return Cast.compare(args.OPERAND1, args.OPERAND2) > 0;
}

gtoet (args) {
return Cast.compare(args.OPERAND1, args.OPERAND2) >= 0;
}

and (args) {
return Cast.toBoolean(args.OPERAND1) && Cast.toBoolean(args.OPERAND2);
}
Expand Down
Loading