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
/
turnip.py
diff --git
a/tabakrolletjie/turnip.py
b/tabakrolletjie/turnip.py
index 27cb4de9b20c3f3af8da42fe24b347c051fcb8ec..b1bb5a4571f330027fe0b2ea74491636b60e1560 100644
(file)
--- a/
tabakrolletjie/turnip.py
+++ b/
tabakrolletjie/turnip.py
@@
-3,6
+3,7
@@
import pymunk
import pymunk.pygame_util
import pygame.display
import pymunk
import pymunk.pygame_util
import pygame.display
+import pygame.transform
from .loader import loader
from .constants import TURNIP_CATEGORY, LIGHT_CATEGORY
from .loader import loader
from .constants import TURNIP_CATEGORY, LIGHT_CATEGORY
@@
-23,18
+24,23
@@
class Turnip(object):
self._age = kwargs.get('age', 0)
self._pos = kwargs.get('pos', (0, 0))
space = kwargs.get('space', None)
self._age = kwargs.get('age', 0)
self._pos = kwargs.get('pos', (0, 0))
space = kwargs.get('space', None)
+ self._rotation = 90 * (hash(tuple(self._pos)) % 4)
self._update_image()
self._update_image()
+ self.eaten = False # Flag for boyd
self._body = pymunk.Body(0, 0, pymunk.Body.STATIC)
self._body = pymunk.Body(0, 0, pymunk.Body.STATIC)
- self._shape = pymunk.Circle(self._body,
16
)
+ self._shape = pymunk.Circle(self._body,
24
)
self._shape.filter = TURNIP_FILTER
self._body.position = pymunk.pygame_util.from_pygame(
self._pos, pygame.display.get_surface())
self._shape.filter = TURNIP_FILTER
self._body.position = pymunk.pygame_util.from_pygame(
self._pos, pygame.display.get_surface())
+ # Add a reference so space query can get the object
+ self._body.turnip = self
if space.shape_query(self._shape):
raise TurnipInvalidPosition()
space.add(self._body, self._shape)
def _update_image(self):
if space.shape_query(self._shape):
raise TurnipInvalidPosition()
space.add(self._body, self._shape)
def _update_image(self):
- self._image = loader.load_image('32', 'turnip%d.png' % (self._age + 1))
+ self._image = loader.load_image('48', 'turnip%d.png' % (self._age + 1))
+ self._image = pygame.transform.rotate(self._image, self._rotation)
def render(self, surface):
surface.blit(self._image, self._pos, None)
def render(self, surface):
surface.blit(self._image, self._pos, None)
@@
-43,13
+49,15
@@
class Turnip(object):
return {'age': self._age, 'pos': self._pos}
def remove(self):
return {'age': self._age, 'pos': self._pos}
def remove(self):
- # FIXME: Remove body from the space
- pass
+ self._body.turnip = None
+ space = self._body.space
+ space.remove(self._body, self._shape)
def grow(self):
self._age += 1
if self._age >= 3:
# Mature, so harvest it for seeds
def grow(self):
self._age += 1
if self._age >= 3:
# Mature, so harvest it for seeds
+ self.remove()
return random.randint(1, 3)
else:
self._update_image()
return random.randint(1, 3)
else:
self._update_image()