rinkhals: gamelib/animal.py annotate

annotate gamelib/animal.py @ 414:9096c237928c

Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details.

author	Jeremy Thurgood <firxen@gmail.com>
date	Sat, 21 Nov 2009 12:48:12 +0000
parents	bdc4757e0497
children	8f012ef1f64f

rev	line source
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	1 """Class for the various animals in the game"""
6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	2
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	3 import random
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	4
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	5 from pgu.vid import Sprite
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	6 from pgu.algo import getline
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	7
44 7e884084e7b1 Move animal sprites to imagecache. Simon Cross <hodgestar@gmail.com> parents: 38 diff changeset	8 import imagecache
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	9 import tiles
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	10 from misc import Position
98 725b292ca07b Added sounds killing foxes and chickens, and nightfall David Fraser <davidf@sjsoft.com> parents: 92 diff changeset	11 import sound
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	12 import equipment
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	13 import animations
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	14
6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	15 class Animal(Sprite):
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	16 """Base class for animals"""
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	17
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	18 STEALTH = 0
199 696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	19 VISION_BONUS = 0
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	20 VISION_RANGE_PENALTY = 10
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	21
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	22 def __init__(self, image_left, image_right, tile_pos):
38 03121c89d5fd Make the secret foxes really secret Neil Muller <drnlmuller@gmail.com> parents: 32 diff changeset	23 # Create the animal somewhere far off screen
53 f20dd3dcb118 foxes don't run backwards Adrianna Pińska <adrianna.pinska@gmail.com> parents: 47 diff changeset	24 Sprite.__init__(self, image_left, (-1000, -1000))
146 423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	25 self._image_left = image_left
423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	26 self.image_left = image_left.copy()
423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	27 self._image_right = image_right
423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	28 self.image_right = image_right.copy()
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	29 if hasattr(tile_pos, 'to_tile_tuple'):
171 9ea53eb919cf Make Animals accept Positions when created. move hatch watching from Chicken to Egg Neil Muller <drnlmuller@gmail.com> parents: 163 diff changeset	30 self.pos = tile_pos
9ea53eb919cf Make Animals accept Positions when created. move hatch watching from Chicken to Egg Neil Muller <drnlmuller@gmail.com> parents: 163 diff changeset	31 else:
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	32 self.pos = Position(tile_pos[0], tile_pos[1], 0)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	33 self.equipment = []
195 9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	34 self.accoutrements = []
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 104 diff changeset	35 self.abode = None
146 423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	36 self.facing = 'left'
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	37
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	38 def loop(self, tv, _sprite):
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	39 ppos = tv.tile_to_view(self.pos.to_tile_tuple())
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	40 self.rect.x = ppos[0]
ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	41 self.rect.y = ppos[1]
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	42
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	43 def die(self, gameboard):
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	44 """Play death animation, noises, whatever."""
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	45 if hasattr(self, 'DEATH_SOUND'):
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	46 sound.play_sound(self.DEATH_SOUND)
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	47 if hasattr(self, 'DEATH_ANIMATION'):
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	48 self.DEATH_ANIMATION(gameboard.tv, self.pos.to_tile_tuple())
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	49 self._game_death(gameboard)
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	50
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	51 def _game_death(self, gameboard):
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	52 # Call appropriate gameboard cleanup here.
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	53 pass
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	54
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	55 def move(self, state):
ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	56 """Given the game state, return a new position for the object"""
ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	57 # Default is not to move
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	58 pass
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	59
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	60 def attack(self, gameboard):
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	61 """Given the game state, attack a suitable target"""
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	62 # Default is not to attack
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	63 pass
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	64
108 437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 104 diff changeset	65 def set_pos(self, tile_pos):
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 104 diff changeset	66 """Move an animal to the given tile_pos."""
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 104 diff changeset	67 new_pos = Position(*tile_pos)
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 104 diff changeset	68 self._fix_face(new_pos)
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 104 diff changeset	69 self.pos = new_pos
437cbd856a03 Add occupants and abodes. Allowing moving chickens around. Simon Cross <hodgestar@gmail.com> parents: 104 diff changeset	70
236 9a6ac9c9ff46 chickens turn to face target foxes Adrianna Pińska <adrianna.pinska@gmail.com> parents: 216 diff changeset	71 def _fix_face(self, facing_pos):
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	72 """Set the face correctly"""
236 9a6ac9c9ff46 chickens turn to face target foxes Adrianna Pińska <adrianna.pinska@gmail.com> parents: 216 diff changeset	73 if facing_pos.left_of(self.pos):
146 423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	74 self._set_image_facing('left')
236 9a6ac9c9ff46 chickens turn to face target foxes Adrianna Pińska <adrianna.pinska@gmail.com> parents: 216 diff changeset	75 elif facing_pos.right_of(self.pos):
146 423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	76 self._set_image_facing('right')
423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	77
423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	78 def _set_image_facing(self, facing):
423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	79 self.facing = facing
423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	80 if self.facing == 'left':
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	81 self.setimage(self.image_left)
146 423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	82 elif self.facing == 'right':
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	83 self.setimage(self.image_right)
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	84
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	85 def equip(self, item):
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	86 if equipment.is_equipment(item):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	87 self.equipment.append(item)
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	88 elif equipment.is_accoutrement(item):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	89 self.accoutrements.append(item)
163 0d6e23dcd3af fixed redrawing Adrianna Pińska <adrianna.pinska@gmail.com> parents: 161 diff changeset	90 self.redraw()
161 9b4213f6ea7f improved equipment layers; unequip method on animal Adrianna Pińska <adrianna.pinska@gmail.com> parents: 158 diff changeset	91
9b4213f6ea7f improved equipment layers; unequip method on animal Adrianna Pińska <adrianna.pinska@gmail.com> parents: 158 diff changeset	92 def unequip(self, item):
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	93 if equipment.is_equipment(item):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	94 self.equipment = [e for e in self.equipment if e != item]
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	95 elif equipment.is_accoutrement(item):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	96 self.accoutrements = [e for e in self.accoutrements if e != item]
163 0d6e23dcd3af fixed redrawing Adrianna Pińska <adrianna.pinska@gmail.com> parents: 161 diff changeset	97 self.redraw()
161 9b4213f6ea7f improved equipment layers; unequip method on animal Adrianna Pińska <adrianna.pinska@gmail.com> parents: 158 diff changeset	98
200 67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	99 def unequip_by_name(self, item_name):
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	100 # only remove first match
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	101 matches = [item for item in self.equipment + self.accoutrements if item.NAME == item_name]
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	102 if matches:
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	103 self.unequip(matches[0])
67d10f7e0159 selected chickens are selected Adrianna Pińska <adrianna.pinska@gmail.com> parents: 199 diff changeset	104
163 0d6e23dcd3af fixed redrawing Adrianna Pińska <adrianna.pinska@gmail.com> parents: 161 diff changeset	105 def redraw(self):
195 9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	106 layers = [(self._image_left.copy(), self._image_right.copy(), 0)]
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	107 if hasattr(self, 'EQUIPMENT_IMAGE_ATTRIBUTE'):
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	108 for item in self.accoutrements + self.equipment:
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	109 images = item.images(self.EQUIPMENT_IMAGE_ATTRIBUTE)
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	110 if images:
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	111 layers.append(images)
158 baf857805867 armour works now Adrianna Pińska <adrianna.pinska@gmail.com> parents: 149 diff changeset	112
195 9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	113 layers.sort(key=lambda l: l[2])
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	114
201 fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	115 # these always go on the bottom so that other layers don't get overwritten
fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	116 self.image_left = self._image_left.copy()
fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	117 self.image_right = self._image_right.copy()
fe1e9c18d4d7 layering bugfix; indoor chickens now use normal chicken icons Adrianna Pińska <adrianna.pinska@gmail.com> parents: 200 diff changeset	118 for l in layers:
195 9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	119 self.image_left.blit(l[0], (0,0))
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	120 self.image_right.blit(l[1], (0,0))
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	121
9d31cfc3afde refactor of layers drawn on chicken, to allow for extended functionality Adrianna Pińska <adrianna.pinska@gmail.com> parents: 187 diff changeset	122 self._set_image_facing(self.facing)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	123
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	124 def weapons(self):
109 48019afde338 Equipment purchasing and some toolbar tweaks. Jeremy Thurgood <firxen@gmail.com> parents: 108 diff changeset	125 return [e for e in self.equipment if equipment.is_weapon(e)]
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	126
174 ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	127 def armour(self):
ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	128 return [e for e in self.equipment if equipment.is_armour(e)]
ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	129
104 d17375586866 Add .covers(tile_pos) to animals (to match similar function on buildings). Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	130 def covers(self, tile_pos):
d17375586866 Add .covers(tile_pos) to animals (to match similar function on buildings). Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	131 return tile_pos[0] == self.pos.x and tile_pos[1] == self.pos.y
d17375586866 Add .covers(tile_pos) to animals (to match similar function on buildings). Simon Cross <hodgestar@gmail.com> parents: 98 diff changeset	132
125 2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 122 diff changeset	133 def outside(self):
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 122 diff changeset	134 return self.abode is None
2e3a05b9594d Chickens in buildings\! Simon Cross <hodgestar@gmail.com> parents: 122 diff changeset	135
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	136 def damage(self, gameboard):
174 ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	137 for a in self.armour():
ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	138 if not a.survive_damage():
ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	139 self.unequip(a)
ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	140 return True
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	141 self.die(gameboard)
174 ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	142 return False
ff168162974e armour gets damaged Adrianna Pińska <adrianna.pinska@gmail.com> parents: 171 diff changeset	143
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	144 class Chicken(Animal):
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	145 """A chicken"""
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	146
146 423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	147 EQUIPMENT_IMAGE_ATTRIBUTE = 'CHICKEN_IMAGE_FILE'
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	148 DEATH_ANIMATION = animations.ChickenDeath
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	149 DEATH_SOUND = 'kill-chicken.ogg'
146 423050ec188b Equipment images. Jeremy Thurgood <firxen@gmail.com> parents: 145 diff changeset	150
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	151 def __init__(self, pos):
53 f20dd3dcb118 foxes don't run backwards Adrianna Pińska <adrianna.pinska@gmail.com> parents: 47 diff changeset	152 image_left = imagecache.load_image('sprites/chkn.png')
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	153 image_right = imagecache.load_image('sprites/chkn.png',
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	154 ("right_facing",))
53 f20dd3dcb118 foxes don't run backwards Adrianna Pińska <adrianna.pinska@gmail.com> parents: 47 diff changeset	155 Animal.__init__(self, image_left, image_right, pos)
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	156 self.eggs = []
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	157
414 9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	158 def start_night(self, gameboard):
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	159 self.lay(gameboard)
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	160 self.reload_weapon()
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	161
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	162 def _game_death(self, gameboard):
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	163 gameboard.remove_chicken(self)
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	164
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	165 def move(self, gameboard):
ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	166 """A free chicken will move away from other free chickens"""
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	167 pass
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	168
414 9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	169 def lay(self, gameboard):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	170 """See if the chicken lays an egg"""
414 9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	171 if self.abode and self.abode.building.HENHOUSE:
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	172 if not self.eggs:
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	173 for x in range(random.randint(1, 4)):
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	174 self.eggs.append(Egg(self.pos))
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	175 self.equip(equipment.NestEgg())
9096c237928c Dear most illustrious brother, I seek your cooperation with the refactoring of egg layerings and the reloading of guns. Please to provide bank details. Jeremy Thurgood <firxen@gmail.com> parents: 413 diff changeset	176 gameboard.eggs += self.get_num_eggs()
216 962934b8c7dc Implement UI part of egg selling Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	177
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	178 def remove_eggs(self):
216 962934b8c7dc Implement UI part of egg selling Neil Muller <drnlmuller@gmail.com> parents: 201 diff changeset	179 """Clean up the egg state"""
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	180 self.eggs = []
305 32149b1d9fd2 Capitalised all equipment names. Jeremy Thurgood <firxen@gmail.com> parents: 293 diff changeset	181 self.unequip_by_name("Nestegg")
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	182
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	183 def remove_one_egg(self):
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	184 """Clean up the egg state"""
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	185 self.eggs.pop()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	186 if not self.eggs:
305 32149b1d9fd2 Capitalised all equipment names. Jeremy Thurgood <firxen@gmail.com> parents: 293 diff changeset	187 self.unequip_by_name("Nestegg")
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	188
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	189 def get_num_eggs(self):
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	190 return len(self.eggs)
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	191
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	192 def hatch(self, gameboard):
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	193 """See if we have an egg to hatch"""
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	194 if self.eggs:
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	195 chick = self.eggs[0].hatch()
187 6854e706dcdf Remove hatched eggs Neil Muller <drnlmuller@gmail.com> parents: 174 diff changeset	196 if chick:
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	197 # sell the remaining eggs
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	198 # Remove hatched egg
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	199 self.eggs.pop()
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	200 gameboard.eggs -= 1
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	201 # Sell other eggs
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	202 for egg in self.eggs[:]:
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	203 gameboard.sell_one_egg(self)
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	204 self.remove_eggs() # clean up stale images, etc.
187 6854e706dcdf Remove hatched eggs Neil Muller <drnlmuller@gmail.com> parents: 174 diff changeset	205 return chick
116 d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	206 return None
d539ef5a3333 Add basic chicken->egg cycle Neil Muller <drnlmuller@gmail.com> parents: 115 diff changeset	207
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	208 def _find_killable_fox(self, weapon, gameboard):
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	209 """Choose a random fox within range of this weapon."""
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	210 killable_foxes = []
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	211 for fox in gameboard.foxes:
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	212 if not visible(self, fox):
4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	213 continue
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	214 if weapon.in_range(gameboard, self, fox):
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	215 killable_foxes.append(fox)
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	216 if not killable_foxes:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	217 return None
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	218 return random.choice(killable_foxes)
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	219
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	220 def attack(self, gameboard):
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	221 """An armed chicken will attack a fox within range."""
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	222 if not self.weapons():
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	223 # Not going to take on a fox bare-winged.
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	224 return
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	225 # Choose the first weapon equipped.
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	226 weapon = self.weapons()[0]
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	227 fox = self._find_killable_fox(weapon, gameboard)
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	228 if not fox:
5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	229 return
236 9a6ac9c9ff46 chickens turn to face target foxes Adrianna Pińska <adrianna.pinska@gmail.com> parents: 216 diff changeset	230 self._fix_face(fox.pos)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	231 if weapon.hit(gameboard, self, fox):
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	232 fox.damage(gameboard)
84 5494af02a0e8 Chickens with rifles! Jeremy Thurgood <firxen@gmail.com> parents: 82 diff changeset	233
413 bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	234 def reload_weapon(self):
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	235 """If we have a weapon that takes ammunition, reload it."""
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	236 if not self.weapons():
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	237 # Nothing to reload
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	238 return
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	239 for weapon in self.weapons():
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	240 if hasattr(weapon, 'AMMUNITION'):
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	241 weapon.ammunition = weapon.AMMUNITION
bdc4757e0497 Add Sniper Rifle and give guns limited ammunition. Jeremy Thurgood <firxen@gmail.com> parents: 407 diff changeset	242
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	243 class Egg(Animal):
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	244 """An egg"""
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	245
47 be2496df2368 Add egg image to egg sprite. Simon Cross <hodgestar@gmail.com> parents: 44 diff changeset	246 def __init__(self, pos):
293 78c49d87e175 oops - bugfix Adrianna Pińska <adrianna.pinska@gmail.com> parents: 290 diff changeset	247 image = imagecache.load_image('sprites/equip_egg.png')
53 f20dd3dcb118 foxes don't run backwards Adrianna Pińska <adrianna.pinska@gmail.com> parents: 47 diff changeset	248 Animal.__init__(self, image, image, pos)
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	249 self.timer = 2
47 be2496df2368 Add egg image to egg sprite. Simon Cross <hodgestar@gmail.com> parents: 44 diff changeset	250
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	251 # Eggs don't move
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	252
171 9ea53eb919cf Make Animals accept Positions when created. move hatch watching from Chicken to Egg Neil Muller <drnlmuller@gmail.com> parents: 163 diff changeset	253 def hatch(self):
243 4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	254 self.timer -= 1
4f86c2616cdf Variable number of eggs for chickens Neil Muller <drnlmuller@gmail.com> parents: 241 diff changeset	255 if self.timer == 0:
171 9ea53eb919cf Make Animals accept Positions when created. move hatch watching from Chicken to Egg Neil Muller <drnlmuller@gmail.com> parents: 163 diff changeset	256 return Chicken(self.pos)
9ea53eb919cf Make Animals accept Positions when created. move hatch watching from Chicken to Egg Neil Muller <drnlmuller@gmail.com> parents: 163 diff changeset	257 return None
9ea53eb919cf Make Animals accept Positions when created. move hatch watching from Chicken to Egg Neil Muller <drnlmuller@gmail.com> parents: 163 diff changeset	258
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	259 class Fox(Animal):
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	260 """A fox"""
25 6d6ab0c1479d Add placing some chickens and foxes Neil Muller <drnlmuller@gmail.com> parents: diff changeset	261
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	262 STEALTH = 20
130 96c5ef7613b5 NINJA FOXES! Jeremy Thurgood <firxen@gmail.com> parents: 125 diff changeset	263 IMAGE_FILE = 'sprites/fox.png'
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	264 DEATH_ANIMATION = animations.FoxDeath
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	265 DEATH_SOUND = 'kill-fox.ogg'
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	266 CONFIG_NAME = 'fox'
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	267
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	268 costs = {
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	269 # weighting for movement calculation
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	270 'grassland' : 2,
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	271 'woodland' : 1, # Try to keep to the woods if possible
72 aa4bd93575d9 Fix some bound checking and tweak movement costs Neil Muller <drnlmuller@gmail.com> parents: 71 diff changeset	272 'broken fence' : 2,
404 e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	273 'fence' : 25,
72 aa4bd93575d9 Fix some bound checking and tweak movement costs Neil Muller <drnlmuller@gmail.com> parents: 71 diff changeset	274 'guardtower' : 2, # We can pass under towers
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	275 'henhouse' : 30, # Don't go into a henhouse unless we're going to
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	276 # catch a chicken there
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	277 'hendominium' : 30,
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	278 }
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	279
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	280 def __init__(self, pos):
130 96c5ef7613b5 NINJA FOXES! Jeremy Thurgood <firxen@gmail.com> parents: 125 diff changeset	281 image_left = imagecache.load_image(self.IMAGE_FILE)
96c5ef7613b5 NINJA FOXES! Jeremy Thurgood <firxen@gmail.com> parents: 125 diff changeset	282 image_right = imagecache.load_image(self.IMAGE_FILE, ("right_facing",))
53 f20dd3dcb118 foxes don't run backwards Adrianna Pińska <adrianna.pinska@gmail.com> parents: 47 diff changeset	283 Animal.__init__(self, image_left, image_right, pos)
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	284 self.landmarks = [self.pos]
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	285 self.hunting = True
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	286 self.dig_pos = None
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	287 self.tick = 0
122 d2b19131d537 Don't continue the night if we're not doing anything anymore Neil Muller <drnlmuller@gmail.com> parents: 116 diff changeset	288 self.safe = False
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	289 self.closest = None
149 2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	290 self.last_steps = []
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	291 # Foxes don't occupy places in the same way chickens do, but they
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	292 # can still be inside
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	293 self.building = None
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	294
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	295 def outside(self):
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	296 return self.building is None
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	297
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	298 def _game_death(self, gameboard):
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	299 gameboard.kill_fox(self)
844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	300
82 bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	301 def _cost_tile(self, pos, gameboard):
bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	302 if gameboard.in_bounds(pos):
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	303 this_tile = gameboard.tv.get(pos.to_tile_tuple())
82 bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	304 cost = self.costs.get(tiles.TILE_MAP[this_tile], 100)
bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	305 else:
bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	306 cost = 100 # Out of bounds is expensive
bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	307 return cost
bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	308
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	309 def _cost_path(self, path, gameboard):
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	310 """Calculate the cost of a path"""
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	311 total = 0
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	312 for pos in path:
82 bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	313 total += self._cost_tile(pos, gameboard)
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	314 return total
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	315
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	316 def _gen_path(self, start_pos, final_pos):
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	317 """Construct a direct path from start_pos to final_pos,
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	318 excluding start_pos"""
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	319 if abs(start_pos.x - final_pos.x) < 2 and \
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	320 abs(start_pos.y - final_pos.y) < 2:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	321 # pgu gets this case wrong on occasion.
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	322 return [final_pos]
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	323 start = start_pos.to_tile_tuple()
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	324 end = final_pos.to_tile_tuple()
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	325 points = getline(start, end)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	326 points.remove(start) # exclude start_pos
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	327 if end not in points:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	328 # Rounding errors in getline cause this
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	329 points.append(end)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	330 return [Position(x[0], x[1]) for x in points]
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	331
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	332 def _find_best_path_step(self, final_pos, gameboard):
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	333 """Find the cheapest path to final_pos, and return the next step
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	334 along the path."""
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	335 # We calculate the cost of the direct path
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	336 if final_pos.z < self.pos.z:
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	337 # We need to try heading down.
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	338 return Position(self.pos.x, self.pos.y, self.pos.z - 1)
404 e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	339 if final_pos.x == self.pos.x and final_pos.y == self.pos.y and \
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	340 final_pos.z > self.pos.z:
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	341 # We try heading up
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	342 return Position(self.pos.x, self.pos.y, self.pos.z + 1)
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	343 cur_dist = final_pos.dist(self.pos)
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	344 if cur_dist < 2:
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	345 # We're right ontop of our target, so just go there
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	346 return final_pos
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	347 # Find the cheapest spot close to us that moves us closer to the target
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	348 neighbours = [Position(self.pos.x + x, self.pos.y + y, self.pos.z) for
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	349 x in range(-1, 2) for y in range(-1, 2) if (x, y) != (0, 0)]
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	350 best_pos = self.pos
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	351 min_cost = 1000
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	352 min_dist = cur_dist
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	353 for point in neighbours:
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	354 dist = point.dist(final_pos)
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	355 if dist < cur_dist:
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	356 cost = self._cost_tile(point, gameboard)
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	357 if cost < min_cost or (min_cost == cost and dist < min_dist):
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	358 # Prefer closest of equal cost points
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	359 min_dist = dist
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	360 min_cost = cost
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	361 best = point
407 bdc8bc78a796 Handle corner case aroudn entering the map Neil Muller <drnlmuller@gmail.com> parents: 406 diff changeset	362 if min_cost < 20 or not gameboard.in_bounds(self.pos):
bdc8bc78a796 Handle corner case aroudn entering the map Neil Muller <drnlmuller@gmail.com> parents: 406 diff changeset	363 # If we're not on the gameboard yet, there's no point in looking
bdc8bc78a796 Handle corner case aroudn entering the map Neil Muller <drnlmuller@gmail.com> parents: 406 diff changeset	364 # for an optimal path.
404 e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	365 return best
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	366 # Else expensive step, so think further
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	367 direct_path = self._gen_path(self.pos, final_pos)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	368 min_cost = self._cost_path(direct_path, gameboard)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	369 min_path = direct_path
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	370 # is there a point nearby that gives us a cheaper direct path?
71 00cf9d7f22dc Expand comment Neil Muller <drnlmuller@gmail.com> parents: 70 diff changeset	371 # This is delibrately not finding the optimal path, as I don't
00cf9d7f22dc Expand comment Neil Muller <drnlmuller@gmail.com> parents: 70 diff changeset	372 # want the foxes to be too intelligent, although the implementation
00cf9d7f22dc Expand comment Neil Muller <drnlmuller@gmail.com> parents: 70 diff changeset	373 # isn't well optimised yet
404 e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	374 # FIXME: Currently, this introduces loops, but the memory kind
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	375 # avoids that. Fixing this is the next goal.
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	376 poss = [Position(self.pos.x + x, self.pos.y + y, self.pos.z) for
e5247ec76f24 The new faster deciding (but somewhat dumber) fox Neil Muller <drnlmuller@gmail.com> parents: 402 diff changeset	377 x in range(-3, 4) for y in range(-3, 4) if (x, y) != (0, 0)]
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	378 for start in poss:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	379 cand_path = self._gen_path(self.pos, start) + \
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	380 self._gen_path(start, final_pos)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	381 cost = self._cost_path(cand_path, gameboard)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	382 if cost < min_cost:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	383 min_cost = cost
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	384 min_path = cand_path
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	385 if not min_path:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	386 return final_pos
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	387 return min_path[0]
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	388
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	389 def _find_path_to_woodland(self, gameboard):
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	390 """Dive back to woodland through the landmarks"""
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	391 # find the closest point to our current location in walked path
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	392 if self.pos == self.landmarks[-1]:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	393 if len(self.landmarks) > 1:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	394 self.landmarks.pop() # Moving to the next landmark
402 3a469d46b820 Tweak safe logic to avoid some corner cases Neil Muller <drnlmuller@gmail.com> parents: 401 diff changeset	395 if not gameboard.in_bounds(self.pos) and not self.hunting:
3a469d46b820 Tweak safe logic to avoid some corner cases Neil Muller <drnlmuller@gmail.com> parents: 401 diff changeset	396 # Safely out of sight
3a469d46b820 Tweak safe logic to avoid some corner cases Neil Muller <drnlmuller@gmail.com> parents: 401 diff changeset	397 self.safe = True
3a469d46b820 Tweak safe logic to avoid some corner cases Neil Muller <drnlmuller@gmail.com> parents: 401 diff changeset	398 return self.pos
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	399 return self._find_best_path_step(self.landmarks[-1], gameboard)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	400
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	401 def _find_path_to_chicken(self, gameboard):
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	402 """Find the path to the closest chicken"""
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	403 # Find the closest chicken
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	404 min_dist = 999
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	405 if self.closest not in gameboard.chickens:
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	406 # Either no target, or someone ate it
196 edcb5edfa0ff If the closest chicken is gone, clear it. Jeremy Thurgood <firxen@gmail.com> parents: 195 diff changeset	407 self.closest = None
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	408 for chicken in gameboard.chickens:
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	409 dist = chicken.pos.dist(self.pos)
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	410 if chicken.abode:
370 b3c90e49a6b7 Foxes are more averse to armed chickens and less averse to indoor chickens. Jeremy Thurgood <firxen@gmail.com> parents: 305 diff changeset	411 dist += 5 # Prefer free-ranging chickens
b3c90e49a6b7 Foxes are more averse to armed chickens and less averse to indoor chickens. Jeremy Thurgood <firxen@gmail.com> parents: 305 diff changeset	412 if len(chicken.weapons()) > 0:
b3c90e49a6b7 Foxes are more averse to armed chickens and less averse to indoor chickens. Jeremy Thurgood <firxen@gmail.com> parents: 305 diff changeset	413 dist += 5 # Prefer unarmed chickens
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	414 if dist < min_dist:
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	415 min_dist = dist
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	416 self.closest = chicken
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	417 if not self.closest:
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	418 # No more chickens, so leave
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	419 self.hunting = False
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	420 return self.pos
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	421 if self.closest.pos == self.pos:
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	422 # No need to move
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	423 return self.pos
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	424 if self.closest.pos.to_tile_tuple() == self.pos.to_tile_tuple():
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	425 # Only differ in z, so next step is in z
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	426 if self.closest.pos.z < self.pos.z:
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	427 new_z = self.pos.z - 1
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	428 else:
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	429 new_z = self.pos.z + 1
2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	430 return Position(self.pos.x, self.pos.y, new_z)
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	431 return self._find_best_path_step(self.closest.pos, gameboard)
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	432
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	433 def attack(self, gameboard):
19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	434 """Attack a chicken"""
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 399 diff changeset	435 chicken = gameboard.get_animal_at_pos(self.pos, 'chicken')
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 399 diff changeset	436 if chicken:
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 399 diff changeset	437 # Always attack a chicken we step on, even if not hunting
7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 399 diff changeset	438 self._catch_chicken(chicken, gameboard)
396 19e583e5cdc0 Refactor for further move work Neil Muller <drnlmuller@gmail.com> parents: 395 diff changeset	439
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	440 def _catch_chicken(self, chicken, gameboard):
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	441 """Catch a chicken"""
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	442 chicken.damage(gameboard)
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	443 self.closest = None
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	444 self.hunting = False
149 2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	445 self.last_steps = [] # Forget history here
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	446
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	447 def _update_pos(self, gameboard, new_pos):
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	448 """Update the position, making sure we don't step on other foxes"""
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	449 if new_pos == self.pos:
490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	450 # We're not moving, so we can skip all the checks
149 2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	451 return new_pos
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 399 diff changeset	452 blocked = gameboard.get_animal_at_pos(new_pos, 'fox') is not None
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	453 if not blocked and new_pos.z == self.pos.z:
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	454 # We're only worried about loops when not on a ladder
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	455 blocked = new_pos in self.last_steps
149 2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	456 final_pos = new_pos
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	457 if blocked:
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	458 if new_pos.z != self.pos.z:
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	459 # We can only move up and down a ladder
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	460 moves = [Position(self.pos.x, self.pos.y, z) for z
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	461 in range(self.pos.z-1, self.pos.z + 2) if z >= 0]
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	462 else:
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	463 moves = [Position(x, y) for x in range(self.pos.x-1, self.pos.x + 2)
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	464 for y in range(self.pos.y-1, self.pos.y + 2)
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	465 if Position(x,y) != self.pos and
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	466 Position(x, y) not in self.last_steps and
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	467 self.pos.z == 0]
3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	468 # find the cheapest point in moves that's not blocked
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	469 final_pos = None
82 bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	470 min_cost = 1000
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	471 for poss in moves:
401 7405f7db469f Tweak fox attack logic - we no longer ignore chickens we accidently step on Neil Muller <drnlmuller@gmail.com> parents: 399 diff changeset	472 if gameboard.get_animal_at_pos(poss, 'fox'):
399 3294929223bd Cache fox positions to avoid a repeated loop Neil Muller <drnlmuller@gmail.com> parents: 398 diff changeset	473 continue # blocked
82 bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	474 cost = self._cost_tile(poss, gameboard)
bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	475 if cost < min_cost:
bf28f499c6b4 Tweak fox avoidance behaviour Neil Muller <drnlmuller@gmail.com> parents: 72 diff changeset	476 min_cost = cost
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	477 final_pos = poss
257 fcaae2cfe3cd Make foxes less determistic when avoiding other foxes Neil Muller <drnlmuller@gmail.com> parents: 251 diff changeset	478 if cost == min_cost and random.randint(0, 1) > 0:
fcaae2cfe3cd Make foxes less determistic when avoiding other foxes Neil Muller <drnlmuller@gmail.com> parents: 251 diff changeset	479 # Add some randomness in this case
fcaae2cfe3cd Make foxes less determistic when avoiding other foxes Neil Muller <drnlmuller@gmail.com> parents: 251 diff changeset	480 final_pos = poss
149 2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	481 if not final_pos:
2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	482 # No good choice, so stay put
2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	483 return self.pos
72 aa4bd93575d9 Fix some bound checking and tweak movement costs Neil Muller <drnlmuller@gmail.com> parents: 71 diff changeset	484 if gameboard.in_bounds(final_pos):
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	485 this_tile = gameboard.tv.get(final_pos.to_tile_tuple())
72 aa4bd93575d9 Fix some bound checking and tweak movement costs Neil Muller <drnlmuller@gmail.com> parents: 71 diff changeset	486 else:
aa4bd93575d9 Fix some bound checking and tweak movement costs Neil Muller <drnlmuller@gmail.com> parents: 71 diff changeset	487 this_tile = tiles.REVERSE_TILE_MAP['woodland']
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	488 if tiles.TILE_MAP[this_tile] == 'broken fence' and self.hunting:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	489 # We'll head back towards the holes we make/find
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	490 self.landmarks.append(final_pos)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	491 elif tiles.TILE_MAP[this_tile] == 'fence' and not self.dig_pos:
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	492 self._dig(gameboard, final_pos)
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	493 return self.pos
149 2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	494 self.last_steps.append(final_pos)
2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	495 if len(self.last_steps) > 3:
2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	496 self.last_steps.pop(0)
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	497 return final_pos
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	498
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	499 def _dig(self, gameboard, dig_pos):
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	500 """Setup dig parameters, to be overridden if needed"""
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	501 self.tick = 5
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	502 self.dig_pos = dig_pos
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	503
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	504 def _make_hole(self, gameboard):
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	505 """Make a hole in the fence"""
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	506 fence = gameboard.get_building(self.dig_pos.to_tile_tuple())
394 ad77b3b71b08 Fix crash when multiple foxes finish digging at the same time Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	507 # Another fox could have made the same hole this turn
ad77b3b71b08 Fix crash when multiple foxes finish digging at the same time Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	508 if fence:
ad77b3b71b08 Fix crash when multiple foxes finish digging at the same time Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	509 fence.damage(gameboard.tv)
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	510 self.dig_pos = None
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	511
28 ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	512 def move(self, gameboard):
ac3a74352b74 Change animal.py to four space indents. Simon Cross <hodgestar@gmail.com> parents: 25 diff changeset	513 """Foxes will aim to move towards the closest henhouse or free
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	514 chicken"""
398 082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	515 if self.safe:
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	516 # We're safe, so do nothing
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	517 return
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	518 elif self.dig_pos:
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	519 if self.tick:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	520 self.tick -= 1
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	521 # We're still digging through the fence
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	522 # Check the another fox hasn't dug a hole for us
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	523 # We're too busy digging to notice if a hole appears nearby,
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	524 # but we'll notice if the fence we're digging vanishes
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	525 this_tile = gameboard.tv.get(self.dig_pos.to_tile_tuple())
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	526 if tiles.TILE_MAP[this_tile] == 'broken fence':
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	527 self.tick = 0
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	528 else:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	529 # We've dug through the fence, so make a hole
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	530 self._make_hole(gameboard)
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	531 return
398 082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	532 elif self.hunting:
70 d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	533 desired_pos = self._find_path_to_chicken(gameboard)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	534 else:
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	535 desired_pos = self._find_path_to_woodland(gameboard)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	536 final_pos = self._update_pos(gameboard, desired_pos)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	537 self._fix_face(final_pos)
d92a2f973cc4 Make foxes move 'better' and break fences Neil Muller <drnlmuller@gmail.com> parents: 53 diff changeset	538 self.pos = final_pos
398 082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	539 change_visible = False
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	540 # See if we're entering/leaving a building
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	541 building = gameboard.get_building(final_pos.to_tile_tuple())
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	542 if building and self.outside():
398 082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	543 # Check if we need to enter
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	544 if self.closest and not self.closest.outside() and \
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	545 self.closest.abode.building is building:
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	546 building.add_predator(self)
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	547 change_visible = True
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	548 elif self.building and final_pos.z == 0:
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	549 # can only leave from the ground floor
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	550 if building == self.building:
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	551 # Check if we need to leave the building
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	552 if not self.hunting or (self.closest and
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	553 self.closest.abode.building is not building):
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	554 self.building.remove_predator(self)
398 082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	555 change_visible = True
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	556 else:
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	557 # we've moved away from the building we were in
532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	558 self.building.remove_predator(self)
398 082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	559 change_visible = True
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	560 if change_visible:
082b1ea5f98d Regain time lost when adding foxes to buildings Neil Muller <drnlmuller@gmail.com> parents: 397 diff changeset	561 gameboard.set_visibility(self)
397 532f1ea476ff Make foxes enter buildings, with a seperate count for them Neil Muller <drnlmuller@gmail.com> parents: 396 diff changeset	562
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	563
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	564 class NinjaFox(Fox):
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	565 """Ninja foxes are hard to see"""
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	566
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	567 STEALTH = 60
130 96c5ef7613b5 NINJA FOXES! Jeremy Thurgood <firxen@gmail.com> parents: 125 diff changeset	568 IMAGE_FILE = 'sprites/ninja_fox.png'
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	569 CONFIG_NAME = 'ninja fox'
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	570
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	571 class DemoFox(Fox):
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	572 """Demolition Foxes destroy fences easily"""
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	573
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	574 DIG_ANIMATION = animations.FenceExplosion
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	575 IMAGE_FILE = 'sprites/sapper_fox.png'
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	576 CONFIG_NAME = 'sapper fox'
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	577
406 f8072b2d6dd1 Fix bug where sapper foxes overwrite costs for all foxes Neil Muller <drnlmuller@gmail.com> parents: 404 diff changeset	578 costs = Fox.costs.copy()
f8072b2d6dd1 Fix bug where sapper foxes overwrite costs for all foxes Neil Muller <drnlmuller@gmail.com> parents: 404 diff changeset	579
269 445f746449fa Tweak sapper fox path weighting Neil Muller <drnlmuller@gmail.com> parents: 257 diff changeset	580 def __init__(self, pos):
445f746449fa Tweak sapper fox path weighting Neil Muller <drnlmuller@gmail.com> parents: 257 diff changeset	581 Fox.__init__(self, pos)
445f746449fa Tweak sapper fox path weighting Neil Muller <drnlmuller@gmail.com> parents: 257 diff changeset	582 self.costs['fence'] = 2 # We don't worry about fences
445f746449fa Tweak sapper fox path weighting Neil Muller <drnlmuller@gmail.com> parents: 257 diff changeset	583
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	584 def _dig(self, gameboard, dig_pos):
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	585 """Setup dig parameters, to be overridden if needed"""
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	586 self.tick = 0 # Costs us nothing to go through a fence.
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	587 self.dig_pos = dig_pos
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	588 self.DIG_ANIMATION(gameboard.tv, dig_pos.to_tile_tuple())
241 1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	589 self._make_hole(gameboard)
1a7000c8211c Demolition foxes, including better fox selection. Jeremy Thurgood <firxen@gmail.com> parents: 236 diff changeset	590
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	591 class GreedyFox(Fox):
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	592 """Greedy foxes eat more chickens"""
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	593 CONFIG_NAME = 'greedy fox'
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	594
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	595 def __init__(self, pos):
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	596 Fox.__init__(self, pos)
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	597 self.chickens_eaten = 0
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	598
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	599 def _catch_chicken(self, chicken, gameboard):
251 844bfb23d4b6 Refactored animal death and added death animations. Jeremy Thurgood <firxen@gmail.com> parents: 243 diff changeset	600 chicken.damage(gameboard)
145 490ede177f50 Tweak fox behaviour around henhouses. Add some memory to avoid the indecisive fox loop Neil Muller <drnlmuller@gmail.com> parents: 130 diff changeset	601 self.closest = None
92 bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	602 self.chickens_eaten += 1
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	603 if self.chickens_eaten > 2:
bea1b9364583 Refactor Fox so we can have different types. Add a greedy fox Neil Muller <drnlmuller@gmail.com> parents: 84 diff changeset	604 self.hunting = False
149 2a1064fae608 More memory for the foxes, to ensure we avoid short loops Neil Muller <drnlmuller@gmail.com> parents: 146 diff changeset	605 self.last_steps = []
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	606
290 664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	607 class Rinkhals(Fox):
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	608 """The Rinkhals has eclectic tastes"""
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	609 STEALTH = 80
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	610 IMAGE_FILE = 'sprites/rinkhals.png'
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	611 CONFIG_NAME = 'rinkhals'
290 664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	612
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	613 def _catch_chicken(self, chicken, gameboard):
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	614 """The Rinkhals hunts for sport, catch and release style"""
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	615 self.closest = None
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	616 self.hunting = False
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	617 self.last_steps = []
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	618
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	619 def _make_hole(self, gameboard):
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	620 """The Rinkhals eats fences"""
395 2d0ff46118e2 Basic support for z coordinate Neil Muller <drnlmuller@gmail.com> parents: 394 diff changeset	621 fence = gameboard.get_building(self.dig_pos.to_tile_tuple())
394 ad77b3b71b08 Fix crash when multiple foxes finish digging at the same time Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	622 if fence:
ad77b3b71b08 Fix crash when multiple foxes finish digging at the same time Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	623 fence.remove(gameboard.tv)
ad77b3b71b08 Fix crash when multiple foxes finish digging at the same time Neil Muller <drnlmuller@gmail.com> parents: 389 diff changeset	624 gameboard.remove_building(fence)
290 664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	625 self.dig_pos = None
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	626
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	627 def damage(self, gameboard):
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	628 """The Rinkhals is invincible!"""
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	629 return True
664bba9be40a Fences are eclectic. Jeremy Thurgood <firxen@gmail.com> parents: 269 diff changeset	630
199 696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	631 def _get_vision_param(parameter, watcher):
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	632 param = getattr(watcher, parameter)
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	633 if watcher.abode:
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	634 modifier = getattr(watcher.abode.building, 'MODIFY_'+parameter, lambda r: r)
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	635 param = modifier(param)
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	636 return param
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	637
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	638 def visible(watcher, watchee):
199 696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	639 vision_bonus = _get_vision_param('VISION_BONUS', watcher)
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	640 range_penalty = _get_vision_param('VISION_RANGE_PENALTY', watcher)
696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	641 distance = watcher.pos.dist(watchee.pos) - 1
114 4c2fbab20abe Foxes are stealthy now. Jeremy Thurgood <firxen@gmail.com> parents: 109 diff changeset	642 roll = random.randint(1, 100)
199 696936621a93 Buildings can affect visual acuity. Jeremy Thurgood <firxen@gmail.com> parents: 196 diff changeset	643 return roll > watchee.STEALTH - vision_bonus + range_penalty*distance
389 463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	644
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	645 # These don't have to add up to 100, but it's easier to think
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	646 # about them if they do.
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	647 DEFAULT_FOX_WEIGHTINGS = (
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	648 (Fox, 59),
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	649 (GreedyFox, 30),
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	650 (NinjaFox, 5),
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	651 (DemoFox, 5),
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	652 (Rinkhals, 1),
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	653 )
463802281182 Add basic level support (level choosing needs work) Neil Muller <drnlmuller@gmail.com> parents: 380 diff changeset	654

Mercurial > rinkhals

annotate gamelib/animal.py @ 414:9096c237928c