sync up with Turtle Blocks v136

1 files changed, 14 insertions, 26 deletions

diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 4dd5f50..74291fc 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -25,11 +25,12 @@ from gettext import gettext as _
 # Sprite layers
 #
 
-OVERLAY_LAYER = 525
-TURTLE_LAYER = 550
+OVERLAY_LAYER = 400
+TURTLE_LAYER = 500
 BLOCK_LAYER = 600
 CATEGORY_LAYER = 700
-TAB_LAYER = 710
+TAB_LAYER = 800
+PROTO_LAYER = 801
 STATUS_LAYER = 900
 TOP_LAYER = 1000
 
@@ -57,6 +58,8 @@ BLOCK_SCALE = [0.5, 1.0, 1.5, 2.0, 3.0, 4.0, 6.0, 8.0]
 PALETTE_SCALE = 1.5
 DEFAULT_TURTLE = 'Yertle'
 DEFAULT_TURTLE_COLORS = ['#008000', '#00A000']
+PALETTE_COLOR = "#FFD000"
+TOOLBAR_COLOR = "#282828"
 HORIZONTAL_PALETTE = 0
 VERTICAL_PALETTE = 1
 BLACK = -9999
@@ -71,6 +74,7 @@ DEFAULT_SCALE = 33
 XO1 = 'xo1'
 XO15 = 'xo1.5'
 XO175 = 'xo1.75'
+XO30 = 'xo3.0'
 UNKNOWN = 'unknown'
 
 CONSTANTS = {'leftpos': None, 'toppos': None, 'rightpos': None,
@@ -225,30 +229,14 @@ 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, 'until', 0, 0, [None, 1, 4, None]],
+               [1, 'greater2', 0, 0, [0, 2, 3, None]],
+               [2, 'keyboard', 0, 0, [1, None]],
+               [3, ['number', '0'], 0, 0, [1, None]],
+               [4, 'wait', 0, 0, [0, 5, 6]],
+               [5, ['number', '0.1'], 0, 0, [4, None]],
+               [6, 'kbinput', 0, 0, [4, None]]],
     'picturelist':
               [[0, 'sandwichtop_no_label', 0, 0, [None, 1]],
                [1, 'penup', 0, 0, [0, 2]],