Changeset 408:02a6de5629d6

Timestamp:

Nov 21, 2009, 9:40:29 AM (11 years ago)

Author:

Neil Muller <drnlmuller@…>

Branch:

default

Convert:

svn:b4e93282-eac8-4b8b-b765-0f5d36de2b68/trunk/rinkhals@413

Message:

Levels can include starting equipment

Files:

• docs/Level_structure (modified) (1 diff)
• gamelib/equipment.py (modified) (1 diff)
• gamelib/gameboard.py (modified) (2 diffs)
• regenerate_level_data.py (modified) (2 diffs)

docs/Level_structure

@@ -4 +4 @@
 two layers of pgu's tilemap - the tile layer, for the objects of interest,
 and the code layer, which indicates the starting chicken positions.
+
+Different codes mean chickens ahve different levels of equipment.
+
+01 - chicken with no equipment
+02 - chicken with helmet
+03 - chicken with kevlar
+04 - chicken with knife
+05 - chicken with rifle
+06 - chicken with kevlar & helmet
+07 - chicken with helmet & knife
+08 - chicken with kevlar & knife
+09 - chicken with kevlar, helmet & knife
+10 - chicken with helmet & rifle
+11 - chicken with kevlar & rifle
+12 - chicken with kevlar, helmet & rifle
 
 The level.conf file allows the default game constants to be customised.

gamelib/equipment.py

@@ -197 +197 @@
     except TypeError:
         pass
+
+
+EQUIP_MAP = { # Map chicken level codes to equipment
+        1  : [],
+        2  : [Helmet],
+        3  : [Kevlar],
+        4  : [Knife],
+        5  : [Rifle],
+        6  : [Kevlar, Helmet],
+        7  : [Helmet, Knife],
+        8  : [Kevlar, Knife],
+        9  : [Kevlar, Helmet, Knife],
+        10 : [Helmet, Rifle],
+        11 : [Kevlar, Rifle],
+        12 : [Kevlar, Helmet, Rifle],
+        }

gamelib/gameboard.py

@@ -303 +303 @@
         self.fix_buildings()
 
-        cdata = {
-                1 : (self.add_start_chickens, None),
-                }
+        cdata = {}
+        for tn in equipment.EQUIP_MAP:
+            cdata[tn]  = (self.add_start_chickens, tn)
 
         self.tv.run_codes(cdata, (0,0,width,height))
@@ -938 +938 @@
         self.toolbar.update_cash_counter(self.cash)
 
-    def add_start_chickens(self, _map, tile, _value):
+    def add_start_chickens(self, _map, tile, value):
         """Add chickens as specified by the code layer"""
         chick = animal.Chicken((tile.tx, tile.ty))
+        for equip_cls in equipment.EQUIP_MAP[value]:
+            item = equip_cls()
+            chick.equip(item)
         self.add_chicken(chick)
 

regenerate_level_data.py

@@ -6 +6 @@
 from pygame.locals import SWSURFACE, SRCALPHA
 
-from gamelib import tiles, buildings
+from gamelib import tiles, buildings, equipment
 import regenerate_pngs
 
@@ -41 +41 @@
 def get_code_mappings():
     code_map = {}
-    # this list needs to manually kept in sync. This should be fixed
-    for tn, sprite_name in [(1, 'chkn')]:
-        image = generate_image(sprite_name, regenerate_pngs.SPRITE_PATH)
+    # Needs better handling of wings
+    for tn, sprites in equipment.EQUIP_MAP.iteritems():
+        image = generate_image('chkn', regenerate_pngs.SPRITE_PATH)
+        need_wing = False
+        for equip in sprites:
+            sub_image = generate_image(equip.CHICKEN_IMAGE_FILE,
+                    regenerate_pngs.SPRITE_PATH)
+            image.blit(sub_image, (0, 0))
+            if equip.UNDER_LIMB:
+                need_wing = True
+        if need_wing:
+            sub_image = generate_image('wing', regenerate_pngs.SPRITE_PATH)
+            image.blit(sub_image, (0, 0))
         if image:
             code_map[tn] = image