simplified keyboard input macro

1 files changed, 9 insertions, 25 deletions

diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 3a0a4c0..ca957f6 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -227,32 +227,16 @@ VOICES = {'af': 'afrikaans', 'cy': 'welsh-test', 'el': 'greek',
 # Macros (groups of blocks)
 #
 MACROS = {
-    '''
-    'until':
-              [[0, 'forever', 0, 0, [None, 2, 1]],
-               [1, 'vspace', 0, 0, [0, None]],
-               [2, 'ifelse', 0, 0, [0, None, 3, None, None]],
-               [3, 'vspace', 0, 0, [2, 4]],
-               [4, 'stopstack', 0, 0, [3, None]]],
-    'while':
-              [[0, 'forever', 0, 0, [None, 2, 1]],
-               [1, 'vspace', 0, 0, [0, None]],
-               [2, 'ifelse', 0, 0, [0, None, 3, 4, None]],
-               [3, 'vspace', 0, 0, [2, None]],
-               [4, 'stopstack', 0, 0, [2, None]]],
-    '''
     'kbinput':
-              [[0, 'forever', 0, 0, [None, 1, None]],
-               [1, 'kbinput', 0, 0, [0, 2]],
-               [2, 'vspace', 0, 0, [1, 3]],
-               [3, 'if', 0, 0, [2, 4, 7, 8]],
-               [4, 'greater2', 0, 0, [3, 5, 6, None]],
-               [5, 'keyboard', 0, 0, [4, None]],
-               [6, ['number', '0'], 0, 0, [4, None]],
-               [7, 'stopstack', 0, 0, [3, None]],
-               [8, 'vspace', 0, 0, [3, 9]],
-               [9, 'wait', 0, 0, [8, 10, None]],
-               [10, ['number', '1'], 0, 0, [9, None]]],
+              [[0, 'kbinput', 0, 0, [None, 1]],
+               [1, 'vspace', 0, 0, [0, 2]],
+               [2, 'until', 0, 0, [1, 3, 6, None]],
+               [3, 'greater2', 0, 0, [2, 4, 5, None]],
+               [4, 'keyboard', 0, 0, [3, None]],
+               [5, ['number', '0'], 0, 0, [3, None]],
+               [6, 'wait', 0, 0, [2, 7, 8]],
+               [7, ['number', '0.1'], 0, 0, [6, None]],
+               [8, 'kbinput', 0, 0, [6, None]]],
     'picturelist':
               [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
                [1, 'penup', 0, 0, [0, 2]],