better eyeballs

diff --git a/data/images/32/eyeball.png b/data/images/32/eyeball.png
index 819e5641dde26ded33920e0ec658e7ec59df7dde..01cce3d02263acc8632c644507822cef67b8da58 100644 (file)
Binary files a/data/images/32/eyeball.png and b/data/images/32/eyeball.png differ

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

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

diff --git a/data/images/Makefile b/data/images/Makefile
index 5b3827cb74f6419423816c6e4b24fd10a848eeb1..c085cad4ee4442e9f373b0fc52af0bc227f4fac1 100644 (file)
--- a/data/images/Makefile
+++ b/data/images/Makefile
@@ -2,7 +2,7 @@ VPATH=../../sources/vector
 
 TURNIP=seed turnip1 turnip2 turnip3
 MOULD_BODY=mouldA mouldB mouldC
-MOULD=eyeball
+MOULD=eyeball eyeballB eyeballC
 LIGHT=spotlight lamp laser
 
 IMG16=$(MOULD_BODY)

diff --git a/sources/vector/eyeball.svg b/sources/vector/eyeball.svg
index fdd925a9167642e37b3f88b88d21c4e3029a6412..ad2acb592764e13c6e8965c6e143d45c0b87aacf 100644 (file)
--- a/sources/vector/eyeball.svg
+++ b/sources/vector/eyeball.svg
@@ -61,33 +61,28 @@
      id="layer1"
      transform="translate(0,-698.0315)">
     <circle
-       style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#ffd5d5;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path4493"
        cx="177.16536"
        cy="875.19684"
        r="100.71429" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4497"
-       sodipodi:sides="4"
-       sodipodi:cx="177.16534"
-       sodipodi:cy="875.19685"
-       sodipodi:r1="69.623245"
-       sodipodi:r2="24.163145"
-       sodipodi:arg1="1.3477347"
-       sodipodi:arg2="2.1331329"
-       inkscape:flatsided="false"
-       inkscape:rounded="0.3"
-       inkscape:randomized="0"
-       d="m 192.56714,943.09515 c -16.16312,3.66638 -14.26315,-38.61948 -28.28473,-47.45601 -14.02158,-8.83653 -51.349,11.12263 -55.01538,-5.0405 -3.66639,-16.16312 38.61948,-14.26315 47.45601,-28.28473 8.83653,-14.02158 -11.12263,-51.349 5.04049,-55.01538 16.16313,-3.66639 14.26316,38.61948 28.28474,47.45601 14.02158,8.83652 51.349,-11.12263 55.01538,5.04049 3.66638,16.16313 -38.61948,14.26316 -47.45601,28.28474 -8.83653,14.02158 11.12263,51.349 -5.0405,55.01538 z"
-       inkscape:transform-center-x="-3.4062874"
-       inkscape:transform-center-y="-8.3049279" />
+    <circle
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="193.57143"
+       cy="898.07648"
+       r="57.857143" />
     <circle
        style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path4501"
        cx="226.78571"
        cy="835.21936"
        r="28.214285" />
+    <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="path4147"
+       cx="201.42857"
+       cy="905.21936"
+       r="32.142857" />
   </g>
 </svg>

diff --git a/sources/vector/eyeballB.svg b/sources/vector/eyeballB.svg
new file mode 100644 (file)
index 0000000..49eca58
--- /dev/null
+++ b/sources/vector/eyeballB.svg
@@ -0,0 +1,88 @@
+<?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="eyeballB.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="123.25557"
+     inkscape:cy="182.29837"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1818"
+     inkscape:window-height="1055"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <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:#ffd5d5;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4493"
+       cx="177.16536"
+       cy="875.19684"
+       r="100.71429" />
+    <circle
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="161.42857"
+       cy="876.64789"
+       r="57.857143" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4501"
+       cx="226.78571"
+       cy="835.21936"
+       r="28.214285" />
+    <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="path4147"
+       cx="154.28572"
+       cy="872.36218"
+       r="32.142857" />
+  </g>
+</svg>

diff --git a/sources/vector/eyeballC.svg b/sources/vector/eyeballC.svg
new file mode 100644 (file)
index 0000000..3ef0fce
--- /dev/null
+++ b/sources/vector/eyeballC.svg
@@ -0,0 +1,88 @@
+<?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="eyeballC.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="123.25557"
+     inkscape:cy="182.29837"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1818"
+     inkscape:window-height="1055"
+     inkscape:window-x="102"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <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:#ffd5d5;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4493"
+       cx="177.16536"
+       cy="875.19684"
+       r="100.71429" />
+    <circle
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="185"
+       cy="849.505"
+       r="57.857143" />
+    <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="path4147"
+       cx="188.57144"
+       cy="841.64795"
+       r="32.142857" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4501"
+       cx="226.78571"
+       cy="835.21936"
+       r="28.214285" />
+  </g>
+</svg>

diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 2de784709b229e7bd7102bb5bcdc3a813b7d18fa..48cd9eae70778c9d77ea0c2c00b13b4269c8a9cb 100644 (file)
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -52,7 +52,9 @@ class Mould(pymunk.Body):
 
     def get_eyeball(self):
         if not self._eyeball:
-            self._eyeball = loader.load_image("32", "eyeball.png")
+            name = random.choice(
+                ('eyeball.png', 'eyeballB.png', 'eyeballC.png'))
+            self._eyeball = loader.load_image("32", name)
         return self._eyeball
 
     def tick(self, gamestate, space, moulds):