projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak Boyd's max size
[tabakrolletjie.git]
/
tabakrolletjie
/
enemies.py
diff --git
a/tabakrolletjie/enemies.py
b/tabakrolletjie/enemies.py
index 140edf7964054ddd7ec3bd6117a9681a6c7f3e15..59151d561d40bad83cc7a1711acb5c3339addc2c 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,17
@@
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)
+
+
+# Boyd parameters
+SPAWN_RATE = 10
+MAX_AGE = 60
+MAX_ELEMENTS = 400
+MAX_HEALTH = 100
+
+MOULD_STAGES = [10, 20]
+
class Mould(pymunk.Body):
"""A segment of Boyd"""
class Mould(pymunk.Body):
"""A segment of Boyd"""
@@
-46,13
+56,15
@@
class Mould(pymunk.Body):
if not self._img:
name = random.choice(
('mouldA.png', 'mouldB.png', 'mouldC.png'))
if not self._img:
name = random.choice(
('mouldA.png', 'mouldB.png', 'mouldC.png'))
- size = "16" if self._age <
10 else "32" if self._age < 20
else "64"
+ size = "16" if self._age <
MOULD_STAGES[0] else "32" if self._age < MOULD_STAGES[1]
else "64"
self._img = loader.load_image(size, name)
return self._img
def get_eyeball(self):
if not self._eyeball:
self._img = loader.load_image(size, name)
return self._img
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):
@@
-61,15
+73,15
@@
class Mould(pymunk.Body):
self._age += 1
# we regain a health every tick, so we heal in the dark
self._age += 1
# we regain a health every tick, so we heal in the dark
- if self._health <
100
:
+ if self._health <
MAX_HEALTH
:
self._health += 1
refresh = False
self._health += 1
refresh = False
- if (self._age %
15) == 0 and len(moulds) < 1000
:
+ if (self._age %
SPAWN_RATE) == 0 and len(moulds) < MAX_ELEMENTS
:
# Spawn a new child, if we can
spawn = True
# Spawn a new child, if we can
spawn = True
- choice = random.randint(0,
4
)
+ choice = random.randint(0,
3
)
if choice == 0:
pos = self.position + (0, 24)
elif choice == 1:
if choice == 0:
pos = self.position + (0, 24)
elif choice == 1:
@@
-99,26
+111,32
@@
class Mould(pymunk.Body):
if random.randint(0, 10) < 2:
sound.play_sound("mouth_pop_2a.ogg")
if random.randint(0, 10) < 2:
sound.play_sound("mouth_pop_2a.ogg")
- if self._age in
(10, 20)
:
+ if self._age in
MOULD_STAGES
:
# We grow in size
refresh = True
# 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 >
MOULD_STAGES[1] 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
- if self._age >
120
:
+ if self._age >
MAX_AGE
:
# We die of old age
space.remove(self, self._shape)
moulds.remove(self)
refresh = True
# We die of old age
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
- if self._health <= 0 and self._age <=
120
:
+ self._health -=
light.base_damage()
+ if self._health <= 0 and self._age <=
MAX_AGE
:
# We die of damage
space.remove(self, self._shape)
moulds.remove(self)
# We die of damage
space.remove(self, self._shape)
moulds.remove(self)
@@
-129,10
+147,12
@@
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, 370))
- self._moulds = [seed]
+ self._moulds = []
+ for position in gamestate.get_spawn_positions():
+ seed = Mould(gamestate, space, position)
+ self._moulds.append(seed)
self._image = pygame.surface.Surface(SCREEN_SIZE)
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
+163,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
+177,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
+185,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
)