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

diff --git a/koperkapel/actors/orientatedsurf.py b/koperkapel/actors/orientatedsurf.py
index 6db857035c518ec8ed84e08c104a2dc8bb8dc976..720bb204cdb5a69e28a2ce482acffc1cfe1d0ab9 100644 (file)
--- a/koperkapel/actors/orientatedsurf.py
+++ b/koperkapel/actors/orientatedsurf.py
@@ -4,6 +4,7 @@ from pygame.transform import rotate
 from pgzero.actor import POS_TOPLEFT, ANCHOR_CENTER
 
 from .surf import SurfActor
+from ..constants import TILE_SIZE
 
 
 class OrientatedSurfActor(SurfActor):
@@ -22,8 +23,12 @@ class OrientatedSurfActor(SurfActor):
 
     @angle.setter
     def angle(self, angle):
+        cur_anchor = self._anchor_value
+        if angle not in (self._angle, self._angle + 180, self._angle - 180):
+            self._anchor_value = (cur_anchor[1], cur_anchor[0])
         self._angle = angle
         self._surf = self._orig_surf = rotate(self._base_surf, angle)
+        print(self.anchor, self.angle)
 
     @property
     def surf(self):

diff --git a/koperkapel/images/roach_management/inventory_pad.png b/koperkapel/images/roach_management/inventory_pad.png
index ed524fd22c74fe229179f12a09a0baa811d3d1bb..b3fe662ab19281262949eb35345909c191f4a1ab 100644 (file)
Binary files a/koperkapel/images/roach_management/inventory_pad.png and b/koperkapel/images/roach_management/inventory_pad.png differ

diff --git a/koperkapel/roaches.py b/koperkapel/roaches.py
index 6dedf305fd3b50b96e3da5c2e748b9f32551964e..95353ee18a441bdf947bb4cf07586c41e1faa18b 100644 (file)
--- a/koperkapel/roaches.py
+++ b/koperkapel/roaches.py
@@ -33,6 +33,15 @@ class RoachActor(OrientatedSurfActor):
         self.surf = self._frames[self._frame]
 
 
+class WorldRoach(object):
+    """A roach proxy with no properties for display on the game level."""
+
+    def __init__(self):
+        self.smart = False
+        self.strong = False
+        self.fast = False
+
+
 class RoachFactory:
 
     def __init__(self, suffix, frames=4):
@@ -59,3 +68,5 @@ default_roaches = RoachFactory("")
 t32_roaches = RoachFactory("_32")
 t21_roaches = RoachFactory("_21")
 big_roaches = RoachFactory("_big")
+roaches_quartet = RoachFactory("_quartet")
+roaches_nonet = RoachFactory("_nonet")

diff --git a/koperkapel/scenes/level.py b/koperkapel/scenes/level.py
index ea37e154ed643a39f166a1fcd8ada72553fd8af3..d2c7d162ef28b99007850086b1a1f45ee02a74bc 100644 (file)
--- a/koperkapel/scenes/level.py
+++ b/koperkapel/scenes/level.py
@@ -6,7 +6,7 @@ import pygame.locals as pgl
 from ..loaders.levelloader import levels
 from .base import Scene, ChangeSceneEvent, MoveViewportEvent
 from ..constants import TILE_SIZE, WIDTH, HEIGHT
-from ..roaches import default_roaches
+from ..vehicles.base import Vehicle
 
 
 class BaseLevelScene(Scene):
@@ -76,17 +76,18 @@ class GameLevelScene(BaseLevelScene):
     def enter(self, world):
         super().enter(world)
         self._roaches = self.actors.add_layer("roaches", level=10)
+        self._vehicle = Vehicle.current(world)
         self._mode = 'walk'
-        return self._init_roaches(world.roaches)
+        self._angle = 0
+        return self._init_roaches(world)
 
