projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made light body bigger
[tabakrolletjie.git]
/
tabakrolletjie
/
enemies.py
diff --git
a/tabakrolletjie/enemies.py
b/tabakrolletjie/enemies.py
index 2de784709b229e7bd7102bb5bcdc3a813b7d18fa..a4ed7b73432e67f7ef54027b6d1674791c8debd0 100644
(file)
--- a/
tabakrolletjie/enemies.py
+++ b/
tabakrolletjie/enemies.py
@@
-8,9
+8,8
@@
import pygame.draw
import pygame.surface
import pygame.display
import pygame.surface
import pygame.display
-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
+17,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
+53,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,10
+116,21
@@
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
return refresh
- def damage(self, light
_color, intensity
, space, moulds):
+ def damage(self, light, space, moulds):
"""Take damage for light, adjusted for resistances."""
"""Take damage for light, adjusted for resistances."""
+ distance = light.position.get_distance(self.position)
+ if distance < (light.radius_limits[0] or 0.0):
+ return False
+ if distance > (light.radius_limits[1] or 50.0):
+ return False
self._health -= 3
if self._health <= 0 and self._age <= 120:
# We die of damage
self._health -= 3
if self._health <= 0 and self._age <= 120:
# We die of damage
@@
-129,7
+143,7
@@
class Mould(pymunk.Body):
class Boyd(object):
def __init__(self, gamestate, space):
class Boyd(object):
def __init__(self, gamestate, space):
- seed = Mould(gamestate, space, (
350, 37
0))
+ seed = Mould(gamestate, space, (
275, 30
0))
self._moulds = [seed]
self._image = pygame.surface.Surface(SCREEN_SIZE)
self._image = self._image.convert_alpha(pygame.display.get_surface())
self._moulds = [seed]
self._image = pygame.surface.Surface(SCREEN_SIZE)
self._image = self._image.convert_alpha(pygame.display.get_surface())
@@
-157,7
+171,7
@@
class Boyd(object):
lit_by = lights.light_query(mould._shape)
for light in lit_by:
# Todo: extract colour and intensity from light
lit_by = lights.light_query(mould._shape)
for light in lit_by:
# Todo: extract colour and intensity from light
- if mould.damage(
None, None
, space, self._moulds):
+ if mould.damage(
light
, space, self._moulds):
redraw = True
break # we only die once
if redraw:
redraw = True
break # we only die once
if redraw: