From: adrianna <adrianna.pinska@gmail.com>
Date: Thu, 8 Sep 2016 22:12:24 +0000 (+0200)
Subject: tweaked eyeball; made eyeballs less frequent; fixed mould transparency and corrected... 
X-Git-Tag: tabakrolletjie-v1.0.0~172^2
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=7694b061e2b612e15dd3005a8e71a289b7f4292e;p=tabakrolletjie.git

tweaked eyeball; made eyeballs less frequent; fixed mould transparency and corrected blend mode
---

diff --git a/data/images/32/eyeball.png b/data/images/32/eyeball.png
index 68693a3..819e564 100644
Binary files a/data/images/32/eyeball.png and b/data/images/32/eyeball.png differ
diff --git a/sources/vector/eyeball.svg b/sources/vector/eyeball.svg
index 83027f4..fdd925a 100644
--- a/sources/vector/eyeball.svg
+++ b/sources/vector/eyeball.svg
@@ -31,8 +31,8 @@
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1264"
-     inkscape:window-height="720"
+     inkscape:window-width="1818"
+     inkscape:window-height="1055"
      inkscape:window-x="102"
      inkscape:window-y="0"
      inkscape:window-maximized="1">
@@ -51,7 +51,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -60,38 +60,34 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-698.0315)">
-    <g
-       id="g4503"
-       transform="translate(-5.1663616e-6,1.5951802e-5)">
-      <circle
-         r="100.71429"
-         cy="875.19684"
-         cx="177.16536"
-         id="path4493"
-         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" />
-      <path
-         inkscape:transform-center-y="-8.3049279"
-         inkscape:transform-center-x="-3.4062874"
-         d="m 192.56715,943.09515 c -16.16312,3.66638 -14.26316,-38.61948 -28.28473,-47.45601 -14.02158,-8.83653 -51.349,11.12263 -55.01539,-5.0405 -3.66638,-16.16312 38.61948,-14.26315 47.45601,-28.28473 8.83653,-14.02158 -11.12262,-51.349 5.0405,-55.01538 16.16312,-3.66639 14.26315,38.61948 28.28473,47.45601 14.02158,8.83652 51.349,-11.12263 55.01539,5.04049 3.66638,16.16313 -38.61948,14.26316 -47.45601,28.28474 -8.83653,14.02158 11.12262,51.349 -5.0405,55.01538 z"
-         inkscape:randomized="0"
-         inkscape:rounded="0.3"
-         inkscape:flatsided="false"
-         sodipodi:arg2="2.1331329"
-         sodipodi:arg1="1.3477347"
-         sodipodi:r2="24.163145"
-         sodipodi:r1="69.623245"
-         sodipodi:cy="875.19684"
-         sodipodi:cx="177.16534"
-         sodipodi:sides="4"
-         id="path4497"
-         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"
-         sodipodi:type="star" />
-      <circle
-         r="28.214285"
-         cy="835.21936"
-         cx="226.78571"
-         id="path4501"
-         style="opacity:1;fill:#ffffa1;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
+    <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"
+       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:#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 104abd1..2de7847 100644
--- a/tabakrolletjie/enemies.py
+++ b/tabakrolletjie/enemies.py
@@ -104,7 +104,7 @@ class Mould(pymunk.Body):
             refresh = True
             self._img = None  # invalidate cached image
 
-        if self._age > 20 and random.randint(0, 100) < 1:
+        if self._age > 20 and random.randint(0, 500) < 1:
             # Maybe we grow an eyeball
             self.has_eyeball = True
 
@@ -132,7 +132,7 @@ class Boyd(object):
         seed = Mould(gamestate, space, (350, 370))
         self._moulds = [seed]
         self._image = pygame.surface.Surface(SCREEN_SIZE)
-        self._image.convert_alpha(pygame.display.get_surface())
+        self._image = self._image.convert_alpha(pygame.display.get_surface())
         self._draw_moulds()
 
     def _draw_moulds(self):
@@ -165,4 +165,4 @@ class Boyd(object):
 
     def render(self, surface):
         """Draw ourselves"""
-        surface.blit(self._image, (0, 0), None, pgl.BLEND_RGBA_ADD)
+        surface.blit(self._image, (0, 0), None, 0)