# HG changeset patch
# User Adrianna Pińska <adrianna.pinska@gmail.com>
# Date 1302346612 -7200
# Node ID 9a0f0ea687da7b8e42a4802f17e18b4ccdd87c62
# Parent  f870e3122ac7dbb8adb54da9d9b9fe0c35b021ff
removed per-set decor tiles; created common set of decorative tiles; added some bamboo to road

diff -r f870e3122ac7 -r 9a0f0ea687da data/levels/road.json
--- a/data/levels/road.json	Sat Apr 09 12:55:38 2011 +0200
+++ b/data/levels/road.json	Sat Apr 09 12:56:52 2011 +0200
@@ -7,11 +7,11 @@
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{......................................}XXd{....}bXXXXXXXXXXXXXXd{......}X",
-        "X.....pXXXq.?..pXXXXXXXXXXXXXXq..?......pXd{........}bXXXXXXXXXXd{........X",
-        "X...(Xd{}bXXXXXXd{.........}bXXXXXXq.?..XX{............}XXXXXXX{..........X",
+        "X.....pXXXq.?..pXXXXXXXXXXXXXXq..?..|...pXd{........}bXXXXXXXXXXd{........X",
+        "X|..(Xd{}bXXXXXXd{.........}bXXXXXXq.?..XX{............}XXXXXXX{..........X",
         "X)........}bXd{...................}bXXq.Xd..............bXXXXXd.........?.X",
         "X{................(XXXXXq............}XXX{................}XXX{.......pXXXX",
-        "XXXXq.................}bXXXq..........XXd......pq..........XXd......pXXXXXX",
+        "XXXXq...............|.}bXXXq..........XXd|.....pq..........XXd|.....pXXXXXX",
         "XXXXXXq..?....pXXXX).....}bXXq........bd{....pXXXXq........bd{....pXXXXXXXX",
         "XXXXXXXXXXXXXXXX{?...?.....}XXXq...........pXXXXXXXXq...........pXXXXXXXXXX",
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/blue/decor-1.png
Binary file data/tiles/blue/decor-1.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/common/bamboo.png
Binary file data/tiles/common/bamboo.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/dummy/decor-1.png
Binary file data/tiles/dummy/decor-1.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/fan_gold/decor-1.png
Binary file data/tiles/fan_gold/decor-1.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/fan_green/decor-1.png
Binary file data/tiles/fan_green/decor-1.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/flower_dark/decor-1.png
Binary file data/tiles/flower_dark/decor-1.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/flower_light/decor-1.png
Binary file data/tiles/flower_light/decor-1.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da data/tiles/red/decor-1.png
Binary file data/tiles/red/decor-1.png has changed
diff -r f870e3122ac7 -r 9a0f0ea687da scripts/tileset-composer.sh
--- a/scripts/tileset-composer.sh	Sat Apr 09 12:55:38 2011 +0200
+++ b/scripts/tileset-composer.sh	Sat Apr 09 12:56:52 2011 +0200
@@ -6,7 +6,7 @@
 function make_tiles(){
     local background=$1
     mkdir -p $background
-    for piece in "floor" "wall" "wall-end-"{"t","b",""}{"l","r"} "floor-"{"start","end"}"-"{"l","r"} "arch-"{"l","r"} "decor-1"
+    for piece in "floor" "wall" "wall-end-"{"t","b",""}{"l","r"} "floor-"{"start","end"}"-"{"l","r"} "arch-"{"l","r"}
     do
         xcf2png $xcffile "$piece" "$background" --mode Screen > $background/"$piece.png"
     done
diff -r f870e3122ac7 -r 9a0f0ea687da skaapsteker/level.py
--- a/skaapsteker/level.py	Sat Apr 09 12:55:38 2011 +0200
+++ b/skaapsteker/level.py	Sat Apr 09 12:56:52 2011 +0200
@@ -12,7 +12,7 @@
 
 class TileSet(object):
     def __init__(self, dirname):
-        self.dirname = 'tiles/' + dirname
+        self.dirname = dirname
         self.tile_factories = {
             '.': lambda pos: None,
             '?': lambda pos: None, # Object placement helper
@@ -30,7 +30,7 @@
             'b': self.tile_factory('wall-end-bl.png', True, True),
             '{': self.tile_factory('arch-l.png'),
             '}': self.tile_factory('arch-r.png'),
-            '1': self.tile_factory('decor-1.png', layer=Layers.FOREGROUND),
+            '|': self.tile_factory('bamboo.png', layer=Layers.BACKGROUND, dirname='common'),
             }
 
 
@@ -38,8 +38,10 @@
         return self.tile_factories[tilechar](pos)
 
 
-    def tile_factory(self, image_name, floor=False, block=False, layer=Layers.BACKGROUND):
-        image = data.load_image(self.dirname + '/' + image_name)
+    def tile_factory(self, image_name, floor=False, block=False, layer=Layers.BACKGROUND, dirname=None):
+        if not dirname:
+            dirname = self.dirname
+        image = data.load_image('tiles/' + dirname + '/' + image_name)
         def _tilefac(pos):
             tile = Geography(pos, image)
             tile.block = block
diff -r f870e3122ac7 -r 9a0f0ea687da sources/tiles/tileset-layers-curly.xcf
Binary file sources/tiles/tileset-layers-curly.xcf has changed
diff -r f870e3122ac7 -r 9a0f0ea687da sources/tiles/tileset-layers.xcf
Binary file sources/tiles/tileset-layers.xcf has changed