projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add days to gamestate and day screen display
[tabakrolletjie.git]
/
tabakrolletjie
/
scenes
/
day.py
diff --git
a/tabakrolletjie/scenes/day.py
b/tabakrolletjie/scenes/day.py
index 162a30b9a1317bf110729665bfcbabbe4ce9015c..e54e2f1664a6c5ecc916127e1b5bf0b37d2f5e9e 100644
(file)
--- a/
tabakrolletjie/scenes/day.py
+++ b/
tabakrolletjie/scenes/day.py
@@
-112,7
+112,7
@@
class DayScene(BaseScene):
self._turnips.append(turnip)
self._seeds -= 1
self._update_toolbar(gamestate)
self._turnips.append(turnip)
self._seeds -= 1
self._update_toolbar(gamestate)
- except TurnipInvalidPosition
as e
:
+ except TurnipInvalidPosition:
# TODO: Add error sound or something
pass
# TODO: Add error sound or something
pass
@@
-141,7
+141,7
@@
class DayScene(BaseScene):
self._update_toolbar(gamestate)
cfg = {
"type": "spotlight",
self._update_toolbar(gamestate)
cfg = {
"type": "spotlight",
- "colour
": colour
,
+ "colour
s": [colour]
,
"position": pos,
"direction": 45,
"spread": 90,
"position": pos,
"direction": 45,
"spread": 90,
@@
-162,7
+162,7
@@
class DayScene(BaseScene):
self._update_toolbar(gamestate)
cfg = {
"type": "lamp",
self._update_toolbar(gamestate)
cfg = {
"type": "lamp",
- "colour
": colour
,
+ "colour
s": [colour]
,
"position": pos,
"intensity": 0.5,
}
"position": pos,
"intensity": 0.5,
}
@@
-174,10
+174,10
@@
class DayScene(BaseScene):
if ev.key in (pgl.K_q, pgl.K_ESCAPE):
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
if ev.key in (pgl.K_q, pgl.K_ESCAPE):
from .menu import MenuScene
SceneChangeEvent.post(scene=MenuScene())
- if ev.key == pgl.K_e:
+
el
if ev.key == pgl.K_e:
from .night import NightScene
SceneChangeEvent.post(scene=NightScene())
from .night import NightScene
SceneChangeEvent.post(scene=NightScene())
- if ev.key == pgl.K_SPACE:
+
el
if ev.key == pgl.K_SPACE:
self._paused = not self._paused
elif ev.type == pgl.MOUSEBUTTONDOWN:
if ev.button == 1:
self._paused = not self._paused
elif ev.type == pgl.MOUSEBUTTONDOWN:
if ev.button == 1:
@@
-244,8
+244,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))