X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;ds=sidebyside;f=koperkapel%2Fvehicles%2Fbase.py;h=fdc9b7f48e90bb12e6515ce0e4ad3ab4ff03d42f;hb=6c6770561fb358f59b4755ba362a65f60c7a1162;hp=2c1d9bf97d5b2e2109fc7f7cc4fbf129aacd2a5c;hpb=ec18a4dde4d14bd4486fb936476266e8511b169b;p=koperkapel.git diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py index 2c1d9bf..fdc9b7f 100644 --- a/koperkapel/vehicles/base.py +++ b/koperkapel/vehicles/base.py @@ -19,6 +19,7 @@ class Vehicle: approximate_radius = 200 weapons_taped_on = True selected_seat_overlay_color = (255, 0, 0, 255) + armour = 0 def __init__(self): self.seats = self.init_seats() @@ -96,13 +97,17 @@ class Vehicle: vehicle = images.load(safepath("vehicle%s/%s_%d") % ( suffix, self.vehicle_type, i + 1)) frame = vehicle.copy() - frame.blit(weapon.surf, (0, 0)) + if weapon: + frame.blit(weapon.surf, (0, 0)) return frame - def get_avatar(self, world): - weapon = default_weapons.assemble( + def get_avatar(self, world=None, dead=False): + if not dead: + weapon = default_weapons.assemble( world.weapons.current, tape=self.weapons_taped_on) - frames = [self._avatar_frame(i, weapon) for i in range(4)] + frames = [self._avatar_frame(i, weapon) for i in range(4)] + else: + frames = [self._avatar_frame(0, weapon=None)] return AnimatedSurfActor(frames, anchor=(0, 0))