projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ctpug.org.za:tabakrolletjie
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
night.py
diff --git
a/tabakrolletjie/scenes/night.py
b/tabakrolletjie/scenes/night.py
index e78ba815c3294219efb0a4a421e0850969a725c9..e4cc73384b9c433f61755cfd16fe73a35226770f 100644
(file)
--- a/
tabakrolletjie/scenes/night.py
+++ b/
tabakrolletjie/scenes/night.py
@@
-58,6
+58,11
@@
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 turnip_count(self):
return len(self._turnips)
@@
-124,6
+129,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()
def toggle_pause(self):
self._paused = not self._paused
def toggle_pause(self):
self._paused = not self._paused
@@
-175,6
+182,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]