From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 5 Mar 2016 11:07:43 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:koperkapel
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=0dc9a8b725a625cc444eb1b49ebf2f9cf00b0539;hp=2c4c2428ac247ea8fdac2aaf6b2373fbf0275e3c;p=koperkapel.git

Merge branch 'master' of ctpug.org.za:koperkapel
---

diff --git a/koperkapel/gamelib/tiles.py b/koperkapel/gamelib/tiles.py
index 66a74ff..fd47252 100644
--- a/koperkapel/gamelib/tiles.py
+++ b/koperkapel/gamelib/tiles.py
@@ -60,6 +60,10 @@ class Wall(RandomizedTile):
 class Underground(RandomizedTile):
     IMGDIR = "underground"
 
+class Grate(Tile):
+    IMG = os.path.join('grate', 'grate')
+    TILESET = 'bunker'
+
 class Tunnel(OrientatedTile):
 
     @classmethod
diff --git a/koperkapel/images/Makefile b/koperkapel/images/Makefile
index 3cac620..c2ea50e 100644
--- a/koperkapel/images/Makefile
+++ b/koperkapel/images/Makefile
@@ -2,13 +2,13 @@ VPATH=../../sources
 
 # Vector tiles
 
-TILE_DIRS=roach serum vehicle_tiles
+TILE_DIRS=roach serum vehicle_tiles fixtures
 TILE_SVGS=$(shell find $(patsubst %, $(VPATH)/vector/%, $(TILE_DIRS)) -name "*.svg")
 TILE_PNGS=$(patsubst $(VPATH)/vector/%.svg, %.png, $(TILE_SVGS))
 
 # Bitmap tiles
 
-BTILE_DIRS=wall floor tunnel underground
+BTILE_DIRS=wall floor tunnel underground grate
 BTILE_SRC=$(shell find $(patsubst %, $(VPATH)/bitmap/%, $(BTILE_DIRS)) -name "*.png")
 BTILE_PNGS=$(patsubst $(VPATH)/bitmap/%, bunker/%, $(BTILE_SRC))
 
diff --git a/koperkapel/images/bunker/grate/grate.png b/koperkapel/images/bunker/grate/grate.png
new file mode 100644
index 0000000..c652922
Binary files /dev/null and b/koperkapel/images/bunker/grate/grate.png differ
diff --git a/koperkapel/images/fixtures/grate.png b/koperkapel/images/fixtures/grate.png
new file mode 100644
index 0000000..41eb3f8
Binary files /dev/null and b/koperkapel/images/fixtures/grate.png differ
diff --git a/koperkapel/images/fixtures/grate_circle.png b/koperkapel/images/fixtures/grate_circle.png
new file mode 100644
index 0000000..369fe31
Binary files /dev/null and b/koperkapel/images/fixtures/grate_circle.png differ
diff --git a/koperkapel/loaders/levelloader.py b/koperkapel/loaders/levelloader.py
index 4bc24db..0addecc 100644
--- a/koperkapel/loaders/levelloader.py
+++ b/koperkapel/loaders/levelloader.py
@@ -4,7 +4,7 @@ import json
 
 from pgzero.loaders import ResourceLoader
 
-from ..gamelib.tiles import Wall, Floor, Tunnel, Underground
+from ..gamelib.tiles import Wall, Floor, Tunnel, Underground, Grate
 from ..gamelib.level import Level
 
         
@@ -51,6 +51,10 @@ class LevelLoader(ResourceLoader):
                     neighbors = [x[layer] if x else None for x in neighborhood]
                     tile['%s image' % layer] = \
                             TILES[tile[layer]['base']].image(neighbors)
+                    # Hack this for now
+                    if layer == 'floor' and 'crawl' in tile[layer]['behaviour']:
+                        print('Here')
+                        tile['floor image'] = Grate.image(neighbors)
 
 
 levels = LevelLoader('levels')
