From 7694b061e2b612e15dd3005a8e71a289b7f4292e Mon Sep 17 00:00:00 2001
From: adrianna <adrianna.pinska@gmail.com>
Date: Fri, 9 Sep 2016 00:12:24 +0200
Subject: [PATCH] tweaked eyeball; made eyeballs less frequent; fixed mould
 transparency and corrected blend mode

---
 data/images/32/eyeball.png | Bin 865 -> 838 bytes
 sources/vector/eyeball.svg |  68 +++++++++++++++++--------------------
 tabakrolletjie/enemies.py  |   6 ++--
 3 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/data/images/32/eyeball.png b/data/images/32/eyeball.png
index 68693a3c7f5143cfee6bc2bc9f065dc6c832f494..819e5641dde26ded33920e0ec658e7ec59df7dde 100644
GIT binary patch
delta 740
zcmV<A0vr9|2F3=EZhyl`L_t(oh3%HfOIuMC#(x^A(t<c7SZHHx)jFF^MGAQl;!dGm
z`zI)F+_-6%?W&54IQ$Dmso;RP60|!(D*BRWDUG2fMHC#U)tKRQaSbLhrY72zesJKt
zJAL0h=iYlB+~Xd19XVOf%L8i5%6JB_vx67d0K)%OfYC@zYkw>6>+5N-+p$<IJOuFh
z__Mf(&+SHEUgq829^Wz*@=u|f#?aUpfp8cRNo}DJGCE4YW@9kZ&7~!GIGEVjAQ(?J
zJB#@J$s!CQ@<cqI+@Qn3#I1<XG=`GNy<Via7_r;q$zO?xUle@e^}al_*%-JHxzR|?
z=qUc=P{#xm6@MYR9&6u}M0}Nz5q_CWRA()qvy+KbIX^i;%w`0T-d;rHfrvzs1e{7J
zlp`G-jHlzsP1Bdx&_IL1aJi$P0E&u~zqABLM`ys7q)`jx<q5U5G@`C;#%P?G;W*W4
zKRiS#D^&zQ`R(mbWp3`X`29a+a`KZbEIbwwWO|z4K!1J4>}E4>*47e<*VmDr9;B)1
zf;`!Zi;=cABoI(@R#y?Tnb%kGTp5~3gs6z}x3{6I3v?Y04pNV|T0zsGyBq4`_A3I>
zDA7y<0C6dpn?p)Vk&+Umyj(>fJ_S`(DlMtfH8quG3IIcYKknE<TU*LbPcP0vbF&g)
zwO;)?_J8%^B2A>z-GYd&qleGSi^ZZWKVN+p7J}Wb{QZ3h1}`rV4ui*oP8LN90Hcu?
zBO{j|qL}HrdW=d+RCJR2olXKK6IEG}$6&KD=<y^z#qp+TN`TLo*zR%>)HFWci2NKm
z4hIugi3kLc`T4{)x0|5D!8o^B5p6aGhKKQoLS5<0vD1nFeCO99&q$%kM0HCGAL{DV
z4@pG@j{vr|I9^)9=W?O1tnhYsm+#l!StbJFU;t{$%6Ja2v%?Qy6NqHF-aYPdhw&HE
W#8{wFokiXN0000<MNUMnLSTX@EoSNf

delta 767
zcmV<b0s#HS2H^&fZhziML_t(oh3%F>NRwe0$A4=pr6RW6m;`f{+H7hAVeGPR#_(LX
zU~~%-?AFCg9qW`9VW~lvu6YP4s++i5k|6WjW)W?J_JI_clH%Ij)8U)A%}v{~lm6j>
z_kExDeg6OFec$hWJ~+f74mu2Vt}_9hb~|SQmX=5Wi$Lzb3V*O#aru1Qb-U>b1aLZ?
z90y3HSf8086^o(H&T{AbcRtlBWKW@r!o%@#v|J7mschLSGB$?h_cKy!a=VfTgG??i
zk|`#8{TfN9%S9X!5sSp*hD<QX<i3bd6dsn7ClZLof&>D^<n1EzNJO5C$OB0v&i?lM
z8Qv@Yk=>kDD}Sy~h^sCa$13?F5r{^&dN%-bq1{Al>-D3d5Z7!rI_ehS^Ko}zfHURe
z&CPJ~B>emd6BD3+6!x-NXBZeTG<&_=t5<-jtBWq9ai^oP5zK{T!(mum%>f_FX2md>
zgw9U73kqu%(5WamD>+tIVSQb1M<USM3;q31dHePQnt%3#moMKlJ^c)TOP6Q?&hNrg
z84d?mB9YQtzOaDYyovPmAW+#X7NoBa(KLO{{5;}taJd>!)vejwBrl@3zkY>K2vk)+
z_e$`1Kv7_D5ZvzVaS_Pp$=A980Nt-%u_l7Nd4n`HA*W9xEiL*Ew6$$#-QJF@tW<uS
zrl$A>xPSNHstDuI5V5U5$)s)@8+w0b1-W=p7vS+!e;se#B1)Z?a8p%LbA|Habn4d7
zp!ZLmf<QoTFE2wTvok<02k|&6brdN8tX9rHc|y8ccB+b)&HB+KlRN#Rqi8l8?RAlF
z!S81z9xr{0i%n5<0jX5!cr;2zQMmt4<OLXlL3k#siO@9U-MiAUSd2_C$P4zfBKrLd
zKYmO)o87$}kB*WqWd2v=H7T^&=<s^Ecj1EmL(<yH34mmhwQ!hJG>SSm$L(+5`25$I
x)gqt>M!;paa}Ho>i7)8IV6)D6hd9Im#vg?L>UIUq%boxL002ovPDHLkV1j?Vd*A>7

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)
-- 
2.34.1