diff gamelib/gameboard.py @ 475:d4f04d81fe54

Rinkhals eats eggs, along with associated changes.
author Jeremy Thurgood <firxen@gmail.com>
date Wed, 25 Nov 2009 17:08:17 +0000
parents a50b53983389
children 3dae0fc14009
line wrap: on
line diff
--- a/gamelib/gameboard.py	Wed Nov 25 16:42:28 2009 +0000
+++ b/gamelib/gameboard.py	Wed Nov 25 17:08:17 2009 +0000
@@ -340,12 +340,14 @@
     def sell_one_egg(self, chicken):
         if chicken.eggs:
             self.add_cash(self.level.sell_price_egg)
-            chicken.remove_one_egg()
-            self.eggs -= 1
-            self.toolbar.update_egg_counter(self.eggs)
+            chicken.remove_one_egg(self)
             return True
         return False
 
+    def remove_eggs(self, num):
+        self.eggs -= num
+        self.toolbar.update_egg_counter(self.eggs)
+
     def sell_egg(self, tile_pos):
         def do_sell(chicken, update_button=None):
             # We try sell and egg
@@ -451,9 +453,7 @@
                     if try_pos:
                         chicken.unequip_by_name("Nest")
                         self.relocate_animal(chicken, tile_pos=try_pos)
-                        self.eggs -= chicken.get_num_eggs()
-                        chicken.remove_eggs()
-                        self.toolbar.update_egg_counter(self.eggs)
+                        chicken.remove_eggs(self)
 
     def relocate_animal(self, chicken, tile_pos=None, place=None):
         assert((tile_pos, place) != (None, None))