Mercurial > skaapsteker

--- a/data/levels/level1.json	Mon Apr 04 21:14:48 2011 +0200
+++ b/data/levels/level1.json	Mon Apr 04 21:27:17 2011 +0200
@@ -2,7 +2,7 @@
     "backgrounds": [
         "background_01_back.png"
     ],
-    "tileset": "dummy",
+    "tileset": "blue",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{.....?...............................}X{..............................}X",
--- a/data/levels/level2.json	Mon Apr 04 21:14:48 2011 +0200
+++ b/data/levels/level2.json	Mon Apr 04 21:27:17 2011 +0200
@@ -3,7 +3,7 @@
         "background_02_back.png",
         "background_02_front.png"
     ],
-    "tileset": "dummy",
+    "tileset": "red",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{..........}XX{...........................}XX{...........}XX{..........}X",
--- a/data/levels/level3.json	Mon Apr 04 21:14:48 2011 +0200
+++ b/data/levels/level3.json	Mon Apr 04 21:27:17 2011 +0200
@@ -3,7 +3,7 @@
         "dummy.png",
         "dummy-fg.png"
     ],
-    "tileset": "dummy",
+    "tileset": "flower_dark",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{..}bd{............}bd{......................}bXd{.......}XX{.}XX{.....}X",
--- a/data/levels/level4.json	Mon Apr 04 21:14:48 2011 +0200
+++ b/data/levels/level4.json	Mon Apr 04 21:27:17 2011 +0200
@@ -3,7 +3,7 @@
         "dummy.png",
         "dummy-fg.png"
     ],
