From 5cfb0b7b438b7cfe15c1e481883b3a95bf9c7c44 Mon Sep 17 00:00:00 2001 From: adrianna Date: Fri, 9 Sep 2016 19:53:10 +0200 Subject: [PATCH] added soil background for day and night; recoloured seed --- data/images/32/seed.png | Bin 899 -> 895 bytes data/images/Makefile | 7 ++++++- data/images/cursors/seed.png | Bin 899 -> 895 bytes sources/vector/seed.svg | 34 +++++++++++++++------------------ tabakrolletjie/scenes/day.py | 8 +++++++- tabakrolletjie/scenes/night.py | 10 +++++++++- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/data/images/32/seed.png b/data/images/32/seed.png index 2f11b2299fc535a1aa61b07cfe12e364e703683c..e559556faf5dfd095faf05e20fe62afa10418b46 100644 GIT binary patch delta 799 zcmV+)1K|9F2mc0;ZGQs%Nkl05Ksw+3rA5;Ww1c}AATGBtKNfT{s+Gr=^LIpK%VoZZ> zdNu>^o_EigJ9qATu!>duXV}V+!vO>V3CRBKW~l^0*@y3lAAkQT1!a>9m#>=YwHY$m zPkj22An`6i;@TW@_W-l325PB2Sx4Qu9qibqp{=pv#fUBS(Kj&0*jZq<90rs|8gF#a zu}4F5{Tx`wI;o8|SwX?T;3FTIU?TU1H)b!rug4ibo+1@1*+7uso*=<1hd9*Y!0}5= zMU~EQ#%{-+w|_59+I+wRqnqv*uXuF;NQ?3pY{CG6-J98b^&khEYy#>ocG>Ew7rsOV z6;hb6?8I3cC0d&zbzj7jt;GHKo11CA-a$vB73V$g3pSaIOedYTFyW&fJS`%QRR!!C z+TAX?wnzoOQi6o3qDl&iCCP(F8fV-&!iYCTsyE-H0Dl_V#bX@XDO(o^027lt+%d)& z%UN+`WE?mM5ZEr#6DinL)T3U!h1I`fnPqzDG5Y8;mRZh=PcmsPvPc6Bnj81lJh9&w zs;JuEN^7_n@gFcT8DJn6A!4@EF0E(11V}o%`GhA1K!}jLimJ{97G4%K;KjQ)K%k@% zohEJe(|<2)OgC=q*tOr+^U5qCdDmb$f`dueY)O)jGGw}%X!4iCz#xOM5k^jD z$)<`j0A!X}>etctZDeDO=o}~(!wkKjv{{hMDt8l1~e9|Mp7e zR8S84@SX7D4Y_cIJb2bRaoWD{#YmD&%rhU06TcZJeiy-izfuFD{ndQCm>R&`3iGXE d6&U{>UjYWz>svV1P~iXo002ovPDHLkV1hCXepvtj delta 803 zcmV+;1Kj-o27?EXZGQs*NklaCj-nuRf z$)vk#dLA9v%(txbopZl?&-v~x*ux%PFtjn$$N>id1qimAtbgoaLDkkcS1|abXz;3` zGF8Y?3I%~D=r}Qt9glAu!EHc}RltQc7S;#Bz9)CZiYpObw=lPNRV|i8F{mcEW+T#r1q}AVa2unKeyyhIJ(k@s^(K0h>Mt@FM+O2h~(UZ0t@%@mu=45jk?F882OHE9TI4I+#}^-N*y*g;>S>O zVQzxTI0XFJrCJNQ7{{~+V_8;f);&J@waLpo8Rd7c7jv^6@05Ksw+3rA5;Ww1c}AATGBtKNfT{s+Gr=^LIpK%VoZZ> zdNu>^o_EigJ9qATu!>duXV}V+!vO>V3CRBKW~l^0*@y3lAAkQT1!a>9m#>=YwHY$m zPkj22An`6i;@TW@_W-l325PB2Sx4Qu9qibqp{=pv#fUBS(Kj&0*jZq<90rs|8gF#a zu}4F5{Tx`wI;o8|SwX?T;3FTIU?TU1H)b!rug4ibo+1@1*+7uso*=<1hd9*Y!0}5= zMU~EQ#%{-+w|_59+I+wRqnqv*uXuF;NQ?3pY{CG6-J98b^&khEYy#>ocG>Ew7rsOV z6;hb6?8I3cC0d&zbzj7jt;GHKo11CA-a$vB73V$g3pSaIOedYTFyW&fJS`%QRR!!C z+TAX?wnzoOQi6o3qDl&iCCP(F8fV-&!iYCTsyE-H0Dl_V#bX@XDO(o^027lt+%d)& z%UN+`WE?mM5ZEr#6DinL)T3U!h1I`fnPqzDG5Y8;mRZh=PcmsPvPc6Bnj81lJh9&w zs;JuEN^7_n@gFcT8DJn6A!4@EF0E(11V}o%`GhA1K!}jLimJ{97G4%K;KjQ)K%k@% zohEJe(|<2)OgC=q*tOr+^U5qCdDmb$f`dueY)O)jGGw}%X!4iCz#xOM5k^jD z$)<`j0A!X}>etctZDeDO=o}~(!wkKjv{{hMDt8l1~e9|Mp7e zR8S84@SX7D4Y_cIJb2bRaoWD{#YmD&%rhU06TcZJeiy-izfuFD{ndQCm>R&`3iGXE d6&U{>UjYWz>svV1P~iXo002ovPDHLkV1hCXepvtj delta 803 zcmV+;1Kj-o27?EXZGQs*NklaCj-nuRf z$)vk#dLA9v%(txbopZl?&-v~x*ux%PFtjn$$N>id1qimAtbgoaLDkkcS1|abXz;3` zGF8Y?3I%~D=r}Qt9glAu!EHc}RltQc7S;#Bz9)CZiYpObw=lPNRV|i8F{mcEW+T#r1q}AVa2unKeyyhIJ(k@s^(K0h>Mt@FM+O2h~(UZ0t@%@mu=45jk?F882OHE9TI4I+#}^-N*y*g;>S>O zVQzxTI0XFJrCJNQ7{{~+V_8;f);&J@waLpo8Rd7c7jv^6@ image/svg+xml - + @@ -53,21 +53,17 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-698.0315)"> - - - - + + diff --git a/tabakrolletjie/scenes/day.py b/tabakrolletjie/scenes/day.py index c2dee94..c280702 100644 --- a/tabakrolletjie/scenes/day.py +++ b/tabakrolletjie/scenes/day.py @@ -1,6 +1,7 @@ """ Be prepared. """ import pygame.locals as pgl +import pygame.surface import pymunk import pymunk.pygame_util @@ -55,7 +56,12 @@ class DayScene(BaseScene): @debug_timer("day.render") def render(self, surface, gamestate): - surface.fill((0, 0, 155)) + surface.blit(loader.load_image("textures", "soil.png"), (0, 0)) + brightness = pygame.surface.Surface(surface.get_size()) + brightness = brightness.convert_alpha() + brightness.fill((255, 255, 255, 50)) + surface.blit(brightness, (0, 0)) + for turnip in self._turnips: turnip.render(surface) self._lights.render_light(surface) diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py index c532c77..fe1fae3 100644 --- a/tabakrolletjie/scenes/night.py +++ b/tabakrolletjie/scenes/night.py @@ -1,6 +1,7 @@ """ In the night, the mould attacks. """ import pygame.locals as pgl +import pygame.surface import pymunk @@ -10,6 +11,7 @@ from ..obstacles import ObstacleManager from ..enemies import Boyd from ..events import SceneChangeEvent from ..utils import debug_timer +from ..loader import loader from ..turnip import Turnip @@ -26,8 +28,14 @@ class NightScene(BaseScene): @debug_timer("night.render") def render(self, surface, gamestate): - surface.fill((0, 0, 155)) + surface.blit(loader.load_image("textures", "soil.png"), (0, 0)) + darkness = pygame.surface.Surface(surface.get_size()) + darkness = darkness.convert_alpha() + darkness.fill((0, 0, 0, 150)) + surface.blit(darkness, (0, 0)) + self._mould.render(surface) + for turnip in self._turnips[:]: if turnip.eaten: self._turnips.remove(turnip) -- 2.34.1