projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added rock texture to wall
[tabakrolletjie.git]
/
tabakrolletjie
/
enemies.py
diff --git
a/tabakrolletjie/enemies.py
b/tabakrolletjie/enemies.py
index 2de784709b229e7bd7102bb5bcdc3a813b7d18fa..65bae00ea4af6b79e5eeba8f76984f8435b8eb58 100644
(file)
--- a/
tabakrolletjie/enemies.py
+++ b/
tabakrolletjie/enemies.py
@@
-10,7
+10,8
@@
import pygame.display
import pygame.locals as pgl
import pygame.locals as pgl
-from .constants import SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY
+from .constants import (SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY,
+ TURNIP_CATEGORY)
from .loader import loader
from .sound import sound
from .loader import loader
from .sound import sound
@@
-18,6
+19,8
@@
MOULD_FILTER = pymunk.ShapeFilter(
mask=MOULD_CATEGORY | OBSTACLE_CATEGORY,
categories=MOULD_CATEGORY)
mask=MOULD_CATEGORY | OBSTACLE_CATEGORY,
categories=MOULD_CATEGORY)
+EAT_TURNIP_FILTER = pymunk.ShapeFilter(mask=TURNIP_CATEGORY)
+
class Mould(pymunk.Body):
"""A segment of Boyd"""
class Mould(pymunk.Body):
"""A segment of Boyd"""
@@
-52,7
+55,9
@@
class Mould(pymunk.Body):
def get_eyeball(self):
if not self._eyeball:
def get_eyeball(self):
if not self._eyeball:
- self._eyeball = loader.load_image("32", "eyeball.png")
+ name = random.choice(
+ ('eyeballA.png', 'eyeballB.png', 'eyeballC.png'))
+ self._eyeball = loader.load_image("32", name)
return self._eyeball
def tick(self, gamestate, space, moulds):
return self._eyeball
def tick(self, gamestate, space, moulds):
@@
-113,6
+118,12
@@
class Mould(pymunk.Body):
space.remove(self, self._shape)
moulds.remove(self)
refresh = True
space.remove(self, self._shape)
moulds.remove(self)
refresh = True
+ else:
+ # Check for turnips we can eat
+ # Note that we can only eat a tick after we spawn
+ query = space.point_query(self.position, 16, EAT_TURNIP_FILTER)
+ if query:
+ query[0].shape.body.turnip.eaten = True
return refresh
def damage(self, light_color, intensity, space, moulds):
return refresh
def damage(self, light_color, intensity, space, moulds):