projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Serialize light state across day and night transitions
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
night.py
diff --git
a/tabakrolletjie/scenes/night.py
b/tabakrolletjie/scenes/night.py
index 580d140a6941475cfeefc1f295e2b51ec82312b7..9459c0ed68668d6edb358879ca93917ab9c75a76 100644
(file)
--- a/
tabakrolletjie/scenes/night.py
+++ b/
tabakrolletjie/scenes/night.py
@@
-108,7
+108,7
@@
class NightScene(BaseScene):
if ev.type == pgl.KEYDOWN:
if not self._do_ticks:
# Any keypress exits
if ev.type == pgl.KEYDOWN:
if not self._do_ticks:
# Any keypress exits
- self._to_day()
+ self._to_day(
gamestate
)
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())
@@
-119,7
+119,7
@@
class NightScene(BaseScene):
elif ev.type == pgl.MOUSEBUTTONDOWN:
if not self._do_ticks:
# Any mouse press exits
elif ev.type == pgl.MOUSEBUTTONDOWN:
if not self._do_ticks:
# Any mouse press exits
- self._to_day()
+ self._to_day(
gamestate
)
if ev.button == 1:
self._lights.toggle_nearest(ev.pos, surfpos=True)
if ev.button == 1:
self._lights.toggle_nearest(ev.pos, surfpos=True)
@@
-132,7
+132,7
@@
class NightScene(BaseScene):
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
elif tool.name == 'day':
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
elif tool.name == 'day':
- self._to_day()
+ self._to_day(
gamestate
)
def toggle_pause(self):
self._paused = not self._paused
def toggle_pause(self):
self._paused = not self._paused
@@
-141,8
+141,9
@@
class NightScene(BaseScene):
if tool.name == 'pause play':
tool.update_image("32", pause_img)
if tool.name == 'pause play':
tool.update_image("32", pause_img)
- def _to_day(self):
+ def _to_day(self
, gamestate
):
# End the night
# End the night
+ gamestate.update_lights(self._lights)
from .day import DayScene
SceneChangeEvent.post(scene=DayScene())
from .day import DayScene
SceneChangeEvent.post(scene=DayScene())