adding more block types

1 files changed, 23 insertions, 42 deletions

diff --git a/tasetup.py b/tasetup.py
index 77fc458..2b15c94 100644
--- a/tasetup.py
+++ b/tasetup.py
@@ -60,11 +60,7 @@ selectors = (
      ('xcor','xcor','num'),
      ('ycor','ycor','num'),
      ('heading','heading','num'),
-     ('scale','scale','num'),
-     # not selectable, but here for backward compatability 
-     ('container','container','container','None'),
-     ('image','insertimage','image','None'),
-     ('write','write','1sarg',_('text'),32))),
+     ('scale','scale','num'))),
   ('pen', 55,
     (('pen up','penup','noarg'),
      ('pen down','pendown','noarg'),
@@ -83,62 +79,47 @@ selectors = (
      ('green','green','num'),
      ('cyan','cyan','num'),
      ('blue','blue','num'),
-     ('purple','purple','num'),
-     # not selectable, but here for backward compatability 
-     ('set_text_color','settextcolor','1arg',0),
-     ('text_color','textcolor','num'))),
+     ('purple','purple','num'))),
   ('numbers', 55,
     (('number','','num',100,float,numcheck),
-     ('plus2','plus','newari'),
-     ('minus2','minus','newari2'),
-     ('product2','product','newari'),
-     ('division2','division','newari2'),
-     ('remainder2','mod','newari2'),
-     ('sqrt','sqrt','sqrt',100),
-     ('identity','id','id'),
-     ('identity2','id','id2'),
+     ('plus','plus','newari'),
+     ('minus','minus','newari2'),
+     ('multiply','product','newari'),
+     ('divide','division','newari2'),
+     ('mod','mod','newari2'),
+     ('square root','sqrt','sqrt',100),
      ('random','random','random',0,100),
-     ('greater','greater?','comp'),
-     ('less','less?','comp'),
-     ('equal','equal?','comp'),
+     ('greater than','greater?','comp'),
+     ('less than','less?','comp'),
+     ('equal to','equal?','comp'),
      ('and','and','and'),
      ('or','or','and'),
      ('not','not','not'),
-     ('print','print','onearg'),
-     # not selectable, but here for backward compatability 
-     ('minus','-','ari'),
-     ('product','*','ari'),
-     ('division','/','ari'),
-     ('remainder','%','ari2'),
-     ('plus','+','ari'))),
+     ('print','print','onearg'))),
   ('flow', 55,
     (('wait','wait','onearg',1),
      ('forever','forever','forever'),
      ('repeat','repeat','repeat',4),
      ('if','if','if'),
-     ('stop stack','stopstack','stop'),
+     ('stop action','stopstack','stop'),
      ('if else','ifelse','ifelse'),
      ('hspace','nop','hspace'),
-     ('vspace','nop','vspace'),
-     # not selectable, but here for backward compatability 
-     ('lock','nop','lock'))),
+     ('vspace','nop','vspace'))),
    ('myblocks', 55,
     (('start','start','start'),
-     ('hat1','nop1','start'),
-     ('stack1','stack1','noarg'),
-     ('hat2','nop2','start'),
-     ('stack2','stack2','noarg'),
-     ('hat','nop3','starts',_('action')),
-     ('stack','stack','sarg',_('action')),
+     ('def action 1','nop1','start'),
+     ('action 1','stack1','noarg'),
+     ('def action 2','nop2','start'),
+     ('action 2','stack2','noarg'),
+     ('def action','nop3','starts',_('action')),
+     ('action','stack','sarg',_('action')),
      ('store in box 1','storeinbox1','1arg'),
      ('box 1','box1','num'),
      ('store in box 2','storeinbox2','1arg'),
      ('box 2','box2','num'),
      ('store in','storeinbox','1varg',_('box'),100),
      ('box','box','nfuncs',_('box')),
-     ('string','','string',_('name'),str,strcheck),
-     # not selectable, but here for backward compatability 
-     ('store in box','storeinbox','1sarg',_('box'),100))),
+     ('string','','string',_('name'),str,strcheck))),
   ('sensors', 55,
     (('kbinput','kbinput','noarg2'),
      ('keyboard','keyboard','num'),
@@ -152,8 +133,8 @@ selectors = (
      ('top pos','toppos','num'),
      ('right pos','rightpos','num'),
      ('bottom pos','bottompos','num'),
-     ('hres','hres','num'),
-     ('vres','vres','num'))),
+     ('width','hres','num'),
+     ('height','vres','num'))),
   ('templates',55,
     (('journal','','media','','',''),
      ('audio off','','audio','','',''),