projects
/
tabakrolletjie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d4c8309
)
Add counter text to day scene
author
Neil
<neil@dip.sun.ac.za>
Thu, 8 Sep 2016 21:44:14 +0000
(23:44 +0200)
committer
Neil
<neil@dip.sun.ac.za>
Thu, 8 Sep 2016 21:44:14 +0000
(23:44 +0200)
tabakrolletjie/scenes/day.py
patch
|
blob
|
history
diff --git
a/tabakrolletjie/scenes/day.py
b/tabakrolletjie/scenes/day.py
index 003ae1b596dbec5e3a49c85980490a36060aca68..2d91a69266fbb8010e57459ac7977f2363b3319f 100644
(file)
--- a/
tabakrolletjie/scenes/day.py
+++ b/
tabakrolletjie/scenes/day.py
@@
-10,8
+10,9
@@
from ..lights import LightManager
from ..obstacles import ObstacleManager
from ..events import SceneChangeEvent
from ..utils import debug_timer
from ..obstacles import ObstacleManager
from ..events import SceneChangeEvent
from ..utils import debug_timer
+from ..loader import loader
-from ..constants import SCREEN_SIZE
+from ..constants import SCREEN_SIZE
, FONTS
from ..widgets import ImageButton
from ..turnip import Turnip, TurnipInvalidPosition
from ..widgets import ImageButton
from ..turnip import Turnip, TurnipInvalidPosition
@@
-19,6
+20,7
@@
from ..turnip import Turnip, TurnipInvalidPosition
class DayScene(BaseScene):
def enter(self, gamestate):
self._space = pymunk.Space()
class DayScene(BaseScene):
def enter(self, gamestate):
self._space = pymunk.Space()
+ self._toolbar_font = loader.load_font(FONTS['sans'], size=20)
self._obstacles = ObstacleManager(self._space, gamestate)
self._lights = LightManager(self._space, gamestate)
self._turnips = []
self._obstacles = ObstacleManager(self._space, gamestate)
self._lights = LightManager(self._space, gamestate)
self._turnips = []
@@
-35,14
+37,14
@@
class DayScene(BaseScene):
self._harvested += 1
else:
self._turnips.append(turnip)
self._harvested += 1
else:
self._turnips.append(turnip)
- print 'Seeds', self._seeds
- # Toolbar
+ # Tools
self._tools = [
ImageButton('32', 'seed.png', name='seed',
pos=(50, SCREEN_SIZE[1] - 40)),
ImageButton('32', 'default_cursor.png', name='reset tool',
pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
]
self._tools = [
ImageButton('32', 'seed.png', name='seed',
pos=(50, SCREEN_SIZE[1] - 40)),
ImageButton('32', 'default_cursor.png', name='reset tool',
pos=(SCREEN_SIZE[0] - 50, SCREEN_SIZE[1] - 40)),
]
+ self._update_toolbar()
def exit(self, gamestate):
self._unset_cursor()
def exit(self, gamestate):
self._unset_cursor()
@@
-59,6
+61,7
@@
class DayScene(BaseScene):
self._lights.render_fittings(surface)
for turnip in self._turnips:
turnip.render(surface)
self._lights.render_fittings(surface)
for turnip in self._turnips:
turnip.render(surface)
+ surface.blit(self._toolbar, (120, 10), None)
for tool in self._tools:
tool.render(surface)
self._draw_cursor(surface)
for tool in self._tools:
tool.render(surface)
self._draw_cursor(surface)
@@
-112,4
+115,6
@@
class DayScene(BaseScene):
self._lights.tick()
def _update_toolbar(self):
self._lights.tick()
def _update_toolbar(self):
- pass
+ text = "Turnip Stocks: Seeds: %d. Planted: %d. Harvested: %d" % (
+ self._seeds, len(self._turnips), self._harvested)
+ self._toolbar = self._toolbar_font.render(text, True, (255, 255, 255))