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 115630ab65ef5e143e0266665b12d7e0af8570b9..9459c0ed68668d6edb358879ca93917ab9c75a76 100644
(file)
--- a/
tabakrolletjie/scenes/night.py
+++ b/
tabakrolletjie/scenes/night.py
@@
-8,7
+8,7
@@
import pymunk
from .base import BaseScene
from ..battery import BatteryManager
from ..lights import LightManager
from .base import BaseScene
from ..battery import BatteryManager
from ..lights import LightManager
-from ..infobar import InfoBar
+from ..infobar import InfoBar
, CountDownBar
from ..obstacles import ObstacleManager
from ..enemies import Boyd
from ..events import SceneChangeEvent
from ..obstacles import ObstacleManager
from ..enemies import Boyd
from ..events import SceneChangeEvent
@@
-17,7
+17,9
@@
from ..loader import loader
from ..transforms import Overlay
from ..turnip import Turnip
from ..widgets import ImageButton
from ..transforms import Overlay
from ..turnip import Turnip
from ..widgets import ImageButton
-from ..constants import NIGHT_LENGTH, DEBUG, FONTS, SCREEN_SIZE
+from ..constants import (
+ NIGHT_LENGTH, NIGHT_HOURS_PER_TICK, DEBUG, FONTS,
+ SCREEN_SIZE, FPS)
class NightScene(BaseScene):
class NightScene(BaseScene):
@@
-31,6
+33,7
@@
class NightScene(BaseScene):
self._battery = BatteryManager(gamestate)
self.check_battery()
self._infobar = InfoBar("day", battery=self._battery, scene=self)
self._battery = BatteryManager(gamestate)
self.check_battery()
self._infobar = InfoBar("day", battery=self._battery, scene=self)
+ self._countdownbar = CountDownBar("h")
self._mould = Boyd(gamestate, self._space)
self._turnips = []
for turnip_data in gamestate.turnips:
self._mould = Boyd(gamestate, self._space)
self._turnips = []
for turnip_data in gamestate.turnips:
@@
-55,13
+58,24
@@
class NightScene(BaseScene):
'32', 'exit.png', name='exit', pos=(SCREEN_SIZE[0] - 50, y)))
return tools
'32', 'exit.png', name='exit', pos=(SCREEN_SIZE[0] - 50, y)))
return tools
+ def add_day_button(self):
+ y = SCREEN_SIZE[1] - 40
+ self._tools.append(ImageButton(
+ '32', 'day.png', name='day', pos=(SCREEN_SIZE[0] - 200, y)))
+
@property
def turnip_count(self):
return len(self._turnips)
@property
def power_usage(self):
@property
def turnip_count(self):
return len(self._turnips)
@property
def power_usage(self):
- return int(self._lights.total_power_usage())
+ power = self._lights.total_power_usage()
+ power = power / (FPS * NIGHT_HOURS_PER_TICK)
+ return int(round(power))
+
+ def remaining_hours(self):
+ return int(round(
+ (NIGHT_LENGTH - self._total_ticks) * NIGHT_HOURS_PER_TICK))
@debug_timer("night.render")
def render(self, surface, gamestate):
@debug_timer("night.render")
def render(self, surface, gamestate):
@@
-82,6
+96,7
@@
class NightScene(BaseScene):
self._obstacles.render(surface)
self._lights.render_fittings(surface)
self._infobar.render(surface, gamestate)
self._obstacles.render(surface)
self._lights.render_fittings(surface)
self._infobar.render(surface, gamestate)
+ self._countdownbar.render(surface, self.remaining_hours())
for tool in self._tools:
tool.render(surface)
for tool in self._tools:
tool.render(surface)
@@
-93,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())
@@
-104,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)
@@
-116,6
+131,8
@@
class NightScene(BaseScene):
elif tool.name == 'exit':
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
elif tool.name == 'exit':
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
+ elif tool.name == 'day':
+ self._to_day(gamestate)
def toggle_pause(self):
self._paused = not self._paused
def toggle_pause(self):
self._paused = not self._paused
@@
-124,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())
@@
-158,7
+176,7
@@
class NightScene(BaseScene):
if self._total_ticks < NIGHT_LENGTH:
self._mould.tick(gamestate, self._space, self._lights)
self._lights.tick()
if self._total_ticks < NIGHT_LENGTH:
self._mould.tick(gamestate, self._space, self._lights)
self._lights.tick()
- if self._total_ticks %
60
== 0:
+ if self._total_ticks %
FPS
== 0:
self._battery.current -= int(
self._lights.total_power_usage())
self.check_battery()
self._battery.current -= int(
self._lights.total_power_usage())
self.check_battery()
@@
-167,6
+185,10
@@
class NightScene(BaseScene):
self._end_night()
if not self._mould.alive():
self._end_night()
self._end_night()
if not self._mould.alive():
self._end_night()
+ if not self.turnip_count:
+ self.add_day_button()
+ if not self.turnip_count and not self._battery.current:
+ self._end_night()
def exit(self, gamestate):
turnip_data = [turnip.serialize() for turnip in self._turnips]
def exit(self, gamestate):
turnip_data = [turnip.serialize() for turnip in self._turnips]