Skip to content

Commit 5d03c94

Browse files
avivaceavivace
committed
Fix #19: Restore Logic commands in standard and advanced toolbox
1 parent e8d2266 commit 5d03c94

File tree

2 files changed

+84
-75
lines changed

2 files changed

+84
-75
lines changed

‎src/assets/toolbox_adv.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
<xml>
2+
<category name="Logica" colour="210">
3+
<block type="controls_if"></block>
4+
<block type="logic_compare"></block>
5+
<block type="logic_operation"></block>
6+
<block type="logic_negate"></block>
7+
<block type="logic_boolean"></block>
8+
<block type="logic_null"></block>
9+
<block type="logic_ternary"></block>
10+
</category>
211
<category name="Cicli" colour="120">
312
<block type="controls_repeat_ext">
413
<value name="TIMES">
@@ -158,7 +167,7 @@
158167
</category>
159168
<category name="Variabili" custom="VARIABLE" colour="330"></category>
160169
<category name="Funzioni" custom="PROCEDURE" colour="290"></category>
161-
<!--
170+
<!--
162171
<category name="Eventi" colour="15">
163172
<block type="coderbot_event_generator">
164173
<value name="generator_statements">

‎src/assets/toolbox_std.xml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
<xml id="toolbox" style="display: none">
2-
<category name="Controllo" colour="120">
3-
<block type="controls_if"></block>
4-
<block type="controls_repeat_ext">
5-
<value name="TIMES">
6-
<block type="math_number">
7-
<field name="NUM">10</field>
8-
</block>
9-
</value>
10-
</block>
11-
<block type="controls_whileUntil"></block>
12-
</category>
13-
<category name="Logica" colour="210">
14-
<block type="logic_compare"></block>
15-
<block type="logic_operation"></block>
16-
<block type="logic_negate"></block>
17-
<block type="logic_boolean"></block>
18-
</category>
19-
<category name="Variabili" colour="330">
20-
<block type="variables_get"></block>
21-
<block type="variables_set"></block>
22-
<block type="variables_set"></block>
23-
</category>
24-
<category name="Matematica" colour="230">
25-
<block type="math_number"></block>
26-
<block type="math_arithmetic"></block>
27-
<block type="math_single"></block>
28-
</category>
29-
<category name="Testo" colour="160">
30-
<block type="text_print"></block>
31-
<block type="text"></block>
32-
<block type="text_join"></block>
33-
<block type="text_length"></block>
34-
</category>
35-
<category name="Movimento" colour="40">
36-
<block type="coderbot_moveForward"></block>
37-
<block type="coderbot_moveBackward"></block>
38-
<block type="coderbot_turnLeft"></block>
39-
<block type="coderbot_turnRight"></block>
40-
<block type="coderbot_adv_move">
41-
<value name="SPEED">
42-
<block type="math_number">
43-
<field name="NUM">100</field>
44-
</block>
45-
</value>
46-
<value name="ELAPSE">
47-
<block type="math_number">
48-
<field name="NUM">0.2</field>
49-
</block>
50-
</value>
51-
</block>
52-
<block type="coderbot_adv_stop"></block>
53-
<block type="coderbot_sleep">
54-
<value name="ELAPSE">
55-
<block type="math_number">
56-
<field name="NUM">1.0</field>
57-
</block>
58-
</value>
59-
</block>
60-
</category>
61-
<category name="Sensori" colour="290">
62-
<block type="coderbot_adv_pathAhead"></block>
63-
<block type="coderbot_adv_findLine"></block>
64-
<block type="coderbot_adv_findSignal"></block>
65-
<block type="coderbot_adv_findFace"></block>
66-
<block type="coderbot_adv_findColor">
67-
<value name="COLOR">
68-
<block type="colour_picker">
69-
</block>
70-
</value>
71-
</block>
72-
</category>
73-
<category name="Souno" colour="290">
74-
<block type="coderbot_audio_say"></block>
75-
</category>
2+
<category name="Controllo" colour="120">
3+
<block type="controls_if"></block>
4+
<block type="controls_repeat_ext">
5+
<value name="TIMES">
6+
<block type="math_number">
7+
<field name="NUM">10</field>
8+
</block>
9+
</value>
10+
</block>
11+
<block type="controls_whileUntil"></block>
12+
</category>
13+
<category name="Logica" colour="210">
14+
<block type="logic_compare"></block>
15+
<block type="logic_operation"></block>
16+
<block type="logic_negate"></block>
17+
<block type="logic_boolean"></block>
18+
</category>
19+
<category name="Variabili" colour="330">
20+
<block type="variables_get"></block>
21+
<block type="variables_set"></block>
22+
<block type="variables_set"></block>
23+
</category>
24+
<category name="Matematica" colour="230">
25+
<block type="math_number"></block>
26+
<block type="math_arithmetic"></block>
27+
<block type="math_single"></block>
28+
</category>
29+
<category name="Testo" colour="160">
30+
<block type="text_print"></block>
31+
<block type="text"></block>
32+
<block type="text_join"></block>
33+
<block type="text_length"></block>
34+
</category>
35+
<category name="Movimento" colour="40">
36+
<block type="coderbot_moveForward"></block>
37+
<block type="coderbot_moveBackward"></block>
38+
<block type="coderbot_turnLeft"></block>
39+
<block type="coderbot_turnRight"></block>
40+
<block type="coderbot_adv_move">
41+
<value name="SPEED">
42+
<block type="math_number">
43+
<field name="NUM">100</field>
44+
</block>
45+
</value>
46+
<value name="ELAPSE">
47+
<block type="math_number">
48+
<field name="NUM">0.2</field>
49+
</block>
50+
</value>
51+
</block>
52+
<block type="coderbot_adv_stop"></block>
53+
<block type="coderbot_sleep">
54+
<value name="ELAPSE">
55+
<block type="math_number">
56+
<field name="NUM">1.0</field>
57+
</block>
58+
</value>
59+
</block>
60+
</category>
61+
<category name="Sensori" colour="290">
62+
<block type="coderbot_adv_pathAhead"></block>
63+
<block type="coderbot_adv_findLine"></block>
64+
<block type="coderbot_adv_findSignal"></block>
65+
<block type="coderbot_adv_findFace"></block>
66+
<block type="coderbot_adv_findColor">
67+
<value name="COLOR">
68+
<block type="colour_picker">
69+
</block>
70+
</value>
71+
</block>
72+
</category>
73+
<category name="Souno" colour="290">
74+
<block type="coderbot_audio_say"></block>
75+
</category>
7676
</xml>

0 commit comments

Comments
 (0)