projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Many-angled roaches
[koperkapel.git]
/
koperkapel
/
roaches.py
diff --git
a/koperkapel/roaches.py
b/koperkapel/roaches.py
index 20220c4c6da52165651910e691ad354d62c83dde..0d2448216c16a00900759736ed66e32fe975dbcb 100644
(file)
--- a/
koperkapel/roaches.py
+++ b/
koperkapel/roaches.py
@@
-4,24
+4,18
@@
import random
from pgzero.clock import each_tick
from pgzero.loaders import images
from pygame.constants import BLEND_RGBA_MULT
from pgzero.clock import each_tick
from pgzero.loaders import images
from pygame.constants import BLEND_RGBA_MULT
-from .actors.surf import SurfActor
+from .actors.orientatedsurf import OrientatedSurfActor
+from .serums import roach_serum_color
-ROACH_COLORS = {
- "blue": (0, 0, 255, 255),
- "green": (0, 255, 0, 255),
- "purple": (255, 0, 255, 255),
- "brown": (170, 68, 0, 255),
-}
-
-class RoachActor(SurfActor):
+class RoachActor(OrientatedSurfActor):
def __init__(self, frames):
self._frames = frames
self._frame = random.randint(0, len(frames) - 1)
self._dt = 0
self._cycle_dt = 0.2
each_tick(self.update)
def __init__(self, frames):
self._frames = frames
self._frame = random.randint(0, len(frames) - 1)
self._dt = 0
self._cycle_dt = 0.2
each_tick(self.update)
- super().__init__(surf=frames[self._frame])
+ super().__init__(surf=frames[self._frame]
, angle=0
)
def update(self, dt):
self._dt += dt
def update(self, dt):
self._dt += dt
@@
-38,25
+32,16
@@
class RoachFactory:
self.suffix = suffix
self.frames = 4
self.suffix = suffix
self.frames = 4
- def roach_color(self, roach):
- if roach.smart:
- return ROACH_COLORS["blue"]
- elif roach.fast:
- return ROACH_COLORS["green"]
- elif roach.strong:
- return ROACH_COLORS["purple"]
- return ROACH_COLORS["brown"]
-
def assemble_frame(self, i, color, roach_data):
roach = images.load("roach%s/roach_%d" % (self.suffix, i + 1))
eyes = images.load("roach%s/eyes_%d" % (self.suffix, i + 1))
def assemble_frame(self, i, color, roach_data):
roach = images.load("roach%s/roach_%d" % (self.suffix, i + 1))
eyes = images.load("roach%s/eyes_%d" % (self.suffix, i + 1))
-
roach
= roach.copy()
-
roach
.fill(color, None, BLEND_RGBA_MULT)
-
roach
.blit(eyes, (0, 0))
- return
roach
+
frame
= roach.copy()
+
frame
.fill(color, None, BLEND_RGBA_MULT)
+
frame
.blit(eyes, (0, 0))
+ return
frame
def assemble(self, roach_data):
def assemble(self, roach_data):
- color =
self.roach
_color(roach_data)
+ color =
roach_serum
_color(roach_data)
frames = [
self.assemble_frame(i, color, roach_data)
for i in range(self.frames)]
frames = [
self.assemble_frame(i, color, roach_data)
for i in range(self.frames)]