From: Simon Cross Date: Sat, 5 Mar 2016 22:30:18 +0000 (+0200) Subject: Merge branch 'master' of ctpug.org.za:koperkapel X-Git-Url: https://git.ctpug.org.za/?p=koperkapel.git;a=commitdiff_plain;h=d295d742621497c2b7e99c0ecdb3c2e99e4f7a91;hp=ea01c5200f06149c3ece055c576308601341144e Merge branch 'master' of ctpug.org.za:koperkapel --- diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py index 258ffe0..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() diff --git a/koperkapel/vehicles/quadcopter.py b/koperkapel/vehicles/quadcopter.py index 64f921f..4370139 100644 --- a/koperkapel/vehicles/quadcopter.py +++ b/koperkapel/vehicles/quadcopter.py @@ -7,6 +7,7 @@ class Quadcopter(Vehicle): vehicle_type = "quadcopter" overlay_frame_no = 1 + armour = 5 def init_seats(self): return circle_of_seats(4, vehicle=self) diff --git a/koperkapel/vehicles/robot.py b/koperkapel/vehicles/robot.py index 8fe3fa9..de8799e 100644 --- a/koperkapel/vehicles/robot.py +++ b/koperkapel/vehicles/robot.py @@ -7,6 +7,7 @@ class Robot(Vehicle): vehicle_type = "robot" overlay_frame_no = 1 + armour = 10 def init_seats(self): return circle_of_seats(8, vehicle=self) diff --git a/koperkapel/vehicles/roomba.py b/koperkapel/vehicles/roomba.py index c868763..985abb1 100644 --- a/koperkapel/vehicles/roomba.py +++ b/koperkapel/vehicles/roomba.py @@ -7,6 +7,7 @@ class Roomba(Vehicle): vehicle_type = "roomba" overlay_frame_no = 1 + armour = 2 def init_seats(self): return circle_of_seats(6, vehicle=self)