Skip to content

Commit

Permalink
Fix #19: Restore Logic commands in standard and advanced toolbox
Browse files Browse the repository at this point in the history
  • Loading branch information
avivace committed Dec 21, 2018
1 parent e8d2266 commit 5d03c94
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 75 deletions.
11 changes: 10 additions & 1 deletion src/assets/toolbox_adv.xml
@@ -1,4 +1,13 @@
<xml>
<category name="Logica" colour="210">
<block type="controls_if"></block>
<block type="logic_compare"></block>
<block type="logic_operation"></block>
<block type="logic_negate"></block>
<block type="logic_boolean"></block>
<block type="logic_null"></block>
<block type="logic_ternary"></block>
</category>
<category name="Cicli" colour="120">
<block type="controls_repeat_ext">
<value name="TIMES">
Expand Down Expand Up @@ -158,7 +167,7 @@
</category>
<category name="Variabili" custom="VARIABLE" colour="330"></category>
<category name="Funzioni" custom="PROCEDURE" colour="290"></category>
<!--
<!--
<category name="Eventi" colour="15">
<block type="coderbot_event_generator">
<value name="generator_statements">
Expand Down
148 changes: 74 additions & 74 deletions src/assets/toolbox_std.xml
@@ -1,76 +1,76 @@
<xml id="toolbox" style="display: none">
<category name="Controllo" colour="120">
<block type="controls_if"></block>
<block type="controls_repeat_ext">
<value name="TIMES">
<block type="math_number">
<field name="NUM">10</field>
</block>
</value>
</block>
<block type="controls_whileUntil"></block>
</category>
<category name="Logica" colour="210">
<block type="logic_compare"></block>
<block type="logic_operation"></block>
<block type="logic_negate"></block>
<block type="logic_boolean"></block>
</category>
<category name="Variabili" colour="330">
<block type="variables_get"></block>
<block type="variables_set"></block>
<block type="variables_set"></block>
</category>
<category name="Matematica" colour="230">
<block type="math_number"></block>
<block type="math_arithmetic"></block>
<block type="math_single"></block>
</category>
<category name="Testo" colour="160">
<block type="text_print"></block>
<block type="text"></block>
<block type="text_join"></block>
<block type="text_length"></block>
</category>
<category name="Movimento" colour="40">
<block type="coderbot_moveForward"></block>
<block type="coderbot_moveBackward"></block>
<block type="coderbot_turnLeft"></block>
<block type="coderbot_turnRight"></block>
<block type="coderbot_adv_move">
<value name="SPEED">
<block type="math_number">
<field name="NUM">100</field>
</block>
</value>
<value name="ELAPSE">
<block type="math_number">
<field name="NUM">0.2</field>
</block>
</value>
</block>
<block type="coderbot_adv_stop"></block>
<block type="coderbot_sleep">
<value name="ELAPSE">
<block type="math_number">
<field name="NUM">1.0</field>
</block>
</value>
</block>
</category>
<category name="Sensori" colour="290">
<block type="coderbot_adv_pathAhead"></block>
<block type="coderbot_adv_findLine"></block>
<block type="coderbot_adv_findSignal"></block>
<block type="coderbot_adv_findFace"></block>
<block type="coderbot_adv_findColor">
<value name="COLOR">
<block type="colour_picker">
</block>
</value>
</block>
</category>
<category name="Souno" colour="290">
<block type="coderbot_audio_say"></block>
</category>
<category name="Controllo" colour="120">
<block type="controls_if"></block>
<block type="controls_repeat_ext">
<value name="TIMES">
<block type="math_number">
<field name="NUM">10</field>
</block>
</value>
</block>
<block type="controls_whileUntil"></block>
</category>
<category name="Logica" colour="210">
<block type="logic_compare"></block>
<block type="logic_operation"></block>
<block type="logic_negate"></block>
<block type="logic_boolean"></block>
</category>
<category name="Variabili" colour="330">
<block type="variables_get"></block>
<block type="variables_set"></block>
<block type="variables_set"></block>
</category>
<category name="Matematica" colour="230">
<block type="math_number"></block>
<block type="math_arithmetic"></block>
<block type="math_single"></block>
</category>
<category name="Testo" colour="160">
<block type="text_print"></block>
<block type="text"></block>
<block type="text_join"></block>
<block type="text_length"></block>
</category>
<category name="Movimento" colour="40">
<block type="coderbot_moveForward"></block>
<block type="coderbot_moveBackward"></block>
<block type="coderbot_turnLeft"></block>
<block type="coderbot_turnRight"></block>
<block type="coderbot_adv_move">
<value name="SPEED">
<block type="math_number">
<field name="NUM">100</field>
</block>
</value>
<value name="ELAPSE">
<block type="math_number">
<field name="NUM">0.2</field>
</block>
</value>
</block>
<block type="coderbot_adv_stop"></block>
<block type="coderbot_sleep">
<value name="ELAPSE">
<block type="math_number">
<field name="NUM">1.0</field>
</block>
</value>
</block>
</category>
<category name="Sensori" colour="290">
<block type="coderbot_adv_pathAhead"></block>
<block type="coderbot_adv_findLine"></block>
<block type="coderbot_adv_findSignal"></block>
<block type="coderbot_adv_findFace"></block>
<block type="coderbot_adv_findColor">
<value name="COLOR">
<block type="colour_picker">
</block>
</value>
</block>
</category>
<category name="Souno" colour="290">
<block type="coderbot_audio_say"></block>
</category>
</xml>

0 comments on commit 5d03c94

Please sign in to comment.