projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Display power usage per hour.
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
day.py
diff --git
a/tabakrolletjie/scenes/day.py
b/tabakrolletjie/scenes/day.py
index 1e65fe10794b0e3e05c2a97339df7672ecbcd702..cc7a32e1cf1b1b41cd2bb6508f90f9159fd597f5 100644
(file)
--- a/
tabakrolletjie/scenes/day.py
+++ b/
tabakrolletjie/scenes/day.py
@@
-19,7
+19,7
@@
from ..utils import debug_timer, shadowed_text
from ..loader import loader
from ..transforms import Overlay, Alpha, ColourWedges
from ..loader import loader
from ..transforms import Overlay, Alpha, ColourWedges
-from ..constants import SCREEN_SIZE, FONTS, DEBUG
+from ..constants import SCREEN_SIZE, FONTS,
FPS, NIGHT_HOURS_PER_TICK,
DEBUG
from ..widgets import ImageButton
from ..turnip import Turnip, TurnipInvalidPosition, check_turnips
from ..widgets import ImageButton
from ..turnip import Turnip, TurnipInvalidPosition, check_turnips
@@
-138,7
+138,9
@@
class DayScene(BaseScene):
@property
def power_usage(self):
@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))
@debug_timer("day.render")
def render(self, surface, gamestate):
@debug_timer("day.render")
def render(self, surface, gamestate):