-    def _init_roaches(self, roaches):
-        for roach in roaches:
-            roach_actor = self._roaches.add(default_roaches.assemble(roach))
-            roach_actor.anchor = (0, 0)
-            roach_actor.pos = (WIDTH // 2, HEIGHT // 2)
+    def _init_roaches(self, world):
         x, y = self._level.start_pos
-        self._set_pos(x, y)
         self._level_layer = 'floor'
+        self._avatar = self._vehicle.get_avatar(world)
+        self._set_pos(x, y)
+        self._avatar.pos = (WIDTH // 2, HEIGHT // 2)
+        self._roaches.add(self._avatar)
         # Fix viewport offset
         return [MoveViewportEvent((x * TILE_SIZE - WIDTH // 2, y * TILE_SIZE - HEIGHT // 2))]
 
@@ -103,8 +104,17 @@ class GameLevelScene(BaseLevelScene):
             return self._level.can_crawl(x, y, self._level_layer)
 
     def _set_angle(self, angle):
-        for roach in self._roaches:
-            roach.angle = angle
+        self._angle = angle
+        self._avatar.angle = angle
+
+    def update(self, world, engine, dt):
+        if self._vehicle.changed():
+            self._roaches.remove(self._avatar)
+            self._avatar = self._vehicle.get_avatar(world)
+            self._avatar.pos = (WIDTH // 2, HEIGHT // 2)
+            self._roaches.add(self._avatar)
+            self._avatar.set_angle(self._angle)
+        super().update(world, engine, dt)
 
     def on_key_down(self, key, mod, unicode):
         offset = None
@@ -149,7 +159,6 @@ class GameLevelScene(BaseLevelScene):
         elif key == keys.V:
             # Leave vehicle
             print('Vehicle key pressed')
-            
         if offset:
             return [MoveViewportEvent(offset)]
         return super(GameLevelScene, self).on_key_down(key, mod, unicode)

diff --git a/koperkapel/vehicles/base.py b/koperkapel/vehicles/base.py
index c2a24f64ecbfb6cb5d9f27cc03ae11da0a3cf141..47588a59c5450aaaabd5f74ac120302c65037f50 100644 (file)
--- a/koperkapel/vehicles/base.py
+++ b/koperkapel/vehicles/base.py
@@ -16,6 +16,7 @@ class Vehicle:
 
     def __init__(self):
         self.seats = self.init_seats()
+        self.game_pos = (0, 0)
 
     def roach_management_overlay(self):
         return Actor("vehicles/%s/background" % (self.vehicle_type,))
@@ -66,6 +67,9 @@ class Vehicle:
         from .walking import Walking
         cls.register(Walking)
 
+    def get_avatar(self, world):
+        raise NotImplementedError("Vehicles should know how to create their own avatars.")
+
 
 class Seat:
     """ A space in a vehicle for a roach.

diff --git a/koperkapel/vehicles/walking.py b/koperkapel/vehicles/walking.py
index 9c19aa2264e7f730e0a4ea303b4c7e5310944848..aa88bc65a97230d5048f01927e43b4cddcdfbc1c 100644 (file)
--- a/koperkapel/vehicles/walking.py
+++ b/koperkapel/vehicles/walking.py
@@ -2,7 +2,7 @@
 
 import math
 from .base import Vehicle, Seat
-
+from ..roaches import default_roaches, roaches_quartet, roaches_nonet, WorldRoach
 
 class Walking(Vehicle):
 
@@ -17,3 +17,20 @@ class Walking(Vehicle):
                 pos=(math.sin(i * d_theta), math.cos(i * d_theta)))
             for i in range(n_seats)
         ]
+
+    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 = (-16, 0)
+        else:
+            avatar = roaches_nonet.assemble(roach)
+        return avatar
+
+    def changed(self):
+        return False

diff --git a/sources/vector/roach_management/inventory_pad.svg b/sources/vector/roach_management/inventory_pad.svg
index a6005482c480c5156c3c830e32c554298666b273..4c7e48ab84d19ff39f924f28096a3dc230ec9e8a 100644 (file)
--- a/sources/vector/roach_management/inventory_pad.svg
+++ b/sources/vector/roach_management/inventory_pad.svg
@@ -26,7 +26,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.413958"
-     inkscape:cx="117.75416"
+     inkscape:cx="4.5966263"
      inkscape:cy="188.28195"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -55,7 +55,7 @@
      id="layer1"
      transform="translate(0,-700.36216)">
     <g
-       transform="translate(-18.246291,466.58634)"
+       transform="translate(-18.246291,444.58634)"
        style="font-style:normal;font-weight:normal;font-size:22.5px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        id="flowRoot3368-7">
       <path