# HG changeset patch # User Adrianna Pińska # Date 1252095411 0 # Node ID fe1e9c18d4d746f0115ba32b798fc0b23c3ac734 # Parent 67d10f7e0159c23098d4e91cc925e6ded2ff68f0 layering bugfix; indoor chickens now use normal chicken icons diff -r 67d10f7e0159 -r fe1e9c18d4d7 data/images/gameover_lose.png Binary file data/images/gameover_lose.png has changed diff -r 67d10f7e0159 -r fe1e9c18d4d7 data/images/gameover_win.png Binary file data/images/gameover_win.png has changed diff -r 67d10f7e0159 -r fe1e9c18d4d7 data/images/splash.png Binary file data/images/splash.png has changed diff -r 67d10f7e0159 -r fe1e9c18d4d7 data/sprites/chknnest.png Binary file data/sprites/chknnest.png has changed diff -r 67d10f7e0159 -r fe1e9c18d4d7 data/sprites/chknnest.svg --- a/data/sprites/chknnest.svg Fri Sep 04 19:51:19 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,280 +0,0 @@ - - - diff -r 67d10f7e0159 -r fe1e9c18d4d7 data/sprites/emptynest.png Binary file data/sprites/emptynest.png has changed diff -r 67d10f7e0159 -r fe1e9c18d4d7 data/sprites/emptynest.svg --- a/data/sprites/emptynest.svg Fri Sep 04 19:51:19 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,199 +0,0 @@ - - - diff -r 67d10f7e0159 -r fe1e9c18d4d7 gamelib/animal.py --- a/gamelib/animal.py Fri Sep 04 19:51:19 2009 +0000 +++ b/gamelib/animal.py Fri Sep 04 20:16:51 2009 +0000 @@ -94,9 +94,10 @@ layers.sort(key=lambda l: l[2]) - self.image_left = layers[0][0] - self.image_right = layers[0][1] - for l in layers[1:]: + # these always go on the bottom so that other layers don't get overwritten + self.image_left = self._image_left.copy() + self.image_right = self._image_right.copy() + for l in layers: self.image_left.blit(l[0], (0,0)) self.image_right.blit(l[1], (0,0)) diff -r 67d10f7e0159 -r fe1e9c18d4d7 gamelib/gameboard.py --- a/gamelib/gameboard.py Fri Sep 04 19:51:19 2009 +0000 +++ b/gamelib/gameboard.py Fri Sep 04 20:16:51 2009 +0000 @@ -349,6 +349,7 @@ try: place = building.first_empty_place() self.relocate_animal(self.animal_to_place, place=place) + self.animal_to_place.equip(equipment.Nest()) self.select_animal_to_place(None) pygame.mouse.set_cursor(*cursors.cursors['select']) except buildings.BuildingFullError: @@ -358,6 +359,7 @@ return if self.tv.get(tile_pos) == self.GRASSLAND: if self.animal_to_place is not None: + self.animal_to_place.unequip_by_name("nest") self.relocate_animal(self.animal_to_place, tile_pos=tile_pos) def relocate_animal(self, chicken, tile_pos=None, place=None): @@ -422,7 +424,7 @@ def set_occupant(place, button, sell_callback): """Set occupant of a given place.""" if self.animal_to_place is not None: - button.value = icons.CHKN_NEST_ICON + button.value = icons.animal_icon(self.animal_to_place) button.disconnect(gui.CLICK, set_occupant) button.connect(gui.CLICK, select_occupant, place, button, sell_callback) @@ -454,7 +456,7 @@ button.connect(gui.CLICK, set_occupant, place, button, sell_callback) else: - button = gui.Button(icons.CHKN_NEST_ICON) + button = gui.Button(icons.animal_icon(place.occupant)) button.connect(gui.CLICK, select_occupant, place, button, sell_callback) place_button_map[id(place)] = button diff -r 67d10f7e0159 -r fe1e9c18d4d7 gamelib/icons.py --- a/gamelib/icons.py Fri Sep 04 19:51:19 2009 +0000 +++ b/gamelib/icons.py Fri Sep 04 20:16:51 2009 +0000 @@ -6,5 +6,7 @@ KILLED_FOX = Image(imagecache.load_image('icons/killed_fox.png')) CHKN_ICON = Image(imagecache.load_image('icons/chkn.png')) -EMPTY_NEST_ICON = Image(imagecache.load_image('sprites/emptynest.png')) -CHKN_NEST_ICON = Image(imagecache.load_image('sprites/chknnest.png')) +EMPTY_NEST_ICON = Image(imagecache.load_image('sprites/nest.png')) + +def animal_icon(animal): + return Image(animal.image_left) diff -r 67d10f7e0159 -r fe1e9c18d4d7 regenerate-pngs.py --- a/regenerate-pngs.py Fri Sep 04 19:51:19 2009 +0000 +++ b/regenerate-pngs.py Fri Sep 04 20:16:51 2009 +0000 @@ -73,8 +73,6 @@ ("select_hendominium", 40, 60), ("watchtower", 40, 40), ("select_watchtower", 40, 40), - ("chknnest", 20, 20), - ("emptynest", 20, 20), ("nest", 20, 20), ]