X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fvehicles%2Fwalking.py;h=8061f2c31c94e83689d286907252f2d61cbaaaca;hb=94041e07b1111324d2666a1f3aa2ea5cdbdbb805;hp=aa88bc65a97230d5048f01927e43b4cddcdfbc1c;hpb=20d1e19f23c04daf107ede8c9fe57b97005a37fd;p=koperkapel.git

diff --git a/koperkapel/vehicles/walking.py b/koperkapel/vehicles/walking.py
index aa88bc6..8061f2c 100644
--- a/koperkapel/vehicles/walking.py
+++ b/koperkapel/vehicles/walking.py
@@ -1,36 +1,32 @@
 """ A vehicle to represent roaches on foot. """
 
-import math
-from .base import Vehicle, Seat
-from ..roaches import default_roaches, roaches_quartet, roaches_nonet, WorldRoach
+from .base import Vehicle, circle_of_seats
+from ..roaches import (
+    default_roaches, roaches_quartet, roaches_nonet, WorldRoach)
+from ..weapons import default_weapons
+
 
 class Walking(Vehicle):
 
     vehicle_type = "walking"
+    weapons_taped_on = False
 
     def init_seats(self):
-        n_seats = 6
-        d_theta = 2 * math.pi / n_seats
-        return [
-            Seat(
-                vehicle=self,
-                pos=(math.sin(i * d_theta), math.cos(i * d_theta)))
-            for i in range(n_seats)
-        ]
+        return circle_of_seats(6, vehicle=self)
 
     def get_avatar(self, world):
+        weapon = default_weapons.assemble(
+            world.weapons.current, tape=self.weapons_taped_on)
         num_roaches = len(world.roaches)
         roach = WorldRoach()
         if num_roaches == 1:
             # Return a single large roach
-            avatar = default_roaches.assemble(roach)
+            avatar = default_roaches.assemble(roach, weapon)
             avatar.anchor = (0, 0)
         elif num_roaches < 6:
-            avatar = roaches_quartet.assemble(roach)
-            avatar.anchor = (-16, 0)
+            avatar = roaches_quartet.assemble(roach, weapon)
+            avatar.anchor = (0, 0)
         else:
-            avatar = roaches_nonet.assemble(roach)
+            avatar = roaches_nonet.assemble(roach, weapon)
+            avatar.anchor = (0, 0)
         return avatar
-
-    def changed(self):
-        return False