projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added exit button
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
day.py
diff --git
a/tabakrolletjie/scenes/day.py
b/tabakrolletjie/scenes/day.py
index b6abaac7db8227e448f1b65109efcdcee9c846c2..4c81130c9e7e77104ad24ce84a92dc35547dfb0e 100644
(file)
--- a/
tabakrolletjie/scenes/day.py
+++ b/
tabakrolletjie/scenes/day.py
@@
-60,7
+60,11
@@
class DayScene(BaseScene):
def create_tools(self, gamestate):
tools = []
def create_tools(self, gamestate):
tools = []
- x, y, step = 50, SCREEN_SIZE[1] - 40, 50
+ x, y, step = 0, SCREEN_SIZE[1] - 40, 50
+
+ tools.append(ImageButton(
+ '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
+ x += step
tools.append(ImageButton('32', 'seed.png', name='seed', pos=(x, y)))
x += step
tools.append(ImageButton('32', 'seed.png', name='seed', pos=(x, y)))
x += step
@@
-73,7
+77,9
@@
class DayScene(BaseScene):
x += step
tools.append(ImageButton(
x += step
tools.append(ImageButton(
- '32', 'default_cursor.png', name='reset tool', pos=(x, y)))
+ '32', 'night.png', name='start night', pos=(SCREEN_SIZE[0] - 100, y)))
+ tools.append(ImageButton(
+ '32', 'exit.png', name='exit', pos=(SCREEN_SIZE[0] - 50, y)))
return tools
def exit(self, gamestate):
return tools
def exit(self, gamestate):
@@
-179,6
+185,12
@@
class DayScene(BaseScene):
self._unset_cursor()
self._tool = None
self._clear_light_toolbar()
self._unset_cursor()
self._tool = None
self._clear_light_toolbar()
+ elif tool.name == 'start night':
+ from .night import NightScene
+ SceneChangeEvent.post(scene=NightScene())
+ elif tool.name == 'exit':
+ from .menu import MenuScene
+ SceneChangeEvent.post(scene=MenuScene())
else:
self._tool = tool
if self._tool.name == 'seed':
else:
self._tool = tool
if self._tool.name == 'seed':
@@
-231,8
+243,8
@@
class DayScene(BaseScene):
self._lights.tick()
def _update_toolbar(self, gamestate):
self._lights.tick()
def _update_toolbar(self, gamestate):
- text = ("Turnip Stocks: Seeds: %d. Planted: %d. "
+ text = ("
Day: %d:
Turnip Stocks: Seeds: %d. Planted: %d. "
"Harvested: %d. Destroyed: %d" %
"Harvested: %d. Destroyed: %d" %
- (self._seeds, len(self._turnips),
+ (
gamestate.days,
self._seeds, len(self._turnips),
self._harvested, gamestate.eaten))
self._toolbar = self._toolbar_font.render(text, True, (255, 255, 255))
self._harvested, gamestate.eaten))
self._toolbar = self._toolbar_font.render(text, True, (255, 255, 255))