projects
/
tabakrolletjie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
43a3705
)
Move harvested and seeds to gamestate.
author
Simon Cross
<hodgestar@gmail.com>
Sat, 10 Sep 2016 15:55:02 +0000
(17:55 +0200)
committer
Simon Cross
<hodgestar@gmail.com>
Sat, 10 Sep 2016 15:55:02 +0000
(17:55 +0200)
tabakrolletjie/scenes/day.py
patch
|
blob
|
history
diff --git
a/tabakrolletjie/scenes/day.py
b/tabakrolletjie/scenes/day.py
index 8d39c2b2d72f34d4e5c16aa9745a459ba8b66328..485952e9b19f5c19a3a7a8f9310247f6df9eff91 100644
(file)
--- a/
tabakrolletjie/scenes/day.py
+++ b/
tabakrolletjie/scenes/day.py
@@
-34,8
+34,6
@@
class DayScene(BaseScene):
self._lights = LightManager(self._space, gamestate)
self._battery = BatteryManager(gamestate)
self._turnips = []
self._lights = LightManager(self._space, gamestate)
self._battery = BatteryManager(gamestate)
self._turnips = []
- self._seeds = gamestate.seeds
- self._harvested = gamestate.harvested
self._paused = False
self._tool = None
self._light_colors = None
self._paused = False
self._tool = None
self._light_colors = None
@@
-51,12
+49,12
@@
class DayScene(BaseScene):
"textures", "soil.png", transform=self.BRIGHTNESS)
# Check if we've lost
self._game_over_text = []
"textures", "soil.png", transform=self.BRIGHTNESS)
# Check if we've lost
self._game_over_text = []
- if
self._
seeds == 0 and len(self._turnips) == 0:
- self._draw_you_lose()
- elif
self._
harvested >= gamestate.get_target():
- self._draw_you_win()
+ if
gamestate.
seeds == 0 and len(self._turnips) == 0:
+ self._draw_you_lose(
gamestate
)
+ elif
gamestate.
harvested >= gamestate.get_target():
+ self._draw_you_win(
gamestate
)
- def _draw_you_lose(self):
+ def _draw_you_lose(self
, gamestate
):
overlay = pygame.surface.Surface(
(SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha()
overlay.fill((0, 0, 0, 128))
overlay = pygame.surface.Surface(
(SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha()
overlay.fill((0, 0, 0, 128))
@@
-70,7
+68,7
@@
class DayScene(BaseScene):
(shadowed_text("Press a key to return to the menu",
FONTS["sans"], 24), (350, 400)))
(shadowed_text("Press a key to return to the menu",
FONTS["sans"], 24), (350, 400)))
- def _draw_you_win(self):
+ def _draw_you_win(self
, gamestate
):
overlay = pygame.surface.Surface(
(SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha()
overlay.fill((0, 0, 0, 128))
overlay = pygame.surface.Surface(
(SCREEN_SIZE[0], 240), pgl.SWSURFACE).convert_alpha()
overlay.fill((0, 0, 0, 128))
@@
-79,7
+77,8
@@
class DayScene(BaseScene):
(shadowed_text("You Win", FONTS["bold"], 48), (400, 280)))
self._game_over_text.append(
(shadowed_text(
(shadowed_text("You Win", FONTS["bold"], 48), (400, 280)))
self._game_over_text.append(
(shadowed_text(
- "You have Successfully Harvested %d turnips" % self._harvested,
+ ("You have Successfully Harvested %d turnips" %
+ gamestate.harvested),
FONTS["sans"], 24),
(300, 350)))
self._game_over_text.append(
FONTS["sans"], 24),
(300, 350)))
self._game_over_text.append(
@@
-92,8
+91,8
@@
class DayScene(BaseScene):
# Turnips grow at dawn
seeds = turnip.grow()
if seeds:
# Turnips grow at dawn
seeds = turnip.grow()
if seeds:
-
self._
seeds += seeds
-
self._
harvested += 1
+
gamestate.
seeds += seeds
+
gamestate.
harvested += 1
else:
self._turnips.append(turnip)
else:
self._turnips.append(turnip)
@@
-125,8
+124,6
@@
class DayScene(BaseScene):
def exit(self, gamestate):
self._unset_cursor()
def exit(self, gamestate):
self._unset_cursor()
- gamestate.seeds = self._seeds
- gamestate.harvested = self._harvested
turnip_data = [turnip.serialize() for turnip in self._turnips]
gamestate.turnips = turnip_data
turnip_data = [turnip.serialize() for turnip in self._turnips]
gamestate.turnips = turnip_data
@@
-172,7
+169,7
@@
class DayScene(BaseScene):
self._light_toolbar = []
def _place_seed(self, gamestate, ev):
self._light_toolbar = []
def _place_seed(self, gamestate, ev):
- if
self._
seeds > 0:
+ if
gamestate.
seeds > 0:
# plant seed
# We don't want top-left to equal the mouse position,
# since that looks weird, but we don't want to center
# plant seed
# We don't want top-left to equal the mouse position,
# since that looks weird, but we don't want to center
@@
-182,7
+179,7
@@
class DayScene(BaseScene):
try:
turnip = Turnip(age=0, pos=pos, space=self._space)
self._turnips.append(turnip)
try:
turnip = Turnip(age=0, pos=pos, space=self._space)
self._turnips.append(turnip)
-
self._
seeds -= 1
+
gamestate.
seeds -= 1
self._update_infobar(gamestate)
except TurnipInvalidPosition:
# TODO: Add error sound or something
self._update_infobar(gamestate)
except TurnipInvalidPosition:
# TODO: Add error sound or something
@@
-206,13
+203,13
@@
class DayScene(BaseScene):
cfg = cfg.copy()
cost = cfg.pop("cost")
cfg.pop("available_colours")
cfg = cfg.copy()
cost = cfg.pop("cost")
cfg.pop("available_colours")
- if
self._
seeds > cost:
+ if
gamestate.
seeds > cost:
pos = pymunk.pygame_util.from_pygame(
ev.pos, pygame.display.get_surface())
# Bail if we're too close to an existing light
if self._lights.nearest(pos, max_distance=25):
return
pos = pymunk.pygame_util.from_pygame(
ev.pos, pygame.display.get_surface())
# Bail if we're too close to an existing light
if self._lights.nearest(pos, max_distance=25):
return
-
self._
seeds -= cost
+
gamestate.
seeds -= cost
self._update_infobar(gamestate)
cfg["position"] = pos
cfg["colours"] = colours
self._update_infobar(gamestate)
cfg["position"] = pos
cfg["colours"] = colours
@@
-304,10
+301,10
@@
class DayScene(BaseScene):
def _update_infobar(self, gamestate):
line1 = ("Day %d: Goal: %d Turnips. Turnips harvested: %d" % (
def _update_infobar(self, gamestate):
line1 = ("Day %d: Goal: %d Turnips. Turnips harvested: %d" % (
- gamestate.days, gamestate.get_target(),
self._
harvested))
+ gamestate.days, gamestate.get_target(),
gamestate.
harvested))
line1_img = self._infobar_font.render(line1, True, (255, 255, 255))
line2 = ("Turnip Stocks: Seeds: %s. Planted: %d. Battery: %d/%d" % (
line1_img = self._infobar_font.render(line1, True, (255, 255, 255))
line2 = ("Turnip Stocks: Seeds: %s. Planted: %d. Battery: %d/%d" % (
-
self._
seeds, len(self._turnips), self._battery.current,
+
gamestate.
seeds, len(self._turnips), self._battery.current,
self._battery.max))
line2_img = self._infobar_font.render(line2, True, (255, 255, 255))
width = max(line1_img.get_width(), line2_img.get_width()) + 10
self._battery.max))
line2_img = self._infobar_font.render(line2, True, (255, 255, 255))
width = max(line1_img.get_width(), line2_img.get_width()) + 10