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

diff --git a/data/images/32/pulsatinglamp.png b/data/images/32/pulsatinglamp.png
new file mode 100644 (file)
index 0000000..9d016d0
Binary files /dev/null and b/data/images/32/pulsatinglamp.png differ

diff --git a/data/images/48/pulsatinglamp.png b/data/images/48/pulsatinglamp.png
new file mode 100644 (file)
index 0000000..26eb395
Binary files /dev/null and b/data/images/48/pulsatinglamp.png differ

diff --git a/data/images/Makefile b/data/images/Makefile
index a223f47469041f1cd2b64acbf76f356ed02ced50..11ed46f8ddefc9d3e0d21ffbdfe5ff699c591979 100644 (file)
--- a/data/images/Makefile
+++ b/data/images/Makefile
@@ -4,7 +4,7 @@ SEED=seed
 TURNIP=turnip1 turnip2 turnip3
 MOULD_BODY=mouldA mouldB mouldC
 MOULD=eyeballA eyeballB eyeballC eyelid
-LIGHT=spotlight lamp laser
+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
 BLANKS=circle square

diff --git a/data/images/cursors/pulsatinglamp.png b/data/images/cursors/pulsatinglamp.png
new file mode 100644 (file)
index 0000000..9d016d0
Binary files /dev/null and b/data/images/cursors/pulsatinglamp.png differ

diff --git a/data/stations/station-alpha.json b/data/stations/station-alpha.json
index 21c17898b9582b7a22bdfd622f2f06e49245ae66..1cd4ebc4b35cb80d81014f5991ecd3dd62017a7c 100644 (file)
--- a/data/stations/station-alpha.json
+++ b/data/stations/station-alpha.json
@@ -32,6 +32,12 @@
       "cost": 3,
       "available_colours": ["red", "yellow/blue", "green"],
       "intensity": 0.5
+    },
+    {
+      "type": "pulsatinglamp",
+      "cost": 3,
+      "available_colours": ["red", "blue/green"],
+      "intensity": 0.5
     }
   ],
   "obstacles": [

diff --git a/sources/vector/pulsatinglamp.svg b/sources/vector/pulsatinglamp.svg
new file mode 100644 (file)
index 0000000..9ca60bb
--- /dev/null
+++ b/sources/vector/pulsatinglamp.svg
@@ -0,0 +1,85 @@
+<?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="pulsatinglamp.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="142.57714"
+     inkscape:cy="182.65552"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1231"
+     inkscape:window-height="776"
+     inkscape:window-x="49"
+     inkscape:window-y="24"
+     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)">
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:60;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:120,60;stroke-dashoffset:600;stroke-opacity:1"
+       id="path4136"
+       cx="177.16536"
+       cy="875.19684"
+       r="141.73227" />
+    <circle
+       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"
+       id="path4554"
+       cx="177.16536"
+       cy="875.19684"
+       r="141.73228" />
+    <ellipse
+       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"
+       id="path4558"
+       cx="177.16536"
+       cy="875.19684"
+       rx="106.29922"
+       ry="106.29919" />
+  </g>
+</svg>

diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py
index 3b6520c3d96cdb15b5614a66db0e3bc65e9e9dc5..cda60022a5d5aa227d7a9401ad119ca31ff2ba67 100644 (file)
--- a/tabakrolletjie/lights.py
+++ b/tabakrolletjie/lights.py
@@ -316,7 +316,7 @@ class Lamp(BaseLight):
 
 class PulsatingLamp(BaseLight):
 
-    FITTING_IMG = "lamp.png"
+    FITTING_IMG = "pulsatinglamp.png"
     DEFAULT_PULSE_RANGE = (20, 100)
     DEFAULT_PULSE_VELOCITY = 2
     DEFAULT_INTENSITY_RANGE = (0.0, 0.9)