projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add total power and damage.
[tabakrolletjie.git]
/
tabakrolletjie
/
enemies.py
diff --git
a/tabakrolletjie/enemies.py
b/tabakrolletjie/enemies.py
index 140edf7964054ddd7ec3bd6117a9681a6c7f3e15..eef2596e5300455ea7437d29642b27b9bdaabe02 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):
@@
-102,9
+105,9
@@
class Mould(pymunk.Body):
if self._age in (10, 20):
# We grow in size
refresh = True
if self._age in (10, 20):
# We grow in size
refresh = True
- self._img = None # invalidate cached image
+ self._img = None
# invalidate cached image
- if self._age > 20 and random.randint(0,
1
00) < 1:
+ if self._age > 20 and random.randint(0,
5
00) < 1:
# Maybe we grow an eyeball
self.has_eyeball = True
# Maybe we grow an eyeball
self.has_eyeball = True
@@
-113,11
+116,17
@@
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."""
- self._health -=
3
+ self._health -=
light.base_damage()
if self._health <= 0 and self._age <= 120:
# We die of damage
space.remove(self, self._shape)
if self._health <= 0 and self._age <= 120:
# We die of damage
space.remove(self, self._shape)
@@
-129,10
+138,10
@@
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._moulds = [seed]
self._image = pygame.surface.Surface(SCREEN_SIZE)
- self._image.convert_alpha(pygame.display.get_surface())
+ self._image
= self._image
.convert_alpha(pygame.display.get_surface())
self._draw_moulds()
def _draw_moulds(self):
self._draw_moulds()
def _draw_moulds(self):
@@
-143,7
+152,8
@@
class Boyd(object):
0)
for m in self._moulds:
if m.has_eyeball:
0)
for m in self._moulds:
if m.has_eyeball:
- self._image.blit(m.get_eyeball(), m.pygame_pos(self._image), None, 0)
+ self._image.blit(m.get_eyeball(), m.pygame_pos(self._image),
+ None, 0)
def tick(self, gamestate, space, lights):
redraw = False
def tick(self, gamestate, space, lights):
redraw = False
@@
-156,7
+166,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:
@@
-164,4
+174,4
@@
class Boyd(object):
def render(self, surface):
"""Draw ourselves"""
def render(self, surface):
"""Draw ourselves"""
- surface.blit(self._image, (0, 0), None,
pgl.BLEND_RGBA_ADD
)
+ surface.blit(self._image, (0, 0), None,
0
)