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 72705fccdf7aa18e3548357ffc14954e0d9a41a8..b1bb5a4571f330027fe0b2ea74491636b60e1560 100644
(file)
--- a/
tabakrolletjie/turnip.py
+++ b/
tabakrolletjie/turnip.py
@@
-14,14
+14,6
@@
TURNIP_FILTER = pymunk.ShapeFilter(
categories=TURNIP_CATEGORY)
categories=TURNIP_CATEGORY)
-def check_turnips(space, pos, max_distance):
- point_info = space.point_query_nearest(
- pos, max_distance, pymunk.ShapeFilter(mask=TURNIP_CATEGORY))
- if point_info is not None:
- return True
- return False
-
-
class TurnipInvalidPosition(Exception):
pass
class TurnipInvalidPosition(Exception):
pass
@@
-32,7
+24,7
@@
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(
self._pos
) % 4)
+ self._rotation = 90 * (hash(
tuple(self._pos)
) % 4)
self._update_image()
self.eaten = False # Flag for boyd
self._body = pymunk.Body(0, 0, pymunk.Body.STATIC)
self._update_image()
self.eaten = False # Flag for boyd
self._body = pymunk.Body(0, 0, pymunk.Body.STATIC)