projects
/
tabakrolletjie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Display power usage per hour.
[tabakrolletjie.git]
/
tabakrolletjie
/
enemies.py
diff --git
a/tabakrolletjie/enemies.py
b/tabakrolletjie/enemies.py
index 4fc9470ba90155cf109f20a7292496b148982039..146ef56fa973e9823e0e09bc111947bf6d723183 100644
(file)
--- a/
tabakrolletjie/enemies.py
+++ b/
tabakrolletjie/enemies.py
@@
-12,7
+12,7
@@
from .constants import (SCREEN_SIZE, MOULD_CATEGORY, OBSTACLE_CATEGORY,
TURNIP_CATEGORY, COLOURS)
from .loader import loader
from .sound import sound
TURNIP_CATEGORY, COLOURS)
from .loader import loader
from .sound import sound
-from .transforms import Multiply
+from .transforms import Multiply
, Overlay
from .utils import debug_timer
MOULD_FILTER = pymunk.ShapeFilter(
from .utils import debug_timer
MOULD_FILTER = pymunk.ShapeFilter(
@@
-101,7
+101,10
@@
class Mould(pymunk.Body):
if not self._eyeball:
name = random.choice(
('eyeballA.png', 'eyeballB.png', 'eyeballC.png'))
if not self._eyeball:
name = random.choice(
('eyeballA.png', 'eyeballB.png', 'eyeballC.png'))
- self._eyeball = loader.load_image("32", name)
+ self._eyeball = loader.load_image("32", name,
+ transform=Overlay(colour=self._transform.colour+(127,)))
+ eyelid = loader.load_image("32", "eyelid.png", transform=self._transform)
+ self._eyeball.blit(eyelid, (0, 0), None)
return self._eyeball
def set_health(self, new_health):
return self._eyeball
def set_health(self, new_health):
@@
-146,8
+149,6
@@
class Mould(pymunk.Body):
child._health = self._health
moulds.append(child)
refresh = True
child._health = self._health
moulds.append(child)
refresh = True
- if random.randint(0, 10) < 2:
- sound.play_sound("mouth_pop_2a.ogg")
if self._age in MOULD_STAGES:
# We grow in size
if self._age in MOULD_STAGES:
# We grow in size
@@
-157,6
+158,7
@@
class Mould(pymunk.Body):
if self._age > MOULD_STAGES[1] and random.randint(0, 500) < 1:
# Maybe we grow an eyeball
self.has_eyeball = True
if self._age > MOULD_STAGES[1] and random.randint(0, 500) < 1:
# Maybe we grow an eyeball
self.has_eyeball = True
+ sound.play_sound("mouth_pop_2a.ogg")
if self._age > MAX_AGE:
# We die of old age
if self._age > MAX_AGE:
# We die of old age