diff --git a/sources/bitmap/grate/grate.png b/sources/bitmap/grate/grate.png
new file mode 100644
index 0000000..9743b26
Binary files /dev/null and b/sources/bitmap/grate/grate.png differ
diff --git a/sources/vector/fixtures/grate.svg b/sources/vector/fixtures/grate.svg
new file mode 100644
index 0000000..9fc5ce8
--- /dev/null
+++ b/sources/vector/fixtures/grate.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="450"
+   height="450"
+   viewBox="0 0 450 450"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="grate.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1925602"
+     inkscape:cx="180.23012"
+     inkscape:cy="238.88169"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg2"
+     showgrid="true"
+     inkscape:window-width="1178"
+     inkscape:window-height="999"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-nodes="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5375" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-117.12111,-302.36221)" />
+  <path
+     style="opacity:1;fill:#777777;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 225 20 A 205 205 0 0 0 85 75.599609 L 85 75.460938 A 205 205 0 0 0 83.691406 76.820312 A 205 205 0 0 0 71.873047 89.083984 A 205 205 0 0 0 69 92.355469 A 205 205 0 0 0 25 181.16797 L 25 180.69336 A 205 205 0 0 0 24.640625 182.76758 A 205 205 0 0 0 22.089844 197.50781 A 205 205 0 0 0 21.255859 204.38281 A 205 205 0 0 0 20.214844 218.95898 A 205 205 0 0 0 20 225 A 205 205 0 0 0 65 352.8457 L 65 353.0918 A 205 205 0 0 0 66.208984 354.4375 A 205 205 0 0 0 78.701172 368.32812 A 205 205 0 0 0 125 403.67383 L 125 403.85156 A 205 205 0 0 0 127.39844 405.05078 A 205 205 0 0 0 138.54688 410.62109 A 205 205 0 0 0 145 413.73633 L 145 413.50977 A 205 205 0 0 0 185 425.85938 L 185 426.02344 A 205 205 0 0 0 187.1582 426.3457 A 205 205 0 0 0 198.41211 428.01953 A 205 205 0 0 0 205 429 L 205 428.81836 A 205 205 0 0 0 225 430 A 205 205 0 0 0 365 374.40039 L 365 374.53906 A 205 205 0 0 0 366.30859 373.17969 A 205 205 0 0 0 378.12695 360.91602 A 205 205 0 0 0 381 357.64453 A 205 205 0 0 0 425 268.83203 L 425 269.30664 A 205 205 0 0 0 425.35938 267.23242 A 205 205 0 0 0 427.91016 252.49219 A 205 205 0 0 0 428.74414 245.61719 A 205 205 0 0 0 429.78516 231.04102 A 205 205 0 0 0 430 225 A 205 205 0 0 0 385 97.154297 L 385 96.908203 A 205 205 0 0 0 383.79102 95.5625 A 205 205 0 0 0 371.29883 81.671875 A 205 205 0 0 0 325 46.326172 L 325 46.148438 A 205 205 0 0 0 322.60156 44.949219 A 205 205 0 0 0 311.45312 39.378906 A 205 205 0 0 0 305 36.263672 L 305 36.490234 A 205 205 0 0 0 265 24.140625 L 265 23.976562 A 205 205 0 0 0 262.8418 23.654297 A 205 205 0 0 0 251.58789 21.980469 A 205 205 0 0 0 245 21 L 245 21.181641 A 205 205 0 0 0 225 20 z M 225 40 A 185 185 0 0 1 245 41.154297 L 245 408.69727 A 185 185 0 0 1 225 410 A 185 185 0 0 1 205 408.8457 L 205 41.302734 A 185 185 0 0 1 225 40 z M 265 44.515625 A 185 185 0 0 1 305 58.447266 L 305 391.625 A 185 185 0 0 1 265 405.38672 L 265 44.515625 z M 185 44.613281 L 185 405.48438 A 185 185 0 0 1 145 391.55273 L 145 58.375 A 185 185 0 0 1 185 44.613281 z M 125 69.359375 L 125 380.42188 A 185 185 0 0 1 85 345.59375 L 85 104.21484 A 185 185 0 0 1 125 69.359375 z M 325 69.578125 A 185 185 0 0 1 365 104.40625 L 365 345.78516 A 185 185 0 0 1 325 380.64062 L 325 69.578125 z M 65 132.46875 L 65 317.41016 A 185 185 0 0 1 40 225 A 185 185 0 0 1 65 132.46875 z M 385 132.58984 A 185 185 0 0 1 410 225 A 185 185 0 0 1 385 317.53125 L 385 132.58984 z "
+     id="rect4929" />
+</svg>
diff --git a/sources/vector/fixtures/grate_circle.svg b/sources/vector/fixtures/grate_circle.svg
new file mode 100644
index 0000000..023d40b
--- /dev/null
+++ b/sources/vector/fixtures/grate_circle.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="450"
+   height="450"
+   viewBox="0 0 450 450"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="grate_circle.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.1925602"
+     inkscape:cx="180.23012"
+     inkscape:cy="238.88169"
+     inkscape:document-units="px"
+     inkscape:current-layer="svg2"
+     showgrid="true"
+     inkscape:window-width="1178"
+     inkscape:window-height="999"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:bbox-nodes="true"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5375" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <circle
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4991"
+     cx="225"
+     cy="225"
+     r="205" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-117.12111,-302.36221)" />
+</svg>