rinkhals: gamelib/animal.py comparison

comparison gamelib/animal.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	fc648da2334c
children	3dae0fc14009

comparison

equal deleted inserted replaced

-:a50b53983389
+:d4f04d81fe54
 for x in range(random.randint(1, 4)):
 self.eggs.append(Egg(self.pos))
 self.equip(equipment.NestEgg())
 gameboard.eggs += self.get_num_eggs()
-def remove_eggs(self):
+def remove_eggs(self, gameboard):
 """Clean up the egg state"""
+gameboard.remove_eggs(len(self.eggs))
 self.eggs = []
 self.unequip_by_name("Nestegg")
-def remove_one_egg(self):
+def remove_one_egg(self, gameboard):
 """Clean up the egg state"""
 self.eggs.pop()
+gameboard.remove_eggs(1)
 if not self.eggs:
 self.unequip_by_name("Nestegg")
 def get_num_eggs(self):
 return len(self.eggs)
 self.eggs.pop()
 gameboard.eggs -= 1
 # Sell other eggs
 for egg in self.eggs[:]:
 gameboard.sell_one_egg(self)
-self.remove_eggs() # clean up stale images, etc.
+self.remove_eggs(gameboard) # clean up stale images, etc.
 gameboard.place_hatched_chicken(chick, self.abode.building)
 def _find_killable_fox(self, weapon, gameboard):
 """Choose a random fox within range of this weapon."""
 killable_foxes = []
 # Safely out of sight
 self.safe = True
 return self.pos
 return self._find_best_path_step(self.landmarks[-1], gameboard)
+def _select_target(self, gameboard):
+min_dist = 999
+self.closest = None
+for chicken in gameboard.chickens:
+dist = chicken.pos.dist(self.pos)
+if chicken.abode:
+dist += 5 # Prefer free-ranging chickens
+if len(chicken.weapons()) > 0:
+dist += 5 # Prefer unarmed chickens
+if dist < min_dist:
+min_dist = dist
+self.closest = chicken
 def _find_path_to_chicken(self, gameboard):
 """Find the path to the closest chicken"""
 # Find the closest chicken
-min_dist = 999
 if self.closest not in gameboard.chickens:
 # Either no target, or someone ate it
-self.closest = None
+self._select_target(gameboard)
-for chicken in gameboard.chickens:
-dist = chicken.pos.dist(self.pos)
-if chicken.abode:
-dist += 5 # Prefer free-ranging chickens
-if len(chicken.weapons()) > 0:
-dist += 5 # Prefer unarmed chickens
-if dist < min_dist:
-min_dist = dist
-self.closest = chicken
 if not self.closest:
 # No more chickens, so leave
 self.hunting = False
 return self.pos
 if self.closest.pos == self.pos:
 this_tile = tiles.REVERSE_TILE_MAP['woodland']
 if tiles.TILE_MAP[this_tile] == 'broken fence' and self.hunting:
 # We'll head back towards the holes we make/find
 self.landmarks.append(final_pos)
 elif tiles.TILE_MAP[this_tile] == 'fence' and not self.dig_pos:
-self._dig(gameboard, final_pos)
+return self._dig(gameboard, final_pos)
-return self.pos
 self.last_steps.append(final_pos)
 if len(self.last_steps) > 3:
 self.last_steps.pop(0)
 return final_pos
 def _dig(self, gameboard, dig_pos):
 """Setup dig parameters, to be overridden if needed"""
 self.tick = 5
 self.dig_pos = dig_pos
+return self.pos
 def _make_hole(self, gameboard):
 """Make a hole in the fence"""
 fence = gameboard.get_building(self.dig_pos.to_tile_tuple())
 # Another fox could have made the same hole this turn
 # We're still digging through the fence
 # Check the another fox hasn't dug a hole for us
 # We're too busy digging to notice if a hole appears nearby,
 # but we'll notice if the fence we're digging vanishes
 this_tile = gameboard.tv.get(self.dig_pos.to_tile_tuple())
-if tiles.TILE_MAP[this_tile] == 'broken fence':
+if tiles.TILE_MAP[this_tile] != 'fence':
 self.tick = 0
 else:
 # We've dug through the fence, so make a hole
 self._make_hole(gameboard)
 return
 """Setup dig parameters, to be overridden if needed"""
 self.tick = 0 # Costs us nothing to go through a fence.
 self.dig_pos = dig_pos
 self.DIG_ANIMATION(gameboard.tv, dig_pos.to_tile_tuple())
 self._make_hole(gameboard)
+return self.pos
 class GreedyFox(Fox):
 """Greedy foxes eat more chickens"""
 CONFIG_NAME = 'greedy fox'
 """The Rinkhals has eclectic tastes"""
 STEALTH = 80
 IMAGE_FILE = 'sprites/rinkhals.png'
 CONFIG_NAME = 'rinkhals'
+def _select_target(self, gameboard):
+"""The Rinkhals eats eggs"""
+min_dist = 999
+self.closest = None
+for chicken in gameboard.chickens:
+dist = chicken.pos.dist(self.pos)
+if not chicken.eggs:
+dist += 100 # The closest eggs have to be *far* away to be safe
+if dist < min_dist:
+min_dist = dist
+self.closest = chicken
 def _catch_chicken(self, chicken, gameboard):
-"""The Rinkhals hunts for sport, catch and release style"""
+"""The Rinkhals eats eggs, but does not harm chickens"""
+chicken.remove_eggs(gameboard)
 self.closest = None
 self.hunting = False
 self.last_steps = []
-def _make_hole(self, gameboard):
+def _dig(self, gameboard, dig_pos):
-"""The Rinkhals eats fences"""
+"""Snakes ignore fences"""
-fence = gameboard.get_building(self.dig_pos.to_tile_tuple())
+return dig_pos
-if fence:
-fence.remove(gameboard.tv)
-gameboard.remove_building(fence)
-self.dig_pos = None
 def damage(self, gameboard):
 """The Rinkhals is invincible!"""
 return True

Mercurial > rinkhals

comparison gamelib/animal.py @ 475:d4f04d81fe54