projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ctpug.org.za:koperkapel
[koperkapel.git]
/
koperkapel
/
vehicles
/
base.py
diff --git
a/koperkapel/vehicles/base.py
b/koperkapel/vehicles/base.py
index 551826f5053dee9d56c8fd489af54db8abd218f3..27e1b24d4f0633575ac9519260de5c05d8c1a002 100644
(file)
--- a/
koperkapel/vehicles/base.py
+++ b/
koperkapel/vehicles/base.py
@@
-1,19
+1,22
@@
""" Base class for vehicles. """
import math
""" Base class for vehicles. """
import math
+import random
from itertools import chain, islice, repeat
from pygame.constants import BLEND_RGBA_MULT
from itertools import chain, islice, repeat
from pygame.constants import BLEND_RGBA_MULT
-from pgzero.actor import Actor
from pgzero.loaders import images
from ..actors.orientatedsurf import OrientatedSurfActor
from ..actors.animsurf import AnimatedSurfActor
from pgzero.loaders import images
from ..actors.orientatedsurf import OrientatedSurfActor
from ..actors.animsurf import AnimatedSurfActor
+from ..weapons import default_weapons
class Vehicle:
""" Vehicle base class. """
vehicle_type = None
class Vehicle:
""" Vehicle base class. """
vehicle_type = None
+ overlay_frame_no = None
approximate_radius = 200
approximate_radius = 200
+ weapons_taped_on = True
selected_seat_overlay_color = (255, 0, 0, 255)
def __init__(self):
selected_seat_overlay_color = (255, 0, 0, 255)
def __init__(self):
@@
-21,7
+24,13
@@
class Vehicle:
self.game_pos = (0, 0)
def roach_management_overlay(self):
self.game_pos = (0, 0)
def roach_management_overlay(self):
- return Actor("vehicles/%s/background" % (self.vehicle_type,))
+ return images.load("vehicles/walking/background")
+
+ def roach_management_frame(self):
+ if self.overlay_frame_no is None:
+ return None
+ return images.load("vehicle_big/%s_%d" % (
+ self.vehicle_type, self.overlay_frame_no))
def init_seats(self):
raise NotImplementedError("Vehicles should specify a list of seats")
def init_seats(self):
raise NotImplementedError("Vehicles should specify a list of seats")
@@
-67,6
+76,10
@@
class Vehicle:
def register(cls, vehicle_cls):
cls._vehicle_types[vehicle_cls.__name__.lower()] = vehicle_cls
def register(cls, vehicle_cls):
cls._vehicle_types[vehicle_cls.__name__.lower()] = vehicle_cls
+ @classmethod
+ def random(cls):
+ return random.choice(list(cls._vehicle_types.keys()))
+
@classmethod
def register_all(cls):
from .walking import Walking
@classmethod
def register_all(cls):
from .walking import Walking
@@
-78,15
+91,18
@@
class Vehicle:
cls.register(Robot)
cls.register(Roomba)
cls.register(Robot)
cls.register(Roomba)
- def _avatar_frame(self, i, suffix="_tiles"):
+ def _avatar_frame(self, i,
weapon,
suffix="_tiles"):
vehicle = images.load("vehicle%s/%s_%d" % (
suffix, self.vehicle_type, i + 1))
frame = vehicle.copy()
vehicle = images.load("vehicle%s/%s_%d" % (
suffix, self.vehicle_type, i + 1))
frame = vehicle.copy()
+ frame.blit(weapon.surf, (0, 0))
return frame
def get_avatar(self, world):
return frame
def get_avatar(self, world):
- frames = [self._avatar_frame(i) for i in range(4)]
- return AnimatedSurfActor(frames)
+ weapon = default_weapons.assemble(
+ world.weapons.current, tape=self.weapons_taped_on)
+ frames = [self._avatar_frame(i, weapon) for i in range(4)]
+ return AnimatedSurfActor(frames, anchor=(0, 0))
class Seat:
class Seat:
@@
-109,8
+125,7
@@
class Seat:
self.vehicle_pos = (pos[0] * vrad, pos[1] * vrad)
def actor(self):
self.vehicle_pos = (pos[0] * vrad, pos[1] * vrad)
def actor(self):
- seat = images.load(
- "vehicles/%s/seat" % (self.vehicle.vehicle_type,))
+ seat = images.load("vehicles/walking/seat")
selected_seat = seat.copy()
selected_seat.fill(
self.vehicle.selected_seat_overlay_color, None, BLEND_RGBA_MULT)
selected_seat = seat.copy()
selected_seat.fill(
self.vehicle.selected_seat_overlay_color, None, BLEND_RGBA_MULT)