From: adrianna <adrianna.pinska@gmail.com>
Date: Thu, 8 Sep 2016 22:27:14 +0000 (+0200)
Subject: naming consistency
X-Git-Tag: tabakrolletjie-v1.0.0~170^2
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=f00db4b6d09a5db2723de1d4e9926db5209d1d16;p=tabakrolletjie.git

naming consistency
---

diff --git a/data/images/32/eyeball.png b/data/images/32/eyeball.png
deleted file mode 100644
index 01cce3d..0000000
Binary files a/data/images/32/eyeball.png and /dev/null differ
diff --git a/data/images/32/eyeballA.png b/data/images/32/eyeballA.png
new file mode 100644
index 0000000..01cce3d
Binary files /dev/null and b/data/images/32/eyeballA.png differ
diff --git a/data/images/Makefile b/data/images/Makefile
index c085cad..1e5f862 100644
--- 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 eyeballB eyeballC
+MOULD=eyeballA eyeballB eyeballC
 LIGHT=spotlight lamp laser
 
 IMG16=$(MOULD_BODY)
diff --git a/sources/vector/eyeball.svg b/sources/vector/eyeball.svg
deleted file mode 100644
index ad2acb5..0000000
--- a/sources/vector/eyeball.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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="eyeball.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 />
-      </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="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/eyeballA.svg b/sources/vector/eyeballA.svg
new file mode 100644
index 0000000..ad2acb5
--- /dev/null
+++ b/sources/vector/eyeballA.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="eyeball.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 />
+      </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="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/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py
index 48cd9ea..efd5447 100644
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -53,7 +53,7 @@ class Mould(pymunk.Body):
     def get_eyeball(self):
         if not self._eyeball:
             name = random.choice(
-                ('eyeball.png', 'eyeballB.png', 'eyeballC.png'))
+                ('eyeballA.png', 'eyeballB.png', 'eyeballC.png'))
             self._eyeball = loader.load_image("32", name)
         return self._eyeball