projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python2 vs python3
[koperkapel.git]
/
koperkapel
/
vehicles
/
base.py
diff --git
a/koperkapel/vehicles/base.py
b/koperkapel/vehicles/base.py
index 9eb3eb0cfe714f74f9517d934da6f8e73ba5c7d6..3d7765c11f53094273bfc310b1f6816d118e956a 100644
(file)
--- a/
koperkapel/vehicles/base.py
+++ b/
koperkapel/vehicles/base.py
@@
-7,6
+7,8
@@
from pygame.constants import BLEND_RGBA_MULT
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
+from ..util import safepath
class Vehicle:
class Vehicle:
@@
-15,6
+17,7
@@
class Vehicle:
vehicle_type = None
overlay_frame_no = None
approximate_radius = 200
vehicle_type = None
overlay_frame_no = None
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):
@@
-22,12
+25,12
@@
class Vehicle:
self.game_pos = (0, 0)
def roach_management_overlay(self):
self.game_pos = (0, 0)
def roach_management_overlay(self):
- return images.load(
"vehicles/walking/background"
)
+ return images.load(
safepath("vehicles/walking/background")
)
def roach_management_frame(self):
if self.overlay_frame_no is None:
return None
def roach_management_frame(self):
if self.overlay_frame_no is None:
return None
- return images.load(
"vehicle_big/%s_%d"
% (
+ return images.load(
safepath("vehicle_big/%s_%d")
% (
self.vehicle_type, self.overlay_frame_no))
def init_seats(self):
self.vehicle_type, self.overlay_frame_no))
def init_seats(self):
@@
-89,14
+92,17
@@
class Vehicle:
cls.register(Robot)
cls.register(Roomba)
cls.register(Robot)
cls.register(Roomba)
- def _avatar_frame(self, i, suffix="_tiles"):
- vehicle = images.load(
"vehicle%s/%s_%d"
% (
+ def _avatar_frame(self, i,
weapon,
suffix="_tiles"):
+ vehicle = images.load(
safepath("vehicle%s/%s_%d")
% (
suffix, self.vehicle_type, i + 1))
frame = vehicle.copy()
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)]
+ 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))
return AnimatedSurfActor(frames, anchor=(0, 0))
@@
-120,7
+126,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/walking/seat"
)
+ seat = images.load(
safepath("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)