From ea91002db68118e01b0d09527783a39b4112ac3e Mon Sep 17 00:00:00 2001 From: adrianna Date: Sat, 10 Sep 2016 20:16:39 +0200 Subject: [PATCH] fixed eyeball colour; associated popping sound with eyeball --- data/images/32/eyeballA.png | Bin 1095 -> 1001 bytes data/images/32/eyeballB.png | Bin 1144 -> 1063 bytes data/images/32/eyeballC.png | Bin 1094 -> 1003 bytes data/images/32/eyelid.png | Bin 0 -> 363 bytes data/images/Makefile | 2 +- sources/vector/eyeballA.svg | 12 ++----- sources/vector/eyeballB.svg | 12 ++----- sources/vector/eyeballC.svg | 12 ++----- sources/vector/eyelid.svg | 70 ++++++++++++++++++++++++++++++++++++ tabakrolletjie/enemies.py | 5 +-- 10 files changed, 83 insertions(+), 30 deletions(-) create mode 100644 data/images/32/eyelid.png create mode 100644 sources/vector/eyelid.svg diff --git a/data/images/32/eyeballA.png b/data/images/32/eyeballA.png index c22acad562758e0672f2d917e78d66347db5ddc1..01cce3d02263acc8632c644507822cef67b8da58 100644 GIT binary patch delta 905 zcmV;419tq!2@JT-=<@p;8XS(-01}Fl`)y((F*P$2y(3AdGnvf8f17}zQxw1XxTojC zPkVdcG?`2#gYv4%a5y}F_2$hVe~(1I1hiKbE?wz`=H0joN) zMgnbZ+xE4#`hR1x+&Y^|jr?N*ouc^d<)NXYUblObZs69f(AWqz8&z8=ixqHVF@+Ox+paNxk8&1P%fFoB>ToITOo>(Fid z^eHF`Y=@j=3xz^)Z*UNcAaII(;P^R@Q7DJ`5HM0DqqVwX0kPpbPMA*#d_SaVZp#Nb2ZQ0*=;*R0N!rS~a6!|YPECX7%jMFvix;)2(b47Zy?aBHF>T8p#~ptE z`G1cN9vt|rug_tArjD8h)6+$5*uI^-%f+Q@*Obt$TUW;?C%>YMaa_@b#AdTK2YkMB zK95J}62%6W(^&)XIGN0jO-?4HM~|YBc>L7D!oqa9H8*-CGXY+^)!GP<&SYkQIH2lg fRZ&G1CGZ!RUM=a<+_-oE0000H_Di1(4up*jbE79NVG#u zNMe$+hrhG7P1M-#X&$(6xc7Yg?#DS7wq;xX@1nNoX8@}0R)4DtAQ%db1AhXE{}jM# zwN^E{-REAesBphlS65oR$z8y@Zqg+imx8$dOCJf9tHX?gEN zYip5SuTN`~NGAE_(xsX2u3hW?#q0e9kc|STkMu~{XNeN(CqPiezB|TSe46_v#w!oE|iyp&4$(G(!cI@@A2Nf zyK`!0=EwEiGH(a%&X2UTv~8Fiptu+e22D2_DXXtH9yxTV-Db1x*)l+*+kNh2YpY}3 z#7j#M2tdvgj3yH&+uC+D?A?2Qs{jUfWu-gQgX7K}IDdW|nwsF?LFn&)d_5e-px0CF za@C-fZPozQ%^pu_+LgXO=;(lf0Z65^x%PIrd>Q;_)S8lc2(ulTpl zACpiBPM?N^)^lP&FYv|mG}DI^gtv6fFF1j zco+B(Xnz8}0$5mpD^~yz5mJ!K8Xyo1j!y*wk*5}hhga1P056Za%{1^S@DN~V2!N?T zAnXqY$Fc?hMt=5sC!d;4CRf#oG)|MiuWRgX4h~KN8C!Ek01?sa3kv*+H3Q>F-Uq%0-Ubc;9|65e z!I?AswYZd%9v~KvC&STb zG$|6c7Zr_LES4XXQfD`cy;*=9;5<;jW?)V&E-qSPv6vaaWHLqb^YbH0DFN;SA1kGn zo(sTALIc_Pv(BPn& zmNYqecac__<)fzCuIwKUoO9mi<9FV3p65AmpaZ?`((Kbu2Y+-LWZ47|Pb3zBKY+~t z3LwjJM~~Gy{Lz1uxC?eh%-Vz0o(BmE=!xt<>9-LbK2@18mHrdF#hX{gm| zahyEa@Q%&a9e)akZHv+9!+#CXYqx)WcWmrhhsjj^@}>~*{5j}!ume<611&9}*CU%u zQoq&O=JWfTR${TAUg05&OP1x1iQBiMA{Z1R7!<hzQecQeP-s|soW&HkJa;H;>#zyfB#D6^yKY&Q)_CkpIdLgpee1L3L zr2T#|*w^PQm!tFx1)a6E)hbC6q*8F}7Vh!2tAoOL*k0qqq795oos zJ9UoV&wmoIT*Ph(NCT{{!p)nou#h{?p}>!xecofK#9i}R}^If0JE6};4Jxd`v!1nw^Li;2fv~y$!I(tsTcqV{pR!K zc71RVYHIin_#Eg327vMH0|1Q%E?+JP@~hXo41bht&E){pKsX%8s4B=ZjEtbuXt)DB z27UpCcUxb-4qaV&0WzveC>#z@W=NIognuQIGmW*iR~%hk4OlGD-VQS}xw6|)Qxgmi z!;KpS{u2)##O`}MA8u@HJS&x>WPJi85{daKxBLFNQ>Q-ZY-y?H{COA{fZ17y#o+K^ zuz%U0y1Kx3HXPn^y50BI*4F+kmt)Uauo8>?9EwD2Jtt1I%7+d~XtiK4fY}U2BNUm8 zp-5!w)A8{iA9=kW?-l=5rXh>b=);-$`KHZO>bTuvX(%-jGpfqO)Rb~(a&mGz`JUsr zq8}2yUf<@hSiZEF&DK7 delta 1049 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 E0B`?~&Hw-a literal 0 HcmV?d00001 diff --git a/data/images/Makefile b/data/images/Makefile index 17b0bef..cc3a9a2 100644 --- a/data/images/Makefile +++ b/data/images/Makefile @@ -3,7 +3,7 @@ VPATH=../../sources/vector SEED=seed TURNIP=turnip1 turnip2 turnip3 MOULD_BODY=mouldA mouldB mouldC -MOULD=eyeballA eyeballB eyeballC +MOULD=eyeballA eyeballB eyeballC eyelid LIGHT=spotlight lamp laser LIGHT_MASK=light_mask_2_1 light_mask_2_2 light_mask_3_1 light_mask_3_2 light_mask_3_3 CONTROLS=night default_cursor exit pause play diff --git a/sources/vector/eyeballA.svg b/sources/vector/eyeballA.svg index aa54309..45fa09e 100644 --- a/sources/vector/eyeballA.svg +++ b/sources/vector/eyeballA.svg @@ -26,14 +26,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="132.16977" + inkscape:cx="6.4554843" inkscape:cy="182.29837" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1366" + inkscape:window-width="1264" inkscape:window-height="720" - inkscape:window-x="1920" + inkscape:window-x="102" inkscape:window-y="0" inkscape:window-maximized="1"> - diff --git a/sources/vector/eyeballB.svg b/sources/vector/eyeballB.svg index 0886654..0262fd0 100644 --- a/sources/vector/eyeballB.svg +++ b/sources/vector/eyeballB.svg @@ -26,14 +26,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="8.9698557" + inkscape:cx="-116.74443" inkscape:cy="182.29837" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1366" + inkscape:window-width="1264" inkscape:window-height="720" - inkscape:window-x="1920" + inkscape:window-x="102" inkscape:window-y="0" inkscape:window-maximized="1"> - diff --git a/sources/vector/eyeballC.svg b/sources/vector/eyeballC.svg index c864b43..b400b57 100644 --- a/sources/vector/eyeballC.svg +++ b/sources/vector/eyeballC.svg @@ -26,14 +26,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="123.25557" + inkscape:cx="-2.4587157" inkscape:cy="182.29837" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1366" + inkscape:window-width="1264" inkscape:window-height="720" - inkscape:window-x="1920" + inkscape:window-x="102" inkscape:window-y="0" inkscape:window-maximized="1"> - diff --git a/sources/vector/eyelid.svg b/sources/vector/eyelid.svg new file mode 100644 index 0000000..b37277f --- /dev/null +++ b/sources/vector/eyelid.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/tabakrolletjie/enemies.py b/tabakrolletjie/enemies.py index 4fc9470..0bd2d43 100644 --- a/tabakrolletjie/enemies.py +++ b/tabakrolletjie/enemies.py @@ -102,6 +102,8 @@ class Mould(pymunk.Body): name = random.choice( ('eyeballA.png', 'eyeballB.png', 'eyeballC.png')) self._eyeball = loader.load_image("32", name) + eyelid = loader.load_image("32", "eyelid.png", transform=self._transform) + self._eyeball.blit(eyelid, (0, 0), None) return self._eyeball def set_health(self, new_health): @@ -146,8 +148,6 @@ class Mould(pymunk.Body): child._health = self._health moulds.append(child) refresh = True - if random.randint(0, 10) < 2: - sound.play_sound("mouth_pop_2a.ogg") if self._age in MOULD_STAGES: # We grow in size @@ -157,6 +157,7 @@ class Mould(pymunk.Body): if self._age > MOULD_STAGES[1] and random.randint(0, 500) < 1: # Maybe we grow an eyeball self.has_eyeball = True + sound.play_sound("mouth_pop_2a.ogg") if self._age > MAX_AGE: # We die of old age -- 2.34.1