projects
/
tabakrolletjie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ea2a117
)
Use count down bar.
author
Simon Cross
<hodgestar@gmail.com>
Sat, 10 Sep 2016 19:06:40 +0000
(21:06 +0200)
committer
Simon Cross
<hodgestar@gmail.com>
Sat, 10 Sep 2016 19:06:40 +0000
(21:06 +0200)
tabakrolletjie/scenes/night.py
patch
|
blob
|
history
diff --git
a/tabakrolletjie/scenes/night.py
b/tabakrolletjie/scenes/night.py
index 803827665d534eb2627aef88dc47bb4d42a6d1a6..e78ba815c3294219efb0a4a421e0850969a725c9 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,12
+17,14
@@
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, FPS
+from ..constants import (
+ NIGHT_LENGTH, NIGHT_LENGTH_HOURS, DEBUG, FONTS, SCREEN_SIZE, FPS)
class NightScene(BaseScene):
DARKNESS = Overlay(colour=(0, 0, 0, 150))
class NightScene(BaseScene):
DARKNESS = Overlay(colour=(0, 0, 0, 150))
+ HOURS_PER_TICK = float(NIGHT_LENGTH_HOURS) / NIGHT_LENGTH
def enter(self, gamestate):
self._space = pymunk.Space()
def enter(self, gamestate):
self._space = pymunk.Space()
@@
-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:
@@
-63,6
+66,10
@@
class NightScene(BaseScene):
def power_usage(self):
return int(self._lights.total_power_usage())
def power_usage(self):
return int(self._lights.total_power_usage())
+ def remaining_hours(self):
+ return int(round(
+ (NIGHT_LENGTH - self._total_ticks) * self.HOURS_PER_TICK))
+
@debug_timer("night.render")
def render(self, surface, gamestate):
surface.blit(self._soil, (0, 0))
@debug_timer("night.render")
def render(self, surface, gamestate):
surface.blit(self._soil, (0, 0))
@@
-82,6
+89,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)