projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added rock texture to wall
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
night.py
diff --git
a/tabakrolletjie/scenes/night.py
b/tabakrolletjie/scenes/night.py
index b4e19e8379704b46655a9338452cbd6f498115df..fe1fae3860d1d87bcb2b8a77d2ff895afff904ed 100644
(file)
--- 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
""" In the night, the mould attacks. """
import pygame.locals as pgl
+import pygame.surface
import pymunk
import pymunk
@@
-10,6
+11,8
@@
from ..obstacles import ObstacleManager
from ..enemies import Boyd
from ..events import SceneChangeEvent
from ..utils import debug_timer
from ..enemies import Boyd
from ..events import SceneChangeEvent
from ..utils import debug_timer
+from ..loader import loader
+from ..turnip import Turnip
class NightScene(BaseScene):
class NightScene(BaseScene):
@@
-18,11
+21,28
@@
class NightScene(BaseScene):
self._obstacles = ObstacleManager(self._space, gamestate)
self._lights = LightManager(self._space, gamestate)
self._mould = Boyd(gamestate, self._space)
self._obstacles = ObstacleManager(self._space, gamestate)
self._lights = LightManager(self._space, gamestate)
self._mould = Boyd(gamestate, self._space)
+ self._turnips = []
+ for turnip_data in gamestate.turnips:
+ turnip = Turnip(space=self._space, **turnip_data)
+ self._turnips.append(turnip)
@debug_timer("night.render")
def render(self, surface, gamestate):
@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)
self._mould.render(surface)
+
+ for turnip in self._turnips[:]:
+ if turnip.eaten:
+ self._turnips.remove(turnip)
+ turnip.remove()
+ gamestate.eaten += 1
+ else:
+ turnip.render(surface)
self._lights.render_light(surface)
self._obstacles.render(surface)
self._lights.render_fittings(surface)
self._lights.render_light(surface)
self._obstacles.render(surface)
self._lights.render_fittings(surface)
@@
-32,6
+52,9
@@
class NightScene(BaseScene):
if ev.key in (pgl.K_q, pgl.K_ESCAPE):
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
if ev.key in (pgl.K_q, pgl.K_ESCAPE):
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
+ if ev.key == pgl.K_e:
+ from .day import DayScene
+ SceneChangeEvent.post(scene=DayScene())
elif ev.type == pgl.MOUSEBUTTONDOWN:
if ev.button == 1:
self._lights.toggle_nearest(ev.pos, surfpos=True)
elif ev.type == pgl.MOUSEBUTTONDOWN:
if ev.button == 1:
self._lights.toggle_nearest(ev.pos, surfpos=True)
@@
-40,3
+63,8
@@
class NightScene(BaseScene):
@debug_timer("night.tick")
def tick(self, gamestate):
self._mould.tick(gamestate, self._space, self._lights)
@debug_timer("night.tick")
def tick(self, gamestate):
self._mould.tick(gamestate, self._space, self._lights)
+ self._lights.tick()
+
+ def exit(self, gamestate):
+ turnip_data = [turnip.serialize() for turnip in self._turnips]
+ gamestate.turnips = turnip_data