-    "tileset": "dummy",
+    "tileset": "fan_green",
     "tiles": [
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
         "X{................}X{...................................................}X",
Binary file data/source/tileset-layers.xcf has changed
Binary file data/tiles/blue/arch-l.png has changed
Binary file data/tiles/blue/arch-r.png has changed
Binary file data/tiles/blue/decor-1.png has changed
Binary file data/tiles/blue/floor-end-l.png has changed
Binary file data/tiles/blue/floor-end-r.png has changed
Binary file data/tiles/blue/floor-start-l.png has changed
Binary file data/tiles/blue/floor-start-r.png has changed
Binary file data/tiles/blue/floor.png has changed
Binary file data/tiles/blue/wall-end-bl.png has changed
Binary file data/tiles/blue/wall-end-br.png has changed
Binary file data/tiles/blue/wall-end-l.png has changed
Binary file data/tiles/blue/wall-end-r.png has changed
Binary file data/tiles/blue/wall-end-tl.png has changed
Binary file data/tiles/blue/wall-end-tr.png has changed
Binary file data/tiles/blue/wall.png has changed
Binary file data/tiles/dummy/arch-l.png has changed
Binary file data/tiles/dummy/arch-r.png has changed
Binary file data/tiles/dummy/bonsai.png has changed
Binary file data/tiles/dummy/decor-1.png has changed
Binary file data/tiles/dummy/floor-cap-e.png has changed
Binary file data/tiles/dummy/floor-cap-w.png has changed
Binary file data/tiles/dummy/floor-cnr-l.png has changed
Binary file data/tiles/dummy/floor-cnr-r.png has changed
Binary file data/tiles/dummy/floor-end-l.png has changed
Binary file data/tiles/dummy/floor-end-r.png has changed
Binary file data/tiles/dummy/floor-start-l.png has changed
Binary file data/tiles/dummy/floor-start-r.png has changed
Binary file data/tiles/dummy/solid-cap-e.png has changed
Binary file data/tiles/dummy/solid-cap-ne.png has changed
Binary file data/tiles/dummy/solid-cap-nw.png has changed
Binary file data/tiles/dummy/solid-cap-se.png has changed
Binary file data/tiles/dummy/solid-cap-sw.png has changed
Binary file data/tiles/dummy/solid-cap-w.png has changed
Binary file data/tiles/dummy/solid-cnr-l.png has changed
Binary file data/tiles/dummy/solid-cnr-r.png has changed
Binary file data/tiles/dummy/solid.png has changed
Binary file data/tiles/dummy/wall-end-bl.png has changed
Binary file data/tiles/dummy/wall-end-br.png has changed
Binary file data/tiles/dummy/wall-end-l.png has changed
Binary file data/tiles/dummy/wall-end-r.png has changed
Binary file data/tiles/dummy/wall-end-tl.png has changed
Binary file data/tiles/dummy/wall-end-tr.png has changed
Binary file data/tiles/dummy/wall.png has changed
Binary file data/tiles/fan_gold/arch-l.png has changed
Binary file data/tiles/fan_gold/arch-r.png has changed
Binary file data/tiles/fan_gold/decor-1.png has changed
Binary file data/tiles/fan_gold/floor-end-l.png has changed
Binary file data/tiles/fan_gold/floor-end-r.png has changed
Binary file data/tiles/fan_gold/floor-start-l.png has changed
Binary file data/tiles/fan_gold/floor-start-r.png has changed
Binary file data/tiles/fan_gold/floor.png has changed
Binary file data/tiles/fan_gold/wall-end-bl.png has changed
Binary file data/tiles/fan_gold/wall-end-br.png has changed
Binary file data/tiles/fan_gold/wall-end-l.png has changed
Binary file data/tiles/fan_gold/wall-end-r.png has changed
Binary file data/tiles/fan_gold/wall-end-tl.png has changed
Binary file data/tiles/fan_gold/wall-end-tr.png has changed
Binary file data/tiles/fan_gold/wall.png has changed
Binary file data/tiles/fan_green/arch-l.png has changed
Binary file data/tiles/fan_green/arch-r.png has changed
Binary file data/tiles/fan_green/decor-1.png has changed
Binary file data/tiles/fan_green/floor-end-l.png has changed
Binary file data/tiles/fan_green/floor-end-r.png has changed
Binary file data/tiles/fan_green/floor-start-l.png has changed
Binary file data/tiles/fan_green/floor-start-r.png has changed
Binary file data/tiles/fan_green/floor.png has changed
Binary file data/tiles/fan_green/wall-end-bl.png has changed
Binary file data/tiles/fan_green/wall-end-br.png has changed
Binary file data/tiles/fan_green/wall-end-l.png has changed
Binary file data/tiles/fan_green/wall-end-r.png has changed
Binary file data/tiles/fan_green/wall-end-tl.png has changed
Binary file data/tiles/fan_green/wall-end-tr.png has changed
Binary file data/tiles/fan_green/wall.png has changed
Binary file data/tiles/flower_dark/arch-l.png has changed
Binary file data/tiles/flower_dark/arch-r.png has changed
Binary file data/tiles/flower_dark/decor-1.png has changed
Binary file data/tiles/flower_dark/floor-end-l.png has changed
Binary file data/tiles/flower_dark/floor-end-r.png has changed
Binary file data/tiles/flower_dark/floor-start-l.png has changed
Binary file data/tiles/flower_dark/floor-start-r.png has changed
Binary file data/tiles/flower_dark/floor.png has changed
Binary file data/tiles/flower_dark/wall-end-bl.png has changed
Binary file data/tiles/flower_dark/wall-end-br.png has changed
Binary file data/tiles/flower_dark/wall-end-l.png has changed
Binary file data/tiles/flower_dark/wall-end-r.png has changed
Binary file data/tiles/flower_dark/wall-end-tl.png has changed
Binary file data/tiles/flower_dark/wall-end-tr.png has changed
Binary file data/tiles/flower_dark/wall.png has changed
Binary file data/tiles/flower_light/arch-l.png has changed
Binary file data/tiles/flower_light/arch-r.png has changed
Binary file data/tiles/flower_light/decor-1.png has changed
Binary file data/tiles/flower_light/floor-end-l.png has changed
Binary file data/tiles/flower_light/floor-end-r.png has changed
Binary file data/tiles/flower_light/floor-start-l.png has changed
Binary file data/tiles/flower_light/floor-start-r.png has changed
Binary file data/tiles/flower_light/floor.png has changed
Binary file data/tiles/flower_light/wall-end-bl.png has changed
Binary file data/tiles/flower_light/wall-end-br.png has changed
Binary file data/tiles/flower_light/wall-end-l.png has changed
Binary file data/tiles/flower_light/wall-end-r.png has changed
Binary file data/tiles/flower_light/wall-end-tl.png has changed
Binary file data/tiles/flower_light/wall-end-tr.png has changed
Binary file data/tiles/flower_light/wall.png has changed
Binary file data/tiles/red/arch-l.png has changed
Binary file data/tiles/red/arch-r.png has changed
Binary file data/tiles/red/decor-1.png has changed
Binary file data/tiles/red/floor-end-l.png has changed
Binary file data/tiles/red/floor-end-r.png has changed
Binary file data/tiles/red/floor-start-l.png has changed
Binary file data/tiles/red/floor-start-r.png has changed
Binary file data/tiles/red/floor.png has changed
Binary file data/tiles/red/wall-end-bl.png has changed
Binary file data/tiles/red/wall-end-br.png has changed
Binary file data/tiles/red/wall-end-l.png has changed
Binary file data/tiles/red/wall-end-r.png has changed
Binary file data/tiles/red/wall-end-tl.png has changed
Binary file data/tiles/red/wall-end-tr.png has changed
Binary file data/tiles/red/wall.png has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/tileset-composer.sh	Mon Apr 04 21:27:17 2011 +0200
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+for background in "fan_gold" "fan_green" "red" "blue" "flower_dark" "flower_light"
+do
+    mkdir -p $background
+    for piece in "floor" "wall" "wall-end-"{"t","b",""}{"l","r"} "floor-"{"start","end"}"-"{"l","r"} "arch-"{"l","r"} "decor-1"
+    do
+        xcf2png $1 "$piece" "$background" --mode Screen > $background/"$piece.png"
+    done
+done
--- a/skaapsteker/level.py	Mon Apr 04 21:14:48 2011 +0200
+++ b/skaapsteker/level.py	Mon Apr 04 21:27:17 2011 +0200
@@ -19,20 +19,20 @@
             '.': lambda pos: None,
             '?': lambda pos: None, # Object placement helper
             '-': self.tile_factory('floor.png', True),
-            'X': self.tile_factory('solid.png', True, True),
-            '<': self.tile_factory('floor-cap-w.png', True),
-            '>': self.tile_factory('floor-cap-e.png', True),
-            '=': self.tile_factory('floor-cnr-l.png'),
-            '+': self.tile_factory('floor-cnr-r.png'),
-            '(': self.tile_factory('solid-cap-w.png', True, True),
-            ')': self.tile_factory('solid-cap-e.png', True, True),
-            'q': self.tile_factory('solid-cap-ne.png', True, True),
-            'd': self.tile_factory('solid-cap-se.png', True, True),
-            'p': self.tile_factory('solid-cap-nw.png', True, True),
-            'b': self.tile_factory('solid-cap-sw.png', True, True),
-            '{': self.tile_factory('solid-cnr-l.png'),
-            '}': self.tile_factory('solid-cnr-r.png'),
-            '1': self.tile_factory('bonsai.png', layer=Layers.FOREGROUND),
+            'X': self.tile_factory('wall.png', True, True),
+            '<': self.tile_factory('floor-end-l.png', True),
+            '>': self.tile_factory('floor-end-r.png', True),
+            '=': self.tile_factory('floor-start-l.png'),
+            '+': self.tile_factory('floor-start-r.png'),
+            '(': self.tile_factory('wall-end-l.png', True, True),
+            ')': self.tile_factory('wall-end-r.png', True, True),
+            'q': self.tile_factory('wall-end-tr.png', True, True),
+            'd': self.tile_factory('wall-end-br.png', True, True),
+            'p': self.tile_factory('wall-end-tl.png', True, True),
+            '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),
             }