more sprite fixes

1 files changed, 16 insertions, 38 deletions

diff --git a/block.py b/block.py
index 7564b6d..6913b0c 100644
--- a/block.py
+++ b/block.py
@@ -92,92 +92,70 @@ class Block:
             print "%s (%d %d)" % (name, x, y)
         else:
             print "%s %s (%d %d)" % (name, labels[0], x, y)
+
+        svg = block_factory.SVG()
+        if name in TURTLE_PALETTE:
+            svg.set_colors(TURTLE_COLORS)
+        elif name in PEN_PALETTE:
+            svg.set_colors(PEN_COLORS)
+        elif name in NUMBER_PALETTE:
+            svg.set_colors(NUMBER_COLORS)
+        elif name in BLOCKS_PALETTE:
+            svg.set_colors(BLOCKS_COLORS)
+        svg.set_scale(scale)
+        svg.set_gradiant(True)
         if name in BASIC_STYLE:
-            svg = block_factory.SVG()
-            svg.set_scale(scale)
-            svg.expand(20,0)
+            svg.expand(40,0)
             svg.set_innie([False])
             svg.set_outie(False)
             svg.set_tab(True)
             svg.set_slot(True)
-            svg.set_gradiant(True)
-            svg.set_colors(colors)
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_block()))
             print "created new basic block: %s" % (str(self.spr))
-            self.spr.set_layer(2000)
-            self.spr.draw()
             self.spr.set_label(labels[0])
         elif name in BASIC_STYLE_HEAD:
-            svg = block_factory.SVG()
-            svg.set_scale(scale)
-            svg.expand(20,0)
+            svg.expand(40,0)
             svg.set_innie([False])
             svg.set_outie(False)
             svg.set_tab(False)
             svg.set_slot(True)
-            svg.set_gradiant(True)
-            svg.set_colors(colors)
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_block()))
             print "created new basic block: %s" % (str(self.spr))
-            self.spr.set_layer(2000)
-            self.spr.draw()
             self.spr.set_label(labels[0])
         elif name in BASIC_STYLE_TAIL:
-            svg = block_factory.SVG()
-            svg.set_scale(scale)
-            svg.expand(20,0)
+            svg.expand(40,0)
             svg.set_innie([False])
             svg.set_outie(False)
             svg.set_tab(True)
             svg.set_slot(False)
-            svg.set_gradiant(True)
-            svg.set_colors(colors)
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_block()))
             print "created new basic block: %s" % (str(self.spr))
-            self.spr.set_layer(2000)
-            self.spr.draw()
             self.spr.set_label(labels[0])
         elif name in BASIC_STYLE_1ARG:
-            svg = block_factory.SVG()
-            svg.set_scale(scale)
             svg.expand(20,0)
             svg.set_innie([True])
             svg.set_outie(False)
             svg.set_tab(True)
             svg.set_slot(True)
-            svg.set_gradiant(True)
-            svg.set_colors(colors)
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_block()))
             print "created new basic block: %s" % (str(self.spr))
-            self.spr.set_layer(2000)
-            self.spr.draw()
             self.spr.set_label(labels[0])
         elif name in BASIC_STYLE_2ARG:
-            svg = block_factory.SVG()
-            svg.set_scale(scale)
             svg.expand(20,0)
             svg.set_innie([True,True])
             svg.set_outie(False)
             svg.set_tab(True)
             svg.set_slot(True)
-            svg.set_gradiant(True)
-            svg.set_colors(colors)
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_block()))
             print "created new basic block: %s" % (str(self.spr))
-            self.spr.set_layer(2000)
-            self.spr.draw()
             self.spr.set_label(labels[0])
         elif name in BOX_STYLE:
-            svg = block_factory.SVG()
-            svg.set_scale(scale)
-            svg.expand(60,0)
-            svg.set_gradiant(True)
-            svg.set_colors(colors)
+            svg.expand(50,0)
             self.spr = sprites.Sprite(self.blocks.sprites, x, y,
                                       svg_str_to_pixbuf(svg.basic_box()))
             print "created new box block: %s" % (str(self.spr))