Mercurial > rinkhals

changeset 305:32149b1d9fd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Capitalised all equipment names.
author Jeremy Thurgood <firxen@gmail.com>
date Sat, 05 Sep 2009 17:36:36 +0000
parents 67021d0920dc
children c8267f62fbe8
files gamelib/animal.py gamelib/equipment.py gamelib/gameboard.py
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/animal.py	Sat Sep 05 17:35:51 2009 +0000
+++ b/gamelib/animal.py	Sat Sep 05 17:36:36 2009 +0000
@@ -167,13 +167,13 @@
     def remove_eggs(self):
         """Clean up the egg state"""
         self.eggs = []
-        self.unequip_by_name("nestegg")
+        self.unequip_by_name("Nestegg")
 
     def remove_one_egg(self):
         """Clean up the egg state"""
         self.eggs.pop()
         if not self.eggs:
-            self.unequip_by_name("nestegg")
+            self.unequip_by_name("Nestegg")
 
     def get_num_eggs(self):
         return len(self.eggs)
--- a/gamelib/equipment.py	Sat Sep 05 17:35:51 2009 +0000
+++ b/gamelib/equipment.py	Sat Sep 05 17:36:36 2009 +0000
@@ -81,7 +81,7 @@
 
 class Rifle(Weapon):
     TYPE = "GUN"
-    NAME = "rifle"
+    NAME = "Rifle"
     BUY_PRICE = 100
     SELL_PRICE = 75
 
@@ -96,7 +96,7 @@
 
 class Knife(Weapon):
     TYPE = "KNIFE"
-    NAME = "knife"
+    NAME = "Knife"
     BUY_PRICE = 25
     SELL_PRICE = 15
 
@@ -128,7 +128,7 @@
         return False
 
 class Helmet(Armour):
-    NAME = "helmet"
+    NAME = "Helmet"
     BUY_PRICE = 25
     SELL_PRICE = 15
     DRAW_LAYER = 6
@@ -139,7 +139,7 @@
     UNDER_EYE = True
 
 class Kevlar(Armour):
-    NAME = "kevlar"
+    NAME = "Kevlar"
     BUY_PRICE = 100
     SELL_PRICE = 75
 
@@ -161,17 +161,17 @@
         return True
 
 class Spotlight(Accoutrement):
-    NAME = "spotlight"
+    NAME = "Spotlight"
     CHICKEN_IMAGE_FILE = 'sprites/select_chkn.png'
     DRAW_LAYER = -5
 
 class Nest(Accoutrement):
-    NAME = "nest"
+    NAME = "Nest"
     CHICKEN_IMAGE_FILE = 'sprites/nest.png'
     DRAW_LAYER = 15
 
 class NestEgg(Accoutrement):
-    NAME = "nestegg"
+    NAME = "Nestegg"
     CHICKEN_IMAGE_FILE = 'sprites/equip_egg.png'
     DRAW_LAYER = 14
 
--- a/gamelib/gameboard.py	Sat Sep 05 17:35:51 2009 +0000
+++ b/gamelib/gameboard.py	Sat Sep 05 17:36:36 2009 +0000
@@ -354,7 +354,7 @@
         self.selected_tool = tool
         if self.animal_to_place:
             # Clear any highlights
-            self.animal_to_place.unequip_by_name("spotlight")
+            self.animal_to_place.unequip_by_name("Spotlight")
         self.select_animal_to_place(None)
         sprite_curs = None
         if buildings.is_building(tool):
@@ -489,7 +489,7 @@
 
     def select_animal_to_place(self, animal):
         if self.animal_to_place:
-            self.animal_to_place.unequip_by_name("spotlight")
+            self.animal_to_place.unequip_by_name("Spotlight")
         self.animal_to_place = animal
         if self.animal_to_place:
             self.animal_to_place.equip(equipment.Spotlight())
@@ -525,7 +525,7 @@
             return
         if self.tv.get(tile_pos) == self.GRASSLAND:
             if self.animal_to_place is not None:
-                self.animal_to_place.unequip_by_name("nest")
+                self.animal_to_place.unequip_by_name("Nest")
                 self.relocate_animal(self.animal_to_place, tile_pos=tile_pos)
                 self.eggs -= self.animal_to_place.get_num_eggs()
                 self.animal_to_place.remove_eggs()