From 403f74bb5689f3231a1e23b500a09aee35259b57 Mon Sep 17 00:00:00 2001 From: adrianna <adrianna.pinska@gmail.com> Date: Fri, 9 Sep 2016 00:25:29 +0200 Subject: [PATCH] better eyeballs --- data/images/32/eyeball.png | Bin 838 -> 1001 bytes data/images/32/eyeballB.png | Bin 0 -> 1063 bytes data/images/32/eyeballC.png | Bin 0 -> 1003 bytes data/images/Makefile | 2 +- sources/vector/eyeball.svg | 31 ++++++------- sources/vector/eyeballB.svg | 88 ++++++++++++++++++++++++++++++++++++ sources/vector/eyeballC.svg | 88 ++++++++++++++++++++++++++++++++++++ tabakrolletjie/enemies.py | 4 +- 8 files changed, 193 insertions(+), 20 deletions(-) create mode 100644 data/images/32/eyeballB.png create mode 100644 data/images/32/eyeballC.png create mode 100644 sources/vector/eyeballB.svg create mode 100644 sources/vector/eyeballC.svg diff --git a/data/images/32/eyeball.png b/data/images/32/eyeball.png index 819e5641dde26ded33920e0ec658e7ec59df7dde..01cce3d02263acc8632c644507822cef67b8da58 100644 GIT binary patch delta 906 zcmV;519kky2I&WoZGQu1Nkl<ZScUDDU1(Eh7{`D4@?%B1LSnWw+N5ch#xrU;F^0Of z8wFuXL8fiDt|Bs+yBfP01JR2LdNG6zcj46T+PS0?q#!c9*xFqTZ3;?GW3;C=B{?ND zMJOiFk(0BF%-U*tOuFrA`NInj@ALIPAMgKpp^7U0?=WmI&wmWG*sWGKKsu9|1s(wT z|CE5$YV`&M;p{GtN9gkV8yXyr*8mcVlKX99A~7{H6TKrzr!$$%!+)EAp;HvU`M9U& z!%usA-!z#_C4=&+%5XS5fA!|gAAgTTz67*a6)s)rh34JCVCeGD(9!ohI$k##jq3&) zjYa}(ZQJ&>wtxC#vfMhGN{#$u0-d7x?d74Nqh7arlWySFt<cyAHXByA+w`s=G)L~= zubrEp|3xot{l}sB%?EmV`d`@`puQf==Avz};M%jtGH~F)pv`7$-Y|inAe=qX+w0J6 z{PZa(3T%3T<L1qr=<k0c;Pai^C;_w3)FiC;!*TB(9DhF!?d`CCKa7p7^=Gq~O(t60 z?zbr(+lmRabc$j_Nzd)uaO@b|y$gjxac^)Cu3v{#3S_zXR)F^cft|ox6%*KDw|kzQ z^EJq1;N(fj7d2-Y_!;;vnIw7S2soV}im<o{z)pvwW{2J0R51Y+3MCKm$Oz<e0HlC- zfIi?0pno0s9$;w+ZrlJs(=-ZDsF;9~PS4IMO710xB(0dA0}-C9O%gZ{JOPMC0hm*i zY$~0esh9u|8;?X1FYT)8iut%iQUds6Rot%=6A55lY1Sj4MrApgU)2x*uXn}VRwAhe zaQz*ZS5;!N97ShH>FU58NjiNc99GtB9zF~f3x5Eg0JW=J2A~V@ZP@~c4sj_InvcZe zr}TR0N^vfiTU^R!>-X*6?YGv|6=Q2_i)(zGHlPv60rkKKz!if5^O-YD)z$s^_3-cy zF<JgeuSYpBbO(ds*y!l8CP~`Lx^O|$oK8)H=gZ~Nw2K$DsnOBp?!9|Mlre3~9>*Pi z|9|<94jvr%tgp{uex{C^2Gi3;ZP>n@yvxO<YuA*}ty@>eCnvw6jB#Aig~VpFH3xjY zb3Ttp=n};Sm(y7T@Hm;wj!jM`q(_gUk$C*n!otFIxivR>B{KnDyVcqVkj`XgfH<J) gW>rx|6(#T&m|iXE)7-dt00000NkvXXt^-0~f|QuVI{*Lx delta 741 zcmV<B0vi442gU}FZGQs8Nkl<ZScUDD$xB;N6vlrVsnUWtBv@!;Y}GoOO+^ZM5#mmv zUHc~}Zrr$Om+h*Gi#YrXMXBI`xDvEGK`Q!^Xeo`MCPfq+sMVO^ba4$PF{UQkm40yG zygPm0J?Gwg9^B&|cO5xd&dUR8%gT5Lu(N{~*Z{)+Re;e*O@C`E@9XPnu-ma%EIb78 z`S`QAh|ldtUtZ?j-X7mF74lD^n#R!B7=dsY5lL;K5HdPSz-D7G)6JzNcQ}~X*dQ2B zHam;>{mCK>BJxB$p4_0r!NjeI&@_gU$-Q2rxEQh9<H=u%h+h<Z;`P2fv)LH95xLPw z&FCop<WR>16n_;Vx*lualtg@$kr95GOjKtrptF;SR5?F6LCj_ZkltQI<bjApk_4Pe zD3l`|9gL^r$W7Ci*U&(N!Em{wpa6=Bl)tnDM@MJCm!we(<mCyqwKSrxZN_Mvnc+Cq zX+JzfDl1h4K>6+MPi1cIv-tf#WpeV9EG#@05oCIr-+w@T#_VP@Z`RfliPzVWo*tyB z>4H4jii?r9HY5;Gb5>Uovzgad@mv|2NQ9_}^0&94s|$1;4h~X}w^~8dpt~FD<Mt~8 z(J0YO0|0R;n43dNOOcWiq`X{3AU*|ERVpp1(ls@eWeNa8e?RWnLR(wPPERk+L36Vb zV6|TTI)C={;UZ0>)7^rIuA_&~%ZtULEI(g;7Z!ruuKfLd2nH`N5DtUKgH9Gj3IL;# z7b7E=AEKD)x_XRCN>p@``<+e#CKFXzk;h=OG3fCmKE?5-X-a_4m)P!d5!5t3-iZ7h zISvOCSBVG&kooz<Hn*Fg!@)SWSrKhE28M_6hh9SI%dyjm|9t1yBF{*n$wYNa3m@w0 z)DKBT1&;u>wm4o|!sl|KudMKPcbD(i-dQFB;$Q%3%F1{Su(QJtU=xUBx!yhQafk62 X(!^MxQJqEJ00000NkvXXu0mjfNd{*1 diff --git a/data/images/32/eyeballB.png b/data/images/32/eyeballB.png new file mode 100644 index 0000000000000000000000000000000000000000..e5bdde61dfcd629df43dedf521362be6d73b7b0d GIT binary patch literal 1063 zcmV+?1laqDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11EfhrK~z|U?Ur3=Q)d{*f5}NZ`aR`@u%Om7{mN2<q{QN|tragu zrwA$xI(H>=AlneutFA~dx(jc%s}*F0UAbx^jNJsX!I-XBBT*WXW^I@BgXV<L;Gmk8 zG&y;9kye`Jqo&)g>>m!CbKd9UciwZJ=Q(ho1HJCj?9)#NbQ)yY1Q1Uo7J)y2%>N1? z%W_AL)jIyR*=+6W?rv^28fyWT6=ma**SkC$i3ENR21gT##Qc8^py{>SzZ$x5;r)-U zUVTfFq@qR{RpnckEB3wHJvHs~4Fh7Yz{Ml|Bl)?W9_QV$v1{+1IrFAgt1W4$)oO8^ zJlXJ$&DI?Xhi!||=)->v&}+AUeRpi^T8GJ0{qm*|@ccRGbg%<dQv)q6pw}atOj5tq z+UE27n^t16pI+f1i%XW}j)~j1qaqj-A{Z3H;}PQGMImZyg#aO{s)Xq87sBNdB9#(( z+T0Z1jE=_idVSlz0p9EHcV+zkTym#Vh{i_o48%PUKY&Q)_CkpIdLgpee1L3Lr2T#| z*w^PQm!tFx1)a6E)hbC6q*8F}7Vh<RP6HnRSAf$%0N}+7n4Zq}PA1Vw5}hVf7rC;n z7@)J)Zf^#_;~}dki~w`ni&?-Ae70jfGz3qdLOKoW>!2tAoOL*k0qqq795oosJ9UoV z&l0d)#BK>l1FWvX&6}{WkUP)hdeSkYvF@nB&{{Eo3fY%MoKB+$>WkRb0aZH}TU!O| zLI|?C4XX@5iN_aL6lDVdvzZ3qEctc&25@P&Q(NH&zoIC~XgnUN7yt<U=JVxteQ*$J zYWNQL9OwlGfbs1E0F4GNUoHsptJk{>lx)rA0MtM@9LT6D$TEzKpwno$13U(P0fu*5 zU%w7rU3mdAs!Avv4p3%DmF<LoC6hCawY66qU0n@WEYRK#Gc&oe+fh>!3=hMN8wLIo z4<5wsdpsX*Y-~I$m7`>R0wfZN`6;*i{<%}9KIv>}spkB77#M)rS%}5p@L{mopt`!i zcQzc}a=P93*4EbkESF=?S+Ej|{Tzx!Y&|DVw91DLNociTFo4+%Mk5rNjG;(m>(lY^ zA0K(WAMX|aRi+_}(dfgO`T3^JRO-0hVreKf5i_dF#MG2>XL53KJNcgDxS}5ty<Xqu zuvosdn9bHcyS@4Nkt1~gORKBN$4{Ot2NxCszPY(C_S*J+1MHFnbQom01t6YCM96h% hb)WGLbfDK*e*@EuegzyJ1wsG-002ovPDHLkV1iCy?REeF literal 0 HcmV?d00001 diff --git a/data/images/32/eyeballC.png b/data/images/32/eyeballC.png new file mode 100644 index 0000000000000000000000000000000000000000..2825bd6c9a5ddb991f4fcadd2a8cb3a90775c4ad GIT binary patch literal 1003 zcmV<H0~Gv;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW zd<bNS00009a7bBm0003%0003%0kZKjP5=M^8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H1187M^K~z|U?Ui3lTV)u=f8#KcQJ7hBng$pHR<NyQM$1UYB8=?D z#qCO#m>Ar}661~Dc}KHk3uZAfawRvCc_nPCE^%Sa7BA+k+_-khNV`&IizWS&N`v0C z*siCq7j=~mPqC<1<4L~cobP?!?|HuWocH@+7rS`gv1f;QjeympsyzVdOlAdG0*e2u z0aaBkPP={bC9~N+GBD89)!yC=5KAU=_k6zCqi8hnV=(B-WHQVDwShgu4#%f&pE>i^ zyJyd~DT)H?>u~ojBobgSz_DW#tyVsFyHm3s&)g4w|A&Covq4?)lTN35X?{L0!JtSm zC^9i2vTvUV$ZsI)AOa$zqaye3OK5&Rf70o6*Rer;3_BcCRpKs}2*@uWuY+`ew1K=o zG$h4DLPSI)pO+P{xA5A)z$gDoTvb)e^o0wFiul5Uh`}HNa=KjJ$_R(UQiY8T`OM`? z8I8ui9UC}(;)J`nxF{6^moJNe{0`E+NxZ44Ni<EXHc%?blf^}OV`SudEscg6u||7u zuU%1;zh)ANO48=ULZN`y>#fetW@%IutUW#bl-ss$1J+@OqpNDBwH1K9z$?#?$H&K6 zxN!sGakzC0l1TtY2L}%UFV=0K(_}I~?ehwp&dTE#z?;Bfpa*z09>+2^2A!QSI}63~ znRKYV-Oy<=_3G*9mPUipmL~4&gHxyA_HFh9Ujt7l{|HS_IV~-4{(L1xL?}T?Pe-=` z$#i;UHJQw930%AgM~_xs_dY8=H3e;LmH28hnN6hA(Yg%)A+O&b+cMkI0#~lUrAsh0 z1RWh<vB0@=aPuY{KVC)u&gY8(x<|9_CjhiSBoZiUnyqnjCjcl4jE$8?4HPwvP$Uwd z#wDfb1pt1{W*_cvZXO%#?{BTCq=V^e*HTyS+<7OL%dP8iYJCDSnauK>$8&Wl8ZFc- z{wNYDT=#gsTw7cFsTQwh1pro4sc%Ek=*!L{M|#x*2e#z{grd>H2a}WE-1GU~+m8E> z7F<arzIwR4{K7^)-|ev3S{oYvzHmiNV|s2b`SHxm%%9@hUdMG^mqw$pZ_sA@$YwU% zM;wl>?t=#n06)j$+3z1bhy@=%4*0|2iS5e1V*{I@02Y&~9tKEfGEpE5XggeQ7rS_l Z@duy4l8?$BAt3+&002ovPDHLkV1n|c%H99~ literal 0 HcmV?d00001 diff --git a/data/images/Makefile b/data/images/Makefile index 5b3827c..c085cad 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 +MOULD=eyeball eyeballB eyeballC LIGHT=spotlight lamp laser IMG16=$(MOULD_BODY) diff --git a/sources/vector/eyeball.svg b/sources/vector/eyeball.svg index fdd925a..ad2acb5 100644 --- 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 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 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 2de7847..48cd9ea 100644 --- 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): -- 2.34.1