Merge branch 'master' of ctpug.org.za:tabakrolletjie

diff --git a/data/images/32/remove.png b/data/images/32/remove.png
index e559556faf5dfd095faf05e20fe62afa10418b46..2f9297e3dfd1650f1d552371af3701628a30bf1a 100644 (file)
Binary files a/data/images/32/remove.png and b/data/images/32/remove.png differ

diff --git a/data/images/Makefile b/data/images/Makefile
index 11ed46f8ddefc9d3e0d21ffbdfe5ff699c591979..599099b449e25457c6eb894f62021aac9530db6c 100644 (file)
--- a/data/images/Makefile
+++ b/data/images/Makefile
@@ -1,21 +1,20 @@
 VPATH=../../sources/vector
 
-SEED=seed
 TURNIP=turnip1 turnip2 turnip3
 MOULD_BODY=mouldA mouldB mouldC
 MOULD=eyeballA eyeballB eyeballC eyelid
 LIGHT=spotlight lamp laser pulsatinglamp
 LIGHT_MASK=light_mask_2_1 light_mask_2_2 light_mask_3_1 light_mask_3_2 light_mask_3_3
-CONTROLS=night default_cursor exit pause play day
+CONTROLS=night default_cursor exit pause play day remove
 BLANKS=circle square
 SPLASH=splash new_game continue_retry help quit
 
 IMG16=$(MOULD_BODY)
-IMG32=$(MOULD_BODY) $(MOULD) $(LIGHT) $(SEED) $(LIGHT_MASK) $(CONTROLS)
+IMG32=$(MOULD_BODY) $(MOULD) $(LIGHT) seed $(LIGHT_MASK) $(CONTROLS)
 IMG48=$(LIGHT) $(TURNIP) $(LIGHT_MASK) $(BLANKS)
 IMG64=$(MOULD_BODY)
 
-CURSORS=$(SEED) $(LIGHT)
+CURSORS=seed $(LIGHT) remove
 
 PNG16=$(patsubst %, 16/%.png, $(IMG16))
 PNG32=$(patsubst %, 32/%.png, $(IMG32))

diff --git a/data/images/cursors/remove.png b/data/images/cursors/remove.png
index e559556faf5dfd095faf05e20fe62afa10418b46..2f9297e3dfd1650f1d552371af3701628a30bf1a 100644 (file)
Binary files a/data/images/cursors/remove.png and b/data/images/cursors/remove.png differ

diff --git a/data/stations/02-tunnels.json b/data/stations/02-tunnels.json
index ddd1b4e4f245ecd4ed0f43067477c9316bdc5adb..14cac71e1447b4b5957641f61f4e0dfd18ad4a0d 100644 (file)
--- a/data/stations/02-tunnels.json
+++ b/data/stations/02-tunnels.json
@@ -6,16 +6,19 @@
     "turnip target": 10
   },
   "battery": {
-    "current": 4000,
-    "max": 4000,
-    "recharge": 4000
+    "current": 25000,
+    "max": 25000,
+    "recharge": 25000
   },
   "available_lights": [
     {
-      "type": "lamp",
+      "type": "spotlight",
       "cost": 3,
-      "available_colours": ["blue", "red", "blue/red"],
-      "intensity": 0.5
+      "available_colours": ["blue", "red"],
+      "intensity": 0.6,
+      "spread": 35,
+      "direction": 90,
+      "radius_limits": [10, 700]
     }
   ],
   "lights": [],

diff --git a/sources/vector/remove.svg b/sources/vector/remove.svg
new file mode 100644 (file)
index 0000000..151a523
--- /dev/null
+++ b/sources/vector/remove.svg
@@ -0,0 +1,108 @@
+<?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="100mm"
+   height="100mm"
+   viewBox="0 0 354.33071 354.33071"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="destroy.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.4"
+     inkscape:cx="156.71689"
+     inkscape:cy="168.74492"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1264"
+     inkscape:window-height="720"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4423"
+       units="mm"
+       spacingx="3.543307"
+       spacingy="3.543307" />
+  </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(0,-698.0315)">
+    <g
+       id="g13694"
+       transform="translate(-16.019496,-13.586478)">
+      <g
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,627.97664,170.79624)"
+         id="g13686">
+        <circle
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4188"
+           cx="177.16536"
+           cy="875.19684"
+           r="88.58268" />
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect13684"
+           width="70.866142"
+           height="35.433071"
+           x="141.73228"
+           y="768.89764" />
+      </g>
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path13690"
+         d="m 194.88189,857.48032 c 35.43307,-35.43307 70.86614,-53.14961 106.29921,-35.43307"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         d="m 320.67711,847.08633 -15.93707,-10.39402 -14.30695,12.5434 -3.91953,-18.61889 -18.98606,-1.24702 10.39402,-15.93707 -12.5434,-14.30695 18.61889,-3.91953 1.24702,-18.98606 15.93707,10.39402 14.30695,-12.5434 3.91953,18.61889 18.98606,1.24702 -10.39402,15.93707 12.5434,14.30695 -18.61889,3.91953 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.4998478"
+         sodipodi:arg1="1.1071487"
+         sodipodi:r2="25.102205"
+         sodipodi:r1="39.615379"
+         sodipodi:cy="811.65326"
+         sodipodi:cx="302.96057"
+         sodipodi:sides="8"
+         id="path13692"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>