Mercurial > rinkhals
comparison gamelib/animal.py @ 372:90abd39e6c3c 1.0.x
Merge in post-pyweek fixes (r359:371).
author | Simon Cross <hodgestar@gmail.com> |
---|---|
date | Tue, 13 Oct 2009 20:28:48 +0000 |
parents | 32149b1d9fd2 |
children | 71f5897ac5ef |
comparison
equal
deleted
inserted
replaced
371:c39e7d33ac82 | 372:90abd39e6c3c |
---|---|
347 # Either no target, or someone ate it | 347 # Either no target, or someone ate it |
348 self.closest = None | 348 self.closest = None |
349 for chicken in gameboard.chickens: | 349 for chicken in gameboard.chickens: |
350 dist = chicken.pos.dist(self.pos) | 350 dist = chicken.pos.dist(self.pos) |
351 if chicken.abode: | 351 if chicken.abode: |
352 dist += 10 # Prefer free-ranging chickens | 352 dist += 5 # Prefer free-ranging chickens |
353 if len(chicken.weapons()) > 0: | |
354 dist += 5 # Prefer unarmed chickens | |
353 if dist < min_dist: | 355 if dist < min_dist: |
354 min_dist = dist | 356 min_dist = dist |
355 self.closest = chicken | 357 self.closest = chicken |
356 if not self.closest: | 358 if not self.closest: |
357 # No more chickens, so leave | 359 # No more chickens, so leave |