rinkhals: gamelib/gameboard.py comparison

Refactor for further move work

author	Neil Muller <drnlmuller@gmail.com>
date	Thu, 12 Nov 2009 21:31:52 +0000
parents	2d0ff46118e2
children	532f1ea476ff

comparison

equal deleted inserted replaced

-:2d0ff46118e2
+:19e583e5cdc0
 self.tv = tiles.FarmVid()
 self.tv.png_folder_load_tiles('tiles')
 self.tv.tga_load_level(level.map)
 width, height = self.tv.size
 # Ensure we don't every try to create more foxes then is sane
-self.max_foxes = min(height+width-15, level.max_foxes)
+self.max_foxes = min(2*height+2*width-15, level.max_foxes)
 self.create_display()
 self.selected_tool = None
 self.animal_to_place = None
 self.sprite_cursor = None
 def run_animations(self):
 # For legacy.
 if self.toolbar.anim_clear_tool:
 self.toolbar.clear_tool()
-def move_foxes(self):
+def do_night_step(self):
-"""Move the foxes.
+"""Handle the events of the night.
 We return True if there are no more foxes to move or all the
 foxes are safely back. This end's the night"""
 if not self.foxes:
 return True
+# Move all the foxes
+over = self.foxes_move()
+if not over:
+self.foxes_attack()
+self.chickens_attack()
+return over
+def foxes_move(self):
 over = True
 for fox in self.foxes:
 fox.move(self)
 if not fox.safe:
 over = False
+return over
+def foxes_attack(self):
+for fox in self.foxes:
+fox.attack(self)
+def chickens_attack(self):
 for chicken in self.chickens:
 chicken.attack(self)
-return over
 def add_chicken(self, chicken):
 self.chickens.add(chicken)
 if chicken.outside():
 self.tv.sprites.append(chicken)

Mercurial > rinkhals