projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enemies appear
[koperkapel.git]
/
koperkapel
/
roaches.py
diff --git
a/koperkapel/roaches.py
b/koperkapel/roaches.py
index b708a88b9b0219f65bee7656b924362113cca6a8..1d77563953442090efc97e766d62d0dd243569d2 100644
(file)
--- a/
koperkapel/roaches.py
+++ b/
koperkapel/roaches.py
@@
-4,6
+4,7
@@
from pgzero.loaders import images
from pygame.constants import BLEND_RGBA_MULT
from .actors.animsurf import AnimatedSurfActor
from .serums import roach_serum_color
from pygame.constants import BLEND_RGBA_MULT
from .actors.animsurf import AnimatedSurfActor
from .serums import roach_serum_color
+from .util import safepath
NAMES = [
"roupert",
NAMES = [
"roupert",
@@
-75,8
+76,8
@@
class RoachFactory:
self.frames = 4
def assemble_frame(self, i, color, roach_data, weapon=None):
self.frames = 4
def assemble_frame(self, i, color, roach_data, weapon=None):
- roach = images.load(
"roach%s/roach_%d"
% (self.suffix, i + 1))
- eyes = images.load(
"roach%s/eyes_%d"
% (self.suffix, i + 1))
+ roach = images.load(
safepath("roach%s/roach_%d")
% (self.suffix, i + 1))
+ eyes = images.load(
safepath("roach%s/eyes_%d")
% (self.suffix, i + 1))
if weapon is None:
frame = roach.copy()
frame.fill(color, None, BLEND_RGBA_MULT)
if weapon is None:
frame = roach.copy()
frame.fill(color, None, BLEND_RGBA_MULT)
@@
-88,8
+89,9
@@
class RoachFactory:
frame.blit(eyes, (0, 0))
return frame
frame.blit(eyes, (0, 0))
return frame
- def assemble(self, roach_data, weapon=None):
- color = roach_serum_color(roach_data)
+ def assemble(self, roach_data, color=None, weapon=None):
+ if not color:
+ color = roach_serum_color(roach_data)
frames = []
frames = [
self.assemble_frame(i, color, roach_data, weapon)
frames = []
frames = [
self.assemble_frame(i, color, roach_data, weapon)