Merge branch 'master' of ctpug.org.za:koperkapel

[koperkapel.git] / koperkapel / vehicles / walking.py

diff --git a/koperkapel/vehicles/walking.py b/koperkapel/vehicles/walking.py
index 91cf02df66372b8f33c22771fd43a7dfd4ad6006..f7b73aa398cbf31ca6451f0b117bd0c980e00139 100644 (file)
--- a/koperkapel/vehicles/walking.py
+++ b/koperkapel/vehicles/walking.py
@@ -1,8 +1,8 @@
 """ A vehicle to represent roaches on foot. """
 
-import math
-from pgzero.actor import Actor
-from .base import Vehicle, Seat
+from .base import Vehicle, circle_of_seats
+from ..roaches import (
+    default_roaches, roaches_quartet, roaches_nonet, WorldRoach)
 
 
 class Walking(Vehicle):
@@ -10,11 +10,19 @@ class Walking(Vehicle):
     vehicle_type = "walking"
 
     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):
+        num_roaches = len(world.roaches)
+        roach = WorldRoach()
+        if num_roaches == 1:
+            # Return a single large roach
+            avatar = default_roaches.assemble(roach)
+            avatar.anchor = (0, 0)
+        elif num_roaches < 6:
+            avatar = roaches_quartet.assemble(roach)
+            avatar.anchor = (0, 0)
+        else:
+            avatar = roaches_nonet.assemble(roach)
+            avatar.anchor = (0, 0)
+        return avatar