X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fnight.py;h=593a03f5bed6292238349ec5851da9a01a07e411;hb=8afdc1920e2286fcd96bc3e371d515e5c649f772;hp=e4cc73384b9c433f61755cfd16fe73a35226770f;hpb=48c809306d2aaf6ed2487aad4970138601d74a60;p=tabakrolletjie.git

diff --git a/tabakrolletjie/scenes/night.py b/tabakrolletjie/scenes/night.py
index e4cc733..593a03f 100644
--- a/tabakrolletjie/scenes/night.py
+++ b/tabakrolletjie/scenes/night.py
@@ -14,23 +14,25 @@ from ..enemies import Boyd
 from ..events import SceneChangeEvent
 from ..utils import debug_timer, shadowed_text
 from ..loader import loader
+from ..sound import sound
 from ..transforms import Overlay
 from ..turnip import Turnip
 from ..widgets import ImageButton
 from ..constants import (
-    NIGHT_LENGTH, NIGHT_LENGTH_HOURS, DEBUG, FONTS, SCREEN_SIZE, FPS)
+    NIGHT_LENGTH, NIGHT_HOURS_PER_TICK, DEBUG, FONTS,
+    SCREEN_SIZE, FPS)
 
 
 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()
         self._obstacles = ObstacleManager(self._space, gamestate)
         self._lights = LightManager(self._space, gamestate)
         self._battery = BatteryManager(gamestate)
+        self._battery_dead = False
         self.check_battery()
         self._infobar = InfoBar("day", battery=self._battery, scene=self)
         self._countdownbar = CountDownBar("h")
@@ -47,6 +49,7 @@ class NightScene(BaseScene):
         self._paused = False
         self._eaten_tonight = 0
         self._night_over_text = []
+        self._ending = False
 
     def create_tools(self, gamestate):
         tools = []
@@ -69,11 +72,13 @@ class NightScene(BaseScene):
 
     @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) * self.HOURS_PER_TICK))
+            (NIGHT_LENGTH - self._total_ticks) * NIGHT_HOURS_PER_TICK))
 
     @debug_timer("night.render")
     def render(self, surface, gamestate):
@@ -103,11 +108,14 @@ class NightScene(BaseScene):
             surface.blit(text, text_pos, None)
 
     def event(self, ev, gamestate):
+        if self._ending:
+            return
         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):
+                self._ending = True
                 from .menu import MenuScene
                 SceneChangeEvent.post(scene=MenuScene())
             elif ev.key == pgl.K_e and DEBUG:
@@ -117,7 +125,7 @@ class NightScene(BaseScene):
         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)
 
@@ -127,10 +135,11 @@ class NightScene(BaseScene):
                         if tool.name == 'pause play':
                             self.toggle_pause()
                         elif tool.name == 'exit':
+                            self._ending = True
                             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
@@ -139,8 +148,12 @@ class NightScene(BaseScene):
             if tool.name == 'pause play':
                 tool.update_image("32", pause_img)
 
-    def _to_day(self):
+    def _to_day(self, gamestate):
         # End the night
+        if self._ending:
+            return
+        gamestate.update_lights(self._lights)
+        self._ending = True
         from .day import DayScene
         SceneChangeEvent.post(scene=DayScene())
 
@@ -164,7 +177,9 @@ class NightScene(BaseScene):
              (350, 240)))
 
     def check_battery(self):
-        if self._battery.current == 0:
+        if self._battery.current == 0 and not self._battery_dead:
+            self._battery_dead = True
+            sound.play_sound("battery_dying.ogg")
             self._lights.battery_dead()
 
     @debug_timer("night.tick")