Mercurial > skaapsteker
changeset 341:9a0f0ea687da
removed per-set decor tiles; created common set of decorative tiles; added some bamboo to road
| author | Adrianna Pińska <adrianna.pinska@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 12:56:52 +0200 |
| parents | f870e3122ac7 |
| children | 8f578fe33fe7 |
| files | data/levels/road.json data/tiles/blue/decor-1.png data/tiles/common/bamboo.png data/tiles/dummy/decor-1.png data/tiles/fan_gold/decor-1.png data/tiles/fan_green/decor-1.png data/tiles/flower_dark/decor-1.png data/tiles/flower_light/decor-1.png data/tiles/red/decor-1.png scripts/tileset-composer.sh skaapsteker/level.py sources/tiles/tileset-layers-curly.xcf sources/tiles/tileset-layers.xcf |
| diffstat | 13 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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
--- 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