projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show weapons when walking.
[koperkapel.git]
/
koperkapel
/
roaches.py
diff --git
a/koperkapel/roaches.py
b/koperkapel/roaches.py
index da362a306361b6b28006b641ffb5ac3ff4401523..b708a88b9b0219f65bee7656b924362113cca6a8 100644
(file)
--- a/
koperkapel/roaches.py
+++ b/
koperkapel/roaches.py
@@
-74,18
+74,25
@@
class RoachFactory:
self.suffix = suffix
self.frames = 4
self.suffix = suffix
self.frames = 4
- def assemble_frame(self, i, color, roach_data):
+ 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("roach%s/roach_%d" % (self.suffix, i + 1))
eyes = images.load("roach%s/eyes_%d" % (self.suffix, i + 1))
- frame = roach.copy()
- frame.fill(color, None, BLEND_RGBA_MULT)
+ if weapon is None:
+ frame = roach.copy()
+ frame.fill(color, None, BLEND_RGBA_MULT)
+ else:
+ frame = weapon.surf.copy()
+ roach = roach.copy()
+ roach.fill(color, None, BLEND_RGBA_MULT)
+ frame.blit(roach, (0, 0))
frame.blit(eyes, (0, 0))
return frame
frame.blit(eyes, (0, 0))
return frame
- def assemble(self, roach_data):
+ def assemble(self, roach_data
, weapon=None
):
color = roach_serum_color(roach_data)
color = roach_serum_color(roach_data)
+ frames = []
frames = [
frames = [
- self.assemble_frame(i, color, roach_data)
+ self.assemble_frame(i, color, roach_data
, weapon
)
for i in range(self.frames)]
return AnimatedSurfActor(frames)
for i in range(self.frames)]
return AnimatedSurfActor(frames)